Update stage YAMLs to point to EE2 filename links (NOAA-EMC#4205)

DavidHuber-NOAA · web-flow · commit 22926afdcf1c · 2025-11-20T09:39:10.000-05:00
This updates the staging YAMLs to point to the EE2-standardized
filenames in the ICSDIR.
diff --git a/dev/parm/config/gfs/config.base.j2 b/dev/parm/config/gfs/config.base.j2
@@ -182,7 +182,7 @@ export DO_AERO_ANL="NO"
 if [[ "${RUN}" == "gfs" ]] ; then
    export DOBNDPNT_WAVE="YES" # Create point outputs for downstream boundary points
 else
-   export DOBNDPNT_WAVE="NO" 
+   export DOBNDPNT_WAVE="NO"
 fi
 
 export FRAC_GRID=".true."
@@ -374,7 +374,12 @@ export DO_JEDIATMENS="{{ DO_JEDIATMENS }}"
 export DO_JEDIOCNVAR="{{ DO_JEDIOCNVAR }}"
 export DO_JEDISNOWDA="{{ DO_JEDISNOWDA }}"
 export DO_MERGENSST="{{ DO_MERGENSST }}"
-export DO_STARTMEM_FROM_JEDIICE="{{ DO_STARTMEM_FROM_JEDIICE }}"
+
+if [[ "${EXP_WARM_START}" = ".true." ]]; then
+  export DO_STARTMEM_FROM_JEDIICE="YES"
+else
+  export DO_STARTMEM_FROM_JEDIICE="{{ DO_STARTMEM_FROM_JEDIICE }}"
+fi
 
 # Hybrid related
 export DOHYBVAR="{{ DOHYBVAR }}"
diff --git a/dev/ush/make_ee2_links.sh b/dev/ush/make_ee2_links.sh
@@ -141,7 +141,7 @@ for dir in "${gdas_list[@]}" "${gfs_list[@]}" "${gcdas_list[@]}" "${gcafs_list[@
           fi
           if [[ -f "sfc_inc.tile1.nc" ]]; then
               for tile in {1..6}; do
-                  link_file "sfc_inc.tile${tile}.nc" "increment.sfc.i006.tile${tile}.nc"
+                  link_file "sfc_inc.tile${tile}.nc" "increment.sfc.tile${tile}.nc"
               done
           fi
           if [[ -f "${system_prefix}.t${cyc}z.cubed_sphere_grid_atminc.tile1.nc" ]]; then
@@ -254,7 +254,7 @@ for dir in "${enkfgdas_list[@]}" "${enkfgfs_list[@]}"; do
                 # sfc_inc tile links
                 if [[ -f "sfc_inc.tile1.nc" ]]; then
                     for tile in {1..6}; do
-                        link_file "sfc_inc.tile${tile}.nc" "increment.sfc.i006.tile${tile}.nc"
+                        link_file "sfc_inc.tile${tile}.nc" "increment.sfc.tile${tile}.nc"
                     done
                 fi
             fi
diff --git a/dev/workflow/rocoto/gcafs_tasks.py b/dev/workflow/rocoto/gcafs_tasks.py
@@ -763,7 +763,7 @@ def atmanlupp(self):
         data = f'{atm_anl_path}/{self.run}.t@Hz.analysis.sfc.a006.nc'
         dep_dict = {'type': 'data', 'data': data, 'age': 120}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = f'{atm_anl_path}/{self.run}.t@Hz.done.txt'
+        data = f'{atm_anl_path}/{self.run}.t@Hz.analysis.done.txt'
         dep_dict = {'type': 'data', 'data': data, 'age': 60}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py
@@ -1104,7 +1104,7 @@ def atmanlupp(self):
             data = f'{atm_anl_path}/{self.run}.t@Hz.analysis.sfc.a006.nc'
         dep_dict = {'type': 'data', 'data': data, 'age': 120}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = f'{atm_anl_path}/{self.run}.t@Hz.done.txt'
+        data = f'{atm_anl_path}/{self.run}.t@Hz.analysis.done.txt'
         dep_dict = {'type': 'data', 'data': data, 'age': 60}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
diff --git a/docs/source/init.rst b/docs/source/init.rst
diff --git a/parm/archive/gdas_restarta.yaml.j2 b/parm/archive/gdas_restarta.yaml.j2
@@ -47,7 +47,7 @@ gdas_restarta:
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}cnvstat.tar"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}abias_int.txt"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}analysis.dtf.a006.nc"
-        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}analysis.done.txt"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}increment.done.txt"
         {% else %}
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}rad_varbc_params.tar"
         {% endif %}
diff --git a/parm/archive/gfs_netcdfa.yaml.j2 b/parm/archive/gfs_netcdfa.yaml.j2
@@ -22,5 +22,5 @@ gfs_netcdfa:
     optional:
         {% if not DO_JEDIATMVAR %}
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}analysis.dtf.a006.nc"
-        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}analysis.done.txt"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}increment.done.txt"
         {% endif %}
diff --git a/parm/stage/analysis.yaml.j2 b/parm/stage/analysis.yaml.j2
@@ -14,78 +14,51 @@ analysis:
         {% if DO_JEDIATMVAR %}
 
         {% for itile in range(6) %}
-        {% for source_ftype, dest_ftype in 
-        [
-            ('atminc', 'jedi_increment.atm.i006'),
-            ('atmi009', 'jedi_increment.atm.i009'),
-            ('atmi003', 'jedi_increment.atm.i003'),
-            ('ratminc', 'recentered_jedi_increment.atm.i006'),
-            ('ratmi009', 'recentered_jedi_increment.atm.i009'),
-            ('ratmi003', 'recentered_jedi_increment.atm.i003')
-        ] %}
-        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z.cubed_sphere_grid_" ~ source_ftype ~ ".tile" ~ (itile+1) ~ ".nc") %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.cubed_sphere_grid_{{ source_ftype }}.tile{{ itile+1 }}.nc", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ dest_ftype }}.tile{{ itile+1 }}.nc"]
+        {% if mem == -1 %}
+          {% if DOIAU %}
+            {% set ftypes = ["jedi_increment.atm.i003", "jedi_increment.atm.i006", "jedi_increment.atm.i009" ] %}
+          {% else %}
+            {% set ftypes = ["jedi_increment.atm.i006" ] %}
+          {% endif %}
+        {% else %}
+          {% if DOIAU_ENKF %}
+            {% set ftypes = ["recentered_jedi_increment.atm.i003", "recentered_jedi_increment.atm.i006", "recentered_jedi_increment.atm.i009" ] %}
+          {% else %}
+            {% set ftypes = ["recentered_jedi_increment.atm.i006" ] %}
+          {% endif %}
         {% endif %}
+        {% for ftype in ftypes %}
+        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ ftype }}.tile{{ itile+1 }}.nc", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endfor %}
         {% endfor %}
-
-        # TODO: make these filenames the same after RE-staging inputs with EE2-compliant filenames
-        {% for source_ftype, dest_ftype in [
-            ("abias", "abias.txt"),
-            ("abias_air", "abias_air.txt"),
-            ("abias_int", "abias_int.txt"),
-            ("abias_pc", "abias_pc.txt"),
-            ("rad_varbc_params.tar", "rad_varbc_params.tar")] %}
-        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ source_ftype) %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ source_ftype }}",
-           "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ dest_ftype }}"]
+        {% for ftype in ["abias.txt", "abias_air.txt", "abias_int.txt", "abias_pc.txt", "rad_varbc_params.tar"] %}
+        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ ftype) %}
+        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ ftype }}", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endif %}
         {% endfor %}
 
         {% else %}
-
-        # TODO: make these filenames the same after RE-staging inputs with EE2-compliant filenames
-        {% for source_ftype, dest_ftype in
-        [
-            ("atminc.nc", "increment.atm.i006.nc"),
-            ("atmi009.nc", "increment.atm.i009.nc"),
-            ("atmi003.nc", "increment.atm.i003.nc"),
-            ("ratmi009.nc", "recentered_increment.atm.i009.nc"),
-            ("ratminc.nc", "recentered_increment.atm.i006.nc"),
-            ("ratmi003.nc", "recentered_increment.atm.i003.nc"),
-            ("abias", "abias.txt"),
-            ("radstat", "radstat.tar"),
-            ("abias_air", "abias_air.txt"),
-            ("abias_int", "abias_int.txt"),
-            ("abias_pc", "abias_pc.txt"),
-            ("rad_varbc_params.tar", "rad_varbc_params.tar")
-        ] %}
-        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ source_ftype) %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ source_ftype }}",
-           "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ dest_ftype }}"]
+        {% for ftype in ["abias.txt", "abias_air.txt", "abias_int.txt", "abias_pc.txt",
+                         "increment.atm.i006.nc", "increment.atm.i009.nc", "increment.atm.i003.nc", "radstat.tar",
+                         "recentered_increment.atm.i006.nc", "recentered_increment.atm.i009.nc", "recentered_increment.atm.i003.nc", "rad_varbc_params.tar"] %}
+        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ ftype) %}
+        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ ftype }}", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endif %}
         {% endfor %}
 
         {% endif %}
 
-        # TODO: make these filenames the same after RE-staging inputs with EE2-compliant filenames
         {% if DO_GSISOILDA %}
-        {% for source_ftype, dest_ftype in
-        [
-            ("sfci003.nc", "increment.sfc.i003.nc"),
-            ("sfci006.nc", "increment.sfc.i006.nc"),
-            ("sfci009.nc", "increment.sfc.i009.nc")
-        ] %}
-        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ source_ftype) %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ source_ftype }}",
-           "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ dest_ftype }}"]
+
+        {% for ftype in ["increment.sfc.i003.nc", "increment.sfc.i006.nc", "increment.sfc.i009.nc"] %}
+        {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ ftype) %}
+        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ ftype }}", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endif %}
         {% endfor %}
 
         {% if DO_LAND_IAU %}
         {% for itile in range(1,7) %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/sfc_inc.tile{{ itile }}.nc",
-           "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/increment.sfc.tile{{ itile }}.nc"]
+        - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/increment.sfc.tile{{ itile }}.nc", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endfor %}
         {% endif %}
         {% endif %}
diff --git a/parm/stage/atmosphere_cold_RT.yaml.j2 b/parm/stage/atmosphere_cold_RT.yaml.j2
@@ -4,16 +4,16 @@ atmosphere_cold_RT:
         - "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"
         - "{{ COMOUT_ATMOS_HISTORY_MEM }}"
     link_req:
-        {% set DIAU_cold_previous_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/analysis/atmos/gdas.t' ~ previous_cycle_HH ~ 'z.atma003.ensres.nc' %}
-        {% set DIAU_cold_current_file = ICSDIR ~ '/' ~ 'gfs.' ~ current_cycle_YMD ~ '/' ~ current_cycle_HH ~ '/analysis/atmos/gfs.t' ~ current_cycle_HH ~ 'z.atminc.nc' %}
-        {% set DIAU_current_file= ICSDIR ~ '/' ~ 'gfs.' ~ current_cycle_YMD ~ '/' ~ current_cycle_HH ~ '/analysis/atmos/gfs.t' ~ current_cycle_HH ~ 'z.atmanl.nc' %}
-        {% set atm_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/model/atmos/history/gdas.t' ~ previous_cycle_HH ~ 'z.atmf003.ensres.nc' %}
-        {% set surface_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/model/atmos/history/gdas.t' ~ previous_cycle_HH ~ 'z.sfcf003.nc' %}
+        {% set DIAU_cold_previous_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/analysis/atmos/gdas.t' ~ previous_cycle_HH ~ 'z.ensres_analysis.atm.a003.nc' %}
+        {% set DIAU_cold_current_file = ICSDIR ~ '/' ~ 'gfs.' ~ current_cycle_YMD ~ '/' ~ current_cycle_HH ~ '/analysis/atmos/gfs.t' ~ current_cycle_HH ~ 'z.increment.atm.i006.nc' %}
+        {% set DIAU_current_file= ICSDIR ~ '/' ~ 'gfs.' ~ current_cycle_YMD ~ '/' ~ current_cycle_HH ~ '/analysis/atmos/gfs.t' ~ current_cycle_HH ~ 'z.analysis.atm.a006.nc' %}
+        {% set atm_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/model/atmos/history/gdas.t' ~ previous_cycle_HH ~ 'z.ensres.atm.f006.nc' %}
+        {% set surface_file = ICSDIR ~ '/' ~ 'gdas.' ~ previous_cycle_YMD ~ '/' ~ previous_cycle_HH ~ '/model/atmos/history/gdas.t' ~ previous_cycle_HH ~ 'z.sfc.f003.nc' %}
         {% set current_path = COMOUT_ATMOS_ANALYSIS_MEM %}
         {% set previous_path = COMOUT_ATMOS_RESTART_PREV_MEM %}
         {% set surface_atm_path = COMOUT_ATMOS_HISTORY_MEM %}
-        - ["{{ DIAU_cold_previous_file }}", "{{ previous_path}}/gdas.t{{ previous_cycle_HH }}z.ensres_analysis.atm.i003.nc"]
-        - ["{{ DIAU_cold_current_file }}", "{{ current_path }}/gfs.t{{ current_cycle_HH }}z.increment.atm.i006.nc"]
-        - ["{{ DIAU_current_file }}", "{{ current_path }}/gfs.t{{ current_cycle_HH }}z.analysis.atm.i006.nc"]
-        - ["{{ atm_file }}", "{{ surface_atm_path }}/gdas.t{{ previous_cycle_HH }}z.sfc.f003.nc"]
-        - ["{{ surface_file }}", "{{ surface_atm_path }}/gdas.t{{ previous_cycle_HH }}z.ensres.atm.f003.nc"]
+        - ["{{ DIAU_cold_previous_file }}", "{{ previous_path}}"]
+        - ["{{ DIAU_cold_current_file }}", "{{ current_path }}"]
+        - ["{{ DIAU_current_file }}", "{{ current_path }}"]
+        - ["{{ surface_file }}", "{{ surface_atm_path }}"]
+        - ["{{ atm_file }}", "{{ surface_atm_path  }}"]
diff --git a/parm/stage/atmosphere_warm_RT.yaml.j2 b/parm/stage/atmosphere_warm_RT.yaml.j2
@@ -11,15 +11,9 @@ atmosphere_warm_RT:
         {% set increment_destination_path = COMOUT_ATMOS_ANALYSIS_MEM %}
 
         # Include increment files
-        # TODO: make these filenames the same after RE-staging inputs with EE2-compliant filenames
-        {% for source_ftype, dest_ftype in
-        [
-            ("ratmi003.nc", "recentered_increment.atm.i003.nc"),
-            ("ratmi006.nc", "recentered_increment.atm.i006.nc"),
-            ("ratmi009.nc", "recentered_increment.atm.i009.nc")
-        ] %}
-            {% set source_file = increment_mem_path ~ source_ftype %}
-        - ["{{ source_file }}", "{{ increment_destination_path }}/enkfgfs.t{{ current_cycle_HH }}z.{{ dest_ftype }}"]
+        {% for ftype in ["recentered_increment.atm.i003.nc", "recentered_increment.atm.i009.nc", "recentered_increment.atm.i006.nc"] %}
+            {% set file = increment_mem_path ~ ftype %}
+        - ["{{ file }}", "{{ increment_destination_path }}"]
         {% endfor %}
 
         {% if path_exists(ICSDIR) %}
diff --git a/parm/stage/ice.yaml.j2 b/parm/stage/ice.yaml.j2
@@ -17,7 +17,7 @@ ice:
         {% for mem in range(first_mem, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_ICE_ANALYSIS_MEM = COMOUT_ICE_ANALYSIS_MEM_list[imem] %}
-        - ["{{ ICSDIR }}/{{ COMOUT_ICE_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.cice_model_anl.res.nc", "{{ COMOUT_ICE_ANALYSIS_MEM }}/{{ m_prefix }}.analysis.cice_model.res.nc"]
+        - ["{{ ICSDIR }}/{{ COMOUT_ICE_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.analysis.cice_model.res.nc", "{{ COMOUT_ICE_ANALYSIS_MEM }}"]
         {% endfor %} # mem loop
     {% else %}
     mkdir:
diff --git a/parm/stage/ocean_rerun.yaml.j2 b/parm/stage/ocean_rerun.yaml.j2
@@ -9,6 +9,6 @@ ocean_rerun:
         {% for mem in range(first_mem, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
-        - ["{{ ICSDIR }}/{{ COMOUT_OCEAN_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.ocninc.nc",
-           "{{ COMOUT_OCEAN_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.mom6_increment.i006.nc"]
+        - ["{{ ICSDIR }}/{{ COMOUT_OCEAN_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.mom6_increment.i006.nc",
+           "{{ COMOUT_OCEAN_ANALYSIS_MEM }}/"]
         {% endfor %} # mem loop
diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
@@ -954,7 +954,7 @@ cd "${pwd}" || exit 1
 if [[ ${SENDECF} == "YES" && "${RUN}" != "enkf" ]]; then
    ecflow_client --event release_fcst
 fi
-echo "${rCDUMP} ${PDY}${cyc} atminc done at $(date)" > "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}analysis.done.txt"
+echo "${rCDUMP} ${PDY}${cyc} atminc done at $(date)" > "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.done.txt"
 
 ################################################################################
 
diff --git a/scripts/exglobal_atmos_analysis_calc.sh b/scripts/exglobal_atmos_analysis_calc.sh
@@ -177,7 +177,7 @@ if [[ "${DOGAUSFCANL}" == "YES" ]]; then
     fi
 fi
 
-echo "${rCDUMP} ${PDY}${cyc} atmanl and sfcanl done at $(date)" > "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}done.txt"
+echo "${rCDUMP} ${PDY}${cyc} atmanl and sfcanl done at $(date)" > "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}analysis.done.txt"
 
 ################################################################################
 # Postprocessing
diff --git a/scripts/exglobal_stage_ic.py b/scripts/exglobal_stage_ic.py
@@ -26,6 +26,10 @@ def main():
             'DO_WAVE', 'DO_OCN', 'DO_ICE', 'DO_NEST', 'DO_CA', 'DO_AERO_ANL',
             'USE_ATM_ENS_PERTURB_FILES', 'USE_OCN_ENS_PERTURB_FILES', 'DO_GSISOILDA', 'DO_LAND_IAU']
 
+    # Only pull the DOIAU_ENKF key if this is a gfs staging job
+    if stage.task_config['NET'] == 'gfs':
+        keys.append('DOIAU_ENKF')
+
     stage_dict = AttrDict()
     for key in keys:
         # Make sure OCNRES is three digits
diff --git a/ush/python/pygfs/task/archive.py b/ush/python/pygfs/task/archive.py
@@ -707,7 +707,7 @@ def _arch_restart(self, arch_dict: Dict) -> bool:
         # Restart archiving for gdas RUN
         if run == "gdas":
             # TODO: Always archive gdas ocean restarts (for GEFSv13 when project restarts)
-            if tar_type == "gdasocean_restart" and arch_warm_ics:
+            if (tar_type == "gdasocean_restart") and arch_warm_ics:
                 return True
 
             # Archive warm atmosphere and ice increments if requested
diff --git a/ush/python/pygfs/task/fv3_analysis_calc.py b/ush/python/pygfs/task/fv3_analysis_calc.py
@@ -162,7 +162,7 @@ def finalize(self) -> None:
 
         # Write analysis log file
         formatted_date = datetime.now().strftime("%a %b %d %H:%M:%S %Z%Y")
-        log_file = os.path.join(self.task_config.COMOUT_ATMOS_ANALYSIS, f"{self.task_config.RUN}.t{self.task_config.cyc}z.done.txt")
+        log_file = os.path.join(self.task_config.COMOUT_ATMOS_ANALYSIS, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.analysis.done.txt")
         message = f"{self.task_config.rCDUMP} {self.task_config.PDY}{self.task_config.cyc} atmanl and sfcanl done at {formatted_date}"
         with open(log_file, "w") as file:
             file.write(f"{message}\n")
