Skip to content

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

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.

Sign up for GitHub

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

Merged
WalterKolczynski-NOAA merged 7 commits into from
Oct 12, 2022
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05b4702
Ref #1055
EdwardSafford-NOAA Oct 7, 2022
e59feac
Ref 1055
EdwardSafford-NOAA Oct 9, 2022
a85ad1b
Ref #1055
EdwardSafford-NOAA Oct 11, 2022
f65971e
Ref #1055
EdwardSafford-NOAA Oct 11, 2022
309abfe
Ref #1055
EdwardSafford-NOAA Oct 11, 2022
c63d17f
Ref #1055
EdwardSafford-NOAA Oct 11, 2022
d615071
Ref #1055
EdwardSafford-NOAA Oct 11, 2022
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
26 changes: 15 additions & 11 deletions jobs/rocoto/vrfy.sh
View file
Open in desktop
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 @@ -111,8 +115,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.$PDYm1c/$pcyc"
export MY_MACHINE=$machine

$VRFYRADSH
Expand All @@ -127,8 +131,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.$PDYm1c/$pcyc"
export MY_MACHINE=$machine

$VRFYOZNSH
Expand All @@ -142,8 +146,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.$PDYm1c/$pcyc"
export MY_MACHINE=$machine

$VRFYMINSH
Expand All @@ -165,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
Comment thread Fixed
${GENESISFSU}
fi


###############################################################
# Force Exit out cleanly
if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi
if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf ${DATAROOT} ; fi
Comment thread Fixed
Comment thread Fixed


exit 0
2 changes: 1 addition & 1 deletion ush/minmon_xtrct_costs.pl
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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