Merge branch 'develop' into feature/NickE_conventional_prepbufr

NOAA-EMC · Nov 13, 2023 · fbe39bc · fbe39bc
2 parents 9fe52b0 + 2ed00d2
commit fbe39bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/parm/atm/obs/config/satwind_goes-16.yaml b/parm/atm/obs/config/satwind_goes-16.yaml
@@ -3,7 +3,7 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: $(DATA)/obs/$(OPREFIX)satwind.abi_goes-16.{{ current_cycle | to_YMDH }}.nc4
+      obsfile: $(DATA)/obs/$(OPREFIX)satwnd.abi_goes-16.tm00.nc
   obsdataout:
     engine:
       type: H5File

diff --git a/parm/atm/obs/config/satwind_goes-17.yaml b/parm/atm/obs/config/satwind_goes-17.yaml
@@ -3,7 +3,7 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: $(DATA)/obs/$(OPREFIX)satwind.abi_goes-17.{{ current_cycle | to_YMDH }}.nc4
+      obsfile: $(DATA)/obs/$(OPREFIX)satwnd.abi_goes-17.tm00.nc
   obsdataout:
     engine:
       type: H5File

diff --git a/utils/obsproc/Smap2Ioda.h b/utils/obsproc/Smap2Ioda.h
@@ -21,7 +21,7 @@ namespace gdasapp {
    public:
     explicit Smap2Ioda(const eckit::Configuration & fullConfig, const eckit::mpi::Comm & comm)
       : NetCDFToIodaConverter(fullConfig, comm) {
-      variable_ = "Salinity";
+      variable_ = "seaSurfaceSalinity";
     }
 
     // Read netcdf file and populate iodaVars

diff --git a/utils/obsproc/Smos2Ioda.h b/utils/obsproc/Smos2Ioda.h
@@ -20,7 +20,7 @@ namespace gdasapp {
    public:
     explicit Smos2Ioda(const eckit::Configuration & fullConfig, const eckit::mpi::Comm & comm)
       : NetCDFToIodaConverter(fullConfig, comm) {
-      variable_ = "Salinity";
+      variable_ = "seaSurfaceSalinity";
     }
 
     // Read netcdf file and populate iodaVars