From ba6a4fdf6e245b57530f2b20e6f0ccf567115720 Mon Sep 17 00:00:00 2001
From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:09:48 +0000
Subject: [PATCH] Add Hercules support for the GSI monitor (#2373)

# Description
This updates the GSI monitor hash and updates the modulefiles to add
support for the monitor on Hercules.
---
 modulefiles/module_base.hercules.lua |  1 -
 parm/config/gfs/config.base          | 13 +++----------
 sorc/gsi_monitor.fd                  |  2 +-
 versions/run.hercules.ver            |  2 --
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
index 5534437392..77a77f5505 100644
--- a/modulefiles/module_base.hercules.lua
+++ b/modulefiles/module_base.hercules.lua
@@ -9,7 +9,6 @@ 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")))
 
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
 load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
index 205153313e..186e4ea504 100644
--- a/parm/config/gfs/config.base
+++ b/parm/config/gfs/config.base
@@ -57,16 +57,9 @@ export DO_NPOESS="NO"      # NPOESS products
 export DO_TRACKER="YES"    # Hurricane track verification
 export DO_GENESIS="YES"    # Cyclone genesis verification
 export DO_GENESIS_FSU="NO" # Cyclone genesis verification (FSU)
-# The monitor is not yet supported on Hercules
-if [[ "${machine}" == "HERCULES" ]]; then
-   export DO_VERFOZN="NO"     # Ozone data assimilation monitoring
-   export DO_VERFRAD="NO"     # Radiance data assimilation monitoring
-   export DO_VMINMON="NO"     # GSI minimization monitoring
-else
-   export DO_VERFOZN="YES"    # Ozone data assimilation monitoring
-   export DO_VERFRAD="YES"    # Radiance data assimilation monitoring
-   export DO_VMINMON="YES"    # GSI minimization monitoring
-fi
+export DO_VERFOZN="YES"    # Ozone data assimilation monitoring
+export DO_VERFRAD="YES"    # Radiance data assimilation monitoring
+export DO_VMINMON="YES"    # GSI minimization monitoring
 export DO_MOS="NO"         # GFS Model Output Statistics - Only supported on WCOSS2
 
 # NO for retrospective parallel; YES for real-time parallel
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
index 4e0f72b8f6..149cd811f2 160000
--- a/sorc/gsi_monitor.fd
+++ b/sorc/gsi_monitor.fd
@@ -1 +1 @@
-Subproject commit 4e0f72b8f6117d278c1414de8cb265cb2f41145d
+Subproject commit 149cd811f273883e7d6400eded7b980acd65ca2b
diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver
index 549bb47df0..ee8e4f8aea 100644
--- a/versions/run.hercules.ver
+++ b/versions/run.hercules.ver
@@ -3,7 +3,5 @@ export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
 
-export perl_ver=5.36.0
-
 source "${HOMEgfs:-}/versions/run.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"