Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify default file location for monitor data when using rocoto #1065

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions jobs/rocoto/vrfy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export COMPONENT=${COMPONENT:-atmos}
export CDATEm1=$($NDATE -24 $CDATE)
export PDYm1=$(echo $CDATEm1 | cut -c1-8)

CDATEm1c=$($NDATE -06 $CDATE)
PDYm1c=$(echo $CDATEm1c | cut -c1-8)
pcyc=$(echo ${CDATEm1c} | cut -c9-10)

export pid=${pid:-$$}
export jobid=${job}.${pid}
export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
Expand Down Expand Up @@ -107,80 +111,80 @@ 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"
export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
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


###############################################################
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"
export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1"
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


###############################################################
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"
export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
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


################################################################################
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


################################################################################
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
2 changes: 1 addition & 1 deletion ush/minmon_xtrct_costs.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}
Expand Down
4 changes: 1 addition & 3 deletions ush/minmon_xtrct_gnorms.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}

Expand Down
2 changes: 1 addition & 1 deletion ush/minmon_xtrct_reduct.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}
Expand Down