Revert Hercules modules to SS/1.5.1.

modulefiles/module_base.hercules.lua

@@ -37,8 +37,9 @@ load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
 load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
 load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
 load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
-load(pathJoin("met", (os.getenv("met_ver") or "None")))
-load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
+-- MET/METplus is not yet enabled on Hercules
+--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"))

modulefiles/module_gwci.hercules.lua

@@ -2,7 +2,7 @@ help([[
 Load environment to run GFS workflow ci scripts on Hercules
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2021.9.0")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))

modulefiles/module_gwsetup.hercules.lua

@@ -5,10 +5,10 @@ Load environment to run GFS workflow ci scripts on Hercules
 load(pathJoin("contrib","0.1"))
 load(pathJoin("rocoto","1.3.5"))
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-local python_ver=os.getenv("python_ver") or "3.11.6"
+local python_ver=os.getenv("python_ver") or "3.10.8"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

parm/config/gfs/config.base.emc.dyn

@@ -382,7 +382,12 @@ export netcdf_diag=".true."
 export binary_diag=".false."
 
 # Verification options
-export DO_METP="NO"          # Run METPLUS jobs - set METPLUS settings in config.metp; not supported with spack-stack
+# MET/METplus is not yet supported on Hercules
+if [[ "${machine}" == "HERCULES" ]]; then
+   export DO_METP="NO"
+else
+   export DO_METP="YES"         # Run METPLUS jobs - set METPLUS settings in config.metp; not supported with spack-stack
+fi
 export DO_FIT2OBS="YES"      # Run fit to observations package
 
 # Archiving options

versions/build.hercules.ver

@@ -1,4 +1,31 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
-export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_env=gsi-addon
+#source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_stack_ver=1.5.1
+
+export cmake_ver=3.23.1
+
+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 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

versions/run.hercules.ver

@@ -1,9 +1,39 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
-export spack_env=gsi-addon-env
+export spack_env=gsi-addon
 
 export ncl_ver=6.6.2
 export perl_ver=5.36.0
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+#source "${HOMEgfs:-}/versions/run.spack.ver"
+export spack_stack_ver=1.5.1
+export python_ver=3.10.8
+
+export jasper_ver=2.0.32
+export libpng_ver=1.6.37
+export cdo_ver=2.2.0
+export nco_ver=5.0.6
+
+export hdf5_ver=1.14.0
+export netcdf_c_ver=4.9.2
+export netcdf_fortran_ver=4.6.0
+
+export bufr_ver=11.7.0
+export gsi_ncdiag_ver=1.1.2
+export g2tmpl_ver=1.10.2
+export crtm_ver=2.4.0
+export wgrib2_ver=3.1.1
+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
+export py_pandas_ver=1.5.3
+export py_python_dateutil_ver=2.8.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