From 9fe94bbe1c78b17eb66cdee7f8c425cdf340a2e2 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Fri, 13 Jan 2023 17:16:38 +0000 Subject: [PATCH 1/5] new jjob for ocean analysis bmat --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 87 +++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT new file mode 100755 index 0000000000..128d138a04 --- /dev/null +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT @@ -0,0 +1,87 @@ +#!/bin/bash +export STRICT="NO" +source "${HOMEgfs}/ush/preamble.sh" + + +############################################## +# make temp directory +############################################## +export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}} +mkdir -p "${DATA}" +cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) + + +############################################## +# Run setpdy and initialize PDY variables +############################################## +export cycle="t${cyc}z" +setpdy.sh +. ./PDY + + +############################################## +# Determine Job Output Name on System +############################################## +export pid=${pid:-$$} +export pgmout="OUTPUT.${pid}" +export pgmerr=errfile + + +############################# +# Source relevant config files +############################# +export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} +configs="base ocnanal ocnanalrun" +for config in ${configs}; do + . "${EXPDIR}/config.${config}" + status=$? + [[ ${status} -ne 0 ]] && exit "${status}" +done + + +########################################## +# Source machine runtime environment +########################################## +. "${HOMEgfs}/env/${machine}.env" ocnanalrun +status=$? +[[ ${status} -ne 0 ]] && exit "${status}" + + +############################################## +# 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}} + +############################################################### +# Run relevant script + +EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_bmat.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 From fe9bac7f938ffc0062b05c574bee93ea3c71fdf4 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Tue, 17 Jan 2023 16:42:33 -0500 Subject: [PATCH 2/5] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 44 ++------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT index 128d138a04..058d90093f 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT @@ -3,48 +3,8 @@ export STRICT="NO" source "${HOMEgfs}/ush/preamble.sh" -############################################## -# make temp directory -############################################## -export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}} -mkdir -p "${DATA}" -cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1) - - -############################################## -# Run setpdy and initialize PDY variables -############################################## -export cycle="t${cyc}z" -setpdy.sh -. ./PDY - - -############################################## -# Determine Job Output Name on System -############################################## -export pid=${pid:-$$} -export pgmout="OUTPUT.${pid}" -export pgmerr=errfile - - -############################# -# Source relevant config files -############################# -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} -configs="base ocnanal ocnanalrun" -for config in ${configs}; do - . "${EXPDIR}/config.${config}" - status=$? - [[ ${status} -ne 0 ]] && exit "${status}" -done - - -########################################## -# Source machine runtime environment -########################################## -. "${HOMEgfs}/env/${machine}.env" ocnanalrun -status=$? -[[ ${status} -ne 0 ]] && exit "${status}" +export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}" +source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun" ############################################## From a98d44b0fbd1f19c9b8c18057311196f61a725d8 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:56:58 -0500 Subject: [PATCH 3/5] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT This is necessarily an ocean component Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT index 058d90093f..07b7587127 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT @@ -12,7 +12,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalr ############################################## export CDUMP=${CDUMP:-${RUN:-"gfs"}} -export COMPONENT="ocean" ############################################## # Begin JOB SPECIFIC work From 72965cfa8b7db452de4154312313524f50f685cd Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:57:18 -0500 Subject: [PATCH 4/5] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT This is necessarily an ocean component Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT index 07b7587127..ab64167440 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT @@ -17,7 +17,7 @@ export CDUMP=${CDUMP:-${RUN:-"gfs"}} # Begin JOB SPECIFIC work ############################################## -export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}} +export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean} ############################################################### # Run relevant script From f16d05feb8e926f4efcd4edd74ec52207ff478fa Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:58:58 -0500 Subject: [PATCH 5/5] Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT Co-authored-by: Rahul Mahajan --- jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT index ab64167440..a218967cc2 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT @@ -11,7 +11,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalr # Set variables used in the script ############################################## -export CDUMP=${CDUMP:-${RUN:-"gfs"}} ############################################## # Begin JOB SPECIFIC work