Merge Gaea modulefiles (#1129)

* Simplifying Gaea modulefiles (merging C5 and C6).

* Simplifying modulefiles (one unified Gaea one).

* Getting rid of unnecessary line.

---------

Co-authored-by: Eric James <Eric.James@gaea67.ncrc.gov>

modulefiles/gaeac6.lua → modulefiles/gaea.lua

@@ -1,9 +1,9 @@
 help([[
   This module loads libraries required for building and running UPP
-  on the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0.
+  on the NOAA RDHPC machine Gaea using Intel-2023.2.0.
 ]])
 
-whatis([===[Loads libraries needed for building the UPP on Gaea C6 ]===])
+whatis([===[Loads libraries needed for building the UPP on Gaea ]===])
 
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.8.0/envs/ue-intel-2021.10.0/install/modulefiles/Core")
 
@@ -25,4 +25,4 @@ setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
 
-setenv("CMAKE_Platform","gaeac6.intel")
+setenv("CMAKE_Platform","gaea.intel")

tests/detect_machine.sh

@@ -21,11 +21,11 @@ case $(hostname -f) in
   dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov)  MACHINE_ID=wcoss2 ;; ### dogwood01-9
   dlogin10.dogwood.wcoss2.ncep.noaa.gov)      MACHINE_ID=wcoss2 ;; ### dogwood10
 
-  gaea5[1-8])          MACHINE_ID=gaeac5 ;; ### gaea51-58
-  gaea5[1-8].ncrc.gov) MACHINE_ID=gaeac5 ;; ### gaea51-58
+  gaea5[1-8])          MACHINE_ID=gaea ;; ### gaea51-58
+  gaea5[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea51-58
 
-  gaea6[1-8])          MACHINE_ID=gaeac6 ;; ### gaea61-68
-  gaea6[1-8].ncrc.gov) MACHINE_ID=gaeac6 ;; ### gaea61-68
+  gaea6[1-8])          MACHINE_ID=gaea ;; ### gaea61-68
+  gaea6[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea61-68
 
   hfe0[1-9]) MACHINE_ID=hera ;;   ### hera01-09
   hfe1[01]) MACHINE_ID=hera ;;   ### hera10-11
@@ -87,12 +87,9 @@ elif [[ -d /work ]]; then
   else
     MACHINE_ID=orion
   fi
-elif [[ -d /gpfs/f5 ]]; then
-  # We are on GAEA-C5.
-  MACHINE_ID=gaeac5
-elif [[ -d /gpfs/f6 ]]; then
-  # We are on GAEA-C6.
-  MACHINE_ID=gaeac6
+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