Merge branch 'develop' into feature/wxflow

NOAA-EMC · Jul 8, 2023 · f743d9c · f743d9c
2 parents 58725c1 + e963914
commit f743d9c
Show file tree

Hide file tree

Showing 9 changed files with 1,639 additions and 1,635 deletions.
diff --git a/parm/land/letkfoi/letkfoi.yaml b/parm/land/letkfoi/letkfoi.yaml
@@ -28,7 +28,7 @@ background:
      template:
        datetime: '{{ current_cycle | to_isotime }}'
        filetype: fms restart
-       state variables: [snwdph,vtype,slmsk]
+       state variables: [snodl,vtype,slmsk]
        datapath: $(DATA)/bkg/mem%mem%/RESTART
        filename_sfcd: '{{ current_cycle | to_fv3time }}.sfc_data.nc'
        filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
@@ -56,5 +56,5 @@ output increment:
   filetype: fms restart
   filename_sfcd: '{{ current_cycle | to_fv3time }}.sfc_data.nc'
   filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
-  state variables: [snwdph,vtype,slmsk]
+  state variables: [snodl,vtype,slmsk]
 
diff --git a/parm/land/obs/config/adpsfc_snow.yaml b/parm/land/obs/config/adpsfc_snow.yaml
@@ -86,6 +86,12 @@ obs filters:
       damping_factor_1: 1.0
       damping_factor_2: 1.0
       background_error_group: BkgError
+  - filter: Perform Action
+    filter variables:
+    - name: totalSnowDepth
+    action:
+      name: assign error
+      error parameter: 40.0
   - filter: Variable Assignment
     assignments:
     - name: GrossErrorProbability/totalSnowDepth

diff --git a/test/land/letkfoi_snowda.sh b/test/land/letkfoi_snowda.sh
@@ -19,7 +19,7 @@ WORKDIR=$project_binary_dir/test/land/letkfoi_snowda
 RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model_data/atmos/restart
 export OBSDIR=$GDASAPP_TESTDATA/land
 
-GFSv17=${GFSv17:-"NO"}
+GFSv17=${GFSv17:-"YES"}
 DAtype=letkfoi_snow
 
 if [ $GFSv17 == "YES" ]; then