Merge branch 'develop' into ci_unit-tests

TerrenceMcGuinness-NOAA · Jun 3, 2024 · e48fedd · e48fedd
2 parents 08b7b9f + c92bf41
commit e48fedd
Show file tree

Hide file tree

Showing 22 changed files with 448 additions and 256 deletions.
diff --git a/jobs/JGFS_ATMOS_CYCLONE_GENESIS b/jobs/JGFS_ATMOS_CYCLONE_GENESIS
@@ -3,6 +3,10 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis" -c "base genesis"
 
+# Hack to temporary skip this as the tracker has not been build
+#   on Hercules Rocky 9 yet
+# TODO: Remove this after tracker has been built for Rocky 9 #2639
+if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi
 
 ##############################################
 # Set variables used in the exglobal script

diff --git a/jobs/JGFS_ATMOS_CYCLONE_TRACKER b/jobs/JGFS_ATMOS_CYCLONE_TRACKER
@@ -3,6 +3,10 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "tracker" -c "base tracker"
 
+# Hack to temporary skip this as the tracker has not been build
+#   on Hercules Rocky 9 yet
+# TODO: Remove this after tracker has been built for Rocky 9 #2639
+if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi
 
 export COMPONENT="atmos"
 

diff --git a/jobs/JGFS_ATMOS_FSU_GENESIS b/jobs/JGFS_ATMOS_FSU_GENESIS
@@ -3,6 +3,11 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis_fsu" -c "base genesis_fsu"
 
+# Hack to temporary skip this as the tracker has not been build
+#   on Hercules Rocky 9 yet
+# TODO: Remove this after tracker has been built for Rocky 9 #2639
+if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi
+
 export COMPONENT="atmos"
 
 

diff --git a/parm/archive/arcdir.yaml.j2 b/parm/archive/arcdir.yaml.j2
@@ -2,84 +2,118 @@
 {% set cycle_YMDH = current_cycle | to_YMDH %}
 {% set cycle_YMD = current_cycle | to_YMD %}
 {% set head = RUN + ".t" + cycle_HH + "z." %}
-{% if RUN == "gdas" or RUN == "gfs" %}
-deterministic:
-    mkdir:
-        - "{{ ARCDIR }}"
-        {% if RUN == "gfs" %}
-        - "{{ ARCDIR }}/tracker.{{ cycle_YMDH }}/{{ RUN }}"
-        {% endif %}
-        {% if FITSARC %}
-        {% set VFYARC = ROTDIR + "/vrfyarch" %}
-        - "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}"
-        {% endif %}
-    copy:
-        {% if current_cycle != SDATE and MODE == "cycled" %}
-        {% if DO_JEDIATMVAR %}
-        - ["{{ COM_ATMOS_ANALYSIS }}/{{ head }}atmstat", "{{ ARCDIR }}/atmstat.{{ RUN }}.{{ cycle_YMDH }}"]
-        {% else %}
-        - ["{{ COM_ATMOS_ANALYSIS }}/{{ head }}gsistat", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}"]
-        {% endif %}
-        {% if DO_JEDISNOWDA %}
-        - ["{{ COM_SNOW_ANALYSIS }}/{{ head }}snowstat.tgz", "{{ ARCDIR }}/snowstat.{{ RUN }}.{{ cycle_YMDH }}.tgz"]
-        {% endif %}
-        {% if AERO_ANL_CDUMP == RUN or AERO_ANL_CDUMP == "both" %}
-        - ["{{ COM_CHEM_ANALYSIS }}/{{ head }}aerostat", "{{ ARCDIR }}/aerostat.{{ RUN }}.{{ cycle_YMDH }}"]
-        {% endif %}
-        - ["{{ COM_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.anl", "{{ ARCDIR }}/pgbanl.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
-        {% endif %}  # Full cycle
-        {% if RUN == "gfs" %}
-        {% set fhmax, fhout = FHMAX_GFS, FHOUT_GFS %}
-        {% elif RUN == "gdas" %}
-        {% set fhmax, fhout = FHMAX, FHOUT %}
-        {% endif %}
-        {% for fhr in range(0, fhmax + fhout, fhout) %}
-        - ["{{ COM_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.f{{ '%03d' % fhr }}", "{{ ARCDIR }}/pgbf{{ '%02d' % fhr }}.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
-        {% endfor %}
-        {% if RUN == "gfs" %}
-        {% if FITSARC %}
-        {% if FHMAX_FITS is defined %}
-        {% set fhmax = FHMAX_FITS %}
-        {% else %}
-        {% set fhmax = FHMAX_GFS %}
-        {% endif %}
-        {% for fhr in range(0, fhmax + 6, 6) %}
-        {% set sfcfile = "/" + head + "sfcf" + '%03d'|format(fhr) + ".nc" %}
-        {% set sigfile = "/" + head + "atmf" + '%03d'|format(fhr) + ".nc" %}
-        - ["{{COM_ATMOS_HISTORY}}/{{ sfcfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sfcfile }}"]
-        - ["{{COM_ATMOS_HISTORY}}/{{ sigfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sigfile }}"]
-        {% endfor %}
-        {% endif %} ## FITSARC
-        {% if path_exists(COM_ATMOS_GENESIS ~ "/storms.gfso.atcf_gen." ~ cycle_YMDH) %}
-        - ["{{ COM_ATMOS_GENESIS }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}", "{{ ARCDIR }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}"]
-        - ["{{ COM_ATMOS_GENESIS }}/storms.gfso.atcf_gen.altg.{{ cycle_YMDH }}", "{{ ARCDIR }}/storms.gfso.atcf_gen.altg.{{ cycle_YMDH }}"]
-        {% endif %}
-        {% if path_exists(COM_ATMOS_GENESIS ~ "/trak.gfso.atcfunix." ~ cycle_YMDH) %}
-        - ["{{ COM_ATMOS_GENESIS }}/trak.gfso.atcfunix.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.{{ cycle_YMDH }}"]
-        - ["{{ COM_ATMOS_GENESIS }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}"]
-        {% endif %}
-        ## Only created if tracking is on and there were systems to track
-        {% for basin in ["epac", "natl"] %}
-        {% if path_exists(COM_ATMOS_TRACK + "/" + basin) %}
-        - ["{{ COM_ATMOS_TRACK }}/{{ basin }}", "{{ ARCDIR }}/{{ basin }}"]
-        {% endif %}
-        {% endfor %}
-        {% endif %} ## RUN == "gfs"
-        {% if path_exists(COM_ATMOS_TRACK ~ "/atcfunix." ~ RUN ~ "." ~ cycle_YMDH) %}
-        - ["{{ COM_ATMOS_TRACK }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}", "{{ ARCDIR }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}"]
-        - ["{{ COM_ATMOS_TRACK }}/atcfunixp.{{ RUN }}.{{ cycle_YMDH }}", "{{ ARCDIR }}/atcfunixp.{{ RUN }}.{{ cycle_YMDH }}"]
-        {% endif %}
-{% endif %} # gfs or gdas
-{% if current_cycle != SDATE and (RUN == "enkfgdas" or RUN == "enkfgfs") %}
-ensemble:
-    mkdir:
-        - "{{ ARCDIR }}"
-    copy:
-        {% if DO_JEDIATMENS %}
-        - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}atmensstat", "{{ ARCDIR }}/atmensstat.{{ RUN }}.{{ cycle_YMDH }}"]
-        - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}atminc.ensmean.nc", "{{ ARCDIR }}/atmensstat.{{ RUN }}.{{ cycle_YMDH }}.ensmean.nc"]
-        {% else %}
-        - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}enkfstat", "{{ ARCDIR }}/enkfstat.{{ RUN }}.{{ cycle_YMDH }}"]
-        - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}gsistat.ensmean", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}.ensmean"]
-        {% endif %}
-{% endif %}  # enkfgdas or enkfgfs
+
+# Select data to store in the ARCDIR and VFYARC from deterministic runs
+Base: &base # GDAS, GFS, ENKFGDAS, or ENKFGFS
+    common:
+        mkdir:
+            - "{{ ARCDIR }}"
+
+# Common files to be added to both the gfs and gdas keys below
+Deterministic: &deterministic
+    cyclone:
+        copy:
+            # Cyclone forecasts, produced for both gdas and gfs cycles
+            ## Only created if tracking is on and there were systems to track
+            {% if path_exists(COM_ATMOS_TRACK ~ "/atcfunix." ~ RUN ~ "." ~ cycle_YMDH) %}
+            - ["{{ COM_ATMOS_TRACK }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}", "{{ ARCDIR }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COM_ATMOS_TRACK }}/atcfunixp.{{ RUN }}.{{ cycle_YMDH }}", "{{ ARCDIR }}/atcfunixp.{{ RUN }}.{{ cycle_YMDH }}"]
+            {% endif %}
+
+            # Cyclone tracking data
+            {% for basin in ["epac", "natl"] %}
+                {% if path_exists(COM_ATMOS_TRACK + "/" + basin) %}
+            - ["{{ COM_ATMOS_TRACK }}/{{ basin }}", "{{ ARCDIR }}/{{ basin }}"]
+                {% endif %}
+            {% endfor %}
+
+    {% if MODE == "cycled" %}
+    analysis:
+        copy:
+            # Analysis data (if we are running in cycled mode)
+            - ["{{ COM_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.anl", "{{ ARCDIR }}/pgbanl.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
+
+            {% if DO_JEDIATMVAR %}
+            - ["{{ COM_ATMOS_ANALYSIS }}/{{ head }}atmstat", "{{ ARCDIR }}/atmstat.{{ RUN }}.{{ cycle_YMDH }}"]
+            {% else %}
+            - ["{{ COM_ATMOS_ANALYSIS }}/{{ head }}gsistat", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}"]
+            {% endif %}
+
+            {% if DO_JEDISNOWDA %}
+            - ["{{ COM_SNOW_ANALYSIS }}/{{ head }}snowstat.tgz", "{{ ARCDIR }}/snowstat.{{ RUN }}.{{ cycle_YMDH }}.tgz"]
+            {% endif %}
+
+            {% if AERO_ANL_CDUMP == RUN or AERO_ANL_CDUMP == "both" %}
+            - ["{{ COM_CHEM_ANALYSIS }}/{{ head }}aerostat", "{{ ARCDIR }}/aerostat.{{ RUN }}.{{ cycle_YMDH }}"]
+            {% endif %}
+
+    {% endif %}
+
+{% if RUN == "gfs" %}
+gfs:  # GFS specific
+    <<: *base
+    <<: *deterministic
+
+    gfs:
+        copy:
+            {% for fhr in range(0, FHMAX_GFS + 1, FHOUT_GFS) %}
+            - ["{{ COM_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.f{{ '%03d' % fhr }}", "{{ ARCDIR }}/pgbf{{ '%02d' % fhr }}.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
+            {% endfor %}
+
+            # Cyclone genesis data (only present if there are storms)
+            {% if path_exists(COM_ATMOS_GENESIS ~ "/storms.gfso.atcf_gen." ~ cycle_YMDH) %}
+            - ["{{ COM_ATMOS_GENESIS }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}", "{{ ARCDIR }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}"]
+            - ["{{ COM_ATMOS_GENESIS }}/storms.gfso.atcf_gen.altg.{{ cycle_YMDH }}", "{{ ARCDIR }}/storms.gfso.atcf_gen.altg.{{ cycle_YMDH }}"]
+            {% endif %}
+
+            {% if path_exists(COM_ATMOS_GENESIS ~ "/trak.gfso.atcfunix." ~ cycle_YMDH) %}
+            - ["{{ COM_ATMOS_GENESIS }}/trak.gfso.atcfunix.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.{{ cycle_YMDH }}"]
+            - ["{{ COM_ATMOS_GENESIS }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}"]
+            {% endif %}
+
+    {% if DO_FIT2OBS %}
+    fit2obs:
+
+        mkdir:
+            {% set VFYARC = ROTDIR + "/vrfyarch" %}
+            - "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}"
+
+        copy:
+            {% for fhr in range(0, FHMAX_FITS + 1, 6) %}
+                {% set sfcfile = "/" + head + "sfcf" + '%03d'|format(fhr) + ".nc" %}
+                {% set sigfile = "/" + head + "atmf" + '%03d'|format(fhr) + ".nc" %}
+            - ["{{COM_ATMOS_HISTORY}}/{{ sfcfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sfcfile }}"]
+            - ["{{COM_ATMOS_HISTORY}}/{{ sigfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sigfile }}"]
+            {% endfor %}
+
+    {% endif %}
+{% endif %}
+
+{% if RUN == "gdas" %}
+gdas:  # GDAS specific
+    <<: *base
+    <<: *deterministic
+    gdas:
+        copy:
+            {% for fhr in range(0, FHMAX + 1, FHOUT) %}
+            - ["{{ COM_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.f{{ '%03d' % fhr }}", "{{ ARCDIR }}/pgbf{{ '%02d' % fhr }}.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
+            {% endfor %}
+{% endif %}
+
+Ensemble: &ensemble # ENKFGDAS or ENKFGFS
+    analysis:
+        copy:
+            # Copy ensemble analyses
+            {% if DO_JEDIATMENS %}
+            - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}atmensstat", "{{ ARCDIR }}/atmensstat.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}atminc.ensmean.nc", "{{ ARCDIR }}/atmensstat.{{ RUN }}.{{ cycle_YMDH }}.ensmean.nc"]
+            {% else %}
+            - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}enkfstat", "{{ ARCDIR }}/enkfstat.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COM_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}gsistat.ensmean", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}.ensmean"]
+            {% endif %}
+
+{% if "enkf" in RUN %}
+{{ RUN }}:
+    <<: *base
+    <<: *ensemble
+{% endif %}
diff --git a/parm/archive/enkf.yaml.j2 b/parm/archive/enkf.yaml.j2
@@ -2,24 +2,46 @@ enkf:
     name: "ENKF"
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/{{ RUN }}.tar"
     required:
+        # Logs
+        {% for mem in range(1, nmem_ens + 1) %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_mem{{ '%03d' % mem }}.log"
+        {% endfor %}
+        {% for fhr in range(fhmin, fhmax + 1, fhout) %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}epos{{ '%03d' % (fhr - fhmin) }}.log"
+        {% endfor %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}echgres.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}esfc.log"
+        {% for grp in range(iaufhrs | length) %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}ecen{{ '%03d' % grp }}.log"
+        {% endfor %}
+
+        {% if DO_JEDIATMENS %}
+        {% set steps = ["atmensanlinit", "atmensanlrun", "atmensanlfinal"] %}
+        {% else %}
+        {% set steps = ["eobs", "eupd"] %}
+        {% if lobsdiag_forenkf %}
+        {% do steps.append("ediag") %}
+        {% else %}
+        {% for mem in range(1, nmem_ens + 1) %}
+        {% do steps.append("eomg_mem{{ '%03d' % mem }}") %}
+        {% endfor %}
+        {% endif %}
+        {% endif %}
+
+        {% for step in steps %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}{{ step }}.log"
+        {% endfor %}
+
+        # Ensemble mean and spread
         {% for fhr in range(3, fhmax + 1, 3) %}
         - "{{ COM_ATMOS_HISTORY_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmf{{ '%03d' % fhr }}.ensmean.nc"
         - "{{ COM_ATMOS_HISTORY_ENSSTAT | relpath(ROTDIR) }}/{{ head }}sfcf{{ '%03d' % fhr }}.ensmean.nc"
         {% if ENKF_SPREAD %}
         - "{{ COM_ATMOS_HISTORY_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmf{{ '%03d' % fhr }}.ensspread.nc"
         {% endif %}
         {% endfor %}
-        {% for mem in range(1, nmem_ens + 1) %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_mem{{ '%03d' % mem }}.log"
-        {% endfor %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}epos*.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}echgres.log"
-
-        {% if current_cycle != SDATE %}
-        # TODO archive ecen logs based on actual groups.  Will need to emulate numpy.array_split to do so.
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ecen*.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}esfc.log"
 
+        # Ensemble mean state
         {% if not DO_JEDIATMENS %}
         {% set da_files = ["enkfstat",
                            "gsistat.ensmean",
@@ -34,41 +56,27 @@ enkf:
         {% for file in da_files %}
         - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}{{ file }}"
         {% endfor %}
-        {% if DOIAU %}
-        {% for fhr in iaufhrs %}
-        {% if fhr == IAU_OFFSET %}
+
+        # Ensemble mean analyses/increments
+        # 6-hr analysis/increment
         {% if do_calc_increment %}
         - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmanl.ensmean.nc"
-        {% endif %}  # calc increment
-        {% else %}  # fhr != IAU_OFFSET
-        - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmi{{ '%03d' % fhr }}.ensmean.nc"
-        {% endif %}  # fhr == IAU_OFFSET
-        {% endfor %}  # IAUFHRS
-        {% endif %}   # DOIAU
-
-        {% if DO_JEDIATMENS %}
-        {% set steps = ["atmensanlinit", "atmensanlrun", "atmensanlfinal"] %}
-        {% else %}
-        {% set steps = ["eobs", "eupd"] %}
-        {% if lobsdiag_forenkf %}
-        {% do steps.append("ediag") %}
         {% else %}
-        {% for mem in range(1, nmem_ens + 1) %}
-        {% do steps.append("eomg_mem{{ '%03d' % mem }}") %}
-        {% endfor %}
-        {% endif %}
+        - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atminc.ensmean.nc"
         {% endif %}
 
-        {% for step in steps %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}{{ step }}.log"
-        {% endfor %}
-        {% endif %}  # not the first cycle
-    optional:
-        {% if current_cycle != SDATE and DOIAU %}
-        {% for fhr in iaufhrs %}
-        {% if fhr != IAU_OFFSET %}
+        {% if DOIAU %}
+        # IAU increments/analyses
+
+        {% for fhr in iaufhrs if fhr != 6 %}
+        {% if do_calc_increment %}
+        # Store analyses instead of increments
         - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atma{{ '%03d' % fhr }}.ensmean.nc"
+        {% else %}
+        # Store increments
         - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmi{{ '%03d' % fhr }}.ensmean.nc"
-        {% endif %}  # fhr == IAU_OFFSET
-        {% endfor %}  # IAUFHRS
         {% endif %}
+        {% endfor %}
+
+        {% endif %}  # End IAU
+        # End of analysis mean increments/analyses
diff --git a/parm/archive/enkf_grp.yaml.j2 b/parm/archive/enkf_grp.yaml.j2
@@ -4,19 +4,20 @@ enkf_grp:
     required:
         {% for mem in range(first_group_mem, last_group_mem + 1) %}
         {% set imem = mem - first_group_mem %}
+        # Construct member COM directories
         {% set COM_ATMOS_ANALYSIS_MEM = COM_ATMOS_ANALYSIS_MEM_list[imem] %}
         {% set COM_ATMOS_HISTORY_MEM = COM_ATMOS_HISTORY_MEM_list[imem] %}
         {% set COM_ATMOS_RESTART_MEM = COM_ATMOS_RESTART_MEM_list[imem] %}
 
-        {% for iaufhr in iaufhrs_enkf %}
-        - "{{ COM_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}atmf{{ "%03d" % iaufhr }}.nc"
+        # Forecast data
+        {% for fhr in range(3, 10, 3) %}
+        - "{{ COM_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}atmf{{ "%03d" % fhr }}.nc"
         {% endfor %}
 
-        {% if 6 in iaufhrs_enkf %}
+        # Only store the 6-hour surface forecast
         - "{{ COM_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}sfcf006.nc"
-        {% endif %}
 
-        {% if current_cycle != SDATE %}
+        # Store the individual member analysis data
         {% if not lobsdiag_forenkf %}
         - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}gsistat"
         {% endif %}
@@ -25,5 +26,4 @@ enkf_grp:
         {% else %}
         - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratminc.nc"
         {% endif %}
-        {% endif %}
         {% endfor %}  # first_group_mem to last_group_mem