Merge to develop.

NOAA-EMC · Aug 14, 2023 · 24bfe75 · 24bfe75
1 parent a4a84e7
commit 24bfe75
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 36 deletions.
diff --git a/parm/land/letkfoi/letkfoi.yaml b/parm/land/letkfoi/letkfoi.yaml
@@ -52,7 +52,9 @@ local ensemble DA:
 
 output increment:
   datapath: $(DATA)/anl
+  prefix: landinc
   filetype: fms restart
   filename_sfcd: '{{ current_cycle | to_fv3time }}.sfc_data.nc'
   filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
   state variables: [snodl,vtype,slmsk]
+
diff --git a/parm/land/prep/incr.nml.j2 b/parm/land/prep/incr.nml.j2
diff --git a/parm/land/prep/prep_ims.yaml b/parm/land/prep/prep_ims.yaml
@@ -6,5 +6,5 @@ calcfims:
     - [$(COM_OBS)/$(OPREFIX)IMS4km_to_FV3_mapping.$(CASE)_oro_data.nc, $(DATA)/obs/IMS4km_to_FV3_mapping.$(CASE)_oro_data.nc]
 ims2ioda:
   copy:
-    - [$(DATA)/ims_snow_{{ current_cycle | to_YMDH }}.nc4, $(COM_OBS)/$(OPREFIX)ims_snow_{{ current_cycle | to_YMDH }}.nc4]
+    - [$(DATA)/ims_snow_{{ current_cycle | to_YMDH }}.nc4, $(COM_OBS)/$(OPREFIX)ims_snow.nc4]
 
diff --git a/parm/land/prep/prep_run.yaml b/parm/land/prep/prep_run.yaml
diff --git a/test/land/create_bkg_ens.sh b/test/land/create_bkg_ens.sh
@@ -38,12 +38,12 @@ if [[ ${DAtype} == 'letkfoi_snow' ]]; then
         if [ -e $WORKDIR/mem${ens} ]; then
                 rm -rf $WORKDIR/mem${ens}
         fi
-        mkdir -p $WORKDIR/mem${ens}/RESTART
+        mkdir -p $WORKDIR/mem${ens}
         for tile in 1 2 3 4 5 6
         do
-            cp ${RSTDIR}/${FILEDATE}.sfc_data.tile${tile}.nc  ${WORKDIR}/mem${ens}/RESTART/${FILEDATE}.sfc_data.tile${tile}.nc
+            cp ${RSTDIR}/${FILEDATE}.sfc_data.tile${tile}.nc  ${WORKDIR}/mem${ens}/${FILEDATE}.sfc_data.tile${tile}.nc
         done
-        cp ${RSTDIR}/${FILEDATE}.coupler.res ${WORKDIR}/mem${ens}/RESTART/${FILEDATE}.coupler.res
+        cp ${RSTDIR}/${FILEDATE}.coupler.res ${WORKDIR}/mem${ens}/${FILEDATE}.coupler.res
     done
 
 

diff --git a/ush/land/letkf_create_ens.py b/ush/land/letkf_create_ens.py
@@ -29,7 +29,7 @@
 for (mem, value) in zip(ens_dirs, sign):
     for tt in range(1, 7):
         # open file
-        out_netcdf = os.path.join(workdir, mem, "RESTART", f"{fstub}.sfc_data.tile{tt}.nc")
+        out_netcdf = os.path.join(workdir, mem, f"{fstub}.sfc_data.tile{tt}.nc")
         with Dataset(out_netcdf, "r+") as ncOut:
             slmsk_array = ncOut.variables['slmsk'][:]
             vtype_array = ncOut.variables['vtype'][:]