From 05b47020e05b56f7292bb890a5b70feb33f0dfcc Mon Sep 17 00:00:00 2001 From: "Edward.Safford" Date: Fri, 7 Oct 2022 16:46:54 +0000 Subject: [PATCH 1/7] Ref #1055 Initial file name changes. --- ush/ozn_xtrct.sh | 16 +++++++++------- ush/radmon_verf_angle.sh | 8 ++++---- ush/radmon_verf_bcoef.sh | 8 ++++---- ush/radmon_verf_bcor.sh | 8 ++++---- ush/radmon_verf_time.sh | 14 +++++++------- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ush/ozn_xtrct.sh b/ush/ozn_xtrct.sh index 3f6b3fed19b..c6b59079c67 100755 --- a/ush/ozn_xtrct.sh +++ b/ush/ozn_xtrct.sh @@ -242,13 +242,15 @@ EOF done # ptype in $ozn_ptype - tar -cvf stdout.horiz.tar stdout.horiz* - ${COMPRESS} stdout.horiz.tar - ${NCP} stdout.horiz.tar.${Z} ${TANKverf_ozn}/horiz/ - - tar -cvf stdout.time.tar stdout.time* - ${COMPRESS} stdout.time.tar - ${NCP} stdout.time.tar.${Z} ${TANKverf_ozn}/time/ + horiz_tar=stdout.horiz.${PDATE}.tar + tar -cvf ${horiz_tar} stdout.horiz* + ${COMPRESS} ${horiz_tar} + ${NCP} ${horiz_tar}.gz ${TANKverf_ozn}/horiz/ + + time_tar=stdout.time.${PDATE}.tar + tar -cvf ${time_tar} stdout.time* + ${COMPRESS} ${time_tar} + ${NCP} ${time_tar}.gz ${TANKverf_ozn}/time/ fi #------------------------------------------------------- diff --git a/ush/radmon_verf_angle.sh b/ush/radmon_verf_angle.sh index b2dab0825ab..7c5e2a803c0 100755 --- a/ush/radmon_verf_angle.sh +++ b/ush/radmon_verf_angle.sh @@ -209,17 +209,17 @@ EOF ${USHradmon}/rstprod.sh - tar_file=radmon_angle.tar + tar_file=angle.${PDATE}.tar if compgen -G "angle*.ieee_d*" > /dev/null || compgen -G "angle*.ctl*" > /dev/null; then tar -cf $tar_file angle*.ieee_d* angle*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.${Z} ${TANKverf_rad}/. + mv $tar_file.gz ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.${Z} - rm ${tar_file}.${Z} + tar -xf ${tar_file}.gz + rm ${tar_file}.gz cd ${cwd} fi fi diff --git a/ush/radmon_verf_bcoef.sh b/ush/radmon_verf_bcoef.sh index 374c8db7b28..78c52bba1e9 100755 --- a/ush/radmon_verf_bcoef.sh +++ b/ush/radmon_verf_bcoef.sh @@ -207,16 +207,16 @@ EOF ${USHradmon}/rstprod.sh if compgen -G "bcoef*.ieee_d*" > /dev/null || compgen -G "bcoef*.ctl*" > /dev/null; then - tar_file=radmon_bcoef.tar + tar_file=bcoef.${PDATE}.tar tar -cf $tar_file bcoef*.ieee_d* bcoef*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.${Z} ${TANKverf_rad} + mv $tar_file.gz ${TANKverf_rad} if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.${Z} - rm ${tar_file}.${Z} + tar -xf ${tar_file}.gz + rm ${tar_file}.gz cd ${cwd} fi fi diff --git a/ush/radmon_verf_bcor.sh b/ush/radmon_verf_bcor.sh index 3e267f018cd..4fe0bf19823 100755 --- a/ush/radmon_verf_bcor.sh +++ b/ush/radmon_verf_bcor.sh @@ -198,18 +198,18 @@ EOF ${USHradmon}/rstprod.sh - tar_file=radmon_bcor.tar + tar_file=bcor.${PDATE}.tar if compgen -G "bcor*.ieee_d*" > /dev/null || compgen -G "bcor*.ctl*" > /dev/null; then tar -cf $tar_file bcor*.ieee_d* bcor*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.${Z} ${TANKverf_rad}/. + mv $tar_file.gz ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.${Z} - rm ${tar_file}.${Z} + tar -xf ${tar_file}.gz + rm ${tar_file}.gz cd ${cwd} fi fi diff --git a/ush/radmon_verf_time.sh b/ush/radmon_verf_time.sh index 51743277c91..13439fea27e 100755 --- a/ush/radmon_verf_time.sh +++ b/ush/radmon_verf_time.sh @@ -152,9 +152,9 @@ CYCLE=$cyc local_base="local_base" if [[ $DO_DATA_RPT -eq 1 ]]; then - if [[ -e ${base_file}.${Z} ]]; then - $NCP ${base_file}.${Z} ./${local_base}.{Z} - ${UNCOMPRESS} ${local_base}.${Z} + if [[ -e ${base_file}.gz ]]; then + $NCP ${base_file}.gz ./${local_base}.gz + ${UNCOMPRESS} ${local_base}.gz else $NCP ${base_file} ./${local_base} fi @@ -253,16 +253,16 @@ EOF ${USHradmon}/rstprod.sh if compgen -G "time*.ieee_d*" > /dev/null || compgen -G "time*.ctl*" > /dev/null; then - tar_file=radmon_time.tar + tar_file=time.${PDATE}.tar tar -cf $tar_file time*.ieee_d* time*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.${Z} ${TANKverf_rad}/. + mv $tar_file.gz ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.${Z} - rm ${tar_file}.${Z} + tar -xf ${tar_file}.gz + rm ${tar_file}.gz cd ${cwd} fi fi From e59feac0a49a74f9ccdeee726b2c752cbc71fff3 Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Sun, 9 Oct 2022 15:10:41 -0500 Subject: [PATCH 2/7] Ref 1055 Update minmon file locations, m1 definition. --- jobs/rocoto/vrfy.sh | 2 +- ush/minmon_xtrct_costs.pl | 2 +- ush/minmon_xtrct_gnorms.pl | 4 +--- ush/minmon_xtrct_reduct.pl | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 584961e7ff1..2e4cab0a8cd 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -42,7 +42,7 @@ status=$? ############################################################### export COMPONENT=${COMPONENT:-atmos} -export CDATEm1=$($NDATE -24 $CDATE) +export CDATEm1=$($NDATE -06 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) export pid=${pid:-$$} diff --git a/ush/minmon_xtrct_costs.pl b/ush/minmon_xtrct_costs.pl index 502032da801..1b5d490102f 100755 --- a/ush/minmon_xtrct_costs.pl +++ b/ush/minmon_xtrct_costs.pl @@ -208,7 +208,7 @@ #-------------------------- # move files to $M_TANKverf #-------------------------- - my $tankdir = $ENV{"M_TANKverf"}; + my $tankdir = $ENV{"M_TANKverfM0"}; if(! -d $tankdir) { system( "mkdir -p $tankdir" ); } diff --git a/ush/minmon_xtrct_gnorms.pl b/ush/minmon_xtrct_gnorms.pl index 61da749a1d9..ecd44232da5 100755 --- a/ush/minmon_xtrct_gnorms.pl +++ b/ush/minmon_xtrct_gnorms.pl @@ -414,10 +414,8 @@ sub updateGnormData { #-------------------------- # move files to $M_TANKverf #-------------------------- - my $tankdir = $ENV{"M_TANKverf"}; - print "M_TANKverf = $tankdir \n"; + my $tankdir = $ENV{"M_TANKverfM0"}; if(! -d $tankdir) { - print "making $tankdir\n"; system( "mkdir -p $tankdir" ); } diff --git a/ush/minmon_xtrct_reduct.pl b/ush/minmon_xtrct_reduct.pl index 1b8186b6ade..f6037d3f324 100755 --- a/ush/minmon_xtrct_reduct.pl +++ b/ush/minmon_xtrct_reduct.pl @@ -72,7 +72,7 @@ #---------------------------- # copy outfile to $M_TANKverf #---------------------------- - my $tankdir = $ENV{"M_TANKverf"}; + my $tankdir = $ENV{"M_TANKverfM0"}; if(! -d $tankdir) { system( "mkdir -p $tankdir" ); } From a85ad1bd532b0e97f6389705f343d4bb04a22e59 Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Tue, 11 Oct 2022 09:25:21 -0500 Subject: [PATCH 3/7] Ref #1055 Add $cyc to default module path, revert file name changes. --- jobs/rocoto/vrfy.sh | 13 +++++++------ ush/ozn_xtrct.sh | 16 +++++++--------- ush/radmon_verf_angle.sh | 8 ++++---- ush/radmon_verf_bcoef.sh | 8 ++++---- ush/radmon_verf_bcor.sh | 8 ++++---- ush/radmon_verf_time.sh | 14 +++++++------- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 2e4cab0a8cd..7306cb55bbd 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -44,6 +44,7 @@ status=$? export COMPONENT=${COMPONENT:-atmos} export CDATEm1=$($NDATE -06 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) +export pcyc=$(echo $CDATEm1 | cut -c9-10) export pid=${pid:-$$} export jobid=${job}.${pid} @@ -111,8 +112,8 @@ if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY" - export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1" + export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" + export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" export MY_MACHINE=$machine $VRFYRADSH @@ -127,8 +128,8 @@ if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY" - export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1" + export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY/$cyc" + export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" export MY_MACHINE=$machine $VRFYOZNSH @@ -142,8 +143,8 @@ echo "=============== START TO RUN MINMON ===============" if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY" - export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1" + export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" + export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" export MY_MACHINE=$machine $VRFYMINSH diff --git a/ush/ozn_xtrct.sh b/ush/ozn_xtrct.sh index c6b59079c67..3f6b3fed19b 100755 --- a/ush/ozn_xtrct.sh +++ b/ush/ozn_xtrct.sh @@ -242,15 +242,13 @@ EOF done # ptype in $ozn_ptype - horiz_tar=stdout.horiz.${PDATE}.tar - tar -cvf ${horiz_tar} stdout.horiz* - ${COMPRESS} ${horiz_tar} - ${NCP} ${horiz_tar}.gz ${TANKverf_ozn}/horiz/ - - time_tar=stdout.time.${PDATE}.tar - tar -cvf ${time_tar} stdout.time* - ${COMPRESS} ${time_tar} - ${NCP} ${time_tar}.gz ${TANKverf_ozn}/time/ + tar -cvf stdout.horiz.tar stdout.horiz* + ${COMPRESS} stdout.horiz.tar + ${NCP} stdout.horiz.tar.${Z} ${TANKverf_ozn}/horiz/ + + tar -cvf stdout.time.tar stdout.time* + ${COMPRESS} stdout.time.tar + ${NCP} stdout.time.tar.${Z} ${TANKverf_ozn}/time/ fi #------------------------------------------------------- diff --git a/ush/radmon_verf_angle.sh b/ush/radmon_verf_angle.sh index 7c5e2a803c0..b2dab0825ab 100755 --- a/ush/radmon_verf_angle.sh +++ b/ush/radmon_verf_angle.sh @@ -209,17 +209,17 @@ EOF ${USHradmon}/rstprod.sh - tar_file=angle.${PDATE}.tar + tar_file=radmon_angle.tar if compgen -G "angle*.ieee_d*" > /dev/null || compgen -G "angle*.ctl*" > /dev/null; then tar -cf $tar_file angle*.ieee_d* angle*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.gz ${TANKverf_rad}/. + mv $tar_file.${Z} ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.gz - rm ${tar_file}.gz + tar -xf ${tar_file}.${Z} + rm ${tar_file}.${Z} cd ${cwd} fi fi diff --git a/ush/radmon_verf_bcoef.sh b/ush/radmon_verf_bcoef.sh index 78c52bba1e9..374c8db7b28 100755 --- a/ush/radmon_verf_bcoef.sh +++ b/ush/radmon_verf_bcoef.sh @@ -207,16 +207,16 @@ EOF ${USHradmon}/rstprod.sh if compgen -G "bcoef*.ieee_d*" > /dev/null || compgen -G "bcoef*.ctl*" > /dev/null; then - tar_file=bcoef.${PDATE}.tar + tar_file=radmon_bcoef.tar tar -cf $tar_file bcoef*.ieee_d* bcoef*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.gz ${TANKverf_rad} + mv $tar_file.${Z} ${TANKverf_rad} if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.gz - rm ${tar_file}.gz + tar -xf ${tar_file}.${Z} + rm ${tar_file}.${Z} cd ${cwd} fi fi diff --git a/ush/radmon_verf_bcor.sh b/ush/radmon_verf_bcor.sh index 4fe0bf19823..3e267f018cd 100755 --- a/ush/radmon_verf_bcor.sh +++ b/ush/radmon_verf_bcor.sh @@ -198,18 +198,18 @@ EOF ${USHradmon}/rstprod.sh - tar_file=bcor.${PDATE}.tar + tar_file=radmon_bcor.tar if compgen -G "bcor*.ieee_d*" > /dev/null || compgen -G "bcor*.ctl*" > /dev/null; then tar -cf $tar_file bcor*.ieee_d* bcor*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.gz ${TANKverf_rad}/. + mv $tar_file.${Z} ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.gz - rm ${tar_file}.gz + tar -xf ${tar_file}.${Z} + rm ${tar_file}.${Z} cd ${cwd} fi fi diff --git a/ush/radmon_verf_time.sh b/ush/radmon_verf_time.sh index 13439fea27e..51743277c91 100755 --- a/ush/radmon_verf_time.sh +++ b/ush/radmon_verf_time.sh @@ -152,9 +152,9 @@ CYCLE=$cyc local_base="local_base" if [[ $DO_DATA_RPT -eq 1 ]]; then - if [[ -e ${base_file}.gz ]]; then - $NCP ${base_file}.gz ./${local_base}.gz - ${UNCOMPRESS} ${local_base}.gz + if [[ -e ${base_file}.${Z} ]]; then + $NCP ${base_file}.${Z} ./${local_base}.{Z} + ${UNCOMPRESS} ${local_base}.${Z} else $NCP ${base_file} ./${local_base} fi @@ -253,16 +253,16 @@ EOF ${USHradmon}/rstprod.sh if compgen -G "time*.ieee_d*" > /dev/null || compgen -G "time*.ctl*" > /dev/null; then - tar_file=time.${PDATE}.tar + tar_file=radmon_time.tar tar -cf $tar_file time*.ieee_d* time*.ctl* ${COMPRESS} ${tar_file} - mv $tar_file.gz ${TANKverf_rad}/. + mv $tar_file.${Z} ${TANKverf_rad}/. if [[ $RAD_AREA = "rgn" ]]; then cwd=$(pwd) cd ${TANKverf_rad} - tar -xf ${tar_file}.gz - rm ${tar_file}.gz + tar -xf ${tar_file}.${Z} + rm ${tar_file}.${Z} cd ${cwd} fi fi From f65971edb48a34b725ab7e71fa13f53ffca1935c Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Tue, 11 Oct 2022 13:19:41 -0500 Subject: [PATCH 4/7] Ref #1055 Linter changes. --- jobs/rocoto/vrfy.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 7306cb55bbd..7c1f25bb449 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -42,9 +42,12 @@ status=$? ############################################################### export COMPONENT=${COMPONENT:-atmos} -export CDATEm1=$($NDATE -06 $CDATE) +export CDATEm1=$($NDATE -24 $CDATE) export PDYm1=$(echo $CDATEm1 | cut -c1-8) -export pcyc=$(echo $CDATEm1 | cut -c9-10) + +CDATEm1c=$($NDATE -06 $CDATE) +PDYm1c=$(echo $CDATEm1c | cut -c1-8) +pcyc=$(echo ${CDATEm1c} | cut -c9-10) export pid=${pid:-$$} export jobid=${job}.${pid} @@ -113,7 +116,7 @@ if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" + export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" export MY_MACHINE=$machine $VRFYRADSH @@ -129,7 +132,7 @@ if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then export EXP=$PSLOT export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" + export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" export MY_MACHINE=$machine $VRFYOZNSH @@ -144,7 +147,7 @@ if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1/$pcyc" + export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" export MY_MACHINE=$machine $VRFYMINSH @@ -166,22 +169,22 @@ fi ################################################################################ echo echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION ===============" -if [ $VRFYGENESIS = "YES" -a $CDUMP = "gfs" ]; then - $GENESISSH +if [ ${VRFYGENESIS} = "YES" -a ${CDUMP} = "gfs" ]; then + ${GENESISSH} fi ################################################################################ echo echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION (FSU) ===============" -if [ $VRFYFSU = "YES" -a $CDUMP = "gfs" ]; then - $GENESISFSU +if [ ${VRFYFSU} = "YES" -a ${CDUMP} = "gfs" ]; then + ${GENESISFSU} fi ############################################################### # Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi +if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf ${DATAROOT} ; fi exit 0 From 309abfec83098c6f61125edcd6d8e3c5b63df264 Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Tue, 11 Oct 2022 13:25:33 -0500 Subject: [PATCH 5/7] Ref #1055 Linter changes. --- jobs/rocoto/vrfy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 7c1f25bb449..b31f24548bb 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -169,7 +169,7 @@ fi ################################################################################ echo echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION ===============" -if [ ${VRFYGENESIS} = "YES" -a ${CDUMP} = "gfs" ]; then +if [ ${VRFYGENESIS} = "YES" -a "${CDUMP}" = "gfs" ]; then ${GENESISSH} fi @@ -177,14 +177,14 @@ fi ################################################################################ echo echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION (FSU) ===============" -if [ ${VRFYFSU} = "YES" -a ${CDUMP} = "gfs" ]; then +if [ ${VRFYFSU} = "YES" -a "${CDUMP}" = "gfs" ]; then ${GENESISFSU} fi ############################################################### # Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf ${DATAROOT} ; fi +if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf "${DATAROOT}" ; fi exit 0 From c63d17f0539b3c5cedc5d7190dca7dbc06fa7814 Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Tue, 11 Oct 2022 13:35:51 -0500 Subject: [PATCH 6/7] Ref #1055 Linter changes. --- jobs/rocoto/vrfy.sh | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index b31f24548bb..1012b6d31a1 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -111,15 +111,15 @@ fi ############################################################### echo echo "=============== START TO RUN RADMON DATA EXTRACTION ===============" -if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then +if [ $VRFYRAD = "YES" -a "${CDUMP}" = "${CDFNL}" -a "${CDATE}" != "${SDATE}" ]; then - export EXP=$PSLOT - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" - export MY_MACHINE=$machine + export EXP=${PSLOT} + export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" + export TANKverf_rad="${TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" + export TANKverf_radM1="${TANKverf}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}" + export MY_MACHINE=${machine} - $VRFYRADSH + ${VRFYRADSH} fi @@ -127,15 +127,15 @@ fi ############################################################### echo echo "=============== START TO RUN OZMON DATA EXTRACTION ===============" -if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then +if [ "${VRFYOZN}" = "YES" -a "${CDUMP}" = "${CDFNL}" -a "${CDATE}" != "${SDATE}" ]; then - export EXP=$PSLOT - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" - export MY_MACHINE=$machine + export EXP=${PSLOT} + export COMOUT="${ROTDIR/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" + export TANKverf_ozn="{$TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" + export TANKverf_oznM1="${TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}" + export MY_MACHINE=${machine} - $VRFYOZNSH + ${VRFYOZNSH} fi @@ -143,14 +143,14 @@ fi ############################################################### echo echo "=============== START TO RUN MINMON ===============" -if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then +if [ "${VRFYMINMON}" = "YES" -a "${CDATE}" != "${SDATE}" ]; then - export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT" - export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY/$cyc" - export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1c/$pcyc" - export MY_MACHINE=$machine + export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" + export M_TANKverfM0="{$M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" + export M_TANKverfM1="${M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}" + export MY_MACHINE=${machine} - $VRFYMINSH + ${VRFYMINSH} fi @@ -158,11 +158,11 @@ fi ################################################################################ echo echo "=============== START TO RUN CYCLONE TRACK VERIFICATION ===============" -if [ $VRFYTRAK = "YES" ]; then +if [ ${VRFYTRAK} = "YES" ]; then export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat} - $TRACKERSH + ${TRACKERSH} fi From d6150718edcb9a19fb14c3971c627a8ed16af417 Mon Sep 17 00:00:00 2001 From: "edward.safford" Date: Tue, 11 Oct 2022 16:15:56 -0500 Subject: [PATCH 7/7] Ref #1055 Clean up typo. --- jobs/rocoto/vrfy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh index 1012b6d31a1..50750a94ecc 100755 --- a/jobs/rocoto/vrfy.sh +++ b/jobs/rocoto/vrfy.sh @@ -130,8 +130,8 @@ echo "=============== START TO RUN OZMON DATA EXTRACTION ===============" if [ "${VRFYOZN}" = "YES" -a "${CDUMP}" = "${CDFNL}" -a "${CDATE}" != "${SDATE}" ]; then export EXP=${PSLOT} - export COMOUT="${ROTDIR/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" - export TANKverf_ozn="{$TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" + export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" + export TANKverf_ozn="${TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" export TANKverf_oznM1="${TANKverf_ozn}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}" export MY_MACHINE=${machine} @@ -146,7 +146,7 @@ echo "=============== START TO RUN MINMON ===============" if [ "${VRFYMINMON}" = "YES" -a "${CDATE}" != "${SDATE}" ]; then export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}" - export M_TANKverfM0="{$M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" + export M_TANKverfM0="${M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDY}/${cyc}" export M_TANKverfM1="${M_TANKverf}/stats/${PSLOT}/${CDUMP}.${PDYm1c}/${pcyc}" export MY_MACHINE=${machine}