From 5f1fdc091e2eb62ed74250147c351eaa2e230f76 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 11:13:26 -0500
Subject: [PATCH 1/8] bmat_vrfy and ana_vrfy jobs

---
 jobs/rocoto/ocnanalpost.sh |  8 ++++----
 jobs/rocoto/ocnanalprep.sh |  9 +++++----
 jobs/rocoto/ocnanalrun.sh  |  8 ++++----
 ush/load_ufsda_modules.sh  | 21 +++++++++++++++++++--
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/jobs/rocoto/ocnanalpost.sh b/jobs/rocoto/ocnanalpost.sh
index 5dead927bd..0912598a7a 100755
--- a/jobs/rocoto/ocnanalpost.sh
+++ b/jobs/rocoto/ocnanalpost.sh
@@ -3,10 +3,10 @@
 source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
-# Source GDASApp modules
-module purge
-module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
-module load GDAS/"${machine,,}"
+# Source UFSDA workflow modules
+. ${HOMEgfs}/ush/load_ufsda_modules.sh
+status=$?
+[[ ${status} -ne 0 ]] && exit ${status}
 
 export job="ocnanalpost"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/ocnanalprep.sh b/jobs/rocoto/ocnanalprep.sh
index 0771872629..6661849a7a 100755
--- a/jobs/rocoto/ocnanalprep.sh
+++ b/jobs/rocoto/ocnanalprep.sh
@@ -1,12 +1,13 @@
 #! /usr/bin/env bash
 
+export STRICT="NO"
 source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
-# Source GDASApp modules
-module purge
-module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
-module load "GDAS/${machine,,}"
+# Source UFSDA workflow modules
+. ${HOMEgfs}/ush/load_ufsda_modules.sh
+status=$?
+[[ ${status} -ne 0 ]] && exit ${status}
 
 export job="ocnanalprep"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/ocnanalrun.sh b/jobs/rocoto/ocnanalrun.sh
index cd57d13c44..d9d2edb263 100755
--- a/jobs/rocoto/ocnanalrun.sh
+++ b/jobs/rocoto/ocnanalrun.sh
@@ -3,10 +3,10 @@
 source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
-# Source GDASApp modules
-module purge
-module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
-module load GDAS/"${machine,,}"
+# Source UFSDA workflow modules
+. ${HOMEgfs}/ush/load_ufsda_modules.sh
+status=$?
+[[ ${status} -ne 0 ]] && exit ${status}
 
 export job="ocnanalrun"
 export jobid="${job}.$$"
diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index 6ceba33706..5e6851e1f2 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -6,6 +6,23 @@ if [[ "${DEBUG_WORKFLOW:-NO}" == "NO" ]]; then
     set +x
 fi
 
+# Read optional module argument, default is to use GDAS
+MODS="GDAS"
+if [ $# -gt 0 ]; then
+  case "$1" in
+    --eva)
+      MODS="EVA"
+      ;;
+    --gdas)
+      MODS="GDAS"
+      ;;
+    *)
+      echo "Invalid option: $1" >&2
+      exit 1
+      ;;
+  esac
+fi
+
 # Setup runtime environment by loading modules
 ulimit_s=$( ulimit -S -s )
 
@@ -23,14 +40,14 @@ elif [[ -d /lfs3 ]] ; then
   echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
 elif [[ -d /scratch1 ]] ; then
   # We are on NOAA Hera
-  module load GDAS/hera
+  module load ${MODS}/hera
   if [[ "${DEBUG_WORKFLOW}" == "YES" ]] ; then
      module list
      pip list
   fi
 elif [[ -d /work ]] ; then
   # We are on MSU Orion
-  module load GDAS/orion
+  module load ${MODS}/orion
   if [[ "${DEBUG_WORKFLOW}" == "YES" ]] ; then
      module list
      pip list

From f9f82e47a9e2ccdfc8c2cf612aef9978c4616cab Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 11:27:38 -0500
Subject: [PATCH 2/8] forgotten files ...

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY | 45 ++++++++++++++++++++++
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY      | 45 ++++++++++++++++++++++
 jobs/rocoto/ocnanalvrfy.sh                 | 19 +++++++++
 3 files changed, 109 insertions(+)
 create mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
 create mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
 create mode 100755 jobs/rocoto/ocnanalvrfy.sh

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
new file mode 100755
index 0000000000..145d3032f8
--- /dev/null
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
@@ -0,0 +1,45 @@
+#!/bin/bash
+export STRICT="NO"
+source "${HOMEgfs}/ush/preamble.sh"
+
+
+export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"
+
+
+##############################################
+# Set variables used in the script
+##############################################
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+
+###############################################################
+# Run relevant script
+
+EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_bmat_vrfy.sh}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
+fi
+
+##########################################
+# Do not remove the Temporary working directory (do this in POST)
+##########################################
+cd "${DATAROOT}" || exit 1
+
+exit 0
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
new file mode 100755
index 0000000000..fdd1106046
--- /dev/null
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
@@ -0,0 +1,45 @@
+#!/bin/bash
+export STRICT="NO"
+source "${HOMEgfs}/ush/preamble.sh"
+
+
+export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalprep"
+
+
+##############################################
+# Set variables used in the script
+##############################################
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+
+###############################################################
+# Run relevant script
+
+EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_vrfy.sh}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
+fi
+
+##########################################
+# Do not remove the Temporary working directory (do this in POST)
+##########################################
+cd "${DATAROOT}" || exit 1
+
+exit 0
diff --git a/jobs/rocoto/ocnanalvrfy.sh b/jobs/rocoto/ocnanalvrfy.sh
new file mode 100755
index 0000000000..cdea2133e4
--- /dev/null
+++ b/jobs/rocoto/ocnanalvrfy.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+
+export STRICT="NO"
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source UFSDA workflow modules
+. ${HOMEgfs}/ush/load_ufsda_modules.sh --eva
+status=$?
+[[ ${status} -ne 0 ]] && exit ${status}
+
+export job="ocnanalvrfy"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
+status=$?
+exit "${status}"

From c785bdd0da4cb781ca7165ee6e9dda71fc74cfa1 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 11:33:39 -0500
Subject: [PATCH 3/8] tidy run job

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
index 4ad58366e6..e158005a84 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
@@ -6,18 +6,11 @@ DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"
 
 
-##############################################
-# Set variables used in the script
-##############################################
-
-export CDUMP=${CDUMP:-${RUN:-"gfs"}}
-export COMPONENT="ocean"
-
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
 
 ###############################################################
 # Run relevant script

From 92f794c1a8bba64f45c28fb30ee2ad2033d4eba7 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 12:48:42 -0500
Subject: [PATCH 4/8] code norm

---
 jobs/rocoto/ocnanalpost.sh | 4 ++--
 jobs/rocoto/ocnanalprep.sh | 4 ++--
 jobs/rocoto/ocnanalrun.sh  | 4 ++--
 ush/load_ufsda_modules.sh  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jobs/rocoto/ocnanalpost.sh b/jobs/rocoto/ocnanalpost.sh
index 0912598a7a..b99a4e05ca 100755
--- a/jobs/rocoto/ocnanalpost.sh
+++ b/jobs/rocoto/ocnanalpost.sh
@@ -4,9 +4,9 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source UFSDA workflow modules
-. ${HOMEgfs}/ush/load_ufsda_modules.sh
+. "${HOMEgfs}/ush/load_ufsda_modules.sh"
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+[[ ${status} -ne 0 ]] && exit "${status}"
 
 export job="ocnanalpost"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/ocnanalprep.sh b/jobs/rocoto/ocnanalprep.sh
index 6661849a7a..3830fe1c39 100755
--- a/jobs/rocoto/ocnanalprep.sh
+++ b/jobs/rocoto/ocnanalprep.sh
@@ -5,9 +5,9 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source UFSDA workflow modules
-. ${HOMEgfs}/ush/load_ufsda_modules.sh
+. "${HOMEgfs}/ush/load_ufsda_modules.sh"
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+[[ ${status} -ne 0 ]] && exit "${status}"
 
 export job="ocnanalprep"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/ocnanalrun.sh b/jobs/rocoto/ocnanalrun.sh
index d9d2edb263..5f998af989 100755
--- a/jobs/rocoto/ocnanalrun.sh
+++ b/jobs/rocoto/ocnanalrun.sh
@@ -4,9 +4,9 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source UFSDA workflow modules
-. ${HOMEgfs}/ush/load_ufsda_modules.sh
+. "${HOMEgfs}/ush/load_ufsda_modules.sh"
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+[[ ${status} -ne 0 ]] && exit "${status}"
 
 export job="ocnanalrun"
 export jobid="${job}.$$"
diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index 5e6851e1f2..1c17b073b9 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -8,7 +8,7 @@ fi
 
 # Read optional module argument, default is to use GDAS
 MODS="GDAS"
-if [ $# -gt 0 ]; then
+if [[ $# -gt 0 ]]; then
   case "$1" in
     --eva)
       MODS="EVA"
@@ -40,14 +40,14 @@ elif [[ -d /lfs3 ]] ; then
   echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
 elif [[ -d /scratch1 ]] ; then
   # We are on NOAA Hera
-  module load ${MODS}/hera
+  module load "${MODS}/hera"
   if [[ "${DEBUG_WORKFLOW}" == "YES" ]] ; then
      module list
      pip list
   fi
 elif [[ -d /work ]] ; then
   # We are on MSU Orion
-  module load ${MODS}/orion
+  module load "${MODS}/orion"
   if [[ "${DEBUG_WORKFLOW}" == "YES" ]] ; then
      module list
      pip list

From b7ea944080deb1efe0b4979eb915db3b85341acd Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 13:34:17 -0500
Subject: [PATCH 5/8] wrong resources

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
index fdd1106046..36da33eabe 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
@@ -4,7 +4,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 
 export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalprep"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanalprep"
 
 
 ##############################################

From 71490f157559cafeab70735fcc0dff5ccf63ebc5 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 23 Jan 2023 13:42:06 -0500
Subject: [PATCH 6/8] more shellcheck

---
 jobs/rocoto/ocnanalvrfy.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/rocoto/ocnanalvrfy.sh b/jobs/rocoto/ocnanalvrfy.sh
index cdea2133e4..d8e9bbb805 100755
--- a/jobs/rocoto/ocnanalvrfy.sh
+++ b/jobs/rocoto/ocnanalvrfy.sh
@@ -5,15 +5,15 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source UFSDA workflow modules
-. ${HOMEgfs}/ush/load_ufsda_modules.sh --eva
+. "${HOMEgfs}/ush/load_ufsda_modules.sh" --eva
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+[[ ${status} -ne 0 ]] && exit "${status}"
 
 export job="ocnanalvrfy"
 export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
+"${HOMEgfs}/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY"
 status=$?
 exit "${status}"

From 5afef87bb9a80aac9f110942ef778aca0abdb41f Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Tue, 24 Jan 2023 13:37:57 -0500
Subject: [PATCH 7/8] cp stuff to com

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST | 37 ++++++++++++++++++++++++++-
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY |  8 +++---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
index f050f197f4..451ca31902 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
@@ -6,13 +6,48 @@ DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalpost" -c "base ocnanalpost"
 
 
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+
+mkdir -p ${COMOUT}
+
 ###############################################################
 # Run relevant script
 ###############################################################
 
+# Save some of the DA cycle output to COMOUT
+# TODO: Move to a dedicated script
+
+# Make a copy the IAU increment
+cp "${DATA}/inc.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ocninc.nc"
+
+# TODO: Dump-splash of the sea-ice restart not done yet
+
+# Copy of the ioda output files, as is for now
+cp -r "${DATA}/diags" "${COMOUT}"
+
+# Copy of the diagonal of the background error for the cycle
+bdate=$(date -d "${CDATE:0:8} ${CDATE:8:2} - 3 hours" +"%Y-%m-%dT%H:00:00Z")
+cp "${DATA}/ocn.bkgerr_stddev.incr.${bdate}.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ocn.bkgerr_stddev.nc"
+cp "${DATA}/ice.bkgerr_stddev.incr.${bdate}.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ice.bkgerr_stddev.nc"
+
+# Copy the loacalization and correlation operators
+cp -rL "${DATA}/bump ${COMOUT}/bump"
+
+# Copy the analysis in the middle of the window
+cdate=$(date -d "${CDATE:0:8} ${CDATE:8:2}" +"%Y-%m-%dT%H:00:00Z")
+cp "${DATA}/Data/ocn.3dvarfgat_pseudo.an.${cdate}.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ocnana.nc"
 
-# TODO (#982)
+# Copy DA grid (computed for the start of the window)
+bcyc=$(((cyc - 3 + 24) % 24))
+cp "${DATA}/soca_gridspec.nc" "${COMOUT}/${CDUMP}.t${bcyc}z.ocngrid.nc"
 
+# Copy logs
+mkdir -p ${COMOUT}/logs
+cp "${DATA}/*.out" ${COMOUT}/logs
 
 ##########################################
 # Remove the Temporary working directory
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
index 36da33eabe..9c6ad5e7b9 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
@@ -1,9 +1,6 @@
 #!/bin/bash
 export STRICT="NO"
 source "${HOMEgfs}/ush/preamble.sh"
-
-
-export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanalprep"
 
 
@@ -18,10 +15,13 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanal
 
 export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
 
+# Add UFSDA to PYTHONPATH
+export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/:${PYTHONPATH}
+
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_vrfy.sh}
+EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_vrfy.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"

From ede43962de2f2dafd57e90c5c33b525119b5cabf Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Tue, 24 Jan 2023 13:50:07 -0500
Subject: [PATCH 8/8] fixed shell norms

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST | 9 +++++----
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
index 451ca31902..7ab3eb0028 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
@@ -11,8 +11,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalpost" -c "base ocnanalpost"
 ##############################################
 
 export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+export CDATE=${CDATE:-${PDY}${cyc}}
 
-mkdir -p ${COMOUT}
+mkdir -p "${COMOUT}"
 
 ###############################################################
 # Run relevant script
@@ -35,7 +36,7 @@ cp "${DATA}/ocn.bkgerr_stddev.incr.${bdate}.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ocn
 cp "${DATA}/ice.bkgerr_stddev.incr.${bdate}.nc" "${COMOUT}/${CDUMP}.t${cyc}z.ice.bkgerr_stddev.nc"
 
 # Copy the loacalization and correlation operators
-cp -rL "${DATA}/bump ${COMOUT}/bump"
+cp -rL "${DATA}/bump" "${COMOUT}/bump"
 
 # Copy the analysis in the middle of the window
 cdate=$(date -d "${CDATE:0:8} ${CDATE:8:2}" +"%Y-%m-%dT%H:00:00Z")
@@ -46,8 +47,8 @@ bcyc=$(((cyc - 3 + 24) % 24))
 cp "${DATA}/soca_gridspec.nc" "${COMOUT}/${CDUMP}.t${bcyc}z.ocngrid.nc"
 
 # Copy logs
-mkdir -p ${COMOUT}/logs
-cp "${DATA}/*.out" ${COMOUT}/logs
+mkdir -p "${COMOUT}/logs"
+cp "${DATA}/*.out" "${COMOUT}/logs"
 
 ##########################################
 # Remove the Temporary working directory
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
index e158005a84..893719fa9f 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
@@ -2,7 +2,7 @@
 export STRICT="NO"
 source "${HOMEgfs}/ush/preamble.sh"
 WIPE_DATA="NO"
-DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
+export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"