NOAA-EMC · DavidHuber-NOAA · Feb 23, 2024 · Jan 19, 2024 · Jan 19, 2024 · Jan 22, 2024
@@ -44,6 +44,7 @@ for fhr3 in ${fhrlst}; do
     fhmax=240
     if (( fhr >= fhmin && fhr <= fhmax )); then
         if ((fhr % 6 == 0)); then
+            export fcsthrs="${fhr3}"
             "${AWIPSG2SH}"
         fi
     fi

diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Hera
 ]])
 
-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")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
@@ -33,12 +32,12 @@ 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("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")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
--- MET/METplus are not available for use with spack-stack, yet
---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"))
 

diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
@@ -2,20 +2,15 @@ help([[
 Load environment to run GFS on Hercules
 ]])
 
-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")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 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") 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")))
@@ -35,6 +30,10 @@ 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("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")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")

diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Jet
 ]])
 
-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")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
@@ -33,6 +32,10 @@ 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("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")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")

diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Orion
 ]])
 
-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")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
@@ -31,12 +30,12 @@ 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("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")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
--- MET/METplus are not yet supported with spack-stack
---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"))
 

diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on S4
 ]])
 
-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")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
@@ -30,6 +29,10 @@ 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("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")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
 setenv("WGRIB2","wgrib2")

diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
@@ -31,6 +31,11 @@ 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", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
+setenv("HPC_OPT", "/apps/ops/para/libs")
+load(pathJoin("met", (os.getenv("met_ver") or "None")))
+load(pathJoin("metplus", (os.getenv("metplus_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") or "None")))

diff --git a/modulefiles/module_gwci.hera.lua b/modulefiles/module_gwci.hera.lua
@@ -2,13 +2,13 @@ help([[
 Load environment to run GFS workflow setup scripts on Hera
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2021.5.0")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))
 
 load(pathJoin("netcdf-c", os.getenv("4.9.2")))
-load(pathJoin("netcdf-fortran", os.getenv("4.6.0")))
+load(pathJoin("netcdf-fortran", os.getenv("4.6.1")))
 load(pathJoin("nccmp","1.9.0.1"))
 load(pathJoin("wgrib2", "2.0.8"))
 

diff --git a/modulefiles/module_gwci.hercules.lua b/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.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2021.9.0")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))

diff --git a/modulefiles/module_gwci.orion.lua b/modulefiles/module_gwci.orion.lua
@@ -2,13 +2,13 @@ help([[
 Load environment to run GFS workflow ci scripts on Orion
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2022.0.2")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))
 
 load(pathJoin("netcdf-c", os.getenv("4.9.2")))
-load(pathJoin("netcdf-fortran", os.getenv("4.6.0")))
+load(pathJoin("netcdf-fortran", os.getenv("4.6.1")))
 load(pathJoin("nccmp","1.9.0.1"))
 load(pathJoin("wgrib2", "2.0.8"))
 

diff --git a/modulefiles/module_gwsetup.hera.lua b/modulefiles/module_gwsetup.hera.lua
@@ -4,17 +4,17 @@ Load environment to run GFS workflow setup scripts on Hera
 
 load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))
 load("py-jinja2")
 load("py-pyyaml")
 load("py-numpy")
-local git_ver=os.getenv("git_ver") or "2.40.0"
+local git_ver=os.getenv("git_ver") or "2.18.0"
 load(pathJoin("git", git_ver))
 
 whatis("Description: GFS run setup environment")
diff --git a/modulefiles/module_gwsetup.hercules.lua b/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.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/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.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.jet.lua b/modulefiles/module_gwsetup.jet.lua
@@ -2,12 +2,12 @@ help([[
 Load environment to run GFS workflow setup scripts on Jet
 ]])
 
-load(pathJoin("rocoto", "1.3.3"))
+load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.orion.lua b/modulefiles/module_gwsetup.orion.lua
@@ -7,10 +7,10 @@ load(pathJoin("contrib","0.1"))
 load(pathJoin("rocoto","1.3.3"))
 load(pathJoin("git","2.28.0"))
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.s4.lua b/modulefiles/module_gwsetup.s4.lua
@@ -5,10 +5,10 @@ Load environment to run GFS workflow setup scripts on S4
 load(pathJoin("rocoto","1.3.5"))
 load(pathJoin("git","2.30.0"))
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
@@ -377,7 +377,7 @@ 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
+export DO_METP="YES"         # Run METPLUS jobs - set METPLUS settings in config.metp
 export DO_FIT2OBS="YES"      # Run fit to observations package
 export DO_VRFY_OCEANDA="NO"  # Run SOCA Ocean DA verification tasks
 

diff --git a/parm/config/gfs/config.metp b/parm/config/gfs/config.metp
@@ -23,6 +23,7 @@ export VERIF_GLOBALSH=${HOMEverif_global}/ush/run_verif_global_in_global_workflo
 export model=${PSLOT}
 export model_file_format="pgbf{lead?fmt=%2H}.${CDUMP}.{init?fmt=%Y%m%d%H}.grib2"
 export model_hpss_dir=${ATARDIR}/..
+export model_dir=${ARCDIR}/..
 export get_data_from_hpss="NO"
 export hpss_walltime="10"
 ## OUTPUT SETTINGS

@@ -119,16 +119,16 @@ build_jobs["ufs"]=8
 big_jobs=$((big_jobs+1))
 build_opts["ufs"]="${_wave_unst} ${_verbose_opt} ${_build_ufs_opt}"
 
-build_jobs["upp"]=6     # The UPP is hardcoded to use 6 cores
+build_jobs["upp"]=2
 build_opts["upp"]=""
 
-build_jobs["ufs_utils"]=3
+build_jobs["ufs_utils"]=2
 build_opts["ufs_utils"]="${_verbose_opt}"
 
 build_jobs["gfs_utils"]=1
 build_opts["gfs_utils"]="${_verbose_opt}"
 
-build_jobs["ww3prepost"]=3
+build_jobs["ww3prepost"]=2
 build_opts["ww3prepost"]="${_wave_unst} ${_verbose_opt} ${_build_ufs_opt}"
 
 # Optional DA builds
@@ -146,7 +146,7 @@ if [[ "${_build_gsi}" == "YES" ]]; then
    build_opts["gsi_enkf"]="${_verbose_opt}"
 fi
 if [[ "${_build_gsi}" == "YES" || "${_build_ufsda}" == "YES" ]] ; then
-   build_jobs["gsi_utils"]=2
+   build_jobs["gsi_utils"]=1
    build_opts["gsi_utils"]="${_verbose_opt}"
    if [[ "${MACHINE_ID}" == "hercules" ]]; then
       echo "NOTE: The GSI Monitor is not supported on Hercules.  Disabling build."

@@ -6,9 +6,10 @@ cd "${script_dir}" || exit 1
 
 OPTIND=1
 _opts=""
-while getopts ":dv" option; do
+while getopts ":dj:v" option; do
 	case "${option}" in
 		d) _opts+="-d ";;
+		j) export BUILD_JOBS="${OPTARG}" ;;
 		v) _opts+="-v ";;
 		:)
 			echo "[${BASH_SOURCE[0]}]: ${option} requires an argument"
@@ -27,4 +28,4 @@ fi
 
 cd ufs_model.fd/FV3/upp/tests
 # shellcheck disable=SC2086
-./compile_upp.sh ${_opts}
+BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd
diff --git a/versions/build.hera.ver b/versions/build.hera.ver
@@ -1,3 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
+export spack_env=gsi-addon-dev
 source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver
@@ -1,3 +1,6 @@
 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
 source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.jet.ver b/versions/build.jet.ver
@@ -1,3 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
+export spack_env=gsi-addon-dev
 source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
@@ -1,3 +1,5 @@
-export stack_intel_ver=2021.5.0
+export stack_intel_ver=2022.0.2
 export stack_impi_ver=2021.5.1
+export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
@@ -1,3 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.0
+export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/build.spack.ver"
+export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
+0 −1		.gitmodules
+1 −2		build.sh
+1 −1		modulefiles/GDAS/hera.lua
+0 −0		modulefiles/GDAS/hercules.lua
+0 −0		modulefiles/GDAS/orion.lua
+0 −12		parm/ioda/bufr2ioda/bufr2ioda_snocvr_bufr.json
+1 −1		parm/land/prep/prep_ims.yaml
+31 −40		parm/soca/berror/saber_blocks.yaml
+0 −22		parm/soca/obs/config/insitu_profile_bathy.yaml
+0 −22		parm/soca/obs/config/insitu_profile_tesac.yaml
+0 −18		parm/soca/obs/config/insitu_surface_trkob.yaml
+0 −46		parm/soca/obs/config/sst_abi_g17_l3c.yaml
+0 −46		parm/soca/obs/config/sst_ahi_h08_l3c.yaml
+0 −46		parm/soca/obs/config/sst_avhrr_ma_l3u.yaml
+0 −46		parm/soca/obs/config/sst_avhrr_mb_l3u.yaml
+0 −46		parm/soca/obs/config/sst_avhrr_mc_l3u.yaml
+3 −3		parm/soca/obs/config/sst_metopb_l3u.yaml
+0 −46		parm/soca/obs/config/sst_viirs_n20_l3u.yaml
+0 −46		parm/soca/obs/config/sst_viirs_npp_l3u.yaml
+1 −16		parm/soca/obs/obs_list.yaml
+15 −143		parm/soca/obsprep/obsprep_config.yaml
+33 −1		scripts/exgdas_global_marine_analysis_bmat.sh
+18 −0		scripts/exgdas_global_marine_analysis_prep.py
+30 −65		scripts/exglobal_prep_ocean_obs.py
+1 −1		sorc/fv3-jedi
+1 −1		sorc/ioda
+1 −1		sorc/iodaconv
+1 −1		sorc/land-imsproc
+1 −1		sorc/land-jediincr
+1 −1		sorc/oops
+1 −1		sorc/saber
+1 −1		sorc/soca
+1 −1		sorc/ufo
+41 −0		test/soca/gw/prepdata.sh
+16 −51		test/soca/gw/setup_obsprep.sh
+0 −0		test/soca/testdata/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −0		test/soca/testdata/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −0		test/soca/testdata/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −100		test/soca/testdata/gdas.20180414/00/ocean/adt/rads_adt_3a_2018104.cdl
+0 −100		test/soca/testdata/gdas.20180414/00/ocean/adt/rads_adt_c2_2018104.cdl
+0 −100		test/soca/testdata/gdas.20180414/00/ocean/adt/rads_adt_j2_2018104.cdl
+0 −98		test/soca/testdata/gdas.20180414/00/ocean/adt/rads_adt_j3_2018104.cdl
+0 −100		test/soca/testdata/gdas.20180414/00/ocean/adt/rads_adt_sa_2018104.cdl
+0 −8,961		...gdas.20180414/12/ocean/sst/20180414092000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,965		...gdas.20180414/18/ocean/sst/20180414150000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −9,005		...gdas.20180414/18/ocean/sst/20180414151000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,950		...gdas.20180414/18/ocean/sst/20180414152000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −100		test/soca/testdata/gdas.20180415/00/ocean/adt/rads_adt_3a_2018105.cdl
+0 −101		test/soca/testdata/gdas.20180415/00/ocean/adt/rads_adt_c2_2018105.cdl
+0 −100		test/soca/testdata/gdas.20180415/00/ocean/adt/rads_adt_j2_2018105.cdl
+0 −100		test/soca/testdata/gdas.20180415/00/ocean/adt/rads_adt_j3_2018105.cdl
+0 −100		test/soca/testdata/gdas.20180415/00/ocean/adt/rads_adt_sa_2018105.cdl
+0 −9,011		...gdas.20180415/00/ocean/sst/20180414210000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,959		...gdas.20180415/00/ocean/sst/20180414211000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,947		...gdas.20180415/00/ocean/sst/20180414212000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −9,003		...gdas.20180415/06/ocean/sst/20180415030000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,948		...gdas.20180415/06/ocean/sst/20180415031000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,934		...gdas.20180415/06/ocean/sst/20180415032000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,958		...gdas.20180415/12/ocean/sst/20180415090000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,951		...gdas.20180415/12/ocean/sst/20180415091000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,945		...gdas.20180415/12/ocean/sst/20180415092000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,949		...gdas.20180415/18/ocean/sst/20180415150000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,941		...gdas.20180415/18/ocean/sst/20180415151000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −8,948		...gdas.20180415/18/ocean/sst/20180415152000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
+0 −0		test/soca/testdata/icec_amsr2_north_1.cdl
+0 −0		test/soca/testdata/icec_amsr2_north_2.cdl
+0 −0		test/soca/testdata/icec_amsr2_south_1.cdl
+0 −0		test/soca/testdata/icec_amsr2_south_2.cdl
+0 −0		test/soca/testdata/rads_adt_3a_2018105.cdl
+0 −0		test/soca/testdata/rads_adt_3b_2018105.cdl
+8 −60		ush/detect_machine.sh
+0 −64		ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py
+0 −215		ush/ioda/bufr2ioda/bufr2ioda_snocvr_bufr.py
+66 −0		ush/soca/obs_list_test.yaml
+68 −27		ush/soca/prep_marine_obs.py
+1 −1		ush/soca/run_jjobs.py
+3 −4		utils/obsproc/Ghrsst2Ioda.h
+2 −2		modulefiles/gfsutils_common.lua
+1 −1		modulefiles/gfsutils_hera.intel.lua
+1 −2		modulefiles/gfsutils_hercules.intel.lua
+1 −1		modulefiles/gfsutils_jet.intel.lua
+1 −1		modulefiles/gfsutils_orion.intel.lua
+1 −1		modulefiles/gfsutils_s4.intel.lua
+1 −1		README.md
+0 −18		modulefiles/cheyenne.gnu.lua
+0 −17		modulefiles/cheyenne.intel.lua
+1 −1		modulefiles/common-run.lua
+1 −1		modulefiles/common.lua
+2 −2		modulefiles/hera.gnu-run.lua
+1 −1		modulefiles/hera.gnu.lua
+2 −2		modulefiles/hera.intel-run.lua
+1 −1		modulefiles/hera.intel.lua
+2 −2		modulefiles/jet.intel-run.lua
+2 −2		modulefiles/jet.intel.lua
+2 −2		modulefiles/orion.intel-run.lua
+1 −1		modulefiles/orion.intel.lua
+2 −2		modulefiles/s4.intel-run.lua
+1 −1		modulefiles/s4.intel.lua
+0 −0		modulefiles/wcoss2.intel-run.lua
+0 −0		modulefiles/wcoss2.intel.lua
+1 −1		parm/Mon_config
+1 −1		ush/build.sh
+60 −13		ush/detect_machine.sh
+0 −7		ush/module-setup.sh
+14 −0		.github/workflows/gcc.yml
+14 −0		.github/workflows/intel.yml
+2 −2		ci/spack.yaml
+3 −3		modulefiles/gsiutils_common.lua
+3 −3		modulefiles/gsiutils_hera.gnu.lua
+3 −3		modulefiles/gsiutils_hera.intel.lua
+3 −3		modulefiles/gsiutils_hercules.intel.lua
+3 −3		modulefiles/gsiutils_jet.intel.lua
+3 −3		modulefiles/gsiutils_orion.intel.lua
+3 −3		modulefiles/gsiutils_s4.intel.lua
+1 −1		modulefiles/gsiutils_wcoss2.intel.lua
+0 −1		src/CMakeLists.txt
+0 −7		src/README
+0 −209		src/Radiance_Utilities/diag2grads/Makefile
+0 −88		src/Radiance_Utilities/diag2grads/Makefile.conf.AIX
+0 −68		src/Radiance_Utilities/diag2grads/Makefile.conf.wcoss
+0 −68		src/Radiance_Utilities/diag2grads/Makefile.conf.zeus
+0 −91		src/Radiance_Utilities/diag2grads/configure
+0 −468		src/Radiance_Utilities/diag2grads/diag2grads.f90
+0 −385		src/Radiance_Utilities/diag2grads/diag2grads.sh
+0 −29		src/Radiance_Utilities/diag2grads/grads_hdr.f90
+0 −1		src/Radiance_Utilities/diag2grads/kinds.F90
+0 −1		src/Radiance_Utilities/diag2grads/read_diag.f90
+0 −260		src/Radiance_Utilities/diag2grads/utilities_time.f90
+0 −80		src/Radiance_Utilities/diag2grads/write_station.f90
+0 −94		src/global_angupdate/Convert_Satang.f90
+0 −296		src/global_angupdate/JGDAS_ANGUPDATE
+0 −309		src/global_angupdate/Makefile
+0 −111		src/global_angupdate/Makefile.conf.AIX
+0 −73		src/global_angupdate/Makefile.conf.Linux
+0 −152		src/global_angupdate/Makefile.conf.theia
+0 −76		src/global_angupdate/Makefile.conf.wcoss
+0 −73		src/global_angupdate/Makefile.conf.zeus
+0 −4		src/global_angupdate/Makefile.dependency
+0 −91		src/global_angupdate/configure
+0 −89		src/global_angupdate/determine_time_levels.f90
+0 −374		src/global_angupdate/exglobal_angupdate.sh.ecf
+0 −1		src/global_angupdate/kinds.F90
+0 −696		src/global_angupdate/main.F90
+0 −1		src/global_angupdate/read_diag.f90
+1 −1		ush/build.sh
+60 −15		ush/detect_machine.sh
+3 −3		ci/spack.yaml
+0 −85		modulefiles/build.cheyenne.intel.lua
+4 −4		modulefiles/build.hera.gnu.lua
+4 −4		modulefiles/build.hera.intel.lua
+4 −4		modulefiles/build.hercules.intel.lua
+4 −4		modulefiles/build.jet.intel.lua
+1 −1		modulefiles/build.noaacloud.intel.lua
+4 −4		modulefiles/build.orion.intel.lua
+4 −4		modulefiles/build.s4.intel.lua
+2 −2		reg_tests/chgres_cube/driver.hera.sh
+1 −1		reg_tests/chgres_cube/driver.jet.sh
+1 −1		reg_tests/chgres_cube/driver.orion.sh
+0 −8		sorc/machine-setup.sh
+1 −3		README.md
+0 −59		ecf/scripts/verif_global/jverif_global_grid2grid_step1.ecf
+0 −59		ecf/scripts/verif_global/jverif_global_grid2grid_step2.ecf
+0 −59		ecf/scripts/verif_global/jverif_global_grid2obs_step1.ecf
+0 −59		ecf/scripts/verif_global/jverif_global_grid2obs_step2.ecf
+0 −59		ecf/scripts/verif_global/jverif_global_precip_step1.ecf
+0 −59		ecf/scripts/verif_global/jverif_global_precip_step2.ecf
+0 −128		jobs/JVERIF_GLOBAL_GRID2GRID_STEP1
+0 −128		jobs/JVERIF_GLOBAL_GRID2GRID_STEP2
+0 −128		jobs/JVERIF_GLOBAL_GRID2OBS_STEP1
+0 −128		jobs/JVERIF_GLOBAL_GRID2OBS_STEP2
+0 −128		jobs/JVERIF_GLOBAL_PRECIP_STEP1
+0 −128		jobs/JVERIF_GLOBAL_PRECIP_STEP2
+59 −0		modulefiles/emc_verif_global_jet.lua
+35 −29		parm/config/config.vrfy
+3 −7		scripts/exgrid2grid_step1.sh
+3 −7		scripts/exgrid2grid_step2.sh
+3 −7		scripts/exgrid2obs_step1.sh
+3 −7		scripts/exgrid2obs_step2.sh
+3 −7		scripts/exmaps2d.sh
+3 −7		scripts/exmapsda.sh
+3 −7		scripts/exprecip_step1.sh
+3 −7		scripts/exprecip_step2.sh
+3 −7		scripts/exsatellite_step1.sh
+3 −7		scripts/exsatellite_step2.sh
+7 −14		scripts/extropcyc.sh
+7 −23		ush/build_webpage.py
+53 −4		ush/check_config.py
+14 −4		ush/create_METplus_job_scripts.py
+239 −88		ush/get_data_files.py
+8 −20		ush/get_machine.py
+126 −0		ush/get_tc_info.py
+15 −98		ush/load_modules.sh
+6 −14		ush/load_to_METviewer_AWS.py
+7 −7		ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
+7 −7		ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
+7 −7		ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
+6 −16		ush/plotting_scripts/plot_scorecard.py
+17 −42		ush/run_batch.py
+23 −219		ush/run_verif_global_in_global_workflow.sh
+39 −69		ush/set_up_verif_global.sh
+4 −3		versions/run.ver