RUN to GDUMP and GDUMP_ENS

NOAA-EMC · Jun 3, 2024 · c704b53 · c704b53
1 parent f9541ae
commit c704b53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/parm/soca/letkf/letkf.yaml.j2 b/parm/soca/letkf/letkf.yaml.j2
@@ -11,8 +11,8 @@ background:
   members from template:
     template:
       date: '{{ ATM_WINDOW_MIDDLE }}'
-      ocn_filename: "enkf{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc"
-      ice_filename: "enkf{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc"
+      ocn_filename: "enkf{{ GDUMP }}.ocean.t{{ gcyc }}z.inst.f009.nc"
+      ice_filename: "enkf{{ GDUMP }}.ice.t{{ gcyc }}z.inst.f009.nc"
       read_from_file: 1
       basename: ./ens/mem%mem%
       state variables: [socn, tocn, ssh, uocn, vocn, cicen]

diff --git a/parm/soca/letkf/letkf_stage.yaml.j2 b/parm/soca/letkf/letkf_stage.yaml.j2
@@ -5,11 +5,6 @@
 {% set gcyc = previous_cycle | strftime("%H") %}
 {% set PDY = current_cycle | to_YMD %}
 {% set cyc = current_cycle | strftime("%H") %}
-{% if DOIAU %}
-{% set bkg_time = SNOW_WINDOW_BEGIN | to_fv3time %}
-{% else %}
-{% set bkg_time = current_cycle | to_fv3time %}
-{% endif %}
 ######################################
 # create working directories
 ######################################
@@ -31,9 +26,10 @@ copy:
 ######################################
 {% for mem in range(1, NMEM_ENS + 1) %}
 # define variables
-# Declare a dict of search and replace terms to run on each template
+# Declare a dict of search and replace terms to GDUMP on each template
 {% set tmpl_dict = {'ROTDIR':ROTDIR,
-                    'RUN':'enkf' + RUN,
+                    'GDUMP_ENS':GDUMP_ENS,
+                    'RUN': GDUMP_ENS,
                     'YMD':gPDY,
                     'HH':gcyc,
                     'MEMDIR':"mem" + '%03d' % mem} %}
@@ -50,8 +46,8 @@ copy:
 {% set com_prev_ocn.COM_OCEAN_HISTORY_MEM = com_prev_ocn.COM_OCEAN_HISTORY_MEM.replace(search_term, replace_term) %}
 {% set com_prev_ice.COM_ICE_HISTORY_MEM = com_prev_ice.COM_ICE_HISTORY_MEM.replace(search_term, replace_term) %}
 {% endfor %}
-- ["{{ com_prev_ocn.COM_OCEAN_HISTORY_MEM }}/enkf{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/ens/mem{{ '%03d' % mem }}/enkf{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc"]
-- ["{{ com_prev_ice.COM_ICE_HISTORY_MEM }}/enkf{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/ens/mem{{ '%03d' % mem }}/enkf{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc"]
+- ["{{ com_prev_ocn.COM_OCEAN_HISTORY_MEM }}/{{ GDUMP_ENS }}.ocean.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/ens/mem{{ '%03d' % mem }}/{{ GDUMP_ENS }}.ocean.t{{ gcyc }}z.inst.f009.nc"]
+- ["{{ com_prev_ice.COM_ICE_HISTORY_MEM }}/{{ GDUMP_ENS }}.ice.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/ens/mem{{ '%03d' % mem }}/{{ GDUMP_ENS }}.ice.t{{ gcyc }}z.inst.f009.nc"]
 {% endfor %}
 ######################################
 # copy fix files
@@ -72,7 +68,7 @@ copy:
 ######################################
 # copy deterministic background
 ######################################
-- ["{{ COM_ICE_HISTORY_PREV}}/{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/bkg/{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc"]
-- ["{{ COM_ICE_HISTORY_PREV}}/{{ RUN }}.ice.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/INPUT/cice.res.nc" ]
-- ["{{ COM_OCEAN_HISTORY_PREV}}/{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/bkg/{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc"]
-- ["{{ COM_OCEAN_HISTORY_PREV}}/{{ RUN }}.ocean.t{{ gcyc }}z.inst.f006.nc", "{{ DATA }}/INPUT/MOM.res.nc"]
+- ["{{ COM_ICE_HISTORY_PREV}}/{{ GDUMP }}.ice.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/bkg/{{ GDUMP }}.ice.t{{ gcyc }}z.inst.f009.nc"]
+- ["{{ COM_ICE_HISTORY_PREV}}/{{ GDUMP }}.ice.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/INPUT/cice.res.nc" ]
+- ["{{ COM_OCEAN_HISTORY_PREV}}/{{ GDUMP }}.ocean.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/bkg/{{ GDUMP }}.ocean.t{{ gcyc }}z.inst.f009.nc"]
+- ["{{ COM_OCEAN_HISTORY_PREV}}/{{ GDUMP }}.ocean.t{{ gcyc }}z.inst.f009.nc", "{{ DATA }}/INPUT/MOM.res.nc"]