From 5b614d1e6a399fe1f4ee21b26ef78cd72bed7d35 Mon Sep 17 00:00:00 2001
From: DavidHuber <david.huber@noaa.gov>
Date: Fri, 17 Nov 2023 14:38:25 +0000
Subject: [PATCH] Implement single spack version build/run files, update
 modulefiles for spack #1868

---
 modulefiles/module_base.orion.lua            |  1 -
 modulefiles/module_base.s4.lua               |  3 +-
 sorc/link_workflow.sh                        |  9 +++-
 versions/build.jet.ver                       | 43 ------------------
 versions/build.orion.ver                     | 43 ------------------
 versions/build.s4.ver                        | 43 ------------------
 versions/{build.hera.ver => build.spack.ver} |  7 +--
 versions/run.jet.ver                         | 46 --------------------
 versions/run.orion.ver                       | 46 --------------------
 versions/run.s4.ver                          | 46 --------------------
 versions/{run.hera.ver => run.spack.ver}     | 11 -----
 11 files changed, 9 insertions(+), 289 deletions(-)
 delete mode 100644 versions/build.jet.ver
 delete mode 100644 versions/build.orion.ver
 delete mode 100644 versions/build.s4.ver
 rename versions/{build.hera.ver => build.spack.ver} (85%)
 delete mode 100644 versions/run.jet.ver
 delete mode 100644 versions/run.orion.ver
 delete mode 100644 versions/run.s4.ver
 rename versions/{run.hera.ver => run.spack.ver} (75%)

diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 5a88d65d69..9a34ba7b38 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -13,7 +13,6 @@ local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 load(pathJoin("gempak", os.getenv("gempak_ver")))
 load(pathJoin("ncl", os.getenv("ncl_ver")))
 load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("zlib", os.getenv("zlib_ver")))
 load(pathJoin("png", os.getenv("libpng_ver")))
 load(pathJoin("cdo", os.getenv("cdo_ver")))
 
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
index 21b574e763..ce42012417 100644
--- a/modulefiles/module_base.s4.lua
+++ b/modulefiles/module_base.s4.lua
@@ -13,8 +13,7 @@ load(pathJoin("miniconda", os.getenv("miniconda_ver")))
 load(pathJoin("ncl", os.getenv("ncl_ver")))
 load(pathJoin("cdo", os.getenv("cdo_ver")))
 load(pathJoin("jasper", os.getenv("jasper_ver")))
-load(pathJoin("zlib", os.getenv("zlib_ver")))
-load(pathJoin("png", os.getenv("libpng_ver")))
+load(pathJoin("libpng", os.getenv("libpng_ver")))
 
 load(pathJoin("hdf5", os.getenv("hdf5_ver")))
 load(pathJoin("netcdf", os.getenv("netcdf_ver")))
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index d2328caba9..f274c714ba 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -49,8 +49,13 @@ machine=$(echo "${MACHINE_ID}" | cut -d. -f1)
 #------------------------------
 #--Set up build.ver and run.ver
 #------------------------------
-cp "${HOMEgfs}/versions/build.${machine}.ver" "${HOMEgfs}/versions/build.ver"
-cp "${HOMEgfs}/versions/run.${machine}.ver" "${HOMEgfs}/versions/run.ver"
+if [[ "${machine}" == "wcoss2" ]]; then
+   cp "${HOMEgfs}/versions/build.${machine}.ver" "${HOMEgfs}/versions/build.ver"
+   cp "${HOMEgfs}/versions/run.${machine}.ver" "${HOMEgfs}/versions/run.ver"
+else
+   cp "${HOMEgfs}/versions/build.spack.ver" "${HOMEgfs}/versions/build.ver"
+   cp "${HOMEgfs}/versions/run.spack.ver" "${HOMEgfs}/versions/run.ver"
+fi
 
 #------------------------------
 #--model fix fields
diff --git a/versions/build.jet.ver b/versions/build.jet.ver
deleted file mode 100644
index 64a4e57dd4..0000000000
--- a/versions/build.jet.ver
+++ /dev/null
@@ -1,43 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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 prod_util_ver=1.2.2
-
-export hdf5_ver=1.14.0
-export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
deleted file mode 100644
index 64a4e57dd4..0000000000
--- a/versions/build.orion.ver
+++ /dev/null
@@ -1,43 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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 prod_util_ver=1.2.2
-
-export hdf5_ver=1.14.0
-export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
deleted file mode 100644
index 64a4e57dd4..0000000000
--- a/versions/build.s4.ver
+++ /dev/null
@@ -1,43 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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 prod_util_ver=1.2.2
-
-export hdf5_ver=1.14.0
-export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/build.hera.ver b/versions/build.spack.ver
similarity index 85%
rename from versions/build.hera.ver
rename to versions/build.spack.ver
index 64a4e57dd4..679da91116 100644
--- a/versions/build.hera.ver
+++ b/versions/build.spack.ver
@@ -4,19 +4,17 @@ export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export python_ver=3.10.8
 
-export hpss_ver=hpss
 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.11
+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 prod_util_ver=1.2.2
 
 export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
@@ -38,6 +36,3 @@ 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
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/run.jet.ver b/versions/run.jet.ver
deleted file mode 100644
index dcb8badb3e..0000000000
--- a/versions/run.jet.ver
+++ /dev/null
@@ -1,46 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.1
-
-export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
deleted file mode 100644
index dcb8badb3e..0000000000
--- a/versions/run.orion.ver
+++ /dev/null
@@ -1,46 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.1
-
-export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/run.s4.ver b/versions/run.s4.ver
deleted file mode 100644
index dcb8badb3e..0000000000
--- a/versions/run.s4.ver
+++ /dev/null
@@ -1,46 +0,0 @@
-export spack_stack_ver=1.5.1
-export spack_env=gsi-addon
-export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
-export python_ver=3.10.8
-
-export hpss_ver=hpss
-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.11
-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
-export netcdf_fortran_ver=4.6.0
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
-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 py_netcdf4_ver=1.5.8
-export py_pyyaml_ver=5.4.1
-export py_jinja2_ver=3.1.2
-
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.1
-
-export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.0.0
-export met_ver=9.1.3
-export metplus_ver=3.1.1
diff --git a/versions/run.hera.ver b/versions/run.spack.ver
similarity index 75%
rename from versions/run.hera.ver
rename to versions/run.spack.ver
index dcb8badb3e..d5e64f8be5 100644
--- a/versions/run.hera.ver
+++ b/versions/run.spack.ver
@@ -5,14 +5,10 @@ export stack_impi_ver=2021.5.1
 export python_ver=3.10.8
 
 export hpss_ver=hpss
-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.11
-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
@@ -21,14 +17,7 @@ export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
 export netcdf_fortran_ver=4.6.0
 
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
 export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.3.3
-export ip_ver=4.3.0
 export gsi_ncdiag_ver=1.1.2
 export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0