From 97be8b0267681aaaa75a6c337d88ab4483052b01 Mon Sep 17 00:00:00 2001 From: "Henry R. Winterbottom" <49202169+HenryWinterbottom-NOAA@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:16:01 -0700 Subject: [PATCH] Adds new updates for `detect_machine.sh` and updates module names (#115) * Updated detect_machine.sh. * Updates for module names. * Added compiler name to module identifier. * Removed Gaea machines reaching EOL. --------- Co-authored-by: henrywinterbottom-wxdev Co-authored-by: Ed Safford <62339196+EdwardSafford-NOAA@users.noreply.github.com> --- modulefiles/{jet-run.lua => jet.intel-run.lua} | 0 modulefiles/{jet.lua => jet.intel.lua} | 0 modulefiles/{orion-run.lua => orion.intel-run.lua} | 0 modulefiles/{orion.lua => orion.intel.lua} | 0 modulefiles/{s4-run.lua => s4.intel-run.lua} | 0 modulefiles/{s4.lua => s4.intel.lua} | 0 modulefiles/{wcoss2-run.lua => wcoss2.intel-run.lua} | 0 modulefiles/{wcoss2.lua => wcoss2.intel.lua} | 0 ush/build.sh | 2 +- ush/detect_machine.sh | 6 ++---- 10 files changed, 3 insertions(+), 5 deletions(-) rename modulefiles/{jet-run.lua => jet.intel-run.lua} (100%) rename modulefiles/{jet.lua => jet.intel.lua} (100%) rename modulefiles/{orion-run.lua => orion.intel-run.lua} (100%) rename modulefiles/{orion.lua => orion.intel.lua} (100%) rename modulefiles/{s4-run.lua => s4.intel-run.lua} (100%) rename modulefiles/{s4.lua => s4.intel.lua} (100%) rename modulefiles/{wcoss2-run.lua => wcoss2.intel-run.lua} (100%) rename modulefiles/{wcoss2.lua => wcoss2.intel.lua} (100%) diff --git a/modulefiles/jet-run.lua b/modulefiles/jet.intel-run.lua similarity index 100% rename from modulefiles/jet-run.lua rename to modulefiles/jet.intel-run.lua diff --git a/modulefiles/jet.lua b/modulefiles/jet.intel.lua similarity index 100% rename from modulefiles/jet.lua rename to modulefiles/jet.intel.lua diff --git a/modulefiles/orion-run.lua b/modulefiles/orion.intel-run.lua similarity index 100% rename from modulefiles/orion-run.lua rename to modulefiles/orion.intel-run.lua diff --git a/modulefiles/orion.lua b/modulefiles/orion.intel.lua similarity index 100% rename from modulefiles/orion.lua rename to modulefiles/orion.intel.lua diff --git a/modulefiles/s4-run.lua b/modulefiles/s4.intel-run.lua similarity index 100% rename from modulefiles/s4-run.lua rename to modulefiles/s4.intel-run.lua diff --git a/modulefiles/s4.lua b/modulefiles/s4.intel.lua similarity index 100% rename from modulefiles/s4.lua rename to modulefiles/s4.intel.lua diff --git a/modulefiles/wcoss2-run.lua b/modulefiles/wcoss2.intel-run.lua similarity index 100% rename from modulefiles/wcoss2-run.lua rename to modulefiles/wcoss2.intel-run.lua diff --git a/modulefiles/wcoss2.lua b/modulefiles/wcoss2.intel.lua similarity index 100% rename from modulefiles/wcoss2.lua rename to modulefiles/wcoss2.intel.lua diff --git a/ush/build.sh b/ush/build.sh index edfa0800..5357afc8 100755 --- a/ush/build.sh +++ b/ush/build.sh @@ -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 diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh index 8a719c10..683ee0db 100755 --- a/ush/detect_machine.sh +++ b/ush/detect_machine.sh @@ -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