Address Jiarui's comments

NOAA-EMC · Dec 11, 2024 · d91921b · d91921b
1 parent 74de096
commit d91921b
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 32 deletions.
diff --git a/algorithm/snow/fv3jedi_snow_ensmean.yaml.j2 b/algorithm/snow/fv3jedi_snow_ensmean.yaml.j2
@@ -20,7 +20,7 @@ ensemble:
       datapath: ./bkg/mem%mem%/
       filename_sfcd: '{{ snow_background_time_fv3 }}.sfc_data.nc'
       filename_cplr: '{{ snow_background_time_fv3 }}.coupler.res'
-      filename_orog: '{{snow_orog_prefix}}_oro_data.nc'
+      filename_orog: '{{ snow_orog_prefix }}_oro_data.nc'
     pattern: '%mem%'
-    nmembers: {{snow_number_ensemble_members}}
+    nmembers: {{ snow_number_ensemble_members }}
     zero padding: 3
diff --git a/model/snow/snow_3dvar_outer_loop_1.yaml.j2 b/model/snow/snow_3dvar_outer_loop_1.yaml.j2
@@ -3,23 +3,23 @@
   test: on
   geometry:
     fms initialization:
-      namelist filename: {{snow_fv3jedi_files_path}}/fmsmpp.nml
-      field table filename: {{snow_fv3jedi_files_path}}/field_table
-    akbk: {{snow_fv3jedi_files_path}}/akbk.nc4
+      namelist filename: {{ snow_fv3jedi_files_path }}/fmsmpp.nml
+      field table filename: {{ snow_fv3jedi_files_path }}/field_table
+    akbk: {{ snow_fv3jedi_files_path }}/akbk.nc4
     layout:
-    - {{snow_layout_x}}
-    - {{snow_layout_y}}
-    npx: {{snow_npx_anl}}
-    npy: {{snow_npy_anl}}
-    npz: {{snow_npz_anl}}
-    field metadata override: {{snow_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml
+    - {{ snow_layout_x }}
+    - {{ snow_layout_y }}
+    npx: {{ snow_npx_anl }}
+    npy: {{ snow_npy_anl }}
+    npz: {{ snow_npz_anl }}
+    field metadata override: {{ snow_fv3jedi_files_path }}/fv3jedi_fieldmetadata_restart.yaml
     time invariant fields:
       state fields:
         datetime: '{{ snow_background_time_iso }}'
         filetype: fms restart
         skip coupler file: true
         state variables: [orog_filt]
-        datapath: {{snow_orog_files_path}}/
-        filename_orog: {{snow_orog_prefix}}_oro_data.nc
+        datapath: {{ snow_orog_files_path }}/
+        filename_orog: {{ snow_orog_prefix }}_oro_data.nc
   diagnostics:
     departures: bkgmob
diff --git a/model/snow/snow_background.yaml.j2 b/model/snow/snow_background.yaml.j2
@@ -5,4 +5,4 @@ datetime: '{{ snow_background_time_iso }}'
 state variables: [snodl,vtype,slmsk,sheleg,orog_filt]
 filename_sfcd: '{{ snow_background_time_fv3 }}.sfc_data.nc'
 filename_cplr: '{{ snow_background_time_fv3 }}.coupler.res'
-filename_orog: '{{snow_orog_prefix}}_oro_data.nc'
+filename_orog: '{{ snow_orog_prefix }}_oro_data.nc'
diff --git a/model/snow/snow_final_increment_fms.yaml.j2 b/model/snow/snow_final_increment_fms.yaml.j2
@@ -8,13 +8,13 @@ output:
     state variables: [snodl,vtype,slmsk]
 geometry:
   fms initialization:
-    namelist filename: "{{snow_fv3jedi_files_path}}/fmsmpp.nml"
-    field table filename: "{{snow_fv3jedi_files_path}}/field_table"
-  akbk: "{{snow_fv3jedi_files_path}}/akbk.nc4"
+    namelist filename: "{{ snow_fv3jedi_files_path }}/fmsmpp.nml"
+    field table filename: "{{ snow_fv3jedi_files_path }}/field_table"
+  akbk: "{{ snow_fv3jedi_files_path }}/akbk.nc4"
   layout:
-  - {{snow_layout_x}}
-  - {{snow_layout_y}}
-  npx: {{snow_npx_ges}}
-  npy: {{snow_npy_ges}}
-  npz: {{snow_npz_ges}}
-  field metadata override: "{{snow_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml"
+  - {{ snow_layout_x }}
+  - {{ snow_layout_y }}
+  npx: {{ snow_npx_ges }}
+  npy: {{ snow_npy_ges }}
+  npz: {{ snow_npz_ges }}
+  field metadata override: "{{ snow_fv3jedi_files_path }}/fv3jedi_fieldmetadata_restart.yaml"
diff --git a/observations/snow/adpsfc_snow.yaml.j2 b/observations/snow/adpsfc_snow.yaml.j2
@@ -47,7 +47,7 @@
       filter variables:
       - name: totalSnowDepth
       minvalue: 0.0
-      maxvalue: 2000.0
+      maxvalue: 20000.0
       action:
         name: reject
     - filter: Domain Check
@@ -61,7 +61,7 @@
           name: GeoVaLs/slmsk
         minvalue: 0.5
         maxvalue: 1.5
-    - filter: Domain Check  # no land-ice
+    - filter: RejectList  # no land-ice
       where:
       - variable:
           name: GeoVaLs/vtype

diff --git a/observations/snow/ghcn_snow.yaml.j2 b/observations/snow/ghcn_snow.yaml.j2
@@ -7,7 +7,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: "{{snow_obsdatain_path}}/{{snow_obsdatain_prefix}}{{observation_from_jcb}}{{snow_obsdatain_suffix}}"
+        obsfile: "{{snow_obsdatain_path}}/{{snow_obsdatain_prefix}}{{observation_from_jcb}}.nc"
     obsdataout:
       engine:
         type: H5File
@@ -39,7 +39,7 @@
           name: GeoVaLs/slmsk
         minvalue: 0.5
         maxvalue: 1.5
-    - filter: Domain Check  # no land-ice
+    - filter: RejectList  # no land-ice
       where:
       - variable:
           name: GeoVaLs/vtype

diff --git a/observations/snow/ims_snow.yaml.j2 b/observations/snow/ims_snow.yaml.j2
@@ -41,7 +41,7 @@
         name: GeoVaLs/slmsk
       minvalue: 0.5
       maxvalue: 1.5
-  - filter: Domain Check  # no land-ice
+  - filter: RejectList  # no land-ice
     where:
     - variable:
         name: GeoVaLs/vtype

diff --git a/observations/snow/sfcsno.yaml.j2 b/observations/snow/sfcsno.yaml.j2
@@ -49,7 +49,7 @@
       filter variables:
       - name: totalSnowDepth
       minvalue: 0.0
-      maxvalue: 2000.0
+      maxvalue: 20000.0
       action:
         name: reject
     - filter: Domain Check
@@ -63,7 +63,7 @@
           name: GeoVaLs/slmsk
         minvalue: 0.5
         maxvalue: 1.5
-    - filter: Domain Check  # no land-ice
+    - filter: RejectList  # no land-ice
       where:
       - variable:
           name: GeoVaLs/vtype

diff --git a/observations/snow/snocvr_snow.yaml.j2 b/observations/snow/snocvr_snow.yaml.j2
@@ -48,7 +48,7 @@
       filter variables:
       - name: totalSnowDepth
       minvalue: 0.0
-      maxvalue: 2000.0
+      maxvalue: 20000.0
       action:
         name: reject
     - filter: Domain Check
@@ -62,7 +62,7 @@
           name: GeoVaLs/slmsk
         minvalue: 0.5
         maxvalue: 1.5
-    - filter: Domain Check  # no land-ice
+    - filter: RejectList  # no land-ice
       where:
       - variable:
           name: GeoVaLs/vtype