Skip to content
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

Tweaks to allow compiler and build_env_fn to be specified in the run_… #711

Merged
merged 1 commit into from
Mar 23, 2022
Merged

Tweaks to allow compiler and build_env_fn to be specified in the run_… #711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions tests/WE2E/run_WE2E_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ Usage:
[verbose=\"...\"] \\
[machine_file=\"...\"] \\
[stmp=\"...\"] \\
[ptmp=\"...\"]
[ptmp=\"...\"] \\
[compiler=\"...\"] \\
[build_env_fn=\"...\"]

The arguments in brackets are optional. The arguments are defined as
follows:
Expand Down Expand Up @@ -204,6 +206,16 @@ argument is not used for any tests that are not in NCO mode.
ptmp:
Same as the argument \"stmp\" described above but for setting the
experiment variable PTMP for all tests that will run in NCO mode.

compiler:
Type of compiler to use for the workflow. Options are \"intel\"
and \"gnu\". Default is \"intel\",

build_env_fn:
Specify the build environment (see ufs-srweather-app/envs) to
use for the workflow. (e.g. build_cheyenne_gnu.env). If a
\"gnu\" compiler is specified, it must also be specified with
the \"compiler\" option.
"
#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -240,6 +252,8 @@ valid_args=( \
"machine_file" \
"stmp" \
"ptmp" \
"compiler" \
"build_env_fn" \
)
process_args valid_args "$@"
#
Expand Down Expand Up @@ -670,7 +684,8 @@ Please correct and rerun."
#
MACHINE="${machine^^}"
ACCOUNT="${account}"

COMPILER=${compiler:-"intel"}
BUILD_ENV_FN=${build_env_fn:-"build_${machine}_${COMPILER}.env"}
EXPT_BASEDIR="${expt_basedir}"
EXPT_SUBDIR="${test_name}"
USE_CRON_TO_RELAUNCH=${use_cron_to_relaunch:-"TRUE"}
Expand All @@ -692,7 +707,10 @@ Please correct and rerun."
# subdirectory.
#
MACHINE=\"${MACHINE}\"
ACCOUNT=\"${ACCOUNT}\""
ACCOUNT=\"${ACCOUNT}\"

COMPILER=\"${COMPILER}\"
BUILD_ENV_FN=\"${BUILD_ENV_FN}\""

if [ -n "${exec_subdir}" ]; then
expt_config_str=${expt_config_str}"
Expand Down