get clibs working, disable atml tests, remove temporary workaround fo…

…r pio/netcdf
BrianCurtis-NOAA · May 30, 2024 · e05dab3 · e05dab3
1 parent b6aaf45
commit e05dab3
Show file tree

Hide file tree

Showing 2 changed files with 254 additions and 257 deletions.
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
@@ -12,33 +12,34 @@ 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.12"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
 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", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/compiler/intel/19.1.3.304")
---prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
+append_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0_pnetcdf/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
 
 local ufs_modules = {
-  {["jasper"]          = "2.0.25"},
-  {["zlib"]            = "1.2.11"},
-  {["libpng"]          = "1.6.37"},
-  {["hdf5-B"]          = "1.14.0"},
-  {["netcdf-B"]        = "4.9.2"},
-  {["pio-B"]           = "2.5.10"},
-  {["esmf-B"]          = "8.5.0"},
-  {["fms"]             = "2023.02.01"},
-  {["bacio"]           = "2.4.1"},
-  {["crtm"]            = "2.4.0"},
-  {["g2"]              = "3.4.5"},
-  {["g2tmpl"]          = "1.10.2"},
-  {["ip"]              = "3.3.3"},
-  {["sp"]              = "2.3.3"},
-  {["w3emc"]           = "2.9.2"},
-  {["gftl-shared"]     = "1.6.1"},
-  {["mapl-B"]          = "2.40.3"},
+  {["jasper"]      = "2.0.25"},
+  {["zlib"]        = "1.2.11"},
+  {["libpng"]      = "1.6.37"},
+  {["hdf5"]        = "1.14.0"},
+  {["netcdf"]      = "4.9.2"},
+  {["pio"]         = "2.5.10"},
+  {["esmf"]        = "8.6.0"},
+  {["fms"]         = "2023.04"},
+  {["bacio"]       = "2.4.1"},
+  {["crtm"]        = "2.4.0"},
+  {["g2"]          = "3.4.5"},
+  {["g2tmpl"]      = "1.10.2"},
+  {["ip"]          = "3.3.3"},
+  {["sp"]          = "2.3.3"},
+  {["w3emc"]       = "2.9.2"},
+  {["gftl-shared"] = "1.6.1"},
+  {["mapl"]        = "2.40.3-esmf-8.6.0"},
+  {["pnetcdf"]     = "1.12.2"},
+  {["scotch"]      = "7.0.4"},
 }
 
 for i = 1, #ufs_modules do
@@ -48,10 +49,6 @@ for i = 1, #ufs_modules do
   end
 end
 
-prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
-scotch_ver=os.getenv("scotch_ver") or "7.0.4"
-load(pathJoin("scotch",scotch_ver))
-
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")