ctest updates for orion rocky 9 (NOAA-EMC#754)

RussTreadon-NOAA · Jun 20, 2024 · 086e273 · 086e273
1 parent aab4a06
commit 086e273
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/regression/regression_var.sh b/regression/regression_var.sh
@@ -40,7 +40,7 @@ elif [[ -d /ncrc ]]; then # Gaea
   export machine="Gaea"
 elif [[ -d /data/prod ]]; then # S4
   export machine="S4"
-elif [[ -d /work && $(hostname) =~ "Orion" ]]; then # Orion
+elif [[ -d /work && $(hostname) =~ "orion" ]]; then # Orion
   export machine="Orion"
 elif [[ -d /work && $(hostname) =~ "hercules" ]]; then # Hercules
   export machine="Hercules"

diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x
 # 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,
@@ -33,7 +34,7 @@ case $(hostname -f) in
   fe[1-8]) MACHINE_ID=jet ;; ### jet01-8
   tfe[12]) MACHINE_ID=jet ;; ### tjet1-2
 
-  Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4
+  [Oo]rion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4
 
   [Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=hercules ;; ### hercules1-4
 
@@ -75,8 +76,8 @@ elif [[ -d /scratch1 ]]; then
   MACHINE_ID=hera
 elif [[ -d /work ]]; then
   # We are on MSU Orion or Hercules
-  if [[ -d /apps/other ]]; then
-    # We are on Hercules
+  mount=$(findmnt -n -o SOURCE /home)   
+  if [[ ${mount} =~ "hercules" ]]; then
     MACHINE_ID=hercules
   else
     MACHINE_ID=orion

diff --git a/ush/sub_orion b/ush/sub_orion
@@ -119,14 +119,13 @@ echo "export ntasks=$(( $nodes * $procs ))" >> $cfile
 echo "export ppn=$procs"                    >> $cfile
 echo "export threads=$threads"              >> $cfile
 echo "export OMP_NUM_THREADS=$threads"      >> $cfile
-##echo "export OMP_STACKSIZE=2048M"           >> $cfile
 echo "ulimit -s unlimited"                  >> $cfile
 
 echo "" >>$cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out)  >>$cfile
 echo "" >>$cfile
 
-echo ". /apps/lmod/lmod/init/sh"                           >> $cfile
+echo ". /apps/other/lmod/lmod/init/sh"                     >> $cfile
 echo "module purge"                                        >> $cfile
 echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_orion.intel" >> $cfile