Merge branch 'feature/aero-bmat-endcycle' into feature/aero-b-interp

NOAA-EMC · Jul 9, 2024 · 4fc561a · 4fc561a
2 parents b2bea99 + 40c2d77
commit 4fc561a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/parm/aero/berror/aero_diagb.yaml.j2 b/parm/aero/berror/aero_diagb.yaml.j2
@@ -1,3 +1,5 @@
+{% set offset_td = "+6H" | to_timedelta %}
+{% set background_time = current_cycle | add_to_datetime(offset_td) %}
 geometry:
   fms initialization:
     namelist filename: ./fv3jedi/fmsmpp.nml
@@ -10,9 +12,9 @@ geometry:
   npy: {{ npy_ges }}
   npz: {{ npz_ges }}
   field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
-date: '{{ current_cycle | to_isotime }}' 
+date: '{{ background_time | to_isotime }}' 
 background:
-  datetime: '{{ current_cycle | to_isotime }}' 
+  datetime: '{{ background_time | to_isotime }}' 
   filetype: fms restart
   state variables: [mass_fraction_of_sulfate_in_air,
                     mass_fraction_of_hydrophobic_black_carbon_in_air,
@@ -25,10 +27,9 @@ background:
                     mass_fraction_of_sea_salt002_in_air, mass_fraction_of_sea_salt003_in_air,
                     mass_fraction_of_sea_salt004_in_air]
   datapath: ./bkg
-  skip coupler file: true
-  filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
-  filename_trcr: '{{ current_cycle | to_fv3time }}.fv_tracer.res.nc'
-  filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
+  filename_core: '{{ background_time | to_fv3time }}.fv_core.res.nc'
+  filename_trcr: '{{ background_time | to_fv3time }}.fv_tracer.res.nc'
+  filename_cplr: '{{ background_time | to_fv3time }}.coupler.res'
 
 background error:
   filetype: fms restart

diff --git a/parm/aero/berror/aero_diffusionparm.yaml.j2 b/parm/aero/berror/aero_diffusionparm.yaml.j2
@@ -1,3 +1,5 @@
+{% set offset_td = "+6H" | to_timedelta %}
+{% set background_time = current_cycle | add_to_datetime(offset_td) %}
 geometry:
   fms initialization:
     namelist filename: ./fv3jedi/fmsmpp.nml
@@ -10,14 +12,14 @@ geometry:
   npy: {{ npy_ges }}
   npz: {{ npz_ges }}
   field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
-date: '{{ current_cycle | to_isotime }}' 
+date: '{{ background_time | to_isotime }}' 
 background:
-  datetime: '{{ current_cycle | to_isotime }}' 
+  datetime: '{{ background_time | to_isotime }}' 
   filetype: fms restart
   datapath: ./bkg
-  filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
-  filename_trcr: '{{ current_cycle | to_fv3time }}.fv_tracer.res.nc'
-  filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
+  filename_core: '{{ background_time | to_fv3time }}.fv_core.res.nc'
+  filename_trcr: '{{ background_time | to_fv3time }}.fv_tracer.res.nc'
+  filename_cplr: '{{ background_time | to_fv3time }}.coupler.res'
   state variables: [mass_fraction_of_sulfate_in_air,
                     mass_fraction_of_hydrophobic_black_carbon_in_air,
                     mass_fraction_of_hydrophilic_black_carbon_in_air,