From 719b4dc325a44cb96ab718e23d1b298770d5f72f Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Mon, 7 Oct 2024 16:59:41 -0500 Subject: [PATCH 01/10] Update fro spack-stack-1.8.0 --- modulefiles/ufs_common.lua | 18 +++++++++--------- modulefiles/ufs_derecho.gnu.lua | 7 ++++--- modulefiles/ufs_derecho.intel.lua | 7 ++++--- modulefiles/ufs_gaea.intel.lua | 6 +++--- modulefiles/ufs_gaea.intelllvm.lua | 6 +++--- modulefiles/ufs_hera.gnu.lua | 11 +++-------- modulefiles/ufs_hera.intel.lua | 4 ++-- modulefiles/ufs_hera.intelllvm.lua | 4 ++-- modulefiles/ufs_hercules.gnu.lua | 10 ++++------ modulefiles/ufs_hercules.intel.lua | 4 ++-- modulefiles/ufs_hercules.intelllvm.lua | 4 ++-- modulefiles/ufs_orion.intel.lua | 4 ++-- modulefiles/ufs_orion.intelllvm.lua | 4 ++-- 13 files changed, 42 insertions(+), 47 deletions(-) diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua index 062fa38449..38eea18a93 100644 --- a/modulefiles/ufs_common.lua +++ b/modulefiles/ufs_common.lua @@ -4,23 +4,23 @@ help([[Load UFS Model common libraries]]) local ufs_modules = { {["jasper"] = "2.0.32"}, - {["zlib"] = "1.2.13"}, + {["zlib-ng"] = "2.1.6"}, {["libpng"] = "1.6.37"}, - {["hdf5"] = "1.14.0"}, + {["hdf5"] = "1.14.3"}, {["netcdf-c"] = "4.9.2"}, {["netcdf-fortran"] = "4.6.1"}, - {["parallelio"] = "2.5.10"}, - {["esmf"] = "8.6.0"}, - {["fms"] = "2024.01"}, + {["parallelio"] = "2.6.2"}, + {["esmf"] = "8.6.1"}, + {["fms"] = "2024.02"}, {["bacio"] = "2.4.1"}, - {["crtm"] = "2.4.0"}, + {["crtm"] = "2.4.0.1"}, {["g2"] = "3.5.1"}, {["g2tmpl"] = "1.13.0"}, - {["ip"] = "4.3.0"}, + {["ip"] = "5.0.0"}, {["sp"] = "2.5.0"}, {["w3emc"] = "2.10.0"}, - {["gftl-shared"] = "1.6.1"}, - {["mapl"] = "2.40.3-esmf-8.6.0"}, + {["gftl-shared"] = "1.9.0"}, + {["mapl"] = "2.46.3-esmf-8.6.1"}, {["scotch"] = "7.0.4"}, } diff --git a/modulefiles/ufs_derecho.gnu.lua b/modulefiles/ufs_derecho.gnu.lua index 295b5560dc..f76a99508a 100644 --- a/modulefiles/ufs_derecho.gnu.lua +++ b/modulefiles/ufs_derecho.gnu.lua @@ -9,7 +9,7 @@ load("mysql/8.0.33") setenv("LMOD_TMOD_FIND_FIRST","yes") prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") -prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/ue-gcc-12.2.0/install/modulefiles/Core") unload("ncarcompilers") stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0" @@ -18,13 +18,14 @@ load(pathJoin("stack-gcc", stack_gnu_ver)) stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25" load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) -stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" +stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" load(pathJoin("stack-python", stack_python_ver)) setenv("CMAKE_Platform", "derecho.gnu") load("ufs-weather-model-env") +load("module load sp/2.5.0") whatis("Description: UFS build environment") diff --git a/modulefiles/ufs_derecho.intel.lua b/modulefiles/ufs_derecho.intel.lua index f858670436..d3ee7d0169 100644 --- a/modulefiles/ufs_derecho.intel.lua +++ b/modulefiles/ufs_derecho.intel.lua @@ -9,7 +9,7 @@ load("mysql/8.0.33") setenv("LMOD_TMOD_FIND_FIRST","yes") prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") -prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/ue-intel-2021.10.0/install/modulefiles/Core") unload("ncarcompilers") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" @@ -18,13 +18,14 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_cray_mpich_ver=os.getenv("stack-cray-mpich_ver") or "8.1.25" load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) -stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" +stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" load(pathJoin("stack-python", stack_python_ver)) setenv("CMAKE_Platform", "derecho.intel") load("ufs-weather-model-env") +load("sp/2.5.0") whatis("Description: UFS build environment") diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua index 592eb7461d..9006a0ab35 100644 --- a/modulefiles/ufs_gaea.intel.lua +++ b/modulefiles/ufs_gaea.intel.lua @@ -5,7 +5,7 @@ help([[ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===]) -prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -13,10 +13,10 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25" load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) -stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" +stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" load(pathJoin("stack-python", stack_python_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_gaea.intelllvm.lua b/modulefiles/ufs_gaea.intelllvm.lua index f91a712d27..9febcfd30d 100644 --- a/modulefiles/ufs_gaea.intelllvm.lua +++ b/modulefiles/ufs_gaea.intelllvm.lua @@ -5,7 +5,7 @@ help([[ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===]) -prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -13,10 +13,10 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25" load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) -stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" +stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" load(pathJoin("stack-python", stack_python_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua index 4e53200209..79a03d6b95 100644 --- a/modulefiles/ufs_hera.gnu.lua +++ b/modulefiles/ufs_hera.gnu.lua @@ -2,17 +2,15 @@ help([[ loads UFS Model prerequisites for Hera/GNU ]]) -prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles") -prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles") -prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-gcc-9.2.0/install/modulefiles/Core") -stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.0" +stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0" load(pathJoin("stack-gcc", stack_gnu_ver)) stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6" load(pathJoin("stack-openmpi", stack_openmpi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") @@ -20,9 +18,6 @@ load("ufs_common") nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -prepend_path("CPPFLAGS", " -I/apps/slurm_hera/23.11.3/include/slurm"," ") -prepend_path("LD_LIBRARY_PATH", "/apps/slurm_hera/23.11.3/lib") - setenv("CC", "mpicc") setenv("CXX", "mpic++") setenv("FC", "mpif90") diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua index feaa88e560..ec97bd6526 100644 --- a/modulefiles/ufs_hera.intel.lua +++ b/modulefiles/ufs_hera.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hera/Intel ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,7 +10,7 @@ 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" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_hera.intelllvm.lua b/modulefiles/ufs_hera.intelllvm.lua index 49e9f2b4a9..ae9f941d5c 100644 --- a/modulefiles/ufs_hera.intelllvm.lua +++ b/modulefiles/ufs_hera.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hera/IntelLLVM ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -13,7 +13,7 @@ load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load("gnu") load("intel/2023.2.0") -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_hercules.gnu.lua b/modulefiles/ufs_hercules.gnu.lua index 035290a9c7..8dd8e4d3f2 100644 --- a/modulefiles/ufs_hercules.gnu.lua +++ b/modulefiles/ufs_hercules.gnu.lua @@ -2,17 +2,15 @@ help([[ loads UFS Model prerequisites for Hercules/GNU ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") --- for mvapich2, need: -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.8.0/envs/ue-gcc-12.2.0/install/modulefiles/Core") stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0" load(pathJoin("stack-gcc", stack_gnu_ver)) -stack_mvapich2_ver=os.getenv("stack_mvapich2_ver") or "2.3.7" -load(pathJoin("stack-mvapich2", stack_mvapich2_ver)) +stack_openmpi=os.getenv("stack_openmpi_ver") or "4.1.4" +load(pathJoin("stack-openmpi", stack_openmpi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_hercules.intel.lua b/modulefiles/ufs_hercules.intel.lua index 455ea4d0f4..52adf8b075 100644 --- a/modulefiles/ufs_hercules.intel.lua +++ b/modulefiles/ufs_hercules.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.8.0/envs/test1/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,7 +10,7 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_hercules.intelllvm.lua b/modulefiles/ufs_hercules.intelllvm.lua index 5fb97a59fc..3a15babfc5 100644 --- a/modulefiles/ufs_hercules.intelllvm.lua +++ b/modulefiles/ufs_hercules.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/IntelLLVM ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.8.0/envs/test1/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,7 +10,7 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua index e549ec4144..e794b3d58e 100644 --- a/modulefiles/ufs_orion.intel.lua +++ b/modulefiles/ufs_orion.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Orion/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,7 +10,7 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") diff --git a/modulefiles/ufs_orion.intelllvm.lua b/modulefiles/ufs_orion.intelllvm.lua index 81f6a07b52..8fb63d12a2 100644 --- a/modulefiles/ufs_orion.intelllvm.lua +++ b/modulefiles/ufs_orion.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for OrionLLVM/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,7 +10,7 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") From 426565ddbfba074c7e18f0f349006a68802df554 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Oct 2024 14:33:04 +0000 Subject: [PATCH 02/10] Update NOAA cloud modulefile for new spack-stack release (1.8.0) --- modulefiles/ufs_noaacloud.intel.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modulefiles/ufs_noaacloud.intel.lua b/modulefiles/ufs_noaacloud.intel.lua index ef03025c14..57087477f4 100644 --- a/modulefiles/ufs_noaacloud.intel.lua +++ b/modulefiles/ufs_noaacloud.intel.lua @@ -2,12 +2,10 @@ help([[ loads UFS Model prerequisites for NOAA Parallelworks/Intel ]]) -prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.8.0/envs/ue-intel-2021.10.0/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") prepend_path("PATH", "/contrib/EPIC/bin") load("gnu") -load("stack-intel") -load("stack-intel-oneapi-mpi") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -16,7 +14,7 @@ stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) unload("gnu") -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") From 66a5f6101c9a314d3c1850774f3eb130488ce913 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 12:24:52 -0500 Subject: [PATCH 03/10] Hercules modulefile. --- modulefiles/ufs_common.lua | 4 ++-- modulefiles/ufs_hercules.intel.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua index 38eea18a93..29f8576b37 100644 --- a/modulefiles/ufs_common.lua +++ b/modulefiles/ufs_common.lua @@ -10,7 +10,7 @@ local ufs_modules = { {["netcdf-c"] = "4.9.2"}, {["netcdf-fortran"] = "4.6.1"}, {["parallelio"] = "2.6.2"}, - {["esmf"] = "8.6.1"}, + {["esmf"] = "8.6.0"}, {["fms"] = "2024.02"}, {["bacio"] = "2.4.1"}, {["crtm"] = "2.4.0.1"}, @@ -20,7 +20,7 @@ local ufs_modules = { {["sp"] = "2.5.0"}, {["w3emc"] = "2.10.0"}, {["gftl-shared"] = "1.9.0"}, - {["mapl"] = "2.46.3-esmf-8.6.1"}, + {["mapl"] = "2.40.3-esmf-8.6.0"}, {["scotch"] = "7.0.4"}, } diff --git a/modulefiles/ufs_hercules.intel.lua b/modulefiles/ufs_hercules.intel.lua index 52adf8b075..97c972c62d 100644 --- a/modulefiles/ufs_hercules.intel.lua +++ b/modulefiles/ufs_hercules.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.8.0/envs/test1/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) From b066979426f87a6cef37b213802082567cbe55fe Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 12:41:49 -0500 Subject: [PATCH 04/10] Hercules - GNU. --- modulefiles/ufs_hercules.gnu.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/ufs_hercules.gnu.lua b/modulefiles/ufs_hercules.gnu.lua index 8dd8e4d3f2..4436e254d6 100644 --- a/modulefiles/ufs_hercules.gnu.lua +++ b/modulefiles/ufs_hercules.gnu.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/GNU ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.8.0/envs/ue-gcc-12.2.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-gcc-12.2.0/install/modulefiles/Core") stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0" load(pathJoin("stack-gcc", stack_gnu_ver)) From c70cf1d3d2093aa02819fb2def5c96cdd234a59f Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 17:52:48 +0000 Subject: [PATCH 05/10] Hera: Intel+GNU --- modulefiles/ufs_hera.gnu.lua | 2 +- modulefiles/ufs_hera.intel.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua index 79a03d6b95..42558c34b3 100644 --- a/modulefiles/ufs_hera.gnu.lua +++ b/modulefiles/ufs_hera.gnu.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hera/GNU ]]) -prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-gcc-9.2.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-gcc-9.2.0/install/modulefiles/Core") stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0" load(pathJoin("stack-gcc", stack_gnu_ver)) diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua index ec97bd6526..fa60d446dd 100644 --- a/modulefiles/ufs_hera.intel.lua +++ b/modulefiles/ufs_hera.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hera/Intel ]]) -prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.5.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) From a466cdc98b2d5b68f88b6123877a45e9ee75ea2e Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 12:23:14 -0600 Subject: [PATCH 06/10] Derecho: Intel and GNU --- modulefiles/ufs_derecho.gnu.lua | 4 ++-- modulefiles/ufs_derecho.intel.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/ufs_derecho.gnu.lua b/modulefiles/ufs_derecho.gnu.lua index f76a99508a..405ed6fa98 100644 --- a/modulefiles/ufs_derecho.gnu.lua +++ b/modulefiles/ufs_derecho.gnu.lua @@ -9,7 +9,7 @@ load("mysql/8.0.33") setenv("LMOD_TMOD_FIND_FIRST","yes") prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") -prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/ue-gcc-12.2.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/mapl-2.40.3-gcc-12.2.0/install/modulefiles/Core") unload("ncarcompilers") stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0" @@ -26,6 +26,6 @@ load(pathJoin("stack-python", stack_python_ver)) setenv("CMAKE_Platform", "derecho.gnu") load("ufs-weather-model-env") -load("module load sp/2.5.0") +load("sp/2.5.0") whatis("Description: UFS build environment") diff --git a/modulefiles/ufs_derecho.intel.lua b/modulefiles/ufs_derecho.intel.lua index d3ee7d0169..aba6f705dc 100644 --- a/modulefiles/ufs_derecho.intel.lua +++ b/modulefiles/ufs_derecho.intel.lua @@ -9,7 +9,7 @@ load("mysql/8.0.33") setenv("LMOD_TMOD_FIND_FIRST","yes") prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") -prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/ue-intel-2021.10.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.10.0/install/modulefiles/Core") unload("ncarcompilers") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0" From dc20fa48a81ba422d86204a15e3c537168e3cd29 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 18:35:54 +0000 Subject: [PATCH 07/10] Gaea - Intel --- modulefiles/ufs_gaea.intel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua index 09d22900ef..ac029bc848 100644 --- a/modulefiles/ufs_gaea.intel.lua +++ b/modulefiles/ufs_gaea.intel.lua @@ -5,7 +5,7 @@ help([[ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===]) -prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.10.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0" load(pathJoin("stack-intel", stack_intel_ver)) From cc2d6dfd4b83b184a1062341884d9caaf0c7d87a Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 18:46:22 +0000 Subject: [PATCH 08/10] Jet - Intel. --- modulefiles/ufs_jet.intel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua index 63dd53721a..06f490a470 100644 --- a/modulefiles/ufs_jet.intel.lua +++ b/modulefiles/ufs_jet.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Jet/Intel ]]) -prepend_path("MODULEPATH", " /contrib/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.5.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -10,10 +10,10 @@ 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)) -stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" +stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" load(pathJoin("stack-python", stack_python_ver)) -cmake_ver=os.getenv("cmake_ver") or "3.23.1" +cmake_ver=os.getenv("cmake_ver") or "3.27.9" load(pathJoin("cmake", cmake_ver)) load("ufs_common") From 438926874409516890c0405bbafec935f629a42b Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 14:03:42 -0500 Subject: [PATCH 09/10] Orion - Intel. --- modulefiles/ufs_orion.intel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua index 2cf8ff1a2d..e074eada2c 100644 --- a/modulefiles/ufs_orion.intel.lua +++ b/modulefiles/ufs_orion.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Orion/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.9.0/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -16,7 +16,7 @@ load(pathJoin("cmake", cmake_ver)) load("ufs_common") -- HDF5 needed for LM4 -hdf5_ver=os.getenv("hdf5_ver") or "1.14.0" +hdf5_ver=os.getenv("hdf5_ver") or "1.14.3" load(pathJoin("hdf5", hdf5_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) From fdf2c997a9f6a161a57b9af40a37ade1d4136056 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 1 Nov 2024 19:31:46 +0000 Subject: [PATCH 10/10] Jet - modulefile versions in rt.sh --- tests/rt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/rt.sh b/tests/rt.sh index 48a65436be..0c55a32d89 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -835,9 +835,9 @@ case ${MACHINE_ID} in if [[ "${ECFLOW:-false}" == true ]] ; then module load ecflow/5.11.4 fi - module use /contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core + module use /contrib/spack-stack/spack-stack-1.8.0/envs/mapl-2.40.3-intel-2021.5.0/install/modulefiles/Core module load stack-intel/2021.5.0 - module load stack-python/3.10.13 + module load stack-python/3.11.7 QUEUE="batch" COMPILE_QUEUE="batch"