From dddb392af69f82b0ce58eaa156e4c613da76fea1 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@gmail.com>
Date: Mon, 23 Oct 2023 14:50:48 +0000
Subject: [PATCH 1/3] fix early cycle with s2s

---
 jobs/JGLOBAL_FORECAST        | 4 ++--
 workflow/rocoto/gfs_tasks.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
index 7fb0fbe4f7..e42c81eaa4 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -61,13 +61,13 @@ fi
 if [[ ${DO_OCN} == "YES" ]]; then
   YMD=${PDY} HH=${cyc} generate_com -rx COM_MED_RESTART COM_OCEAN_RESTART COM_OCEAN_INPUT \
     COM_OCEAN_HISTORY COM_OCEAN_ANALYSIS
-  RUN=${CDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
+  RUN=${rCDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
     COM_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL
 fi
 
 if [[ ${DO_ICE} == "YES" ]]; then
   YMD=${PDY} HH=${cyc} generate_com -rx COM_ICE_HISTORY COM_ICE_INPUT COM_ICE_RESTART
-  RUN=${CDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
+  RUN=${rCDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
     COM_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL
 fi
 
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index 56449cb9d5..12e8f833ec 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -366,7 +366,7 @@ def landanl(self):
 
     def ocnanalprep(self):
 
-        ocean_hist_path = self._template_to_rocoto_cycstring(self._base["COM_OCEAN_HISTORY_TMPL"])
+        ocean_hist_path = self._template_to_rocoto_cycstring(self._base["COM_OCEAN_HISTORY_TMPL"], {'RUN': 'gdas'})
 
         deps = []
         data = f'{ocean_hist_path}/gdas.t@Hz.ocnf009.nc'

From f5b72ca25b5018ee0e29692bcf4c29b0186fba15 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@gmail.com>
Date: Tue, 24 Oct 2023 20:37:27 +0000
Subject: [PATCH 2/3] copy to gdas, not gfs

---
 jobs/JGLOBAL_STAGE_IC        | 3 +++
 scripts/exglobal_stage_ic.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jobs/JGLOBAL_STAGE_IC b/jobs/JGLOBAL_STAGE_IC
index 437c8f40a0..609783d1d7 100755
--- a/jobs/JGLOBAL_STAGE_IC
+++ b/jobs/JGLOBAL_STAGE_IC
@@ -3,6 +3,9 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic"
 
+# Restart conditions for GFS cycle come from GDAS
+rCDUMP=${CDUMP}
+[[ ${CDUMP} = "gfs" ]] && export rCDUMP="gdas"
 
 # Execute the Script
 "${HOMEgfs}/scripts/exglobal_stage_ic.sh"
diff --git a/scripts/exglobal_stage_ic.sh b/scripts/exglobal_stage_ic.sh
index e42a4943d4..607e7a9b9f 100755
--- a/scripts/exglobal_stage_ic.sh
+++ b/scripts/exglobal_stage_ic.sh
@@ -40,7 +40,7 @@ done
 
 # Stage ocean initial conditions to ROTDIR (warm start)
 if [[ "${DO_OCN:-}" = "YES" ]]; then
-  YMD=${gPDY} HH=${gcyc} generate_com -r COM_OCEAN_RESTART
+  RUN=${rCDUMP} YMD=${gPDY} HH=${gcyc} generate_com -r COM_OCEAN_RESTART
   [[ ! -d "${COM_OCEAN_RESTART}" ]] && mkdir -p "${COM_OCEAN_RESTART}"
   source="${BASE_CPLIC}/${CPL_OCNIC}/${PDY}${cyc}/ocn/${OCNRES}/MOM.res.nc"
   target="${COM_OCEAN_RESTART}/${PDY}.${cyc}0000.MOM.res.nc"
@@ -73,7 +73,7 @@ fi
 
 # Stage ice initial conditions to ROTDIR (warm start)
 if [[ "${DO_ICE:-}" = "YES" ]]; then
-  YMD=${gPDY} HH=${gcyc} generate_com -r COM_ICE_RESTART
+  RUN=${rCDUMP} YMD=${gPDY} HH=${gcyc} generate_com -r COM_ICE_RESTART
   [[ ! -d "${COM_ICE_RESTART}" ]] && mkdir -p "${COM_ICE_RESTART}"
   ICERESdec=$(echo "${ICERES}" | awk '{printf "%0.2f", $1/100}')
   source="${BASE_CPLIC}/${CPL_ICEIC}/${PDY}${cyc}/ice/${ICERES}/cice5_model_${ICERESdec}.res_${PDY}${cyc}.nc"

From 10b88087a046eb00328292231e25fbad94ca78e1 Mon Sep 17 00:00:00 2001
From: Rahul Mahajan <aerorahul@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:17:56 -0400
Subject: [PATCH 3/3] Update jobs/JGLOBAL_STAGE_IC

---
 jobs/JGLOBAL_STAGE_IC | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jobs/JGLOBAL_STAGE_IC b/jobs/JGLOBAL_STAGE_IC
index 609783d1d7..317231871e 100755
--- a/jobs/JGLOBAL_STAGE_IC
+++ b/jobs/JGLOBAL_STAGE_IC
@@ -4,6 +4,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic"
 
 # Restart conditions for GFS cycle come from GDAS
+# shellcheck disable=SC2153
 rCDUMP=${CDUMP}
 [[ ${CDUMP} = "gfs" ]] && export rCDUMP="gdas"