From f30d43b058027a7e325024866ca0ded2820b0c75 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 16 Jan 2024 11:24:03 +0000
Subject: [PATCH 1/3] correct ocnanalbmat and ocnanalrun configuration errors;
 extend UFS-DA build to hercules (#2222)

---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT | 2 +-
 parm/config/gfs/config.resources      | 2 +-
 sorc/build_all.sh                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
index 4a8242abfb..20b669ab4c 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
@@ -3,7 +3,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 export WIPE_DATA="NO"
 
 export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalbmat" -c "base ocnanal ocnanalbmat"
 
 
 ##############################################
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index 98ddb47a7d..dda10c3305 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -414,7 +414,7 @@ elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export wtime_ocnanalrun="00:15:00"
     export npe_ocnanalrun=${npes}
-    export nth_ocnanalrun=2
+    export nth_ocnanalrun=1
     export is_exclusive=True
     npe_node_ocnanalrun=$(echo "${npe_node_max} / ${nth_ocnanalrun}" | bc)
     export npe_node_ocnanalrun
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index 23cf420f1d..c337374428 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -129,7 +129,7 @@ build_opts["ww3prepost"]="${_verbose_opt} ${_build_ufs_opt}"
 
 # Optional DA builds
 if [[ "${_build_ufsda}" == "YES" ]]; then
-   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" ]]; then
+   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera.intel" && "${MACHINE_ID}" != "hercules" ]]; then
       echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}.  Disabling build."
    else
       build_jobs["gdas"]=8

From 4bb20f85178f38630b8b748f8242e80e57fb6cbe Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 16 Jan 2024 15:55:36 +0000
Subject: [PATCH 2/3] update GDASApp (gdas.cd) hash (#2222)

---
 sorc/gdas.cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index f44a6d500d..639ef1673b 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit f44a6d500dda2aba491e4fa12c0bee428ddb7b80
+Subproject commit 639ef1673b8aca1b2631153cfdc89c134c08ea88

From bc17d0fa26a75cb1dd1c22bab1ed7d3001d1eef8 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 16 Jan 2024 16:52:23 +0000
Subject: [PATCH 3/3] Replace DRIPCG with DRPCG as minimizer for varitional
 UFS-DA (#2222)

---
 parm/config/gfs/config.atmanl | 2 +-
 sorc/gdas.cd                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parm/config/gfs/config.atmanl b/parm/config/gfs/config.atmanl
index abfbd80734..3e6b351cb2 100644
--- a/parm/config/gfs/config.atmanl
+++ b/parm/config/gfs/config.atmanl
@@ -8,7 +8,7 @@ echo "BEGIN: config.atmanl"
 export CASE_ANL=${CASE}
 export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/
 export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/gdas_prototype_3d.yaml
-export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_dripcg.yaml
+export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_drpcg.yaml
 export STATICB_TYPE="gsibec"
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
 export INTERP_METHOD='barycentric'
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index 639ef1673b..5056169ed7 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit 639ef1673b8aca1b2631153cfdc89c134c08ea88
+Subproject commit 5056169ed700fdd3e92e316866ad608fe93a6ab2