Merge branch 'develop' into bugfix/stable_driver

NOAA-EMC · Jul 12, 2023 · 590a7f4 · 590a7f4
2 parents c8a9765 + 78d5873
commit 590a7f4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/parm/land/letkfoi/apply_incr_nml.j2 b/parm/land/letkfoi/apply_incr_nml.j2
@@ -2,7 +2,7 @@
   date_str = "{{ current_cycle | to_YMD }}",
   hour_str = "{{ current_cycle | strftime('%H') }}",
   res = {{ CASE[1:] }},
-  frac_grid = {{ FRAC_GRID | to_f90bool }},
+  frac_grid = .true.,
   rst_path = "{{ DATA }}/anl",
   inc_path = "{{ DATA }}/anl",
   orog_path = "{{ HOMEgfs }}/fix/orog/{{ CASE }}",

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

diff --git a/ush/land/genYAML_output_letkfoi.yaml b/ush/land/genYAML_output_letkfoi.yaml
@@ -10,7 +10,7 @@ background:
       filename_sfcd: 20210323.180000.sfc_data.nc
       filetype: fms restart
       state variables:
-      - snwdph
+      - snodl
       - vtype
       - slmsk
     zero padding: '3'
@@ -119,6 +119,13 @@ observations:
           min_latitude: '-90'
           min_longitude: '-180'
         use_legacy_buddy_collector: 'false'
+    # Assign obsError.
+    - filter: Perform Action
+      filter variables:
+      - name: totalSnowDepth
+      action:
+        name: assign error
+        error parameter: 40.0
     - assignments:
       - name: GrossErrorProbability/totalSnowDepth
         type: float