diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 489a2b536..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 - - # #----------------------------------------------------------------------- # @@ -669,7 +667,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 @@ -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,6 +1063,3 @@ Stopping. " exit 1 fi - - -