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 3 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
15 changes: 8 additions & 7 deletions jobs/rocoto/vrfy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ status=$?

###############################################################
export COMPONENT=${COMPONENT:-atmos}
export CDATEm1=$($NDATE -24 $CDATE)
export CDATEm1=$($NDATE -06 $CDATE)
export PDYm1=$(echo $CDATEm1 | cut -c1-8)
export pcyc=$(echo $CDATEm1 | cut -c9-10)
Fixed Show fixed Hide fixed

export pid=${pid:-$$}
export jobid=${job}.${pid}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
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