From 23237610845c3a4438b21b25e9b3dc25c4c15b73 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 9 Oct 2024 11:55:13 -0600 Subject: [PATCH] Support UFS_UTILS on CSPs under Rocky 8 (#989) Fixes #982. --- modulefiles/build.noaacloud.intel.lua | 17 +++++++---------- modulefiles/common4noaacloud.lua | 10 ---------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/modulefiles/build.noaacloud.intel.lua b/modulefiles/build.noaacloud.intel.lua index eb6b7a6e0..cfed65dd8 100644 --- a/modulefiles/build.noaacloud.intel.lua +++ b/modulefiles/build.noaacloud.intel.lua @@ -2,16 +2,13 @@ help([[ Load environment to compile UFS_UTILS on NOAA CSPs using Intel ]]) -prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") - -stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0" -load(pathJoin("stack-intel", stack_intel_ver)) - -stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0" -load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) - -cmake_ver=os.getenv("cmake_ver") or "3.23.1" -load(pathJoin("cmake", cmake_ver)) +prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/ue-intel/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/modules/modulefiles") +load("gnu") +load("stack-intel") +load("stack-intel-oneapi-mpi") +unload("gnu") +load("cmake/3.23.1") load("common4noaacloud") diff --git a/modulefiles/common4noaacloud.lua b/modulefiles/common4noaacloud.lua index a7028dd9d..8e24390c6 100644 --- a/modulefiles/common4noaacloud.lua +++ b/modulefiles/common4noaacloud.lua @@ -2,15 +2,6 @@ help([[ Load environment to compile UFS_UTILS on NOAA CSPs using Intel ]]) -cmake_ver=os.getenv("cmake_ver") or "3.16.1" -load(pathJoin("cmake", cmake_ver)) - -hpc_intel_ver=os.getenv("hpc_intel_ver") or "2021.3.0" -load(pathJoin("intel", hpc_intel_ver)) - -impi_ver=os.getenv("impi_ver") or "2021.3.0" -load(pathJoin("impi", impi_ver)) - bacio_ver=os.getenv("bacio_ver") or "2.4.1" load(pathJoin("bacio", bacio_ver)) @@ -38,7 +29,6 @@ load(pathJoin("sigio", sigio_ver)) zlib_ver=os.getenv("zlib_ver") or "1.2.13" load(pathJoin("zlib", zlib_ver)) - png_ver=os.getenv("png_ver") or "1.6.37" load(pathJoin("libpng", png_ver))