From 3f46d0b6e8bb62a65edf299ae54ec05b5d833908 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 4 Apr 2024 13:14:07 +0000 Subject: [PATCH 1/2] Remove the detection of Jet/Centos7 nodes and removes the associated module file jet_c.lua --- modulefiles/jet_c.lua | 22 ---------------------- tests/detect_machine.sh | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 modulefiles/jet_c.lua diff --git a/modulefiles/jet_c.lua b/modulefiles/jet_c.lua deleted file mode 100644 index dcd54d7b5..000000000 --- a/modulefiles/jet_c.lua +++ /dev/null @@ -1,22 +0,0 @@ -help([[ -Load environment to build UPP on Jet -]]) - -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") - -stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" -load(pathJoin("stack-intel", stack_intel_ver)) - -stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" -load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) - -cmake_ver=os.getenv("cmake_ver") or "3.23.1" -load(pathJoin("cmake", cmake_ver)) - -load("upp_common") - -setenv("CC","mpiicc") -setenv("CXX","mpiicpc") -setenv("FC","mpiifort") - -whatis("Description: UPP build environment") diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh index ba157a0eb..588969e7f 100755 --- a/tests/detect_machine.sh +++ b/tests/detect_machine.sh @@ -30,8 +30,7 @@ case $(hostname -f) in s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### s4 - fe[1-4]) MACHINE_ID=jet_c ;; ### jet1-4 - fe[5-8]) MACHINE_ID=jet ;; ### jet1-8 + fe[1-8]) MACHINE_ID=jet ;; ### jet1-8 tfe[12]) MACHINE_ID=jet ;; ### tjet1-2 Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4 From c1d3e7dd0f472512086b734f8c4475f2533075f5 Mon Sep 17 00:00:00 2001 From: Fernando Andrade - NOAA <121964418+FernandoAndrade-NOAA@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:39:55 -0700 Subject: [PATCH 2/2] Update detect_machine.sh remove hera 12 --- tests/detect_machine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh index 588969e7f..76b7ce933 100755 --- a/tests/detect_machine.sh +++ b/tests/detect_machine.sh @@ -25,7 +25,7 @@ case $(hostname -f) in 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 + hfe1[01]) MACHINE_ID=hera ;; ### hera10-11 hecflow01) MACHINE_ID=hera ;; ### heraecflow01 s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### s4