From e4b8492fb2b2364cdf99421b21ddbdbf72ea195d Mon Sep 17 00:00:00 2001
From: "Kristi R. Arsenault" <kristi.r.arsenault@nasa.gov>
Date: Mon, 23 Oct 2023 00:00:30 -0400
Subject: [PATCH 1/2] Remove user prompt and file checker re-added

 - 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.
---
 lis/utils/usaf/s2s/s2s_app/s2s_run.sh         | 21 +++++++++++++------
 .../s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh    |  2 +-
 .../s2s_modules/s2splots/plot_anom_verify.py  |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lis/utils/usaf/s2s/s2s_app/s2s_run.sh b/lis/utils/usaf/s2s/s2s_app/s2s_run.sh
index bd6f159c3..86eb46d4c 100755
--- a/lis/utils/usaf/s2s/s2s_app/s2s_run.sh
+++ b/lis/utils/usaf/s2s/s2s_app/s2s_run.sh
@@ -977,6 +977,8 @@ 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
@@ -984,17 +986,24 @@ if [ $DATATYPE  == "forecast" ]; then
     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}
diff --git a/lis/utils/usaf/s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh b/lis/utils/usaf/s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh
index ff350c0f5..28f3b2099 100755
--- a/lis/utils/usaf/s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh
+++ b/lis/utils/usaf/s2s/s2s_app/wget_cfsv2_oper_ts_e2es.sh
@@ -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
 # ____________________________
diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py
index ce5cdd5dd..57e77943a 100644
--- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py
+++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py
@@ -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

From e6cc74c3541f3dfed23cb18dea2b78d15ffb3a67 Mon Sep 17 00:00:00 2001
From: "Kristi R. Arsenault" <kristi.r.arsenault@nasa.gov>
Date: Mon, 23 Oct 2023 16:03:59 -0400
Subject: [PATCH 2/2] Update the segment numbers for S2S config file

 Modified the segment numbers for the LIS 7.5.13 patch in the
  s2s_config_global_fcst file to:

GEOSv2: 2
CFSv2: 5
---
 lis/utils/usaf/s2s/s2s_app/s2s_config_global_fcast | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lis/utils/usaf/s2s/s2s_app/s2s_config_global_fcast b/lis/utils/usaf/s2s/s2s_app/s2s_config_global_fcast
index a9f7506df..74dad8d17 100755
--- a/lis/utils/usaf/s2s/s2s_app/s2s_config_global_fcast
+++ b/lis/utils/usaf/s2s/s2s_app/s2s_config_global_fcast
@@ -68,8 +68,8 @@ FCST:
   - CCM4: 3
     CCSM4: 3
     GNEMO5: 3
-    GEOSv2: 1
-    CFSv2: 3 
+    GEOSv2: 2
+    CFSv2: 5
     GFDL: 9 
   
 #######################################################################