Skip to content

Commit

Permalink
Remove user prompt and file checker re-added
Browse files Browse the repository at this point in the history
 - Commented out user prompt for downloading CFSv2 files on HPC11;
 - Readded the CFSv2 file checker (no prompt included);
 - Minor updates to script messages and comments.

 Target for LISV7.5.13 patch.
  • Loading branch information
karsenau committed Oct 23, 2023
1 parent 0c8576e commit e4b8492
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
21 changes: 15 additions & 6 deletions lis/utils/usaf/s2s/s2s_app/s2s_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -977,24 +977,33 @@ if [ $DATATYPE == "forecast" ]; then
mkdir -p -m 775 ${SCRDIR}/lis_darun
mkdir -p -m 775 ${SCRDIR}/s2smetric
mkdir -p -m 775 ${SCRDIR}/s2splots

# Check for CFSv2 files being ready to read in:
if [[ $NODE_NAME =~ discover* ]] || [[ $NODE_NAME =~ borg* ]]; then
if [[ $STEP == "E2E" ]] || [[ $STEP == "BCSD" ]]; then
download_forecasts
fi
else
echo
# CFSv2 forecast
# sh s2s_app/wget_cfsv2_oper_ts_e2es.sh -y ${YYYY} -m ${MM} -c ${BWD}/${CFILE} -d N
# ret_code=$?
sh s2s_app/wget_cfsv2_oper_ts_e2es.sh -y ${YYYY} -m ${MM} -c ${BWD}/${CFILE} -d N
ret_code=$?

if [ $ret_code -gt 0 ]; then
echo " Error return code from the CFSv2 file download checker :: "${ret_code}
echo " > 0 :: Exiting from s2s_run.sh --"
exit
fi
read -p "WARNING: Downloading ${YYYY}${MM} NMME precipitation and CFSv2 forcings forecats is a prerequisite to run the ${YYYY}${MM} E2E hydrological forecast. Please confirm, have you downloaded CFSv2 and NMME forecasts already (Y/N)?" YESORNO
if [ "$YESORNO" = 'N' ] || [ "$YESORNO" = 'n' ]; then
exit
fi
# -----------------
# NOTE: Turned off user-specified check below since run from cron env for operations ...
# read -p "WARNING: Downloading ${YYYY}${MM} NMME precipitation and CFSv2 forcings forecasts is a prerequisite to run the ${YYYY}${MM} E2E hydrological forecast. Please confirm, have you downloaded CFSv2 and NMME forecasts already (Y/N)? " YESORNO
# if [ "$YESORNO" = 'N' ] || [ "$YESORNO" = 'n' ]; then
# exit
# fi
# -----------------
fi
fi

MODELS=`grep NMME_models $CFILE | cut -d'[' -f2 | cut -d']' -f1 | sed 's/,//g'`

cd ${BWD}
Expand Down
2 changes: 1 addition & 1 deletion lis/utils/usaf/s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ else
echo "**************************************************************"

fi
echo " -- Done downloading CFSv2 Reforecast files -- "
echo " -- Done checking (and/or downloading) CFSv2 Forecast files -- "

exit $ret_code
# ____________________________
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def write_clim(config_file, month, flabel):
gl_.left_labels = False
gl_.right_labels = False

plt.title('Monthly '+ var + ' Anomally : ' +titles[count_plot], fontsize=fscale*FONT_SIZE2)
plt.title('Monthly '+ var + ' Anomaly : ' +titles[count_plot], fontsize=fscale*FONT_SIZE2)

if np.mod (count_plot, ncols) == 0:
gl_.left_labels = True
Expand Down

0 comments on commit e4b8492

Please sign in to comment.