From 0b3bc75d38112671dfe3270a546375664643694f Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 15 Dec 2022 14:08:59 -0600 Subject: [PATCH 1/4] excised CDATE from ocean jjobs --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST | 2 +- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP | 3 +-- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST index f4c4cc60e7..9dbddc820d 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST @@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready +export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP index 88a540a62c..d20230b8bf 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP @@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready +export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} rm -rf "${DATA}" # Ensure starting with a clean DATA mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) @@ -50,7 +50,6 @@ status=$? ############################################## # Set variables used in the script ############################################## -export CDATE=${CDATE:-${PDY}${cyc}} export CDUMP=${CDUMP:-${RUN:-"gfs"}} export COMPONENT="ocean" diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN index 65232697ff..9f925dce19 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN @@ -6,7 +6,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready +export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} # TODO (G): Switch to {cyc} when the downstream code is ready mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) From 68bad9e97dbafbdd4ac1e19577ea9562852b6269 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Fri, 16 Dec 2022 16:53:08 -0500 Subject: [PATCH 2/4] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP index d20230b8bf..d7bede1b7e 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP @@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} +export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}} rm -rf "${DATA}" # Ensure starting with a clean DATA mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) From bfd8637c4e74b33f79208a10997bbe9a610d89cf Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Fri, 16 Dec 2022 16:53:21 -0500 Subject: [PATCH 3/4] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN index 9f925dce19..ca692acf64 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN @@ -6,7 +6,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} # TODO (G): Switch to {cyc} when the downstream code is ready +export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}} mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) From de3d253e625b4942ca9129c3730b98abd7d7afc5 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Fri, 16 Dec 2022 16:53:32 -0500 Subject: [PATCH 4/4] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST index 9dbddc820d..a3039553bf 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST @@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh" ############################################## # make temp directory ############################################## -export DATA=${DATA:-${DATAROOT}/ocnanal_${PDY}${cyc}} +export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}} mkdir -p "${DATA}" cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1)