enable APP=S2SWA on WCOSS2 (#1142)

Author: aerorahul

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

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";;

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 + $?))