From ad32cd154a396271aedd3a57a58d68cde297eaac Mon Sep 17 00:00:00 2001
From: DavidNew-NOAA <david.new@noaa.gov>
Date: Fri, 8 Nov 2024 13:59:31 +0000
Subject: [PATCH] Add GFS 17 test back

---
 parm/jcb-algorithms       |  2 +-
 parm/jcb-gdas             |  2 +-
 test/gw-ci/CMakeLists.txt | 29 +++++++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/parm/jcb-algorithms b/parm/jcb-algorithms
index 9f7612ced..7b074df5c 160000
--- a/parm/jcb-algorithms
+++ b/parm/jcb-algorithms
@@ -1 +1 @@
-Subproject commit 9f7612ceda5a814a9715dc13ba99d6dec9ef40d2
+Subproject commit 7b074df5ce059a5ce6c8d9bc11441e0646908610
diff --git a/parm/jcb-gdas b/parm/jcb-gdas
index 25c5b7f66..6d3a5bd28 160000
--- a/parm/jcb-gdas
+++ b/parm/jcb-gdas
@@ -1 +1 @@
-Subproject commit 25c5b7f663e909378d0b9d5a36830d9a257a03f0
+Subproject commit 6d3a5bd28b7faed42d067e77dfbcabd92bb57bbf
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
index 9ae197fda..8171d6ec5 100644
--- a/test/gw-ci/CMakeLists.txt
+++ b/test/gw-ci/CMakeLists.txt
@@ -180,7 +180,7 @@ if (WORKFLOW_TESTS)
     "gdas_sfcanl"
     "gdas_fcst"
     )
-    add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${HALF_CYCLE_TASKS}" "${FULL_CYCLE_TASKS}")
+  add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${HALF_CYCLE_TASKS}" "${FULL_CYCLE_TASKS}")
 
   # WCDA, low-res, ensemble da
   # -------------
@@ -203,5 +203,30 @@ if (WORKFLOW_TESTS)
     # "gdas_marineanlfinal"
     )
   add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${HALF_CYCLE_TASKS}" "${FULL_CYCLE_TASKS}")
-  set(letkf FALSE)    
+  set(letkf FALSE)
+
+  # GFSv17, 3DVAR prototype
+  # -----------------------
+  option(TEST_GFS17 "Enable the GFSv17 prototype CI tests" OFF)
+  if(TEST_GFS17)
+    set(pslot "GFSv17-3DVAR-C384mx025")
+    set(YAML_PATH ${HOMEgfs}/ci/cases/gfsv17/${pslot}.yaml)
+    set(HALF_CYCLE_TASKS
+      "gdas_stage_ic"
+      "gdas_fcst")
+    set(FULL_CYCLE_TASKS
+      "gdas_prepoceanobs"
+      "gdas_marinebmat"
+      "gdas_marineanlinit"
+      "gdas_marineanlvar"
+      "gdas_marineanlchkpt"
+      "gdas_marineanlfinal"
+      "gdas_ocnanalvrfy"
+      "gdas_prep"
+      "gdas_anal"
+      "gdas_sfcanl"
+      "gdas_fcst"
+      )
+    add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${HALF_CYCLE_TASKS}" "${FULL_CYCLE_TASKS}")  
+  endif()
 endif()