NOAA-EMC · WalterKolczynski-NOAA · Mar 28, 2024 · Feb 27, 2024 · Feb 27, 2024 · Feb 28, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -26,3 +26,6 @@
 [submodule "sorc/gsi_monitor.fd"]
   path = sorc/gsi_monitor.fd
   url = https://github.com/NOAA-EMC/GSI-Monitor.git
+[submodule "sorc/upp.fd"]
+  path = sorc/upp.fd
+  url = https://github.com/NOAA-EMC/UPP.git
diff --git a/ci/cases/pr/C48_S2SWA_gefs.yaml b/ci/cases/pr/C48_S2SWA_gefs.yaml
@@ -16,3 +16,6 @@ arguments:
   idate: 2021032312
   edate: 2021032312
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_ci_defaults.yaml
+
+skip_ci_on_hosts:
+  - hera
diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
@@ -19,4 +19,5 @@ arguments:
 
 skip_ci_on_hosts:
   - orion
+  - hera
   - hercules
diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
@@ -42,7 +42,7 @@ 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"))
+prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/dev-gfsv17/modulefiles"))
 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"))

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

diff --git a/modulefiles/module_gwsetup.hera.lua b/modulefiles/module_gwsetup.hera.lua
@@ -4,7 +4,7 @@ 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/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.11.6"

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -383,11 +383,14 @@ export FITSARC="YES"
 export FHMAX_FITS=132
 [[ "${FHMAX_FITS}" -gt "${FHMAX_GFS}" ]] && export FHMAX_FITS=${FHMAX_GFS}
 
-# The monitor jobs are not yet supported for JEDIATMVAR
+# The monitor jobs are not yet supported for JEDIATMVAR.
 if [[ ${DO_JEDIATMVAR} = "YES" ]]; then
    export DO_VERFOZN="NO"     # Ozone data assimilation monitoring
    export DO_VERFRAD="NO"     # Radiance data assimilation monitoring
    export DO_VMINMON="NO"     # GSI minimization monitoring
+# The minimization monitor is not yet supported on RDHPCS Hera for Rocky-8
+elif [[ ${machine} = "HERA" ]]; then
+   export DO_VMINMON="NO"     # GSI minimization monitoring
 fi
 
 echo "END: config.base"
diff --git a/sorc/build_upp.sh b/sorc/build_upp.sh
@@ -26,6 +26,6 @@ if [[ ! -d "../exec" ]]; then
   mkdir -p ../exec
 fi
 
-cd ufs_model.fd/FV3/upp/tests
+cd upp.fd/tests
 # shellcheck disable=SC2086
 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/link_workflow.sh b/sorc/link_workflow.sh
@@ -352,10 +352,11 @@ fi
 #--link source code directories
 #------------------------------
 cd "${HOMEgfs}/sorc" || exit 8
-if [[ -d ufs_model.fd ]]; then
-  [[ -d upp.fd ]] && rm -rf upp.fd
-  ${LINK} ufs_model.fd/FV3/upp upp.fd
-fi
+# TODO: Commenting out until UPP is up-to-date with Rocky-8.
+#if [[ -d ufs_model.fd ]]; then
+#  [[ -d upp.fd ]] && rm -rf upp.fd
+#  ${LINK} ufs_model.fd/FV3/upp upp.fd
+#fi
 
 if [[ -d gsi_enkf.fd ]]; then
   [[ -d gsi.fd ]] && rm -rf gsi.fd

diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/sorc/upp.fd b/sorc/upp.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,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev
+export spack_env=gsi-addon-dev-rocky8
 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/run.hera.ver b/versions/run.hera.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev
+export spack_env=gsi-addon-dev-rocky8
 
 export hpss_ver=hpss
 export ncl_ver=6.6.2