Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds new updates for detect_machine.sh and updates module names #115

Merged
merged 7 commits into from
Jan 30, 2024
Merged

Adds new updates for detect_machine.sh and updates module names #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0c27d1
Updated detect_machine.sh.
henrywinterbottom-wxdev Jan 24, 2024
c7f5852
Merge branch 'develop' into feature/gsi_monitor_issue_112
EdwardSafford-NOAA Jan 30, 2024
6850afc
Updates for module names.
HenryRWinterbottom Jan 30, 2024
28a1774
Added compiler name to module identifier.
HenryRWinterbottom Jan 30, 2024
e43394c
Removed Gaea machines reaching EOL.
HenryRWinterbottom Jan 30, 2024
46fb4cc
Merge branch 'feature/gsi_monitor_issue_112' of https://github.com/He…
HenryRWinterbottom Jan 30, 2024
907dfa5
Merge branch 'develop' into feature/gsi_monitor_issue_112
HenryRWinterbottom Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 modulefiles/jet-run.lua → modulefiles/jet.intel-run.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/jet.lua → modulefiles/jet.intel.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/orion-run.lua → modulefiles/orion.intel-run.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/orion.lua → modulefiles/orion.intel.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/s4-run.lua → modulefiles/s4.intel-run.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/s4.lua → modulefiles/s4.intel.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/wcoss2-run.lua → modulefiles/wcoss2.intel-run.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/wcoss2.lua → modulefiles/wcoss2.intel.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ush/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ echo "MACHINE_ID = $MACHINE_ID"
source $DIR_ROOT/ush/module-setup.sh

module use $DIR_ROOT/modulefiles
module load $MACHINE_ID
module load $MACHINE_ID.$COMPILER
module list

# Collect BUILD Options
Expand Down
6 changes: 2 additions & 4 deletions ush/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ 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

gaea9) MACHINE_ID=gaea ;; ### gaea9
gaea1[0-6]) MACHINE_ID=gaea ;; ### gaea10-16
gaea9.ncrc.gov) MACHINE_ID=gaea ;; ### gaea9
gaea1[0-6].ncrc.gov) MACHINE_ID=gaea ;; ### gaea10-16
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-09
hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12
Expand Down
Loading