Stage job yaml updates

- remove master yaml, no longer using - update fv3_cold, ice, ocean, and wave yamls Refs NOAA-EMC#2475
KateFriedman-NOAA · May 30, 2024 · cf50f54 · cf50f54
1 parent 719701b
commit cf50f54
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 50 deletions.
diff --git a/parm/stage/fv3_cold.yaml.j2 b/parm/stage/fv3_cold.yaml.j2
@@ -3,9 +3,9 @@ fv3_cold:
     mkdir:
         - "{{ COM_ATMOS_INPUT }}"
     copy:
-        - ["{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/atmos/gfs_ctrl.nc", "{{ COM_ATMOS_INPUT }}/gfs_ctrl.nc"]
+        - ["{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/atmos/gfs_ctrl.nc", "{{ COM_ATMOS_INPUT }}"]
         {% for ftype in ["gfs_data", "sfc_data"] %}
         {% for ntile in range(1, ntiles + 1) %}
-        - ["{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/atmos/{{ ftype }}.tile{{ ntile }}.nc", "{{ COM_ATMOS_INPUT }}/{{ ftype }}.tile{{ ntile }}.nc"]
+        - ["{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/atmos/{{ ftype }}.tile{{ ntile }}.nc", "{{ COM_ATMOS_INPUT }}"]
         {% endfor %} # ntile
         {% endfor %} # ftype
diff --git a/parm/stage/ice.yaml.j2 b/parm/stage/ice.yaml.j2
@@ -5,4 +5,4 @@ ice:
     mkdir:
         - "{{ COM_ICE_RESTART_PREV }}"
     copy:
-        - ["{{ BASE_CPLIC }}/{{ CPL_ICEIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ice/{{ cycle_YMD }}.{{ cycle_HH }}0000.cice_model.res.nc", "{{ COM_ICE_RESTART_PREV }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.cice_model.res.nc"]
+        - ["{{ BASE_CPLIC }}/{{ CPL_ICEIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ice/{{ cycle_YMD }}.{{ cycle_HH }}0000.cice_model.res.nc", "{{ COM_ICE_RESTART_PREV }}"]
diff --git a/parm/stage/master_forecast_only.yaml.j2 b/parm/stage/master_forecast_only.yaml.j2
diff --git a/parm/stage/ocean.yaml.j2 b/parm/stage/ocean.yaml.j2
@@ -5,22 +5,21 @@ ocean:
     mkdir:
         - "{{ COM_OCEAN_RESTART_PREV }}"
     copy:
-        {% set head = "{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ocean" %}
         #-------------------------
         # Ocean initial conditions
         #-------------------------
-        - ["{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res.nc", "{{ COM_OCEAN_RESTART_PREV }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res.nc"]
+        - ["{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ocean/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res.nc", "{{ COM_OCEAN_RESTART_PREV }}"]
         #------------------------------------
         # Resolution based initial conditions
         #------------------------------------
-        #NOTE: {% if OCNRES == 500 or OCNRES == 100 %} # Nothing more to do for these resolutions
-        {% if OCNRES == 025 %}
-        {% for nn in $(seq 1 3) %}
-        - ["{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res_{{ nn }}.nc", "{{ COM_OCEAN_RESTART_PREV }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res_{{ nn }}.nc"]
+        {% if OCNRES == "025" %}
+        {% for nn in range(1, 3) %}
+        - ["{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ocean/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res_{{ nn }}.nc", "{{ COM_OCEAN_RESTART_PREV }}"]
         {% endfor %}
         {% endif %}
         #-------------------------
         # Ocean Perturbation Files
         #-------------------------
-        {% if MEMDIR > 0 and USE_OCN_PERTURB_FILES %}
-        - ["{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.mom6_increment.nc", "{{ COM_OCEAN_RESTART_PREV }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.mom6_increment.nc"]
+        {% if MEMDIR and USE_OCN_PERTURB_FILES %}
+        - ["{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/ocean/{{ cycle_YMD }}.{{ cycle_HH }}0000.mom6_increment.nc", "{{ COM_OCEAN_RESTART_PREV }}"]
+        {% endif %}
diff --git a/parm/stage/wave.yaml.j2 b/parm/stage/wave.yaml.j2
@@ -5,6 +5,4 @@ wave:
     mkdir:
         - "{{ COM_WAVE_RESTART }}"
     copy:
-        {% for grdID in waveGRD %}
-        - ["{{ BASE_CPLIC }}/{{ CPL_WAVIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/wave/{{ cycle_YMD }}.{{ cycle_HH }}0000.restart.{{ grdID }}", "{{ COM_WAVE_RESTART }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.restart.{{ grdID }}"]
-        {% endfor %}
+        - ["{{ BASE_CPLIC }}/{{ CPL_WAVIC }}/{{ cycle_YMDH }}/{{ MEMDIR }}/wave/{{ cycle_YMD }}.{{ cycle_HH }}0000.restart.{{ waveGRD }}", "{{ COM_WAVE_RESTART }}"]