Update archive job to use COMIN/COMOUT

jobs/JGLOBAL_ARCHIVE

@@ -9,21 +9,44 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "arch" -c "base arch"
 ##############################################
 export CDUMP=${RUN/enkf}
 
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMOS_GEMPAK \
-  COM_ATMOS_GENESIS COM_ATMOS_HISTORY COM_ATMOS_INPUT COM_ATMOS_MASTER COM_ATMOS_RESTART \
-  COM_ATMOS_TRACK COM_ATMOS_WMO \
-  COM_CHEM_HISTORY COM_CHEM_ANALYSIS\
-  COM_MED_RESTART \
-  COM_SNOW_ANALYSIS \
-  COM_ICE_HISTORY COM_ICE_INPUT COM_ICE_RESTART COM_ICE_GRIB \
-  COM_OBS COM_TOP \
-  COM_OCEAN_HISTORY COM_OCEAN_RESTART COM_OCEAN_GRIB COM_OCEAN_NETCDF \
-  COM_OCEAN_ANALYSIS \
-  COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION COM_WAVE_RESTART \
-  COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON COM_CONF
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+	COMOUT_ATMOS_BUFR:COM_ATMOS_BUFR_TMPL \
+	COMOUT_ATMOS_GEMPAK:COM_ATMOS_GEMPAK_TMPL \
+	COMOUT_ATMOS_GENESIS:COM_ATMOS_GENESIS_TMPL \
+	COMOUT_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \
+	COMOUT_ATMOS_INPUT:COM_ATMOS_INPUT_TMPL \
+	COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL \
+	COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \
+	COMOUT_ATMOS_TRACK:COM_ATMOS_TRACK_TMPL \
+	COMOUT_ATMOS_WMO:COM_ATMOS_WMO_TMPL \
+        COMOUT_CHEM_HISTORY:COM_CHEM_HISTORY_TMPL \
+	COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
+	COMOUT_MED_RESTART:COM_MED_RESTART_TMPL \
+	COMOUT_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \
+	COMOUT_ICE_HISTORY:COM_ICE_HISTORY_TMPL \
+	COMOUT_ICE_INPUT:COM_ICE_INPUT_TMPL \
+	COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \
+	COMOUT_ICE_GRIB:COM_ICE_GRIB_TMPL \
+	COMOUT_OBS:COM_OBS_TMPL \
+	COMOUT_TOP:COM_TOP_TMPL \
+	COMOUT_OCEAN_HISTORY:COM_OCEAN_HISTORY_TMPL \
+	COMOUT_OCEAN_RESTART:COM_OCEAN_RESTART_TMPL \
+	COMOUT_OCEAN_GRIB:COM_OCEAN_GRIB_TMPL \
+	COMOUT_OCEAN_NETCDF:COM_OCEAN_NETCDF_TMPL \
+	COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \
+	COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL \
+	COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+	COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL \
+	COMOUT_WAVE_RESTART:COM_WAVE_RESTART_TMPL \
+	COMOUT_ATMOS_OZNMON:COM_ATMOS_OZNMON_TMPL \
+	COMOUT_ATMOS_RADMON:COM_ATMOS_RADMON_TMPL \
+	COMOUT_ATMOS_MINMON:COM_ATMOS_MINMON_TMPL \
+	COMOUT_CONF:COM_CONF_TMPL
 
 for grid in "0p25" "0p50" "1p00"; do
-  YMD=${PDY} HH=${cyc} GRID=${grid} declare_from_tmpl -rx "COM_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"
+  YMD=${PDY} HH=${cyc} GRID=${grid} declare_from_tmpl -rx \
+	  "COMOUT_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"
 done
 
 ###############################################################

parm/archive/arcdir.yaml.j2

@@ -15,36 +15,36 @@ Deterministic: &deterministic
         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 }}"]
+            {% if path_exists(COMOUT_ATMOS_TRACK ~ "/atcfunix." ~ RUN ~ "." ~ cycle_YMDH) %}
+            - ["{{ COMOUT_ATMOS_TRACK }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}", "{{ ARCDIR }}/atcfunix.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_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 }}"]
+                {% if path_exists(COMOUT_ATMOS_TRACK + "/" + basin) %}
+            - ["{{ COMOUT_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"]
+            - ["{{ COMOUT_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 }}"]
+            - ["{{ COMOUT_ATMOS_ANALYSIS }}/{{ head }}atmstat", "{{ ARCDIR }}/atmstat.{{ RUN }}.{{ cycle_YMDH }}"]
             {% else %}
-            - ["{{ COM_ATMOS_ANALYSIS }}/{{ head }}gsistat", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_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"]
+            - ["{{ COMOUT_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 }}"]
+            - ["{{ COMOUT_CHEM_ANALYSIS }}/{{ head }}aerostat", "{{ ARCDIR }}/aerostat.{{ RUN }}.{{ cycle_YMDH }}"]
             {% endif %}
 
     {% endif %}
@@ -57,18 +57,18 @@ gfs:  # GFS specific
     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"]
+            - ["{{ COMOUT_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 }}"]
+            {% if path_exists(COMOUT_ATMOS_GENESIS ~ "/storms.gfso.atcf_gen." ~ cycle_YMDH) %}
+            - ["{{ COMOUT_ATMOS_GENESIS }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}", "{{ ARCDIR }}/storms.gfso.atcf_gen.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_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 }}"]
+            {% if path_exists(COMOUT_ATMOS_GENESIS ~ "/trak.gfso.atcfunix." ~ cycle_YMDH) %}
+            - ["{{ COMOUT_ATMOS_GENESIS }}/trak.gfso.atcfunix.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_ATMOS_GENESIS }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}", "{{ ARCDIR }}/trak.gfso.atcfunix.altg.{{ cycle_YMDH }}"]
             {% endif %}
 
     {% if DO_FIT2OBS %}
@@ -82,8 +82,8 @@ gfs:  # GFS specific
             {% 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 }}"]
+            - ["{{COMOUT_ATMOS_HISTORY}}/{{ sfcfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sfcfile }}"]
+            - ["{{COMOUT_ATMOS_HISTORY}}/{{ sigfile }}", "{{ VFYARC }}/{{ RUN }}.{{ cycle_YMD }}/{{ cycle_HH }}/{{ sigfile }}"]
             {% endfor %}
 
     {% endif %}
@@ -96,7 +96,7 @@ gdas:  # GDAS specific
     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"]
+            - ["{{ COMOUT_ATMOS_GRIB_1p00 }}/{{ head }}pgrb2.1p00.f{{ '%03d' % fhr }}", "{{ ARCDIR }}/pgbf{{ '%02d' % fhr }}.{{ RUN }}.{{ cycle_YMDH }}.grib2"]
             {% endfor %}
 {% endif %}
 
@@ -105,11 +105,11 @@ Ensemble: &ensemble # ENKFGDAS or ENKFGFS
         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"]
+            - ["{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}atmensstat", "{{ ARCDIR }}/atmensstat.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_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"]
+            - ["{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}enkfstat", "{{ ARCDIR }}/enkfstat.{{ RUN }}.{{ cycle_YMDH }}"]
+            - ["{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT }}/{{ head }}gsistat.ensmean", "{{ ARCDIR }}/gsistat.{{ RUN }}.{{ cycle_YMDH }}.ensmean"]
             {% endif %}
 
 {% if "enkf" in RUN %}

parm/archive/chem.yaml.j2

@@ -4,4 +4,4 @@ chem:
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/chem.tar"
     required:
         # TODO explicitize this set
-        - "{{ COM_CHEM_HISTORY | relpath(ROTDIR) }}/{{ head }}*"
+        - "{{ COMOUT_CHEM_HISTORY | relpath(ROTDIR) }}/{{ head }}*"

parm/archive/enkf.yaml.j2

@@ -34,10 +34,10 @@ enkf:
 
         # 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"
+        - "{{ COMOUT_ATMOS_HISTORY_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmf{{ '%03d' % fhr }}.ensmean.nc"
+        - "{{ COMOUT_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"
+        - "{{ COMOUT_ATMOS_HISTORY_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmf{{ '%03d' % fhr }}.ensspread.nc"
         {% endif %}
         {% endfor %}
 
@@ -54,15 +54,15 @@ enkf:
                            "atmensstat"] %}
         {% endif %}
         {% for file in da_files %}
-        - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}{{ file }}"
+        - "{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}{{ file }}"
         {% endfor %}
 
         # Ensemble mean analyses/increments
         # 6-hr analysis/increment
         {% if do_calc_increment %}
-        - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmanl.ensmean.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmanl.ensmean.nc"
         {% else %}
-        - "{{ COM_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atminc.ensmean.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atminc.ensmean.nc"
         {% endif %}
 
         {% if DOIAU %}
@@ -71,10 +71,10 @@ enkf:
         {% 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"
+        - "{{ COMOUT_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"
+        - "{{ COMOUT_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}atmi{{ '%03d' % fhr }}.ensmean.nc"
         {% endif %}
         {% endfor %}
 

parm/archive/enkf_grp.yaml.j2

@@ -5,25 +5,25 @@ enkf_grp:
         {% 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] %}
+        {% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
+        {% set COMOUT_ATMOS_HISTORY_MEM = COMOUT_ATMOS_HISTORY_MEM_list[imem] %}
+        {% set COMOUT_ATMOS_RESTART_MEM = COMOUT_ATMOS_RESTART_MEM_list[imem] %}
 
         # Forecast data
         {% for fhr in range(3, 10, 3) %}
-        - "{{ COM_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}atmf{{ "%03d" % fhr }}.nc"
+        - "{{ COMOUT_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}atmf{{ "%03d" % fhr }}.nc"
         {% endfor %}
 
         # Only store the 6-hour surface forecast
-        - "{{ COM_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}sfcf006.nc"
+        - "{{ COMOUT_ATMOS_HISTORY_MEM | relpath(ROTDIR) }}/{{ head }}sfcf006.nc"
 
         # Store the individual member analysis data
         {% if not lobsdiag_forenkf %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}gsistat"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}gsistat"
         {% endif %}
         {% if do_calc_increment %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atmanl.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atmanl.nc"
         {% else %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratminc.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratminc.nc"
         {% endif %}
         {% endfor %}  # first_group_mem to last_group_mem

parm/archive/enkf_restarta_grp.yaml.j2

@@ -5,16 +5,16 @@ enkf_restarta_grp:
         {% for mem in range(first_group_mem, last_group_mem + 1) %}
         {% set imem = mem - first_group_mem %}
         # Construct the pertinent 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] %}
+        {% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
+        {% set COMOUT_ATMOS_HISTORY_MEM = COMOUT_ATMOS_HISTORY_MEM_list[imem] %}
+        {% set COMOUT_ATMOS_RESTART_MEM = COMOUT_ATMOS_RESTART_MEM_list[imem] %}
 
         # Store bias data
         {% if not lobsdiag_forenkf %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias"
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_air"
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_int"
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_pc"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_air"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_int"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}abias_pc"
         {% endif %}
 
         # Member surface analysis data
@@ -25,29 +25,29 @@ enkf_restarta_grp:
         {% endif %}
         {% set anl_time = current_cycle | add_to_datetime(anl_delta) %}
         {% for itile in range(1, 7) %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ anl_time | to_YMD }}.{{ anl_time | strftime("%H") }}0000.sfcanl_data.tile{{ itile }}.nc"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ anl_time | to_YMD }}.{{ anl_time | strftime("%H") }}0000.sfcanl_data.tile{{ itile }}.nc"
         {% endfor %}
 
         # Member atmospheric analysis data
         {% if do_calc_increment %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atmanl.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atmanl.nc"
         {% else %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratminc.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratminc.nc"
         {% endif %}
 
         # Member increments
         {% for iaufhr in iaufhrs if iaufhr != 6 %}
         {% set iaufhr = iaufhr %}
         {% if do_calc_increment %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atma{{ '%03d' % iaufhr }}.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}atma{{ '%03d' % iaufhr }}.nc"
         {% else %}
-        - "{{ COM_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratmi{{ '%03d' % iaufhr }}.nc"
+        - "{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ head }}ratmi{{ '%03d' % iaufhr }}.nc"
         {% endif %}
         {% endfor %}  # iaufhr in iaufhrs
 
         # Conventional data
         {% if not lobsdiag_forenkf and not DO_JEDIATMENS %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}cnvstat"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ head }}cnvstat"
         {% endif %}
 
         {% endfor %}  # first_group_mem to last_group_mem

parm/archive/enkf_restartb_grp.yaml.j2

@@ -4,7 +4,7 @@ enkf_restartb_grp:
     required:
         {% for mem in range(first_group_mem, last_group_mem + 1) %}
         {% set imem = mem - first_group_mem %}
-        {% set COM_ATMOS_RESTART_MEM = COM_ATMOS_RESTART_MEM_list[imem] %}
+        {% set COMOUT_ATMOS_RESTART_MEM = COMOUT_ATMOS_RESTART_MEM_list[imem] %}
 
         # Grab surface analysis data.
         # If IAU is on, grab the beginning of the window, otherwise grab the center.
@@ -18,7 +18,7 @@ enkf_restartb_grp:
         {% set offset_HH = offset_dt | strftime("%H") %}
         {% set prefix = offset_YMD + "." + offset_HH + "0000" %}
         {% for itile in range(1, 7) %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ prefix }}.sfcanl_data.tile{{ itile }}.nc"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ prefix }}.sfcanl_data.tile{{ itile }}.nc"
         {% endfor %}
 
         # Now get the restart files.
@@ -28,10 +28,10 @@ enkf_restartb_grp:
         {% set r_prefix = r_dt | to_YMD + "." + r_dt | strftime("%H") + "0000" %}
         {% for itile in range(1, 7) %}
         {% for datatype in ["ca_data", "fv_core.res", "fv_srf_wnd.res", "fv_tracer.res", "phy_data", "sfc_data"] %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.{{datatype}}.tile{{ itile }}.nc"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.{{datatype}}.tile{{ itile }}.nc"
         {% endfor %}
         {% endfor %}
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.coupler.res"
-        - "{{ COM_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.fv_core.res.nc"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.coupler.res"
+        - "{{ COMOUT_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.fv_core.res.nc"
         {% endfor %}
         {% endfor %}