Skip to content

Modifications to run workflow with unmodified executable names from each repository #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkavulich merged 4 commits into from
Oct 9, 2020
Merged

Modifications to run workflow with unmodified executable names from each repository #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f59fc9f
Modifications to run workflow with unmodified executable names from e…
mkavulich Oct 7, 2020
f208194
Small commit for back-compatibilty with old build system: check old b…
mkavulich Oct 8, 2020
6eaec7f
Reduce hard-coding of paths per Gerard's suggestion
mkavulich Oct 8, 2020
ee252ba
Revert ncep_post executable name changes...now cmake build "ncep_post…
mkavulich Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/exregional_make_grid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ fi
#
# Set the name and path to the executable and make sure that it exists.
#
exec_fn="shave.x"
exec_fn="shave"
exec_fp="$EXECDIR/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_make_ics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ hh="${EXTRN_MDL_CDATE:8:2}"
#
#-----------------------------------------------------------------------
#
exec_fn="chgres_cube.exe"
exec_fn="chgres_cube"
exec_fp="$EXECDIR/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_make_lbcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ esac
#
#-----------------------------------------------------------------------
#
exec_fn="chgres_cube.exe"
exec_fn="chgres_cube"
exec_fp="$EXECDIR/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
Expand Down
4 changes: 2 additions & 2 deletions scripts/exregional_make_orog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ mkdir_vrfy -p "${shave_dir}"
# Set the name and path to the executable that generates the raw orography
# file and make sure that it exists.
#
exec_fn="orog.x"
exec_fn="orog"
exec_fp="$EXECDIR/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
Expand Down Expand Up @@ -531,7 +531,7 @@ Filtering of orography complete."
#
# Set the name and path to the executable and make sure that it exists.
#
exec_fn="shave.x"
exec_fn="shave"
exec_fp="$EXECDIR/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
Expand Down
22 changes: 19 additions & 3 deletions ush/generate_FV3LAM_wflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,28 @@ fi
#-----------------------------------------------------------------------
#
if [ "${USE_CCPP}" = "TRUE" ]; then
exec_fn="fv3.exe"
exec_fn="NEMS.exe"
else
exec_fn="fv3_32bit.exe"
print_err_msg_exit "\
Running this workflow without CCPP is not supported at this time.
Please set USE_CCPP=TRUE in your config.sh file.
"
fi

exec_fp="${SR_WX_APP_TOP_DIR}/bin/${exec_fn}"
#Check for the old build location for fv3 executable
if [ ! -f "${exec_fp}" ]; then
exec_fp_alt="${UFS_WTHR_MDL_DIR}/build/${exec_fn}"
if [ ! -f "${exec_fp_alt}" ]; then
print_err_msg_exit "\
The executable (exec_fp) for running the forecast model does not exist:
exec_fp = \"${exec_fp}\"
Please ensure that you've built this executable."
else
exec_fp="${exec_fp_alt}"
fi
fi

exec_fp="${UFS_WTHR_MDL_DIR}/tests/${exec_fn}"
if [ ! -f "${exec_fp}" ]; then
print_err_msg_exit "\
The executable (exec_fp) for running the forecast model does not exist:
Expand Down
2 changes: 1 addition & 1 deletion ush/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ SORCDIR="$HOMErrfs/sorc"
SRC_DIR="${SR_WX_APP_TOP_DIR}/src"
PARMDIR="$HOMErrfs/parm"
MODULES_DIR="$HOMErrfs/modulefiles"
EXECDIR="${SR_WX_APP_TOP_DIR}/exec"
EXECDIR="${SR_WX_APP_TOP_DIR}/bin"
FIXrrfs="$HOMErrfs/fix"
TEMPLATE_DIR="$USHDIR/templates"

Expand Down