From 5056169ed700fdd3e92e316866ad608fe93a6ab2 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Tue, 16 Jan 2024 11:38:11 -0500
Subject: [PATCH] Get rid of DRIPCG (#850)

A little (tall?) birdie has informed us that we apparently should not be
using DRIPCG, and seems we are using DRIPCG in our tests. This PR
removes that. Note that the global-workflow will likely need modified in
`config.atmanl` to use the different YAML name.
---
 parm/aero/variational/3dvar_fgat_gfs_aero.yaml               | 2 +-
 parm/aero/variational/3dvar_gfs_aero.yaml                    | 2 +-
 parm/atm/variational/{3dvar_dripcg.yaml => 3dvar_drpcg.yaml} | 2 +-
 test/atm/global-workflow/config.atmanl                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename parm/atm/variational/{3dvar_dripcg.yaml => 3dvar_drpcg.yaml} (99%)

diff --git a/parm/aero/variational/3dvar_fgat_gfs_aero.yaml b/parm/aero/variational/3dvar_fgat_gfs_aero.yaml
index 5887ca55a..2252493d8 100644
--- a/parm/aero/variational/3dvar_fgat_gfs_aero.yaml
+++ b/parm/aero/variational/3dvar_fgat_gfs_aero.yaml
@@ -49,7 +49,7 @@ cost function:
   observations: !INC ${OBS_LIST}
 variational:
   minimizer:
-    algorithm: DRIPCG
+    algorithm: DRPCG
   iterations:
   - ninner: 35
     gradient norm reduction: 1e-10
diff --git a/parm/aero/variational/3dvar_gfs_aero.yaml b/parm/aero/variational/3dvar_gfs_aero.yaml
index 719afad52..75371080f 100644
--- a/parm/aero/variational/3dvar_gfs_aero.yaml
+++ b/parm/aero/variational/3dvar_gfs_aero.yaml
@@ -40,7 +40,7 @@ cost function:
   observations: !INC ${OBS_LIST}
 variational:
   minimizer:
-    algorithm: DRIPCG
+    algorithm: DRPCG
   iterations:
   - ninner: 35
     gradient norm reduction: 1e-10
diff --git a/parm/atm/variational/3dvar_dripcg.yaml b/parm/atm/variational/3dvar_drpcg.yaml
similarity index 99%
rename from parm/atm/variational/3dvar_dripcg.yaml
rename to parm/atm/variational/3dvar_drpcg.yaml
index ed6a15b5a..9464c7489 100644
--- a/parm/atm/variational/3dvar_dripcg.yaml
+++ b/parm/atm/variational/3dvar_drpcg.yaml
@@ -33,7 +33,7 @@ cost function:
   observations: !INC ${OBS_LIST}
 variational:
   minimizer:
-    algorithm: DRIPCG
+    algorithm: DRPCG
   iterations:
   - ninner: 2
     gradient norm reduction: 1e-10
diff --git a/test/atm/global-workflow/config.atmanl b/test/atm/global-workflow/config.atmanl
index 147a042ae..a2660e055 100755
--- a/test/atm/global-workflow/config.atmanl
+++ b/test/atm/global-workflow/config.atmanl
@@ -8,7 +8,7 @@ echo "BEGIN: config.atmanl"
 export CASE_ANL="@ATMRES_ANL@"
 export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/
 export OBS_LIST=@OBS_LIST@
-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="identity"
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
 export INTERP_METHOD='barycentric'