Fix other yamls to work

Add target, remove source, and update file info Refs NOAA-EMC#2475
KateFriedman-NOAA · May 22, 2024 · 606c34a · 606c34a
1 parent 11df1af
commit 606c34a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/parm/stage/fv3_nest.yaml.j2 b/parm/stage/fv3_nest.yaml.j2
@@ -13,14 +13,14 @@
 #       ${NLN} "${COM_ATMOS_INPUT}/${ftype}.tile7.nc" "${COM_ATMOS_INPUT}/${ftype}.nest02.tile7.nc"
 fv3:
     name: "FV3"
-    source: "{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/atmos"
+    target: "{{ COM_ATMOS_RESTART_PREV }}"
     {% set ntile = 7 %}
     required:
         #---------------
         # WARM START
         #---------------
         {% if EXP_WARM_START %}
-        {% set head = "{{ COM_ATMOS_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000." %}
+        {% set head = "{{ BASE_CPLIC }}/{{ CPL_ATMIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/atmos/{{ cycle_YMD }}.{{ cycle_HH }}0000." %}
         {% set ntile = 7 %}
         {% for ftype in ca_data fv_core.res fv_srf_wnd.res fv_tracer.res phy_data sfc_data %}
         #TODO: figure out how to copy one name to the other in here

diff --git a/parm/stage/ice.yaml.j2 b/parm/stage/ice.yaml.j2
@@ -1,5 +1,5 @@
 ice:
     name: "ICE"
-    source: "{{ BASE_CPLIC }}/{{ CPL_ICEIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/ice"
+    target: "{{ COM_ICE_RESTART_PREV }}"
     required:
-        - "{{ COM_ICE_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.cice_model.res.nc"
+        - "{{ BASE_CPLIC }}/{{ CPL_ICEIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/ice/{{ cycle_YMD }}.{{ cycle_HH }}0000.cice_model.res.nc"
diff --git a/parm/stage/master_forecast_only.yaml.j2 b/parm/stage/master_forecast_only.yaml.j2
@@ -3,9 +3,15 @@
 {% set cycle_YMDH = current_cycle | to_YMDH %}
 datasets:
 
+{% if EXP_WARM_START %}
+{% filter indent(width=4) %}
+{% include "fv3_warm.yaml.j2" %}
+{% endfilter %}
+{% else %}
 {% filter indent(width=4) %}
-{% include "fv3.yaml.j2" %}
+{% include "fv3_cold.yaml.j2" %}
 {% endfilter %}
+{% endif %}
 
 {% if DO_NEST %}
 {% filter indent(width=4) %}
@@ -21,11 +27,11 @@ datasets:
 {% endif %}
 {% endif %}
 
-{% if DO_OCEAN %}
+{% if DO_OCN %}
 {% if EXP_WARM_START %}
 {% filter indent(width=4) %}
 {% include "ocean.yaml.j2" %}
-{% include "mediator.yaml.j2" %}
+#TODO:#{% include "mediator.yaml.j2" %}
 {% endfilter %}
 {% endif %}
 {% endif %}

diff --git a/parm/stage/mediator.yaml.j2 b/parm/stage/mediator.yaml.j2
@@ -1,7 +1,5 @@
-#src="${BASE_CPLIC}/${CPL_MEDIC:-}/${PDY}${cyc}/${MEMDIR}/med/${PDY}.${cyc}0000.ufs.cpld.cpl.r.nc"
-#      tgt="${COM_MED_RESTART_PREV}/${PDY}.${cyc}0000.ufs.cpld.cpl.r.nc"
 mediator:
     name: "MEDIATOR"
-    source: "{{ BASE_CPLIC }}/{{ CPL_MEDIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/med"
+    target: "{{ COM_MED_RESTART_PREV }}"
     required:
-        - "{{ COM_MED_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.ufs.cpld.cpl.r.nc"
+        - "{{ BASE_CPLIC }}/{{ CPL_MEDIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/med/{{ cycle_YMD }}.{{ cycle_HH }}0000.ufs.cpld.cpl.r.nc"
diff --git a/parm/stage/ocean.yaml.j2 b/parm/stage/ocean.yaml.j2
@@ -1,20 +1,24 @@
 ocean:
     name: "OCEAN"
-    source: "{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/ocean"
+    target: "{{ COM_OCEAN_RESTART_PREV }}"
     required:
+        {% set head = "{{ BASE_CPLIC }}/{{ CPL_OCNIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/ocean" %}
+        #-------------------------
         # Ocean initial conditions
         #-------------------------
-        - "{{ COM_OCEAN_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res.nc"
+        - "{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res.nc"
+        #------------------------------------
         # 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) %}
-        - "{{ COM_OCEAN_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res_{{ nn }}.nc"
+        - "{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.MOM.res_{{ nn }}.nc"
         {% endfor %}
         {% endif %}
     optional:
+        #-------------------------
         # Ocean Perturbation Files
         #-------------------------
         {% if MEMDIR > 0 and USE_OCN_PERTURB_FILES %}
-        - "{{ COM_OCEAN_RESTART_PREV | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.mom6_increment.nc"
+        - "{{ head }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.mom6_increment.nc"
diff --git a/parm/stage/wave.yaml.j2 b/parm/stage/wave.yaml.j2
@@ -2,8 +2,8 @@
 wave:
     #TODO: check if BASE_CPLIC/CPL_WAVIC exists?
     name: "WAVE"
-    source: "{{ BASE_CPLIC }}/{{ CPL_WAVIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/wave"
+    target: "{{ COM_WAVE_RESTART }}"
     required:
         {% for grdID in waveGRD %}
-        - "{{ COM_WAVE_RESTART | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.restart.{{ grdID }}"
+        - "{{ BASE_CPLIC }}/{{ CPL_WAVIC }}/{{ cycle_YMD }}{{ cycle_HH }}/{{ MEMDIR }}/wave/{{ cycle_YMD }}.{{ cycle_HH }}0000.restart.{{ grdID }}"
         {% endfor %}