Merge remote-tracking branch 'origin/develop' into feature/ss_160

ush/build.sh

@@ -24,7 +24,7 @@ source $DIR_ROOT/ush/detect_machine.sh
 set +x
 source $DIR_ROOT/ush/module-setup.sh
 module use $DIR_ROOT/modulefiles
-module load gsi_$MACHINE_ID
+module load "gsi_${MACHINE_ID}.${COMPILER}"
 module list
 set -x
 

ush/detect_machine.sh

@@ -1,17 +1,30 @@
 #!/bin/bash
 
+# The authoritative copy of this script lives in the ufs-weather-model at:
+# https://github.com/ufs-community/ufs-weather-model/blob/develop/tests/detect_machine.sh
+# If any local modifications are made or new platform support added,
+# please consider opening an issue and a PR to the ufs-weather-model
+# so that this copy remains in sync with its authoritative source
+#
+# Thank you for your contribution
+
+# If the MACHINE_ID variable is set, skip this script.
+[[ -n ${MACHINE_ID:-} ]] && return
+
+# First detect w/ hostname
 case $(hostname -f) in
 
- adecflow0[12].acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
- alogin0[1-3].acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
+ adecflow0[12].acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=acorn ;; ### acorn
+ alogin0[12].acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=acorn ;; ### acorn
  clogin0[1-9].cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus01-9
  clogin10.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus10
  dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood01-9
  dlogin10.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood10
 
- gaea5[0-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea50-58 (C5)
+ gaea5[1-8]) MACHINE_ID=gaea ;; ### gaea51-58
+ gaea5[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea51-58
 
- hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-9
+ hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-09
  hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12
  hecflow01) MACHINE_ID=hera ;; ### heraecflow01
 
@@ -22,19 +35,58 @@ case $(hostname -f) in
 
  Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4
 
- Hercules-login-[1-4].HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules1-4
+ [Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=hercules ;; ### hercules1-4
 
  login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4
 
  login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
 
  discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35
+ *) MACHINE_ID=UNKNOWN ;; # Unknown platform
 esac
 
+if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then 
+ case ${PW_CSP:-} in
+ "aws" | "google" | "azure") MACHINE_ID=noaacloud ;;
+ *) PW_CSP="UNKNOWN"
+ esac
+fi
+
 # Overwrite auto-detect with MACHINE if set
 MACHINE_ID=${MACHINE:-${MACHINE_ID}}
 
-# Append compiler (only on machines that have multiple compilers)
-if [ $MACHINE_ID = hera ]; then
- MACHINE_ID=${MACHINE_ID}.${COMPILER}
+# If MACHINE_ID is no longer UNKNNOWN, return it
+if [[ "${MACHINE_ID}" != "UNKNOWN" ]]; then
+ return
+fi
+
+# Try searching based on paths since hostname may not match on compute nodes
+if [[ -d /lfs/h3 ]]; then
+ # We are on NOAA Cactus or Dogwood
+ MACHINE_ID=wcoss2
+elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then
+ # We are on NOAA TDS Acorn
+ MACHINE_ID=acorn
+elif [[ -d /mnt/lfs1 ]]; then
+ # We are on NOAA Jet
+ MACHINE_ID=jet
+elif [[ -d /scratch1 ]]; then
+ # We are on NOAA Hera
+ MACHINE_ID=hera
+elif [[ -d /work ]]; then
+ # We are on MSU Orion or Hercules
+ if [[ -d /apps/other ]]; then
+ # We are on Hercules
+ MACHINE_ID=hercules
+ else
+ MACHINE_ID=orion
+ fi
+elif [[ -d /gpfs && -d /ncrc ]]; then
+ # We are on GAEA.
+ MACHINE_ID=gaea
+elif [[ -d /data/prod ]]; then
+ # We are on SSEC's S4
+ MACHINE_ID=s4
+else
+ echo WARNING: UNKNOWN PLATFORM 1>&2
 fi

ush/sub_discover

@@ -130,7 +130,7 @@ echo "" >>$cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out) >>$cfile
 echo "" >>$cfile
 echo "module use -a $modulefiles" >> $cfile
-echo "module load gsi_discover" >> $cfile
+echo "module load gsi_discover.intel" >> $cfile
 echo "" >>$cfile
 echo "jobname=$jobname" >>$cfile
 echo "" >>$cfile

ush/sub_gaea

@@ -123,7 +123,7 @@ echo "" >>$cfile
 
 echo "module purge" >> $cfile
 echo "module use $modulefiles" >> $cfile
-echo "module load gsi_gaea" >> $cfile
+echo "module load gsi_gaea.intel" >> $cfile
 echo "module list" >> $cfile
 echo "" >>$cfile
 

ush/sub_hercules

@@ -129,7 +129,7 @@ echo "" >>$cfile
 echo ". /apps/other/lmod/lmod/init/sh" >> $cfile
 echo "module purge" >> $cfile
 echo "module use $modulefiles" >> $cfile
-echo "module load gsi_hercules" >> $cfile
+echo "module load gsi_hercules.intel" >> $cfile
 echo "module list" >> $cfile
 echo "" >> $cfile
 cat $exec >> $cfile

ush/sub_jet

@@ -127,7 +127,7 @@ echo "" >>$cfile
 echo ". /apps/lmod/lmod/init/sh" >> $cfile
 echo "module purge" >> $cfile
 echo "module use $modulefiles" >> $cfile
-echo "module load gsi_jet" >> $cfile
+echo "module load gsi_jet.intel" >> $cfile
 echo "module list" >> $cfile
 echo "" >>$cfile
 

ush/sub_orion

@@ -129,7 +129,7 @@ echo "" >>$cfile
 echo ". /apps/lmod/lmod/init/sh" >> $cfile
 echo "module purge" >> $cfile
 echo "module use $modulefiles" >> $cfile
-echo "module load gsi_orion" >> $cfile
+echo "module load gsi_orion.intel" >> $cfile
 echo "module list" >> $cfile
 echo "" >> $cfile
 cat $exec >> $cfile

ush/sub_wcoss2

@@ -125,7 +125,7 @@ echo "" >> $cfile
 
 echo "module reset" >> $cfile
 echo "module use $modulefiles" >> $cfile
-echo "module load gsi_wcoss2" >> $cfile
+echo "module load gsi_wcoss2.intel" >> $cfile
 echo "module load envvar/1.0" >> $cfile
 echo "module load cray-pals/1.2.2" >> $cfile
 echo "module -t list 2>&1 | while read line;do module show $line 2>&1 | sed -n -e '2p';done | sort" >> $cfile