Merge branch 'develop' into feature/update-ci

NOAA-EMC · Dec 11, 2024 · 1f979e0 · 1f979e0
2 parents 2082d8e + a2ea377
commit 1f979e0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/parm/aero/berror/aero_diagb.yaml.j2 b/parm/aero/berror/aero_diagb.yaml.j2
@@ -76,25 +76,25 @@ variables:
   - mass_fraction_of_sea_salt003_in_air
   - mass_fraction_of_sea_salt004_in_air
 
-#global rescale:
-#  geometry:
-#    fms initialization:
-#      namelist filename: ./fv3jedi/fmsmpp.nml
-#      field table filename: ./fv3jedi/field_table
-#    akbk: ./fv3jedi/akbk.nc4
-#    layout:
-#    - {{ layout_x }}
-#    - {{ layout_y }}
-#    npx: {{ npx_rescale }}
-#    npy: {{ npy_rescale }}
-#    npz: {{ npz_ges }}
-#    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
-#  rescale stddev:
-#    filetype: fms restart
-#    skip coupler file: true
-#    dateapath: ./stddev
-#    filename_trcr: rescale.fv_tracer.res.nc
-#    filename_cplr: rescale.coupler.res
+global rescale:
+  geometry:
+    fms initialization:
+      namelist filename: ./fv3jedi/fmsmpp.nml
+      field table filename: ./fv3jedi/field_table
+    akbk: ./fv3jedi/akbk.nc4
+    layout:
+    - {{ layout_x }}
+    - {{ layout_y }}
+    npx: {{ npx_rescale }}
+    npy: {{ npy_rescale }}
+    npz: {{ npz_ges }}
+    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+  rescale stddev:
+    filetype: fms restart
+    skip coupler file: true
+    dateapath: ./stddev
+    filename_trcr: rescale.fv_tracer.res.nc
+    filename_cplr: rescale.coupler.res
 
 number of halo points: {{ aero_diagb_n_halo }}
 number of neighbors: {{ aero_diagb_n_neighbors }}

diff --git a/parm/aero/jcb-base.yaml.j2 b/parm/aero/jcb-base.yaml.j2
@@ -74,19 +74,22 @@ aero_background_error_time_fv3: "{{ background_time | to_fv3time }}"
 # Background error
 aero_berror_data_directory: "{{ DATA }}/berror"
 aero_berror_diffusion_directory: "{{ DATA }}/diffusion"
-aero_standard_devation_path: ./stddev
+aero_standard_deviation_path: ./stddev
 aero_climatological_b_path: ./clm_stddev
+aero_rescale_b_path: ./rescale
 aero_diagb_weight: {{ aero_diagb_weight | default(1.0, true) }}
 aero_diagb_static_rescale_factor: {{aero_staticb_rescaling_factor | default(1.0, true) }}
-aero_diagb_rescale_factor: {{aero_diagb_rescale | default(1.0, true) }}
-aero_diagb_n_halo: {{ aero_diagb_n_halo  | default(1, true)  }}
-aero_diagb_n_neighbors: {{ aero_diagb_n_neighbors | default(1, true) }}
-aero_diagb_smooth_horiz_iter: {{ aero_diagb_smooth_horiz_iter | default(1, true) }}
-aero_diagb_smooth_vert_iter: {{ aero_diagb_smooth_vert_iter | default(1, true) }}
-aero_diffusion_iter: {{ aero_diffusion_iter | default(1, true) }}
+aero_diagb_n_halo: {{ aero_diagb_n_halo  | default(0)  }}
+aero_diagb_n_neighbors: {{ aero_diagb_n_neighbors | default(0) }}
+aero_diagb_smooth_horiz_iter: {{ aero_diagb_smooth_horiz_iters | default(0) }}
+aero_diagb_smooth_vert_iter: {{ aero_diagb_smooth_vert_iters | default(0) }}
+aero_diffusion_iter: {{ aero_diffusion_iter | default(0) }}
 aero_diffusion_horiz_len: {{ aero_diffusion_horiz_len  | default(1.0, true)}}
 aero_diffusion_fixed_val: {{ aero_diffusion_fixed_val  | default(1.0, true)}}
 
+# Analysis
+aero_analysis_path: ./anl
+
 # Forecasting
 aero_forecast_timestep: "{{ BKG_TSTEP }}"