From 4bb6dc490fd94e625144afd9eb007468fa82ae00 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 1 Dec 2022 17:19:15 -0500 Subject: [PATCH] enable APP=S2SWA on WCOSS2 --- parm/config/config.aero | 3 +++ sorc/build_ufs.sh | 4 ---- sorc/checkout.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/parm/config/config.aero b/parm/config/config.aero index 85f85837962..171701cd2a1 100644 --- a/parm/config/config.aero +++ b/parm/config/config.aero @@ -16,6 +16,9 @@ case $machine in "S4") AERO_INPUTS_DIR="/data/prod/glopara/gocart_emissions" ;; + "WCOSS2") + AERO_INPUTS_DIR="/lfs/h2/emc/global/noscrub/emc.global/data/gocart_emissions" + ;; *) echo "FATAL ERROR: Machine $machine unsupported for aerosols" exit 2 diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh index c91bb07e376..e1c2e5aabfe 100755 --- a/sorc/build_ufs.sh +++ b/sorc/build_ufs.sh @@ -11,10 +11,6 @@ export RT_COMPILER="intel" source "${cwd}/ufs_model.fd/tests/detect_machine.sh" source "${cwd}/ufs_model.fd/tests/module-setup.sh" -if [[ ${MACHINE_ID} =~ wcoss2.* ]]; then - APP='S2SW' -fi - while getopts ":da:v" option; do case "${option}" in d) BUILD_TYPE="Debug";; diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 89f71762845..9ef987f28d6 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -156,7 +156,7 @@ mkdir -p "${logdir}" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) -checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-6b73f5d}" ; errs=$((errs + $?)) +checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?))