Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace nems cpl validation
Browse files Browse the repository at this point in the history
Removes the old cpl validation script since the nemsconfigure string
is no longer used and replaces it with a check whether the specified
template file is readable.

Refs NOAA-EMC#1692
WalterKolczynski-NOAA committed Nov 15, 2023
1 parent fa6c96a commit db2913a
Showing 4 changed files with 10 additions and 47 deletions.
5 changes: 5 additions & 0 deletions parm/config/gefs/config.ufs
Original file line number Diff line number Diff line change
@@ -487,4 +487,9 @@ case "${model_list}" in
;;
esac

if [[ ! -r ${ufs_configure_template} ]]; then
echo "FATAL ERROR: ${ufs_configure_template} either doesn't exist or is not readable."
exit 17
fi

echo "END: config.ufs"
5 changes: 5 additions & 0 deletions parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
@@ -507,4 +507,9 @@ case "${model_list}" in
;;
esac

if [[ ! -r ${ufs_configure_template} ]]; then
echo "FATAL ERROR: ${ufs_configure_template} either doesn't exist or is not readable."
exit 17
fi

echo "END: config.ufs"
8 changes: 0 additions & 8 deletions scripts/exglobal_forecast.sh
Original file line number Diff line number Diff line change
@@ -80,16 +80,12 @@
source "${HOMEgfs}/ush/preamble.sh"

# include all subroutines. Executions later.
source "${HOMEgfs}/ush/cplvalidate.sh" # validation of cpl*
source "${HOMEgfs}/ush/forecast_predet.sh" # include functions for variable definition
source "${HOMEgfs}/ush/forecast_det.sh" # include functions for run type determination
source "${HOMEgfs}/ush/forecast_postdet.sh" # include functions for variables after run type determination
source "${HOMEgfs}/ush/nems_configure.sh" # include functions for nems_configure processing
source "${HOMEgfs}/ush/parsing_model_configure_FV3.sh"

# Compset string. For nems.configure.* template selection. Default ATM only
confignamevarfornems=${confignamevarfornems:-'atm'}

# Coupling control switches, for coupling purpose, off by default
cpl=${cpl:-.false.}
cplflx=${cplflx:-.false.} # default off,import from outside source
@@ -104,10 +100,6 @@ ICETIM=${DELTIM}
CPL_SLOW=${CPL_SLOW:-${OCNTIM}}
CPL_FAST=${CPL_FAST:-${ICETIM}}

echo "MAIN: Validating '${confignamevarfornems}' with cpl switches"
cplvalidate
echo "MAIN: '${confignamevarfornems}' validated, continue"

echo "MAIN: Loading common variables before determination of run type"
common_predet

39 changes: 0 additions & 39 deletions ush/cplvalidate.sh

This file was deleted.

0 comments on commit db2913a

Please sign in to comment.