AQM updates (Was #1383) + Update to use .lua modulefiles (#1376)

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/BrianCurtis-NOAA/fv3atm
+  branch = bugfix/aqm-heat-fluxes
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
@@ -41,4 +43,5 @@
 [submodule "AQM"]
   path = AQM
   url = https://github.com/NOAA-EMC/AQM
-  branch = develop
+  branch = bugfix/restore-epa-cmaq
+  #branch = develop

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")

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")

modulefiles/ufs_cheyenne.gnu.lua

@@ -0,0 +1,43 @@
+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))
+
+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("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.gnu")
+
+whatis("Description: UFS build environment")

modulefiles/ufs_cheyenne.gnu_debug.lua

@@ -0,0 +1,43 @@
+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))
+
+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("CC", "mpicc")
+setenv("CXX", "mpicxx")
+setenv("FC", "mpif90")
+setenv("CMAKE_Platform", "cheyenne.gnu")
+
+whatis("Description: UFS build environment")

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")