From be1f5d9d90e4213768dc2147aa8fc56a4d71b582 Mon Sep 17 00:00:00 2001
From: jeff beck <jeff.beck@noaa.gov>
Date: Tue, 13 Oct 2020 18:08:32 +0000
Subject: [PATCH 1/2] Add NOMADS data script call back into generate script.

---
 ush/generate_FV3LAM_wflow.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index 489a2b536..a90e4dd45 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -669,7 +669,7 @@ if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
     print_err_msg_exit "\
 The value to set the variable lsoil to in the FV3 namelist file (FV3_NML_FP)
 has not been specified for the following combination of physics suite and
-external models for ICs and LBCs:
+external model ICs:
   CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"
   EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"
 Please change one or more of these parameters or provide a value for lsoil
@@ -1060,6 +1060,13 @@ Stopping.
 "
   exit 1
 fi
-
-
-
+#
+# If necessary, run the NOMADS script to source external model data.
+#
+source $exptdir/var_defns.sh
+if [ "${NOMADS}" = "TRUE" ]; then
+  echo "Getting NOMADS online data"
+  echo "NOMADS_file_type=" $NOMADS_file_type
+cd $exptdir
+$ushdir/NOMADS_get_extrn_mdl_files.sh $DATE_FIRST_CYCL $CYCL_HRS $NOMADS_file_type $FCST_LEN_HRS $LBC_SPEC_INTVL_HRS
+fi

From 60b9c9241a1fcf8a19170bf0484b560c098b5632 Mon Sep 17 00:00:00 2001
From: jeff beck <jeff.beck@noaa.gov>
Date: Tue, 13 Oct 2020 18:26:04 +0000
Subject: [PATCH 2/2] Change location of NOMADS script call

---
 ush/generate_FV3LAM_wflow.sh | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index a90e4dd45..daad082e3 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -631,8 +631,6 @@ Copying the FV3-LAM executable (exec_fp) to the executables directory
   EXECDIR = \"$EXECDIR\""
   cp_vrfy "${exec_fp}" "${FV3_EXEC_FP}"
 fi
-
-
 #
 #-----------------------------------------------------------------------
 #
@@ -950,6 +948,15 @@ edit the cron table):
 Done.
 "
 #
+# If necessary, run the NOMADS script to source external model data.
+#
+if [ "${NOMADS}" = "TRUE" ]; then
+  echo "Getting NOMADS online data"
+  echo "NOMADS_file_type=" $NOMADS_file_type
+  cd $EXPTDIR
+  $USHDIR/NOMADS_get_extrn_mdl_files.sh $DATE_FIRST_CYCL $CYCL_HRS $NOMADS_file_type $FCST_LEN_HRS $LBC_SPEC_INTVL_HRS
+fi
+#
 #-----------------------------------------------------------------------
 #
 # Restore the shell options saved at the beginning of this script/func-
@@ -960,10 +967,6 @@ Done.
 { restore_shell_opts; } > /dev/null 2>&1
 
 }
-
-
-
-
 #
 #-----------------------------------------------------------------------
 #
@@ -1060,13 +1063,3 @@ Stopping.
 "
   exit 1
 fi
-#
-# If necessary, run the NOMADS script to source external model data.
-#
-source $exptdir/var_defns.sh
-if [ "${NOMADS}" = "TRUE" ]; then
-  echo "Getting NOMADS online data"
-  echo "NOMADS_file_type=" $NOMADS_file_type
-cd $exptdir
-$ushdir/NOMADS_get_extrn_mdl_files.sh $DATE_FIRST_CYCL $CYCL_HRS $NOMADS_file_type $FCST_LEN_HRS $LBC_SPEC_INTVL_HRS
-fi