Use nccmp to compare netcdf files in regression test on NOAA R&D mach…

…ines. Update WW3 (#1702)

* Use nccmp to compare netcdf files

* Use nccmp only on NOAA R&D systems

* Do not skip checking fv_core.res.nc when GNU compiler is used

* Update ufs_common.lua

* Update ufs_hera modulefiles

* Cleanup compile.sh. Remove unnecessary FIXME for gnu compiler

* Update WW3

modulefiles/ufs_common.lua

@@ -1,56 +1,30 @@
-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.7"
-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.04"
-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.4.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.2"
-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))
-
-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")
+
+help([[Load UFS Model common libraries]])
+
+local ufs_modules = {
+  {["jasper"]      = "2.0.25"},
+  {["zlib"]        = "1.2.11"},
+  {["libpng"]      = "1.6.37"},
+  {["hdf5"]        = "1.10.6"},
+  {["netcdf"]      = "4.7.4"},
+  {["pio"]         = "2.5.7"},
+  {["esmf"]        = "8.3.0b09"},
+  {["fms"]         = "2022.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"] = "v1.5.0"},
+  {["mapl"]        = "2.22.0-esmf-8.3.0b09"},
+}
+
+for i = 1, #ufs_modules do
+  for name, default_version in pairs(ufs_modules[i]) do
+    local env_version_name = string.gsub(name, "-", "_") .. "_ver"
+    load(pathJoin(name, os.getenv(env_version_name) or default_version))
+  end
+end

modulefiles/ufs_gaea.intel.lua

@@ -5,9 +5,6 @@ help([[
 
 whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])
 
-prepend_path("MODULEPATH", "/lustre/f2/dev/role.epic/contrib/modulefiles")
-load(pathJoin("miniconda3",os.getenv("miniconda_ver") or "4.12.0"))
-
 load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
 
 prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0_noarch/modulefiles/stack")
@@ -22,14 +19,10 @@ load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))
 load(pathJoin("gcc", os.getenv("gcc_ver") or "8.3.0"))
 -- Needed at runtime:
 load("alps")
-load("rocoto")
 
 load("ufs_common")
 
 setenv("CC","cc")
 setenv("FC","ftn")
 setenv("CXX","CC")
-setenv("CMAKE_C_COMPILER","cc")
-setenv("CMAKE_CXX_COMPILER","CC")
-setenv("CMAKE_Fortran_COMPILER","ftn")
 setenv("CMAKE_Platform","gaea.intel")

modulefiles/ufs_hera.gnu.lua

@@ -2,10 +2,6 @@ help([[
 loads UFS Model prerequisites for Hera/GNU
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
-miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
-load(pathJoin("miniconda3", miniconda3_ver))
-
 prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
 load("sutils")
 

modulefiles/ufs_hera.intel.lua

@@ -2,10 +2,6 @@ help([[
 loads UFS Model prerequisites for Hera/Intel
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
-miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
-load(pathJoin("miniconda3", miniconda3_ver))
-
 prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
 load("sutils")
 

modulefiles/ufs_jet.intel.lua

@@ -8,11 +8,6 @@ load("sutils")
 cmake_ver=os.getenv("cmake_ver") or "3.20.1"
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
-miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
-load(pathJoin("miniconda3", miniconda3_ver))
-
-
 prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"

modulefiles/ufs_orion.intel.lua

@@ -8,10 +8,6 @@ load("noaatools")
 cmake_ver=os.getenv("cmake_ver") or "3.22.1"
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
-miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
-load(pathJoin("miniconda3", miniconda3_ver))
-
 prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"