From f92d074319fcb0b62372c37dda324753c73c83c6 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 12 Aug 2022 14:57:36 +0000
Subject: [PATCH 01/18] acorn and common .lua changes

---
 modulefiles/ufs_acorn.intel           | 26 ------------
 modulefiles/ufs_acorn.intel.lua       | 36 ++++++++++++++++
 modulefiles/ufs_acorn.intel_debug     | 26 ------------
 modulefiles/ufs_acorn.intel_debug.lua | 36 ++++++++++++++++
 modulefiles/ufs_common                | 23 -----------
 modulefiles/ufs_common.lua            | 59 +++++++++++++++++++++++++++
 modulefiles/ufs_common_debug          | 23 -----------
 modulefiles/ufs_common_debug.lua      | 59 +++++++++++++++++++++++++++
 8 files changed, 190 insertions(+), 98 deletions(-)
 delete mode 100644 modulefiles/ufs_acorn.intel
 create mode 100644 modulefiles/ufs_acorn.intel.lua
 delete mode 100644 modulefiles/ufs_acorn.intel_debug
 create mode 100644 modulefiles/ufs_acorn.intel_debug.lua
 delete mode 100644 modulefiles/ufs_common
 create mode 100644 modulefiles/ufs_common.lua
 delete mode 100644 modulefiles/ufs_common_debug
 create mode 100644 modulefiles/ufs_common_debug.lua

diff --git a/modulefiles/ufs_acorn.intel b/modulefiles/ufs_acorn.intel
deleted file mode 100644
index a9c0ea7479..0000000000
--- a/modulefiles/ufs_acorn.intel
+++ /dev/null
@@ -1,26 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Acorn"
-}
-
-module-whatis "loads UFS Model prerequisites for Acorn"
-
-module load PrgEnv-intel/8.1.0
-module load intel/19.1.3.304
-module load craype/2.7.13
-module load cray-mpich/8.1.7
-
-module load cmake/3.20.2
-
-module use /lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack
-module load hpc/1.2.0
-module load hpc-intel/19.1.3.304
-module load hpc-cray-mpich/8.1.7
-
-module load ufs_common
-
-setenv CC cc
-setenv CXX CC
-setenv FC ftn
-setenv CMAKE_Platform acorn
diff --git a/modulefiles/ufs_acorn.intel.lua b/modulefiles/ufs_acorn.intel.lua
new file mode 100644
index 0000000000..e8d93b5805
--- /dev/null
+++ b/modulefiles/ufs_acorn.intel.lua
@@ -0,0 +1,36 @@
+help([[
+Load environment to build UFS on Acorn with Intel compiler
+]])
+
+PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
+load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
+
+intel_ver=os.getenv("intel_ver") or "19.1.3.304"
+load(pathJoin("intel", intel_ver))
+
+craype_ver=os.getenv("craype_ver") or "2.7.13"
+load(pathJoin("craype", craype_ver))
+
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+load(pathJoin("cray-mpich", cray_mpich_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.2"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+load(pathJoin("hpc", hpc_ver))
+load(pathJoin("hpc-intel", hpc_intel_ver))
+load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
+
+load("ufs_common")
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("CMake_Platform", "acorn")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_acorn.intel_debug b/modulefiles/ufs_acorn.intel_debug
deleted file mode 100644
index 662a7ee9c2..0000000000
--- a/modulefiles/ufs_acorn.intel_debug
+++ /dev/null
@@ -1,26 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Acorn"
-}
-
-module-whatis "loads UFS Model prerequisites for Acorn"
-
-module load PrgEnv-intel/8.1.0
-module load intel/19.1.3.304
-module load craype/2.7.13
-module load cray-mpich/8.1.7
-
-module load cmake/3.20.2
-
-module use /lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack
-module load hpc/1.2.0
-module load hpc-intel/19.1.3.304
-module load hpc-cray-mpich/8.1.7
-
-module load ufs_common_debug
-
-setenv CC cc
-setenv CXX CC
-setenv FC ftn
-setenv CMAKE_Platform acorn
diff --git a/modulefiles/ufs_acorn.intel_debug.lua b/modulefiles/ufs_acorn.intel_debug.lua
new file mode 100644
index 0000000000..a378c672f2
--- /dev/null
+++ b/modulefiles/ufs_acorn.intel_debug.lua
@@ -0,0 +1,36 @@
+help([[
+Load environment to build UFS on Acorn with Intel compiler
+]])
+
+PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
+load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
+
+intel_ver=os.getenv("intel_ver") or "19.1.3.304"
+load(pathJoin("intel", intel_ver))
+
+craype_ver=os.getenv("craype_ver") or "2.7.13"
+load(pathJoin("craype", craype_ver))
+
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+load(pathJoin("cray-mpich", cray_mpich_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.2"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+load(pathJoin("hpc", hpc_ver))
+load(pathJoin("hpc-intel", hpc_intel_ver))
+load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("CMake_Platform", "acorn")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
deleted file mode 100644
index 440ba82655..0000000000
--- a/modulefiles/ufs_common
+++ /dev/null
@@ -1,23 +0,0 @@
-#%Module
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.3
-module load esmf/8.3.0b09
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3nco/2.4.1
-
-module load gftl-shared/v1.5.0
-module load yafyaml/v0.5.1
-module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
new file mode 100644
index 0000000000..06bf389abd
--- /dev/null
+++ b/modulefiles/ufs_common.lua
@@ -0,0 +1,59 @@
+help([[
+Load environment of common libraries for UFS
+]])
+
+jasper_ver=os.getenv("jasper_ver") or "2.0.25"
+load(pathJoin("jasper", jasper_ver))
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.11"
+load(pathJoin("zlib", zlib_ver))
+
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
+
+hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
+load(pathJoin("hdf5", hdf5_ver))
+
+netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+load(pathJoin("netcdf", netcdf_ver))
+
+pio_ver=os.getenv("pio_ver") or "2.5.3"
+load(pathJoin("pio", pio_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
+load(pathJoin("esmf", esmf_ver))
+
+fms_ver=os.getenv("fms_ver") or "2022.01"
+load(pathJoin("fms", fms_ver))
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+crtm_ver=os.getenv("crtm_ver") or "2.3.0"
+load(pathJoin("crtm", crtm_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+load(pathJoin("g2tmpl", g2tmpl_ver))
+
+ip_ver=os.getenv("ip_ver") or "3.3.3"
+load(pathJoin("ip", ip_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.3.3"
+load(pathJoin("sp", sp_ver))
+
+w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
+load(pathJoin("w3nco", w3nco_ver))
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
+load(pathJoin("gftl-shared", gftl_shared_ver))
+
+yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
+load(pathJoin("yafyaml", yafyaml_ver))
+
+mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
+load(pathJoin("mapl", mapl_ver))
+
+whatis("Description: UFS common libraries")
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
deleted file mode 100644
index 95623836e7..0000000000
--- a/modulefiles/ufs_common_debug
+++ /dev/null
@@ -1,23 +0,0 @@
-#%Module
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.3
-module load esmf/8.3.0b09-debug
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3nco/2.4.1
-
-module load gftl-shared/v1.5.0
-module load yafyaml/v0.5.1
-module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
new file mode 100644
index 0000000000..7d16110c1e
--- /dev/null
+++ b/modulefiles/ufs_common_debug.lua
@@ -0,0 +1,59 @@
+help([[
+Load environment of common libraries for UFS
+]])
+
+jasper_ver=os.getenv("jasper_ver") or "2.0.25"
+load(pathJoin("jasper", jasper_ver))
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.11"
+load(pathJoin("zlib", zlib_ver))
+
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
+
+hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
+load(pathJoin("hdf5", hdf5_ver))
+
+netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+load(pathJoin("netcdf", netcdf_ver))
+
+pio_ver=os.getenv("pio_ver") or "2.5.3"
+load(pathJoin("pio", pio_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
+load(pathJoin("esmf", esmf_ver))
+
+fms_ver=os.getenv("fms_ver") or "2022.01"
+load(pathJoin("fms", fms_ver))
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+crtm_ver=os.getenv("crtm_ver") or "2.3.0"
+load(pathJoin("crtm", crtm_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+load(pathJoin("g2tmpl", g2tmpl_ver))
+
+ip_ver=os.getenv("ip_ver") or "3.3.3"
+load(pathJoin("ip", ip_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.3.3"
+load(pathJoin("sp", sp_ver))
+
+w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
+load(pathJoin("w3nco", w3nco_ver))
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
+load(pathJoin("gftl-shared", gftl_shared_ver))
+
+yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
+load(pathJoin("yafyaml", yafyaml_ver))
+
+mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
+load(pathJoin("mapl", mapl_ver))
+
+whatis("Description: UFS common libraries")

From 0625a31363db35d98a15ae649b6df5fe05048fde Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 12 Aug 2022 16:22:08 +0000
Subject: [PATCH 02/18] hera.intel (not hera.gnu) .lua changes

---
 modulefiles/ufs_common.lua           |  4 ++--
 modulefiles/ufs_common_debug.lua     |  4 ++--
 modulefiles/ufs_hera.intel           | 29 ------------------------
 modulefiles/ufs_hera.intel.lua       | 33 ++++++++++++++++++++++++++++
 modulefiles/ufs_hera.intel_debug     | 29 ------------------------
 modulefiles/ufs_hera.intel_debug.lua | 33 ++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+), 62 deletions(-)
 delete mode 100644 modulefiles/ufs_hera.intel
 create mode 100644 modulefiles/ufs_hera.intel.lua
 delete mode 100644 modulefiles/ufs_hera.intel_debug
 create mode 100644 modulefiles/ufs_hera.intel_debug.lua

diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
index 06bf389abd..7d2e105b5c 100644
--- a/modulefiles/ufs_common.lua
+++ b/modulefiles/ufs_common.lua
@@ -44,8 +44,8 @@ load(pathJoin("ip", ip_ver))
 sp_ver=os.getenv("sp_ver") or "2.3.3"
 load(pathJoin("sp", sp_ver))
 
-w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
-load(pathJoin("w3nco", w3nco_ver))
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
+load(pathJoin("w3emc", w3emc_ver))
 
 gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
 load(pathJoin("gftl-shared", gftl_shared_ver))
diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
index 7d16110c1e..58c992497b 100644
--- a/modulefiles/ufs_common_debug.lua
+++ b/modulefiles/ufs_common_debug.lua
@@ -44,8 +44,8 @@ load(pathJoin("ip", ip_ver))
 sp_ver=os.getenv("sp_ver") or "2.3.3"
 load(pathJoin("sp", sp_ver))
 
-w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
-load(pathJoin("w3nco", w3nco_ver))
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
+load(pathJoin("w3emc", w3emc_ver))
 
 gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
 load(pathJoin("gftl-shared", gftl_shared_ver))
diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel
deleted file mode 100644
index 3d15659d44..0000000000
--- a/modulefiles/ufs_hera.intel
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Hera/Intel"
-
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load miniconda3/3.7.3
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform hera.intel
diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua
new file mode 100644
index 0000000000..96f573f5f9
--- /dev/null
+++ b/modulefiles/ufs_hera.intel.lua
@@ -0,0 +1,33 @@
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3"
+load(pathJoin("miniconda3", miniconda3_ver))
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMake_Platform", "hera.intel")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug
deleted file mode 100644
index 111a1ad112..0000000000
--- a/modulefiles/ufs_hera.intel_debug
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Hera/Intel"
-
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load miniconda3/3.7.3
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common_debug
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform hera.intel
diff --git a/modulefiles/ufs_hera.intel_debug.lua b/modulefiles/ufs_hera.intel_debug.lua
new file mode 100644
index 0000000000..86eb4be266
--- /dev/null
+++ b/modulefiles/ufs_hera.intel_debug.lua
@@ -0,0 +1,33 @@
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3"
+load(pathJoin("miniconda3", miniconda3_ver))
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMake_Platform", "hera.intel")
+
+whatis("Description: UFS build environment")

From 1f9e4e226f326bff65f50913e8fa8d0b30d2993a Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 12 Aug 2022 18:25:53 +0000
Subject: [PATCH 03/18] CMake_Platform --> CMAKE_Platform

---
 modulefiles/ufs_acorn.intel.lua       | 2 +-
 modulefiles/ufs_acorn.intel_debug.lua | 2 +-
 modulefiles/ufs_hera.intel.lua        | 2 +-
 modulefiles/ufs_hera.intel_debug.lua  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modulefiles/ufs_acorn.intel.lua b/modulefiles/ufs_acorn.intel.lua
index e8d93b5805..d04043c27e 100644
--- a/modulefiles/ufs_acorn.intel.lua
+++ b/modulefiles/ufs_acorn.intel.lua
@@ -31,6 +31,6 @@ load("ufs_common")
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")
-setenv("CMake_Platform", "acorn")
+setenv("CMAKE_Platform", "acorn")
 
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_acorn.intel_debug.lua b/modulefiles/ufs_acorn.intel_debug.lua
index a378c672f2..a28ac5ff06 100644
--- a/modulefiles/ufs_acorn.intel_debug.lua
+++ b/modulefiles/ufs_acorn.intel_debug.lua
@@ -31,6 +31,6 @@ load("ufs_common_debug")
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")
-setenv("CMake_Platform", "acorn")
+setenv("CMAKE_Platform", "acorn")
 
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua
index 96f573f5f9..b262571c35 100644
--- a/modulefiles/ufs_hera.intel.lua
+++ b/modulefiles/ufs_hera.intel.lua
@@ -28,6 +28,6 @@ load("ufs_common")
 setenv("CC", "mpiicc")
 setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
-setenv("CMake_Platform", "hera.intel")
+setenv("CMAKE_Platform", "hera.intel")
 
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_hera.intel_debug.lua b/modulefiles/ufs_hera.intel_debug.lua
index 86eb4be266..78ea39dadb 100644
--- a/modulefiles/ufs_hera.intel_debug.lua
+++ b/modulefiles/ufs_hera.intel_debug.lua
@@ -28,6 +28,6 @@ load("ufs_common_debug")
 setenv("CC", "mpiicc")
 setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
-setenv("CMake_Platform", "hera.intel")
+setenv("CMAKE_Platform", "hera.intel")
 
 whatis("Description: UFS build environment")

From eb6eaf84f0065aaac4ed4c1d269002f356d8869a Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 12 Aug 2022 20:17:29 +0000
Subject: [PATCH 04/18] hera.gnu and debug lua changes

---
 modulefiles/ufs_hera.gnu           | 29 --------------------------
 modulefiles/ufs_hera.gnu.lua       | 33 ++++++++++++++++++++++++++++++
 modulefiles/ufs_hera.gnu_debug     | 29 --------------------------
 modulefiles/ufs_hera.gnu_debug.lua | 33 ++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 58 deletions(-)
 delete mode 100644 modulefiles/ufs_hera.gnu
 create mode 100644 modulefiles/ufs_hera.gnu.lua
 delete mode 100644 modulefiles/ufs_hera.gnu_debug
 create mode 100644 modulefiles/ufs_hera.gnu_debug.lua

diff --git a/modulefiles/ufs_hera.gnu b/modulefiles/ufs_hera.gnu
deleted file mode 100644
index 2322493abc..0000000000
--- a/modulefiles/ufs_hera.gnu
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/GNU"
-}
-
-module-whatis "loads UFS Model prerequisites for Hera/GNU"
-
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load miniconda3/3.7.3
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-
-module load hpc-gnu/9.2.0
-module load hpc-mpich/3.3.2
-
-module load ufs_common
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform hera.gnu
diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua
new file mode 100644
index 0000000000..0e8189a652
--- /dev/null
+++ b/modulefiles/ufs_hera.gnu.lua
@@ -0,0 +1,33 @@
+help([[
+loads UFS Model prerequisites for Hera/GNU
+]])
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3"
+load(pathJoin("miniconda3", miniconda3_ver))
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+load(pathJoin("hpc", hpc_ver))
+
+hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2.0"
+load(pathJoin("hpc-gnu", hpc_gnu_ver))
+
+hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2"
+load(pathJoin("hpc-mpich", hpc_mpich_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "hera.gnu")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_hera.gnu_debug b/modulefiles/ufs_hera.gnu_debug
deleted file mode 100644
index cd2041578c..0000000000
--- a/modulefiles/ufs_hera.gnu_debug
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/GNU"
-}
-
-module-whatis "loads UFS Model prerequisites for Hera/GNU"
-
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load miniconda3/3.7.3
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-
-module load hpc-gnu/9.2.0
-module load hpc-mpich/3.3.2
-
-module load ufs_common_debug
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform hera.gnu
diff --git a/modulefiles/ufs_hera.gnu_debug.lua b/modulefiles/ufs_hera.gnu_debug.lua
new file mode 100644
index 0000000000..8d294fa20a
--- /dev/null
+++ b/modulefiles/ufs_hera.gnu_debug.lua
@@ -0,0 +1,33 @@
+help([[
+loads UFS Model prerequisites for Hera/GNU Debugging
+]])
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3"
+load(pathJoin("miniconda3", miniconda3_ver))
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+load(pathJoin("hpc", hpc_ver))
+
+hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2.0"
+load(pathJoin("hpc-gnu", hpc_gnu_ver))
+
+hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2"
+load(pathJoin("hpc-mpich", hpc_mpich_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "hera.gnu")
+
+whatis("Description: UFS build environment")

From 77becf1ab23c74fff4082c2bfd11d4a6dcf604ed Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Thu, 18 Aug 2022 16:10:10 -0400
Subject: [PATCH 05/18] jet and wcoss2 .lua changes

---
 modulefiles/ufs_jet.intel              |  25 ------
 modulefiles/ufs_jet.intel.lua          |  29 +++++++
 modulefiles/ufs_jet.intel_debug        |  25 ------
 modulefiles/ufs_jet.intel_debug.lua    |  29 +++++++
 modulefiles/ufs_wcoss2.intel           |  51 ------------
 modulefiles/ufs_wcoss2.intel.lua       | 104 +++++++++++++++++++++++++
 modulefiles/ufs_wcoss2.intel_debug     |  51 ------------
 modulefiles/ufs_wcoss2.intel_debug.lua | 104 +++++++++++++++++++++++++
 8 files changed, 266 insertions(+), 152 deletions(-)
 delete mode 100644 modulefiles/ufs_jet.intel
 create mode 100644 modulefiles/ufs_jet.intel.lua
 delete mode 100644 modulefiles/ufs_jet.intel_debug
 create mode 100644 modulefiles/ufs_jet.intel_debug.lua
 delete mode 100644 modulefiles/ufs_wcoss2.intel
 create mode 100644 modulefiles/ufs_wcoss2.intel.lua
 delete mode 100644 modulefiles/ufs_wcoss2.intel_debug
 create mode 100644 modulefiles/ufs_wcoss2.intel_debug.lua

diff --git a/modulefiles/ufs_jet.intel b/modulefiles/ufs_jet.intel
deleted file mode 100644
index 009471befb..0000000000
--- a/modulefiles/ufs_jet.intel
+++ /dev/null
@@ -1,25 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Jet/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Jet/Intel"
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform jet.intel
diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua
new file mode 100644
index 0000000000..b4e2ab059d
--- /dev/null
+++ b/modulefiles/ufs_jet.intel.lua
@@ -0,0 +1,29 @@
+help([[
+loads UFS Model prerequisites for Jet/Intel
+]])
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
+
+pc_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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "jet.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_jet.intel_debug b/modulefiles/ufs_jet.intel_debug
deleted file mode 100644
index a8055ca991..0000000000
--- a/modulefiles/ufs_jet.intel_debug
+++ /dev/null
@@ -1,25 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Jet/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Jet/Intel"
-
-module use /contrib/sutils/modulefiles
-module load sutils
-
-module load cmake/3.20.1
-
-module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common_debug
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform jet.intel
diff --git a/modulefiles/ufs_jet.intel_debug.lua b/modulefiles/ufs_jet.intel_debug.lua
new file mode 100644
index 0000000000..aa05b806d3
--- /dev/null
+++ b/modulefiles/ufs_jet.intel_debug.lua
@@ -0,0 +1,29 @@
+help([[
+loads UFS Model prerequisites for Jet/Intel
+]])
+
+prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+load("sutils")
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
+
+prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
+
+pc_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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "jet.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_wcoss2.intel b/modulefiles/ufs_wcoss2.intel
deleted file mode 100644
index d8c1be7446..0000000000
--- a/modulefiles/ufs_wcoss2.intel
+++ /dev/null
@@ -1,51 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on WCOSS2"
-}
-
-module-whatis "loads UFS Model prerequisites on Cactus and Dogwood"
-
-module load PrgEnv-intel/8.1.0
-module load intel/19.1.3.304
-module load craype/2.7.13
-module load cray-mpich/8.1.7
-
-module load cmake/3.20.2
-
-#module use /apps/ops/para/libs/modulefiles/stack
-#module load hpc/1.2.0
-#module load hpc-intel/19.1.3.304
-#module load hpc-cray-mpich/8.1.7
-#module load ufs_common
-
-setenv HPC_OPT /apps/ops/para/libs
-module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304
-module use /apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.2
-module load esmf/8.3.0b09
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3emc/2.9.2
-
-#module load gftl-shared/v1.3.3
-#module load yafyaml/v0.5.1
-#module load mapl/2.11.0-esmf-8.3.0b09
-
-setenv CC cc
-setenv CXX CC
-setenv FC ftn
-setenv CMAKE_Platform wcoss2
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
new file mode 100644
index 0000000000..0433694a3f
--- /dev/null
+++ b/modulefiles/ufs_wcoss2.intel.lua
@@ -0,0 +1,104 @@
+help([[
+loads UFS Model prerequisites on Cactus and Dogwood
+]])
+
+PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
+load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
+--module load PrgEnv-intel/8.1.0
+
+intel_ver=os.getenv("intel_ver") or "19.1.3.304"
+load(pathJoin("intel", intel_ver))
+--module load intel/19.1.3.304
+
+craype_ver=os.getenv("craype_ver") or "2.7.13"
+load(pathJoin("craype", craype_ver))
+--module load craype/2.7.13
+
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+load(pathJoin("cray-mpich", cray_mpich_ver))
+--module load cray-mpich/8.1.7
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.2"
+load(pathJoin("cmake", cmake_ver))
+--module load cmake/3.20.2
+
+--#module use /apps/ops/para/libs/modulefiles/stack
+--#module load hpc/1.2.0
+--#module load hpc-intel/19.1.3.304
+--#module load hpc-cray-mpich/8.1.7
+--#module load ufs_common
+
+setenv("HPC_OPT", "/apps/ops/para/libs")
+prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
+prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")
+
+jasper_ver=os.getenv("jasper_ver") or "2.0.25"
+load(pathJoin("jasper", jasper_ver))
+--module load jasper/2.0.25
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.11"
+load(pathJoin("zlib", zlib_ver))
+--module load zlib/1.2.11
+
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
+--module load libpng/1.6.37
+
+hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
+load(pathJoin("hdf5", hdf5_ver))
+--module load hdf5/1.10.6
+
+netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+load(pathJoin("netcdf", netcdf_ver))
+--module load netcdf/4.7.4
+
+pio_ver=os.getenv("pio_ver") or "2.5.2"
+load(pathJoin("pio", pio_ver))
+--module load pio/2.5.2
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
+load(pathJoin("esmf", esmf_ver))
+--module load esmf/8.3.0b09
+
+fms_ver=os.getenv("fms_ver") or "2022.01"
+load(pathJoin("fms", fms_ver))
+--module load fms/2022.01
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+--module load bacio/2.4.1
+
+crtm_ver=os.getenv("crtm_ver") or "2.3.0"
+load(pathJoin("crtm", crtm_ver))
+--module load crtm/2.3.0
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+--module load g2/3.4.5
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+load(pathJoin("g2tmpl", g2tmpl_ver))
+--module load g2tmpl/1.10.0
+
+ip_ver=os.getenv("ip_ver") or "3.3.3"
+load(pathJoin("ip", ip_ver))
+--module load ip/3.3.3
+
+sp_ver=os.getenv("sp_ver") or "2.3.3"
+load(pathJoin("sp", sp_ver))
+--module load sp/2.3.3
+
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
+load(pathJoin("w3emc", w3emc_ver))
+--module load w3emc/2.9.2
+
+--#module load gftl-shared/v1.3.3
+--#module load yafyaml/v0.5.1
+--#module load mapl/2.11.0-esmf-8.3.0b09
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("CMAKE_Platform", "wcoss2")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_wcoss2.intel_debug b/modulefiles/ufs_wcoss2.intel_debug
deleted file mode 100644
index d8c1be7446..0000000000
--- a/modulefiles/ufs_wcoss2.intel_debug
+++ /dev/null
@@ -1,51 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on WCOSS2"
-}
-
-module-whatis "loads UFS Model prerequisites on Cactus and Dogwood"
-
-module load PrgEnv-intel/8.1.0
-module load intel/19.1.3.304
-module load craype/2.7.13
-module load cray-mpich/8.1.7
-
-module load cmake/3.20.2
-
-#module use /apps/ops/para/libs/modulefiles/stack
-#module load hpc/1.2.0
-#module load hpc-intel/19.1.3.304
-#module load hpc-cray-mpich/8.1.7
-#module load ufs_common
-
-setenv HPC_OPT /apps/ops/para/libs
-module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304
-module use /apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.2
-module load esmf/8.3.0b09
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3emc/2.9.2
-
-#module load gftl-shared/v1.3.3
-#module load yafyaml/v0.5.1
-#module load mapl/2.11.0-esmf-8.3.0b09
-
-setenv CC cc
-setenv CXX CC
-setenv FC ftn
-setenv CMAKE_Platform wcoss2
diff --git a/modulefiles/ufs_wcoss2.intel_debug.lua b/modulefiles/ufs_wcoss2.intel_debug.lua
new file mode 100644
index 0000000000..0433694a3f
--- /dev/null
+++ b/modulefiles/ufs_wcoss2.intel_debug.lua
@@ -0,0 +1,104 @@
+help([[
+loads UFS Model prerequisites on Cactus and Dogwood
+]])
+
+PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
+load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
+--module load PrgEnv-intel/8.1.0
+
+intel_ver=os.getenv("intel_ver") or "19.1.3.304"
+load(pathJoin("intel", intel_ver))
+--module load intel/19.1.3.304
+
+craype_ver=os.getenv("craype_ver") or "2.7.13"
+load(pathJoin("craype", craype_ver))
+--module load craype/2.7.13
+
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+load(pathJoin("cray-mpich", cray_mpich_ver))
+--module load cray-mpich/8.1.7
+
+cmake_ver=os.getenv("cmake_ver") or "3.20.2"
+load(pathJoin("cmake", cmake_ver))
+--module load cmake/3.20.2
+
+--#module use /apps/ops/para/libs/modulefiles/stack
+--#module load hpc/1.2.0
+--#module load hpc-intel/19.1.3.304
+--#module load hpc-cray-mpich/8.1.7
+--#module load ufs_common
+
+setenv("HPC_OPT", "/apps/ops/para/libs")
+prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
+prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")
+
+jasper_ver=os.getenv("jasper_ver") or "2.0.25"
+load(pathJoin("jasper", jasper_ver))
+--module load jasper/2.0.25
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.11"
+load(pathJoin("zlib", zlib_ver))
+--module load zlib/1.2.11
+
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
+--module load libpng/1.6.37
+
+hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
+load(pathJoin("hdf5", hdf5_ver))
+--module load hdf5/1.10.6
+
+netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+load(pathJoin("netcdf", netcdf_ver))
+--module load netcdf/4.7.4
+
+pio_ver=os.getenv("pio_ver") or "2.5.2"
+load(pathJoin("pio", pio_ver))
+--module load pio/2.5.2
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
+load(pathJoin("esmf", esmf_ver))
+--module load esmf/8.3.0b09
+
+fms_ver=os.getenv("fms_ver") or "2022.01"
+load(pathJoin("fms", fms_ver))
+--module load fms/2022.01
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+--module load bacio/2.4.1
+
+crtm_ver=os.getenv("crtm_ver") or "2.3.0"
+load(pathJoin("crtm", crtm_ver))
+--module load crtm/2.3.0
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+--module load g2/3.4.5
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+load(pathJoin("g2tmpl", g2tmpl_ver))
+--module load g2tmpl/1.10.0
+
+ip_ver=os.getenv("ip_ver") or "3.3.3"
+load(pathJoin("ip", ip_ver))
+--module load ip/3.3.3
+
+sp_ver=os.getenv("sp_ver") or "2.3.3"
+load(pathJoin("sp", sp_ver))
+--module load sp/2.3.3
+
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
+load(pathJoin("w3emc", w3emc_ver))
+--module load w3emc/2.9.2
+
+--#module load gftl-shared/v1.3.3
+--#module load yafyaml/v0.5.1
+--#module load mapl/2.11.0-esmf-8.3.0b09
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("CMAKE_Platform", "wcoss2")
+
+whatis("Description: UFS build environment")
\ No newline at end of file

From 84a6de425282f381ab5287ab5d629a3d31850da2 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Thu, 18 Aug 2022 16:49:45 -0400
Subject: [PATCH 06/18] cheyenne.gnu/intel lua updates, orion lua updates, typo
 in jet.lua files

---
 modulefiles/ufs_cheyenne.gnu             | 29 ----------------
 modulefiles/ufs_cheyenne.gnu.lua         | 44 ++++++++++++++++++++++++
 modulefiles/ufs_cheyenne.gnu_debug       | 29 ----------------
 modulefiles/ufs_cheyenne.gnu_debug.lua   | 44 ++++++++++++++++++++++++
 modulefiles/ufs_cheyenne.intel           | 30 ----------------
 modulefiles/ufs_cheyenne.intel.lua       | 44 ++++++++++++++++++++++++
 modulefiles/ufs_cheyenne.intel_debug     | 30 ----------------
 modulefiles/ufs_cheyenne.intel_debug.lua | 44 ++++++++++++++++++++++++
 modulefiles/ufs_jet.intel.lua            |  2 +-
 modulefiles/ufs_jet.intel_debug.lua      |  2 +-
 modulefiles/ufs_orion.intel              | 25 --------------
 modulefiles/ufs_orion.intel.lua          | 35 +++++++++++++++++++
 modulefiles/ufs_orion.intel_debug        | 25 --------------
 modulefiles/ufs_orion.intel_debug.lua    | 35 +++++++++++++++++++
 14 files changed, 248 insertions(+), 170 deletions(-)
 delete mode 100644 modulefiles/ufs_cheyenne.gnu
 create mode 100644 modulefiles/ufs_cheyenne.gnu.lua
 delete mode 100644 modulefiles/ufs_cheyenne.gnu_debug
 create mode 100644 modulefiles/ufs_cheyenne.gnu_debug.lua
 delete mode 100644 modulefiles/ufs_cheyenne.intel
 create mode 100644 modulefiles/ufs_cheyenne.intel.lua
 delete mode 100644 modulefiles/ufs_cheyenne.intel_debug
 create mode 100644 modulefiles/ufs_cheyenne.intel_debug.lua
 delete mode 100644 modulefiles/ufs_orion.intel
 create mode 100644 modulefiles/ufs_orion.intel.lua
 delete mode 100644 modulefiles/ufs_orion.intel_debug
 create mode 100644 modulefiles/ufs_orion.intel_debug.lua

diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
deleted file mode 100644
index d61433a40f..0000000000
--- a/modulefiles/ufs_cheyenne.gnu
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/GNU"
-}
-
-module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
-
-module load cmake/3.22.0
-module load python/3.7.9
-
-# load programming environment
-module load ncarenv/1.3
-module load gnu/10.1.0
-module load mpt/2.22
-module load ncarcompilers/0.5.0
-module unload netcdf
-
-module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
-module load hpc/1.2.0
-module load hpc-gnu/10.1.0
-module load hpc-mpt/2.22
-
-module load ufs_common
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform cheyenne.gnu
diff --git a/modulefiles/ufs_cheyenne.gnu.lua b/modulefiles/ufs_cheyenne.gnu.lua
new file mode 100644
index 0000000000..df1987d2b8
--- /dev/null
+++ b/modulefiles/ufs_cheyenne.gnu.lua
@@ -0,0 +1,44 @@
+help([[
+loads UFS Model prerequisites for Cheyenne/GNU
+]])
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
+python_ver=os.getenv("python_ver") or "3.7.9"
+load(pathJoin("python", python_ver))
+
+# load programming environment
+ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
+load(pathJoin("ncarenv", ncarenv_ver))
+
+gnu_ver=os.getenv("gnu_ver") or "10.1.0"
+load(pathJoin("gnu", gnu_ver))
+
+mpt_ver=os.getenv("mpt_ver") or "2.22"
+load(pathJoin("mpt", mpt_ver))
+
+ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
+load(pathJoin("ncarcompilers", ncarcompilers_ver))
+
+unload("netcdf")
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+load(pathJoin("hpc", hpc_ver))
+
+hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "10.1.0"
+load(pathJoin("hpc-gnu", hpc_gnu_ver))
+
+hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.22"
+load(pathJoin("hpc-mpt", hpc_mpt_ver))
+
+load("ufs_common")
+
+setenv("C", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.gnu")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
deleted file mode 100644
index 8b8af506b6..0000000000
--- a/modulefiles/ufs_cheyenne.gnu_debug
+++ /dev/null
@@ -1,29 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/GNU"
-}
-
-module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
-
-module load cmake/3.22.0
-module load python/3.7.9
-
-# load programming environment
-module load ncarenv/1.3
-module load gnu/10.1.0
-module load mpt/2.22
-module load ncarcompilers/0.5.0
-module unload netcdf
-
-module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
-module load hpc/1.2.0
-module load hpc-gnu/10.1.0
-module load hpc-mpt/2.22
-
-module load ufs_common_debug
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform cheyenne.gnu
diff --git a/modulefiles/ufs_cheyenne.gnu_debug.lua b/modulefiles/ufs_cheyenne.gnu_debug.lua
new file mode 100644
index 0000000000..a546c05d79
--- /dev/null
+++ b/modulefiles/ufs_cheyenne.gnu_debug.lua
@@ -0,0 +1,44 @@
+help([[
+loads UFS Model prerequisites for Cheyenne/GNU
+]])
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
+python_ver=os.getenv("python_ver") or "3.7.9"
+load(pathJoin("python", python_ver))
+
+# load programming environment
+ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
+load(pathJoin("ncarenv", ncarenv_ver))
+
+gnu_ver=os.getenv("gnu_ver") or "10.1.0"
+load(pathJoin("gnu", gnu_ver))
+
+mpt_ver=os.getenv("mpt_ver") or "2.22"
+load(pathJoin("mpt", mpt_ver))
+
+ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
+load(pathJoin("ncarcompilers", ncarcompilers_ver))
+
+unload("netcdf")
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+load(pathJoin("hpc", hpc_ver))
+
+hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "10.1.0"
+load(pathJoin("hpc-gnu", hpc_gnu_ver))
+
+hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.22"
+load(pathJoin("hpc-mpt", hpc_mpt_ver))
+
+load("ufs_common_debug")
+
+setenv("C", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.gnu")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
deleted file mode 100644
index 640145faea..0000000000
--- a/modulefiles/ufs_cheyenne.intel
+++ /dev/null
@@ -1,30 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
-
-module load cmake/3.22.0
-module load python/3.7.9
-
-# load programming environment
-module load ncarenv/1.3
-module load intel/2022.1
-module load mpt/2.25
-module load ncarcompilers/0.5.0
-module unload netcdf
-
-module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
-
-module load hpc/1.2.0
-module load hpc-intel/2022.1
-module load hpc-mpt/2.25
-
-module load ufs_common
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform cheyenne.intel
diff --git a/modulefiles/ufs_cheyenne.intel.lua b/modulefiles/ufs_cheyenne.intel.lua
new file mode 100644
index 0000000000..434be8d438
--- /dev/null
+++ b/modulefiles/ufs_cheyenne.intel.lua
@@ -0,0 +1,44 @@
+help([[
+loads UFS Model prerequisites for Cheyenne/Intel
+]])
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
+python_ver=os.getenv("python_ver") or "3.7.9"
+load(pathJoin("python", python))
+
+--load programming environment
+ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
+load(pathJoin("ncarenv", ncarenv_ver))
+
+intel_ver=os.getenv("intel_ver") or "2022.1"
+load(pathJoin("intel", intel_ver))
+
+mpt_ver=os.getenv("mpt_ver") or "2.25"
+load(pathJoin("mpt", mpt_ver))
+
+ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
+load(pathJoin("ncarcompilers", ncarcompilers_ver))
+
+unload("netcdf")
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.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_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
+load(pathJoin("hpc-mpt", hpc_mpt_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
deleted file mode 100644
index 4564060569..0000000000
--- a/modulefiles/ufs_cheyenne.intel_debug
+++ /dev/null
@@ -1,30 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
-
-module load cmake/3.22.0
-module load python/3.7.9
-
-# load programming environment
-module load ncarenv/1.3
-module load intel/2022.1
-module load mpt/2.25
-module load ncarcompilers/0.5.0
-module unload netcdf
-
-module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
-
-module load hpc/1.2.0
-module load hpc-intel/2022.1
-module load hpc-mpt/2.25
-
-module load ufs_common_debug
-
-setenv CC mpicc
-setenv CXX mpicxx
-setenv FC mpif90
-setenv CMAKE_Platform cheyenne.intel
diff --git a/modulefiles/ufs_cheyenne.intel_debug.lua b/modulefiles/ufs_cheyenne.intel_debug.lua
new file mode 100644
index 0000000000..725fc8a5f0
--- /dev/null
+++ b/modulefiles/ufs_cheyenne.intel_debug.lua
@@ -0,0 +1,44 @@
+help([[
+loads UFS Model prerequisites for Cheyenne/Intel
+]])
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
+python_ver=os.getenv("python_ver") or "3.7.9"
+load(pathJoin("python", python))
+
+--load programming environment
+ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
+load(pathJoin("ncarenv", ncarenv_ver))
+
+intel_ver=os.getenv("intel_ver") or "2022.1"
+load(pathJoin("intel", intel_ver))
+
+mpt_ver=os.getenv("mpt_ver") or "2.25"
+load(pathJoin("mpt", mpt_ver))
+
+ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
+load(pathJoin("ncarcompilers", ncarcompilers_ver))
+
+unload("netcdf")
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.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_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
+load(pathJoin("hpc-mpt", hpc_mpt_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua
index b4e2ab059d..668738a45e 100644
--- a/modulefiles/ufs_jet.intel.lua
+++ b/modulefiles/ufs_jet.intel.lua
@@ -10,7 +10,7 @@ load(pathJoin("cmake", cmake_ver))
 
 prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
 
-pc_ver=os.getenv("hpc_ver") or "1.1.0"
+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.2"
diff --git a/modulefiles/ufs_jet.intel_debug.lua b/modulefiles/ufs_jet.intel_debug.lua
index aa05b806d3..d012313b7d 100644
--- a/modulefiles/ufs_jet.intel_debug.lua
+++ b/modulefiles/ufs_jet.intel_debug.lua
@@ -10,7 +10,7 @@ load(pathJoin("cmake", cmake_ver))
 
 prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
 
-pc_ver=os.getenv("hpc_ver") or "1.1.0"
+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.2"
diff --git a/modulefiles/ufs_orion.intel b/modulefiles/ufs_orion.intel
deleted file mode 100644
index 92dbe9a7d9..0000000000
--- a/modulefiles/ufs_orion.intel
+++ /dev/null
@@ -1,25 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Orion/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Orion/Intel"
-
-module load contrib noaatools
-
-module load cmake/3.22.1
-module load python/3.7.5
-
-module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform orion.intel
diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua
new file mode 100644
index 0000000000..860e05d002
--- /dev/null
+++ b/modulefiles/ufs_orion.intel.lua
@@ -0,0 +1,35 @@
+help([[
+loads UFS Model prerequisites for Orion/Intel
+]])
+
+load("contrib")
+load("noaatools")
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.1"
+load(pathJoin("cmake", cmake_ver))
+--module load cmake/3.22.1
+
+python_ver=os.getenv("python_ver") or "3.7.5"
+load(pathJoin("python", python_ver))
+module load python/3.7.5
+
+
+prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "orion.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file
diff --git a/modulefiles/ufs_orion.intel_debug b/modulefiles/ufs_orion.intel_debug
deleted file mode 100644
index bc5016fc07..0000000000
--- a/modulefiles/ufs_orion.intel_debug
+++ /dev/null
@@ -1,25 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on Orion/Intel"
-}
-
-module-whatis "loads UFS Model prerequisites for Orion/Intel"
-
-module load contrib noaatools
-
-module load cmake/3.22.1
-module load python/3.7.5
-
-module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2022.1.2
-module load hpc-impi/2022.1.2
-
-module load ufs_common_debug
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform orion.intel
diff --git a/modulefiles/ufs_orion.intel_debug.lua b/modulefiles/ufs_orion.intel_debug.lua
new file mode 100644
index 0000000000..c95769d01b
--- /dev/null
+++ b/modulefiles/ufs_orion.intel_debug.lua
@@ -0,0 +1,35 @@
+help([[
+loads UFS Model prerequisites for Orion/Intel
+]])
+
+load("contrib")
+load("noaatools")
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.1"
+load(pathJoin("cmake", cmake_ver))
+--module load cmake/3.22.1
+
+python_ver=os.getenv("python_ver") or "3.7.5"
+load(pathJoin("python", python_ver))
+module load python/3.7.5
+
+
+prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/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.2"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "orion.intel")
+
+whatis("Description: UFS build environment")
\ No newline at end of file

From cd93f573dadd4e29d15c0952f1bbd2af2fafc099 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 19 Aug 2022 10:33:28 -0500
Subject: [PATCH 07/18] Orion fixes for .lua files

---
 modulefiles/ufs_orion.intel.lua       | 5 +----
 modulefiles/ufs_orion.intel_debug.lua | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua
index 860e05d002..c9acab7fcb 100644
--- a/modulefiles/ufs_orion.intel.lua
+++ b/modulefiles/ufs_orion.intel.lua
@@ -7,12 +7,9 @@ load("noaatools")
 
 cmake_ver=os.getenv("cmake_ver") or "3.22.1"
 load(pathJoin("cmake", cmake_ver))
---module load cmake/3.22.1
 
 python_ver=os.getenv("python_ver") or "3.7.5"
 load(pathJoin("python", python_ver))
-module load python/3.7.5
-
 
 prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
 
@@ -32,4 +29,4 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "orion.intel")
 
-whatis("Description: UFS build environment")
\ No newline at end of file
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_orion.intel_debug.lua b/modulefiles/ufs_orion.intel_debug.lua
index c95769d01b..45910b1f28 100644
--- a/modulefiles/ufs_orion.intel_debug.lua
+++ b/modulefiles/ufs_orion.intel_debug.lua
@@ -7,12 +7,9 @@ load("noaatools")
 
 cmake_ver=os.getenv("cmake_ver") or "3.22.1"
 load(pathJoin("cmake", cmake_ver))
---module load cmake/3.22.1
 
 python_ver=os.getenv("python_ver") or "3.7.5"
 load(pathJoin("python", python_ver))
-module load python/3.7.5
-
 
 prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
 
@@ -32,4 +29,4 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "orion.intel")
 
-whatis("Description: UFS build environment")
\ No newline at end of file
+whatis("Description: UFS build environment")

From 594da83a2a8abce731b117ce73c20694ad7249a3 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 19 Aug 2022 10:57:31 -0600
Subject: [PATCH 08/18] gnu typo for lua files

---
 modulefiles/ufs_cheyenne.gnu.lua       | 5 ++---
 modulefiles/ufs_cheyenne.gnu_debug.lua | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modulefiles/ufs_cheyenne.gnu.lua b/modulefiles/ufs_cheyenne.gnu.lua
index df1987d2b8..7e963b41d7 100644
--- a/modulefiles/ufs_cheyenne.gnu.lua
+++ b/modulefiles/ufs_cheyenne.gnu.lua
@@ -8,7 +8,6 @@ load(pathJoin("cmake", cmake_ver))
 python_ver=os.getenv("python_ver") or "3.7.9"
 load(pathJoin("python", python_ver))
 
-# load programming environment
 ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
 load(pathJoin("ncarenv", ncarenv_ver))
 
@@ -36,9 +35,9 @@ load(pathJoin("hpc-mpt", hpc_mpt_ver))
 
 load("ufs_common")
 
-setenv("C", "mpicc")
+setenv("CC", "mpicc")
 setenv("CXX", "mpicxx")
 setenv("FC", "mpif90")
 setenv("CMAKE_Platform", "cheyenne.gnu")
 
-whatis("Description: UFS build environment")
\ No newline at end of file
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_cheyenne.gnu_debug.lua b/modulefiles/ufs_cheyenne.gnu_debug.lua
index a546c05d79..6c6f12dac7 100644
--- a/modulefiles/ufs_cheyenne.gnu_debug.lua
+++ b/modulefiles/ufs_cheyenne.gnu_debug.lua
@@ -8,7 +8,6 @@ load(pathJoin("cmake", cmake_ver))
 python_ver=os.getenv("python_ver") or "3.7.9"
 load(pathJoin("python", python_ver))
 
-# load programming environment
 ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
 load(pathJoin("ncarenv", ncarenv_ver))
 
@@ -36,9 +35,9 @@ load(pathJoin("hpc-mpt", hpc_mpt_ver))
 
 load("ufs_common_debug")
 
-setenv("C", "mpicc")
+setenv("CC", "mpicc")
 setenv("CXX", "mpicxx")
 setenv("FC", "mpif90")
 setenv("CMAKE_Platform", "cheyenne.gnu")
 
-whatis("Description: UFS build environment")
\ No newline at end of file
+whatis("Description: UFS build environment")

From ea061dd14511e71a442bd4ea7db18faac9b59f06 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Thu, 1 Sep 2022 14:23:54 +0000
Subject: [PATCH 09/18] Bring back tcl ufs_common/ufs_common_debug for Gaea, as
 .lua will still load it for non-gaea machines

---
 modulefiles/ufs_common           | 23 +++++++++++++
 modulefiles/ufs_common.lua       | 59 --------------------------------
 modulefiles/ufs_common_debug     | 23 +++++++++++++
 modulefiles/ufs_common_debug.lua | 59 --------------------------------
 4 files changed, 46 insertions(+), 118 deletions(-)
 create mode 100644 modulefiles/ufs_common
 delete mode 100644 modulefiles/ufs_common.lua
 create mode 100644 modulefiles/ufs_common_debug
 delete mode 100644 modulefiles/ufs_common_debug.lua

diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
new file mode 100644
index 0000000000..c8c1060989
--- /dev/null
+++ b/modulefiles/ufs_common
@@ -0,0 +1,23 @@
+#%Module
+
+module load jasper/2.0.25
+module load zlib/1.2.11
+module load libpng/1.6.37
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.3
+module load esmf/8.3.0b09
+module load fms/2022.01
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.5
+module load g2tmpl/1.10.0
+module load ip/3.3.3
+module load sp/2.3.3
+module load w3emc/2.9.2
+
+module load gftl-shared/v1.5.0
+module load yafyaml/v0.5.1
+module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
deleted file mode 100644
index 7d2e105b5c..0000000000
--- a/modulefiles/ufs_common.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-help([[
-Load environment of common libraries for UFS
-]])
-
-jasper_ver=os.getenv("jasper_ver") or "2.0.25"
-load(pathJoin("jasper", jasper_ver))
-
-zlib_ver=os.getenv("zlib_ver") or "1.2.11"
-load(pathJoin("zlib", zlib_ver))
-
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
-load(pathJoin("libpng", libpng_ver))
-
-hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
-load(pathJoin("hdf5", hdf5_ver))
-
-netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-load(pathJoin("netcdf", netcdf_ver))
-
-pio_ver=os.getenv("pio_ver") or "2.5.3"
-load(pathJoin("pio", pio_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
-load(pathJoin("esmf", esmf_ver))
-
-fms_ver=os.getenv("fms_ver") or "2022.01"
-load(pathJoin("fms", fms_ver))
-
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-load(pathJoin("bacio", bacio_ver))
-
-crtm_ver=os.getenv("crtm_ver") or "2.3.0"
-load(pathJoin("crtm", crtm_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
-load(pathJoin("g2", g2_ver))
-
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
-load(pathJoin("g2tmpl", g2tmpl_ver))
-
-ip_ver=os.getenv("ip_ver") or "3.3.3"
-load(pathJoin("ip", ip_ver))
-
-sp_ver=os.getenv("sp_ver") or "2.3.3"
-load(pathJoin("sp", sp_ver))
-
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
-load(pathJoin("w3emc", w3emc_ver))
-
-gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
-load(pathJoin("gftl-shared", gftl_shared_ver))
-
-yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
-load(pathJoin("yafyaml", yafyaml_ver))
-
-mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
-load(pathJoin("mapl", mapl_ver))
-
-whatis("Description: UFS common libraries")
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
new file mode 100644
index 0000000000..dcc23b7a10
--- /dev/null
+++ b/modulefiles/ufs_common_debug
@@ -0,0 +1,23 @@
+#%Module
+
+module load jasper/2.0.25
+module load zlib/1.2.11
+module load libpng/1.6.37
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.3
+module load esmf/8.3.0b09-debug
+module load fms/2022.01
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.5
+module load g2tmpl/1.10.0
+module load ip/3.3.3
+module load sp/2.3.3
+module load w3emc/2.9.2
+
+module load gftl-shared/v1.5.0
+module load yafyaml/v0.5.1
+module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
deleted file mode 100644
index 58c992497b..0000000000
--- a/modulefiles/ufs_common_debug.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-help([[
-Load environment of common libraries for UFS
-]])
-
-jasper_ver=os.getenv("jasper_ver") or "2.0.25"
-load(pathJoin("jasper", jasper_ver))
-
-zlib_ver=os.getenv("zlib_ver") or "1.2.11"
-load(pathJoin("zlib", zlib_ver))
-
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
-load(pathJoin("libpng", libpng_ver))
-
-hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
-load(pathJoin("hdf5", hdf5_ver))
-
-netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-load(pathJoin("netcdf", netcdf_ver))
-
-pio_ver=os.getenv("pio_ver") or "2.5.3"
-load(pathJoin("pio", pio_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
-load(pathJoin("esmf", esmf_ver))
-
-fms_ver=os.getenv("fms_ver") or "2022.01"
-load(pathJoin("fms", fms_ver))
-
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-load(pathJoin("bacio", bacio_ver))
-
-crtm_ver=os.getenv("crtm_ver") or "2.3.0"
-load(pathJoin("crtm", crtm_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
-load(pathJoin("g2", g2_ver))
-
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
-load(pathJoin("g2tmpl", g2tmpl_ver))
-
-ip_ver=os.getenv("ip_ver") or "3.3.3"
-load(pathJoin("ip", ip_ver))
-
-sp_ver=os.getenv("sp_ver") or "2.3.3"
-load(pathJoin("sp", sp_ver))
-
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
-load(pathJoin("w3emc", w3emc_ver))
-
-gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
-load(pathJoin("gftl-shared", gftl_shared_ver))
-
-yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
-load(pathJoin("yafyaml", yafyaml_ver))
-
-mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
-load(pathJoin("mapl", mapl_ver))
-
-whatis("Description: UFS common libraries")

From da128a17498eaef1e78147a6be234e69c8eb22de Mon Sep 17 00:00:00 2001
From: Brian Curtis <Brian.Curtis@noaa.gov>
Date: Thu, 1 Sep 2022 11:55:46 -0400
Subject: [PATCH 10/18] update compile script to use new module file names

---
 tests/compile.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index 6ebbc4586d..803b4293b1 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -130,9 +130,13 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "-DDEBUG=ON" ]]; then
-  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
+  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug* ${PATHTR}/tests/modules.${BUILD_NAME}
 else
-  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
+  if [[ $MACHINE_ID == gaea.* ]] ; then
+    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
+  else
+    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}
+  fi
 fi
 
 if [ $clean_after = YES ] ; then

From 75d83d629c0a6e7d25b571de0669e70880536e8f Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Thu, 1 Sep 2022 15:00:22 -0500
Subject: [PATCH 11/18] need to be specific about gaea machine in both debug
 and non debug cases for lua

---
 tests/compile.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index 803b4293b1..79a37ae4cc 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -130,12 +130,16 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "-DDEBUG=ON" ]]; then
-  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug* ${PATHTR}/tests/modules.${BUILD_NAME}
+  if [[ $MACHINE_ID == gaea.* ]] ; then
+    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
+  else
+    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug.lua ${PATHTR}/tests/modules.${BUILD_NAME}.lua
+  fi
 else
   if [[ $MACHINE_ID == gaea.* ]] ; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
   else
-    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}
+    cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}.lua
   fi
 fi
 

From a0bbf68e2b7dce6f0ca6d3f53fcd58ee96aeda79 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Thu, 1 Sep 2022 20:11:06 -0500
Subject: [PATCH 12/18] keep s4 using tcl

---
 tests/compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index 79a37ae4cc..465740b088 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -130,13 +130,13 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "-DDEBUG=ON" ]]; then
-  if [[ $MACHINE_ID == gaea.* ]] ; then
+  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == s4.* ]] ; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug.lua ${PATHTR}/tests/modules.${BUILD_NAME}.lua
   fi
 else
-  if [[ $MACHINE_ID == gaea.* ]] ; then
+  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == s4.* ]] ; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}.lua

From 0d111bfafb1748d0d7aeb19bfea2131977bdbf10 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 2 Sep 2022 09:51:48 -0500
Subject: [PATCH 13/18] s4 changes to use lua

---
 modulefiles/{ufs_s4.intel => ufs_s4.intel.lua} | 0
 tests/compile.sh                               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename modulefiles/{ufs_s4.intel => ufs_s4.intel.lua} (100%)

diff --git a/modulefiles/ufs_s4.intel b/modulefiles/ufs_s4.intel.lua
similarity index 100%
rename from modulefiles/ufs_s4.intel
rename to modulefiles/ufs_s4.intel.lua
diff --git a/tests/compile.sh b/tests/compile.sh
index 465740b088..7969aa078a 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -130,13 +130,13 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "-DDEBUG=ON" ]]; then
-  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == s4.* ]] ; then
+  if [[ $MACHINE_ID == gaea.* ]]; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug.lua ${PATHTR}/tests/modules.${BUILD_NAME}.lua
   fi
 else
-  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == s4.* ]] ; then
+  if [[ $MACHINE_ID == gaea.* ]]; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}.lua

From b6665db97c5d63e7611f86b7ac3c3ce668ccc09a Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Fri, 2 Sep 2022 12:13:11 -0500
Subject: [PATCH 14/18] run_test lua changes if users use rt.sh with -n

---
 tests/run_test.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/run_test.sh b/tests/run_test.sh
index 5ab8f8916b..522e1aff34 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -142,12 +142,16 @@ cd $RUNDIR
 ###############################################################################
 # Make configure and run files
 ###############################################################################
-
+MACHINE_ID=${MACHINE_ID:-false}
 # FV3 executable:
 cp ${PATHRT}/fv3_${COMPILE_NR}.exe                 fv3.exe
 
 # modulefile for FV3 prerequisites:
-cp ${PATHRT}/modules.fv3_${COMPILE_NR}             modules.fv3
+if [[ $MACHINE_ID == gaea.* ]]; then
+  cp ${PATHRT}/modules.fv3_${COMPILE_NR}             modules.fv3
+else
+  cp ${PATHRT}/modules.fv3_${COMPILE_NR}.lua             modules.fv3.lua
+fi
 cp ${PATHTR}/modulefiles/ufs_common*               .
 
 # Get the shell file that loads the "module" command and purges modules:

From 3afa42c11b1ebd14dc7794674de53022638d3f68 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Fri, 2 Sep 2022 18:20:22 +0000
Subject: [PATCH 15/18] Updates S4 modulefiles to lua format. #1376

---
 modulefiles/ufs_s4.intel.lua       | 40 +++++++++++++++++++-----------
 modulefiles/ufs_s4.intel_debug     | 21 ----------------
 modulefiles/ufs_s4.intel_debug.lua | 30 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 36 deletions(-)
 delete mode 100644 modulefiles/ufs_s4.intel_debug
 create mode 100644 modulefiles/ufs_s4.intel_debug.lua

diff --git a/modulefiles/ufs_s4.intel.lua b/modulefiles/ufs_s4.intel.lua
index 95029242b8..38937d2e4c 100644
--- a/modulefiles/ufs_s4.intel.lua
+++ b/modulefiles/ufs_s4.intel.lua
@@ -1,20 +1,30 @@
-#%Module
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
 
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
-}
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"
+load(pathJoin("miniconda", miniconda3_ver))
 
-module-whatis "loads UFS Model prerequisites for S4"
+license_ver=os.getenv("license_ver") or "S4"
+load(pathJoin("license_intel",license_ver))
 
-module load license_intel/S4
-module use /data/prod/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
-module load hpc-intel/2022.1
-module load hpc-impi/2022.1
 
-module load ufs_common
+prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
 
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform s4.intel
+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))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "s4.intel")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_s4.intel_debug b/modulefiles/ufs_s4.intel_debug
deleted file mode 100644
index f5b9643d43..0000000000
--- a/modulefiles/ufs_s4.intel_debug
+++ /dev/null
@@ -1,21 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
-}
-
-module-whatis "loads UFS Model prerequisites for S4"
-
-
-module load license_intel/S4
-module use /data/prod/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
-module load hpc-intel/2022.1
-module load hpc-impi/2022.1
-
-module load ufs_common_debug
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform s4.intel
diff --git a/modulefiles/ufs_s4.intel_debug.lua b/modulefiles/ufs_s4.intel_debug.lua
new file mode 100644
index 0000000000..6286eed5f8
--- /dev/null
+++ b/modulefiles/ufs_s4.intel_debug.lua
@@ -0,0 +1,30 @@
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
+
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"
+load(pathJoin("miniconda", miniconda3_ver))
+
+license_ver=os.getenv("license_ver") or "S4"
+load(pathJoin("license_intel",license_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))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "s4.intel")
+
+whatis("Description: UFS build environment")

From 5c7f07720e3ab2fd8fe7a655fb2455eab0d64327 Mon Sep 17 00:00:00 2001
From: Brian Curtis <Brian.Curtis@noaa.gov>
Date: Tue, 6 Sep 2022 15:54:50 +0000
Subject: [PATCH 16/18] Adjusting for requested full .lua compliance (minus
 Gaea)

---
 modulefiles/ufs_common           | 23 -------------
 modulefiles/ufs_common.lua       | 59 ++++++++++++++++++++++++++++++++
 modulefiles/ufs_common_debug     | 23 -------------
 modulefiles/ufs_common_debug.lua | 59 ++++++++++++++++++++++++++++++++
 modulefiles/ufs_gaea.intel       | 23 ++++++++++++-
 modulefiles/ufs_gaea.intel_debug | 23 ++++++++++++-
 tests/compile.sh                 |  4 ++-
 7 files changed, 165 insertions(+), 49 deletions(-)
 delete mode 100644 modulefiles/ufs_common
 create mode 100644 modulefiles/ufs_common.lua
 delete mode 100644 modulefiles/ufs_common_debug
 create mode 100644 modulefiles/ufs_common_debug.lua

diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
deleted file mode 100644
index c8c1060989..0000000000
--- a/modulefiles/ufs_common
+++ /dev/null
@@ -1,23 +0,0 @@
-#%Module
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.3
-module load esmf/8.3.0b09
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3emc/2.9.2
-
-module load gftl-shared/v1.5.0
-module load yafyaml/v0.5.1
-module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
new file mode 100644
index 0000000000..4ee935e4b4
--- /dev/null
+++ b/modulefiles/ufs_common.lua
@@ -0,0 +1,59 @@
+help([[
+loads UFS Model common libraries
+]])
+
+jasper_ver=os.getenv("jasper_ver") or 2.0.25
+load(pathJoin("jasper", jasper_ver))
+
+zlib_ver=os.getenv("zlib_ver") or 1.2.11
+load(pathJoin("zlib", zlib_ver))
+
+libpng_ver=os.getenv("libpng_ver") or 1.6.37
+load(pathJoin("libpng", libpng_ver))
+
+hdf5_ver=os.getenv("hdf5_ver") or 1.10.6
+load(pathJoin("hdf5", hdf5_ver))
+
+netcdf_ver=os.getenv("netcdf_ver") or 4.7.4
+load(pathJoin("netcdf", netcdf_ver))
+
+pio_ver=os.getenv("pio_ver") or 2.5.3
+load(pathJoin("pio", pio_ver))
+
+esmf_ver=os.getenv("esmf_ver") or 8.3.0b09
+load(pathJoin("esmf", esmf_ver))
+
+fms_ver=os.getenv("fms_ver") or 2022.01
+load(pathJoin("fms",fms_ver))
+
+bacio_ver=os.getenv("bacio_ver") or 2.4.1
+load(pathJoin("bacio", bacio_ver))
+
+crtm_ver=os.getenv("crtm_ver") or 2.3.0
+load(pathJoin("crtm", crtm_ver))
+
+g2_ver=os.getenv("g2_ver") or 3.4.5
+load(pathJoin("g2", g2_ver))
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or 1.10.0
+load(pathJoin("g2tmpl", g2tmpl_ver))
+
+ip_ver=os.getenv("ip_ver") or 3.3.3
+load(pathJoin("ip", ip_ver))
+
+sp_ver=os.getenv("sp_ver") or 2.3.3
+load(pathJoin("sp", sp_ver))
+
+w3emc_ver=os.getenv("w3emc_ver") or 2.9.2
+load(pathJoin("w3emc", w3emc_ver))
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or v1.5.0
+load(pathJoin("gftl-shared", gftl_shared_ver))
+
+yafyaml_ver=os.getenv("yafyaml_ver") or v0.5.1
+load(pathJoin("yafyaml", yafyaml_ver))
+
+mapl_ver=os.getenv("mapl_ver") or 2.22.0-esmf-8.3.0b09
+load(pathJoin("mapl", mapl_ver))
+
+whatis("Description: UFS build environment common libraries")
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
deleted file mode 100644
index dcc23b7a10..0000000000
--- a/modulefiles/ufs_common_debug
+++ /dev/null
@@ -1,23 +0,0 @@
-#%Module
-
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load libpng/1.6.37
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.3
-module load esmf/8.3.0b09-debug
-module load fms/2022.01
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.5
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load sp/2.3.3
-module load w3emc/2.9.2
-
-module load gftl-shared/v1.5.0
-module load yafyaml/v0.5.1
-module load mapl/2.22.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
new file mode 100644
index 0000000000..ebf997d6b7
--- /dev/null
+++ b/modulefiles/ufs_common_debug.lua
@@ -0,0 +1,59 @@
+help([[
+loads UFS Model common libraries for debug
+]])
+
+jasper_ver=os.getenv("jasper_ver") or 2.0.25
+load(pathJoin("jasper", jasper_ver))
+
+zlib_ver=os.getenv("zlib_ver") or 1.2.11
+load(pathJoin("zlib", zlib_ver))
+
+libpng_ver=os.getenv("libpng_ver") or 1.6.37
+load(pathJoin("libpng", libpng_ver))
+
+hdf5_ver=os.getenv("hdf5_ver") or 1.10.6
+load(pathJoin("hdf5", hdf5_ver))
+
+netcdf_ver=os.getenv("netcdf_ver") or 4.7.4
+load(pathJoin("netcdf", netcdf_ver))
+
+pio_ver=os.getenv("pio_ver") or 2.5.3
+load(pathJoin("pio", pio_ver))
+
+esmf_ver=os.getenv("esmf_ver") or 8.3.0b09-debug
+load(pathJoin("esmf", esmf_ver))
+
+fms_ver=os.getenv("fms_ver") or 2022.01
+load(pathJoin("fms",fms_ver))
+
+bacio_ver=os.getenv("bacio_ver") or 2.4.1
+load(pathJoin("bacio", bacio_ver))
+
+crtm_ver=os.getenv("crtm_ver") or 2.3.0
+load(pathJoin("crtm", crtm_ver))
+
+g2_ver=os.getenv("g2_ver") or 3.4.5
+load(pathJoin("g2", g2_ver))
+
+g2tmpl_ver=os.getenv("g2tmpl_ver") or 1.10.0
+load(pathJoin("g2tmpl", g2tmpl_ver))
+
+ip_ver=os.getenv("ip_ver") or 3.3.3
+load(pathJoin("ip", ip_ver))
+
+sp_ver=os.getenv("sp_ver") or 2.3.3
+load(pathJoin("sp", sp_ver))
+
+w3emc_ver=os.getenv("w3emc_ver") or 2.9.2
+load(pathJoin("w3emc", w3emc_ver))
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or v1.5.0
+load(pathJoin("gftl-shared", gftl_shared_ver))
+
+yafyaml_ver=os.getenv("yafyaml_ver") or v0.5.1
+load(pathJoin("yafyaml", yafyaml_ver))
+
+mapl_ver=os.getenv("mapl_ver") or 2.22.0-esmf-8.3.0b09
+load(pathJoin("mapl", mapl_ver))
+
+whatis("Description: UFS build environment common libraries for debug")
diff --git a/modulefiles/ufs_gaea.intel b/modulefiles/ufs_gaea.intel
index 69cd668cca..967102bc39 100644
--- a/modulefiles/ufs_gaea.intel
+++ b/modulefiles/ufs_gaea.intel
@@ -28,7 +28,28 @@ module load hpc/1.1.0
 module load hpc-intel/2021.3.0
 module load hpc-cray-mpich/7.7.11
 
-module load ufs_common
+#module load ufs_common
+module load jasper/2.0.25
+module load zlib/1.2.11
+module load libpng/1.6.37
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.3
+module load esmf/8.3.0b09
+module load fms/2022.01
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.5
+module load g2tmpl/1.10.0
+module load ip/3.3.3
+module load sp/2.3.3
+module load w3emc/2.9.2
+
+module load gftl-shared/v1.5.0
+module load yafyaml/v0.5.1
+module load mapl/2.22.0-esmf-8.3.0b09
 
 setenv CC cc
 setenv CXX CC
diff --git a/modulefiles/ufs_gaea.intel_debug b/modulefiles/ufs_gaea.intel_debug
index a8ec5bfade..8bc01e03d5 100644
--- a/modulefiles/ufs_gaea.intel_debug
+++ b/modulefiles/ufs_gaea.intel_debug
@@ -25,7 +25,28 @@ module load hpc/1.1.0
 module load hpc-intel/2021.3.0
 module load hpc-cray-mpich/7.7.11
 
-module load ufs_common_debug
+#module load ufs_common_debug
+module load jasper/2.0.25
+module load zlib/1.2.11
+module load libpng/1.6.37
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.3
+module load esmf/8.3.0b09-debug
+module load fms/2022.01
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.5
+module load g2tmpl/1.10.0
+module load ip/3.3.3
+module load sp/2.3.3
+module load w3emc/2.9.2
+
+module load gftl-shared/v1.5.0
+module load yafyaml/v0.5.1
+module load mapl/2.22.0-esmf-8.3.0b09
 
 setenv CC cc
 setenv CXX CC
diff --git a/tests/compile.sh b/tests/compile.sh
index 7969aa078a..e007718bf7 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -64,7 +64,9 @@ else
   module use $PATHTR/modulefiles
   modulefile="ufs_${MACHINE_ID}"
   if [[ "${MAKE_OPT}" == *"-DDEBUG=ON"* ]]; then
-    [[ -f $PATHTR/modulefiles/ufs_${MACHINE_ID}_debug ]] && modulefile="ufs_${MACHINE_ID}_debug"
+    if [[ -f $PATHTR/modulefiles/ufs_${MACHINE_ID}_debug ]] || [[ -f $PATHTR/modulefiles/ufs_${MACHINE_ID}_debug.lua ]]; then
+      modulefile="ufs_${MACHINE_ID}_debug"
+    fi
   fi
   module load $modulefile
   module list

From a3e67ab61c5ad83694d5a1cffab69266e308c0f2 Mon Sep 17 00:00:00 2001
From: Brian Curtis <64433609+BrianCurtis-NOAA@users.noreply.github.com>
Date: Tue, 6 Sep 2022 13:11:40 -0400
Subject: [PATCH 17/18] Update ufs_s4.intel.lua

---
 modulefiles/ufs_s4.intel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/ufs_s4.intel.lua b/modulefiles/ufs_s4.intel.lua
index 38937d2e4c..50372f364c 100644
--- a/modulefiles/ufs_s4.intel.lua
+++ b/modulefiles/ufs_s4.intel.lua
@@ -1,5 +1,5 @@
 help([[
-loads UFS Model prerequisites for Hera/Intel
+loads UFS Model prerequisites for S4
 ]])
 
 miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"

From f8382497f105a2212e61e52d5bf19c68a4795892 Mon Sep 17 00:00:00 2001
From: Brian Curtis <64433609+BrianCurtis-NOAA@users.noreply.github.com>
Date: Tue, 6 Sep 2022 13:12:05 -0400
Subject: [PATCH 18/18] Update ufs_s4.intel_debug.lua

---
 modulefiles/ufs_s4.intel_debug.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/ufs_s4.intel_debug.lua b/modulefiles/ufs_s4.intel_debug.lua
index 6286eed5f8..285ddc203e 100644
--- a/modulefiles/ufs_s4.intel_debug.lua
+++ b/modulefiles/ufs_s4.intel_debug.lua
@@ -1,5 +1,5 @@
 help([[
-loads UFS Model prerequisites for Hera/Intel
+loads UFS Model prerequisites for S4
 ]])
 
 miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"