Skip to content

Commit 8814875

Browse files
EricJames-NOAAEric James
andauthored
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 <[email protected]>
1 parent 45c2bae commit 8814875

File tree

3 files changed

+10
-41
lines changed

3 files changed

+10
-41
lines changed

modulefiles/gaeac6.lua renamed to modulefiles/gaea.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
help([[
22
This module loads libraries required for building and running UPP
3-
on the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0.
3+
on the NOAA RDHPC machine Gaea using Intel-2023.2.0.
44
]])
55

6-
whatis([===[Loads libraries needed for building the UPP on Gaea C6 ]===])
6+
whatis([===[Loads libraries needed for building the UPP on Gaea ]===])
77

88
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.8.0/envs/ue-intel-2021.10.0/install/modulefiles/Core")
99

@@ -25,4 +25,4 @@ setenv("CC","cc")
2525
setenv("CXX","CC")
2626
setenv("FC","ftn")
2727

28-
setenv("CMAKE_Platform","gaeac6.intel")
28+
setenv("CMAKE_Platform","gaea.intel")

modulefiles/gaeac5.lua

Lines changed: 0 additions & 28 deletions
This file was deleted.

tests/detect_machine.sh

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ case $(hostname -f) in
2121
dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood01-9
2222
dlogin10.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood10
2323

24-
gaea5[1-8]) MACHINE_ID=gaeac5 ;; ### gaea51-58
25-
gaea5[1-8].ncrc.gov) MACHINE_ID=gaeac5 ;; ### gaea51-58
24+
gaea5[1-8]) MACHINE_ID=gaea ;; ### gaea51-58
25+
gaea5[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea51-58
2626

27-
gaea6[1-8]) MACHINE_ID=gaeac6 ;; ### gaea61-68
28-
gaea6[1-8].ncrc.gov) MACHINE_ID=gaeac6 ;; ### gaea61-68
27+
gaea6[1-8]) MACHINE_ID=gaea ;; ### gaea61-68
28+
gaea6[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea61-68
2929

3030
hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-09
3131
hfe1[01]) MACHINE_ID=hera ;; ### hera10-11
@@ -87,12 +87,9 @@ elif [[ -d /work ]]; then
8787
else
8888
MACHINE_ID=orion
8989
fi
90-
elif [[ -d /gpfs/f5 ]]; then
91-
# We are on GAEA-C5.
92-
MACHINE_ID=gaeac5
93-
elif [[ -d /gpfs/f6 ]]; then
94-
# We are on GAEA-C6.
95-
MACHINE_ID=gaeac6
90+
elif [[ -d /gpfs && -d /ncrc ]]; then
91+
# We are on GAEA.
92+
MACHINE_ID=gaea
9693
elif [[ -d /data/prod ]]; then
9794
# We are on SSEC's S4
9895
MACHINE_ID=s4

0 commit comments

Comments
 (0)