Merge pull request ufs-community#1 from climbfuji/feature/spack_stack…

…_ue_dom Feature/spack stack ue dom
AlexanderRichert-NOAA · Apr 12, 2023 · 9f19835 · 9f19835
2 parents d8a26a5 + 4dd21be
commit 9f19835
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 55 deletions.
diff --git a/modulefiles/ufs_cheyenne.gnu.lua b/modulefiles/ufs_cheyenne.gnu.lua
@@ -3,20 +3,20 @@ loads UFS Model prerequisites for Cheyenne/GNU
 ]])
 
 prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc")
 
 stack_gnu_ver=os.getenv("stack_gnu_ver") or "10.1.0"
 load(pathJoin("stack-gcc", stack_gnu_ver))
 
 stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.1"
 load(pathJoin("stack-openmpi", stack_openmpi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.22.0"
-load(pathJoin("cmake", cmake_ver))
-
-prepend_path("MODULEPATH", "/glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpicc")

diff --git a/modulefiles/ufs_cheyenne.intel.lua b/modulefiles/ufs_cheyenne.intel.lua
@@ -2,22 +2,21 @@ help([[
 loads UFS Model prerequisites for Cheyenne/Intel
 ]])
 
-
 prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "19.1.1.217"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_mpi_ver=os.getenv("stack_mpi_ver") or "2019.7.217"
 load(pathJoin("stack-intel-mpi", stack_mpi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.22.0"
-load(pathJoin("cmake", cmake_ver))
-
-prepend_path("MODULEPATH", "/glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpicc")

diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua
@@ -3,20 +3,20 @@ loads UFS Model prerequisites for Hera/GNU
 ]])
 
 prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
 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 "3.1.4"
 load(pathJoin("stack-openmpi", stack_openmpi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-load(pathJoin("cmake", cmake_ver))
-
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpicc")

diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua
@@ -3,20 +3,20 @@ loads UFS Model prerequisites for Hera/Intel
 ]])
 
 prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
 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))
-
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpiicc")

diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua
@@ -3,20 +3,20 @@ loads UFS Model prerequisites for Jet/Intel
 ]])
 
 prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles")
 
 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))
-
-prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpiicc")

diff --git a/modulefiles/ufs_linux.gnu b/modulefiles/ufs_linux.gnu
@@ -4,7 +4,7 @@
 ##
 ##    UFS prerequisites: Linux (tested: Ubuntu) with gcc/gfortran compilers
 
-echo "Setting environment variables for NEMSfv3gfs on Linux with gcc/gfortran"
+echo "Setting environment variables for UFS Model on Linux with gcc/gfortran"
 
 ##
 ## load programming environment: compiler, flags, paths
@@ -25,16 +25,6 @@ export CMAKE_Platform=linux.gnu
 ##
 export NETCDF=${NETCDF:-/home/builder/opt}
 
-##
-## use SIONlib library if installed and environment variable is set
-##
-SIONLIB=${SIONLIB:-}
-if [ ! "x$SIONLIB" == "x" ]; then
-  echo "Use SIONlib installation in ${SIONLIB}"
-  export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64"
-  export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none"
-fi
-
 ##
 ## use pre-compiled EMSF library for above compiler / MPI combination
 ##

diff --git a/modulefiles/ufs_macosx.gnu b/modulefiles/ufs_macosx.gnu
@@ -2,9 +2,9 @@
 
 #%Module######################################################################
 ##
-##    UFS prerequisites: MACOSX with clang/gfortran compilers
+##    UFS prerequisites: macOS with gcc/gfortran or clang/gfortran compilers
 
-echo "Setting environment variables for NEMSfv3gfs on MACOSX with gcc/gfortran or clang/gfortran"
+echo "Setting environment variables for UFS Model on macOS with gcc/gfortran or clang/gfortran"
 
 ##
 ## load programming environment: compiler, flags, paths

diff --git a/modulefiles/ufs_macosx.intel b/modulefiles/ufs_macosx.intel
@@ -2,9 +2,9 @@
 
 #%Module######################################################################
 ##
-##    UFS prerequisites: MACOSX with clang/gfortran compilers
+##    UFS prerequisites: macOS with icc/ifort compilers
 
-echo "Setting environment variables for NEMSfv3gfs on MACOSX with icc/ifort"
+echo "Setting environment variables for UFS Model on macOS with with icc/ifort"
 
 ##
 ## load programming environment: compiler, flags, paths

diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua
@@ -3,20 +3,20 @@ loads UFS Model prerequisites for Orion/Intel
 ]])
 
 prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
 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.22.1"
-load(pathJoin("cmake", cmake_ver))
-
-prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
 stack_python_ver=os.getenv("stack_python_ver") or "3.9.7"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.22.1"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
 
 setenv("CC", "mpiicc")

diff --git a/modulefiles/ufs_s4.intel.lua b/modulefiles/ufs_s4.intel.lua
@@ -1,24 +1,18 @@
 help([[
-loads UFS Model prerequisites for S4
+loads UFS Model prerequisites for S4/Intel
 ]])
 
-miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"
-load(pathJoin("miniconda", miniconda3_ver))
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/modulefiles")
 
-license_ver=os.getenv("license_ver") or "S4"
-load(pathJoin("license_intel",license_ver))
+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.0"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
-
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-load(pathJoin("hpc", hpc_ver))
-
-hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1"
-load(pathJoin("hpc-intel", hpc_intel_ver))
-
-hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1"
-load(pathJoin("hpc-impi", hpc_impi_ver))
+stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+load(pathJoin("stack-python", stack_python_ver))
 
 load("ufs_common")