From a65e4c675f21dbe72198d263e85e894e62b41e13 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Thu, 11 Jan 2024 11:34:19 -0600
Subject: [PATCH] Initial update of version/module files #2123

---
 modulefiles/module_base.hera.lua     | 64 ++++++++++++++--------------
 modulefiles/module_base.hercules.lua | 54 +++++++++++------------
 modulefiles/module_base.jet.lua      | 58 ++++++++++++-------------
 modulefiles/module_base.orion.lua    | 60 +++++++++++++-------------
 modulefiles/module_base.s4.lua       | 52 +++++++++++-----------
 modulefiles/module_base.wcoss2.lua   | 64 ++++++++++++++--------------
 versions/build.spack.ver             |  8 ----
 versions/build.wcoss2.ver            |  3 --
 versions/run.spack.ver               |  2 +
 9 files changed, 178 insertions(+), 187 deletions(-)

diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
index cf77df520a..a9082378a7 100644
--- a/modulefiles/module_base.hera.lua
+++ b/modulefiles/module_base.hera.lua
@@ -6,45 +6,45 @@ spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
 spack_env=(os.getenv("spack_env") or "None")
 prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
-load(pathJoin("python", os.getenv("python_ver")))
-
-load(pathJoin("hpss", os.getenv("hpss_ver")))
-load(pathJoin("gempak", os.getenv("gempak_ver")))
-load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("libpng", os.getenv("libpng_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-load(pathJoin("R", os.getenv("R_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
-load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib-util", os.getenv("grib_util_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("bufr", os.getenv("bufr_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
-load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
-load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
-
-load(pathJoin("met", os.getenv("met_ver")))
-load(pathJoin("metplus", os.getenv("metplus_ver")))
+load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
+load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+
+load(pathJoin("hpss", (os.getenv("hpss_ver") or "None")))
+load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
+load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
+load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+load(pathJoin("R", (os.getenv("R_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
+load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
+load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
+
+load(pathJoin("met", (os.getenv("met_ver") or "None")))
+load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
 --prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
index 49144efbef..d9c8f5ed0b 100644
--- a/modulefiles/module_base.hercules.lua
+++ b/modulefiles/module_base.hercules.lua
@@ -6,43 +6,43 @@ spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
 spack_env=(os.getenv("spack_env") or "None")
 prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
-load(pathJoin("intel-oneapi-mkl", os.getenv("intel_mkl_ver")))
-load(pathJoin("python", os.getenv("python_ver")))
-load(pathJoin("perl", os.getenv("perl_ver")))
+load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
+load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+load(pathJoin("intel-oneapi-mkl", (os.getenv("intel_mkl_ver") or "None")))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
 
 -- TODO load NCL once the SAs remove the 'depends_on' statements within it
 --      NCL is a static installation and does not depend on any libraries
 --      but as is will load, among others, the system netcdf-c/4.9.0 module
---load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("libpng", os.getenv("libpng_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
-load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib-util", os.getenv("grib_util_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("bufr", os.getenv("bufr_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
-load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
-load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
+--load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
+load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
+load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
+load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index 7a0faaaeb6..64d35da57a 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -6,42 +6,42 @@ spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
 spack_env=(os.getenv("spack_env") or "None")
 prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
-load(pathJoin("python", os.getenv("python_ver")))
-
-load(pathJoin("hpss", os.getenv("hpss_ver")))
-load(pathJoin("gempak", os.getenv("gempak_ver")))
-load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("libpng", os.getenv("libpng_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-load(pathJoin("R", os.getenv("R_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
-load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib-util", os.getenv("grib_util_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("bufr", os.getenv("bufr_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
-load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
-load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
+load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
+load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+
+load(pathJoin("hpss", (os.getenv("hpss_ver") or "None")))
+load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
+load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
+load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+load(pathJoin("R", (os.getenv("R_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
+load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
+load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
 --prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 3464accc89..e4847855cd 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -6,43 +6,43 @@ spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
 spack_env=(os.getenv("spack_env") or "None")
 prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
-load(pathJoin("python", os.getenv("python_ver")))
-
-load(pathJoin("gempak", os.getenv("gempak_ver")))
-load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("libpng", os.getenv("libpng_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
-load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib-util", os.getenv("grib_util_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("bufr", os.getenv("bufr_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
-load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
-load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
-
-load(pathJoin("met", os.getenv("met_ver")))
-load(pathJoin("metplus", os.getenv("metplus_ver")))
+load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
+load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+
+load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
+load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
+load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
+load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
+load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
+
+load(pathJoin("met", (os.getenv("met_ver") or "None")))
+load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
 --prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
index 51eeee0f10..d99a93c3f4 100644
--- a/modulefiles/module_base.s4.lua
+++ b/modulefiles/module_base.s4.lua
@@ -6,39 +6,39 @@ spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
 spack_env=(os.getenv("spack_env") or "None")
 prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
-load(pathJoin("python", os.getenv("python_ver")))
-
-load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("libpng", os.getenv("libpng_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
-load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib-util", os.getenv("grib_util_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("bufr", os.getenv("bufr_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
-load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
-load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
+load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
+load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+
+load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
+load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
+load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
+load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
 --prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
index 57d3bf51dd..ee4ee6a5fb 100644
--- a/modulefiles/module_base.wcoss2.lua
+++ b/modulefiles/module_base.wcoss2.lua
@@ -2,43 +2,43 @@ help([[
 Load environment to run GFS on WCOSS2
 ]])
 
-load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
-load(pathJoin("craype", os.getenv("craype_ver")))
-load(pathJoin("intel", os.getenv("intel_ver")))
-load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver")))
-load(pathJoin("cray-pals", os.getenv("cray_pals_ver")))
-load(pathJoin("cfp", os.getenv("cfp_ver")))
+load(pathJoin("PrgEnv-intel", (os.getenv("PrgEnv_intel_ver") or "None")))
+load(pathJoin("craype", (os.getenv("craype_ver") or "None")))
+load(pathJoin("intel", (os.getenv("intel_ver") or "None")))
+load(pathJoin("cray-mpich", (os.getenv("cray_mpich_ver") or "None")))
+load(pathJoin("cray-pals", (os.getenv("cray_pals_ver") or "None")))
+load(pathJoin("cfp", (os.getenv("cfp_ver") or "None")))
 setenv("USE_CFP","YES")
 
-load(pathJoin("python", os.getenv("python_ver")))
-load(pathJoin("gempak", os.getenv("gempak_ver")))
-load(pathJoin("perl", os.getenv("perl_ver")))
-load(pathJoin("libjpeg", os.getenv("libjpeg_ver")))
-load(pathJoin("udunits", os.getenv("udunits_ver")))
-load(pathJoin("gsl", os.getenv("gsl_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
-
-load(pathJoin("hdf5", os.getenv("hdf5_ver")))
-load(pathJoin("netcdf", os.getenv("netcdf_ver")))
-
-load(pathJoin("nco", os.getenv("nco_ver")))
-load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib_util", os.getenv("grib_util_ver")))
-load(pathJoin("bufr_dump", os.getenv("bufr_dump_ver")))
-load(pathJoin("util_shared", os.getenv("util_shared_ver")))
-load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
-load(pathJoin("ncdiag", os.getenv("ncdiag_ver")))
-load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
-
---prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. os.getenv("prepobs_run_ver"), "modulefiles"))
+load(pathJoin("python", (os.getenv("python_ver") or "None")))
+load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
+load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
+load(pathJoin("libjpeg", (os.getenv("libjpeg_ver") or "None")))
+load(pathJoin("udunits", (os.getenv("udunits_ver") or "None")))
+load(pathJoin("gsl", (os.getenv("gsl_ver") or "None")))
+load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
+
+load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
+load(pathJoin("netcdf", (os.getenv("netcdf_ver") or "None")))
+
+load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
+load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
+load(pathJoin("grib_util", (os.getenv("grib_util_ver") or "None")))
+load(pathJoin("bufr_dump", (os.getenv("bufr_dump_ver") or "None")))
+load(pathJoin("util_shared", (os.getenv("util_shared_ver") or "None")))
+load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
+load(pathJoin("ncdiag", (os.getenv("ncdiag_ver") or "None")))
+load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
+load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+
+--prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
-load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
-prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. os.getenv("fit2obs_ver"), "modulefiles"))
-load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
+prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 append_path("MODULEPATH", pathJoin("/apps/ops/prod/nco/models/modulefiles"))
-load(pathJoin("mos_shared", os.getenv("mos_shared_ver")))
+load(pathJoin("mos_shared", (os.getenv("mos_shared_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/versions/build.spack.ver b/versions/build.spack.ver
index 28c3a10185..fb5b244bf5 100644
--- a/versions/build.spack.ver
+++ b/versions/build.spack.ver
@@ -1,18 +1,13 @@
 export spack_stack_ver=1.5.1
 export spack_env=gsi-addon
-export python_ver=3.10.8
 
 export cmake_ver=3.23.1
 
-export gempak_ver=7.4.2
 export jasper_ver=2.0.32
 export libpng_ver=1.6.37
 export zlib_ver=1.2.13
 export esmf_ver=8.5.0
 export fms_ver=2023.02.01
-export cdo_ver=2.0.5
-export nco_ver=5.0.6
-export ncl_ver=6.6.2
 
 export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
@@ -31,6 +26,3 @@ export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0
 export wgrib2_ver=2.0.8
 export grib_util_ver=1.3.0
-export py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
diff --git a/versions/build.wcoss2.ver b/versions/build.wcoss2.ver
index bb7ee6ac99..046ff5c64e 100644
--- a/versions/build.wcoss2.ver
+++ b/versions/build.wcoss2.ver
@@ -5,8 +5,6 @@ export cray_mpich_ver=8.1.9
 
 export cmake_ver=3.20.2
 
-export python_ver=3.8.6
-export gempak_ver=7.14.1
 export jasper_ver=2.0.25
 export libpng_ver=1.6.37
 export zlib_ver=1.2.11
@@ -31,6 +29,5 @@ export ncio_ver=1.1.2
 export ncdiag_ver=1.0.0
 export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0
-export wgrib2_ver=2.0.8
 
 export upp_ver=10.0.8
diff --git a/versions/run.spack.ver b/versions/run.spack.ver
index 7045f2ed01..c1c13f58df 100644
--- a/versions/run.spack.ver
+++ b/versions/run.spack.ver
@@ -16,6 +16,8 @@ export gsi_ncdiag_ver=1.1.2
 export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0
 export wgrib2_ver=2.0.8
+export grib_util_ver=1.3.0
+export prod_util_ver=1.2.2
 export py_netcdf4_ver=1.5.8
 export py_pyyaml_ver=5.4.1
 export py_jinja2_ver=3.1.2