From 5e147532725d57bfbbdda859ae9b111ec7828a96 Mon Sep 17 00:00:00 2001
From: DavidNew-NOAA <david.new@noaa.gov>
Date: Mon, 30 Dec 2024 16:15:45 +0000
Subject: [PATCH] Debug OOPS apps

---
 utils/fv3jedi/fv3jedi_ecen.h   |  2 +-
 utils/fv3jedi/fv3jedi_fv3inc.h | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/utils/fv3jedi/fv3jedi_ecen.h b/utils/fv3jedi/fv3jedi_ecen.h
index d5618c47a..daad3e0fd 100644
--- a/utils/fv3jedi/fv3jedi_ecen.h
+++ b/utils/fv3jedi/fv3jedi_ecen.h
@@ -27,7 +27,7 @@ namespace gdasapp {
       : Application(comm) {}
     static const std::string classname() {return "gdasapp::ecen";}
 
-    int execute(const eckit::Configuration & fullConfig, bool validate) const {
+    int execute(const eckit::Configuration & fullConfig) const {
       // Get analysis parameters
       std::vector<std::string> fcstHours;
       std::string windowBeginStr;
diff --git a/utils/fv3jedi/fv3jedi_fv3inc.h b/utils/fv3jedi/fv3jedi_fv3inc.h
index 2e2daef74..e3090c919 100644
--- a/utils/fv3jedi/fv3jedi_fv3inc.h
+++ b/utils/fv3jedi/fv3jedi_fv3inc.h
@@ -91,13 +91,13 @@ namespace gdasapp {
       // ---------------------------------------------------------------------------------
 
       // Setup geometries
-      const fv3jedi::Geometry stateGeom(stateGeomConfig, this->getComm());
-      const fv3jedi::Geometry jediIncrGeom(jediIncrGeomConfig, this->getComm());
-      const fv3jedi::Geometry fv3IncrGeom(fv3IncrGeomConfig, this->getComm());
+      const oops::Geometry<fv3jedi::Traits> stateGeom(stateGeomConfig, this->getComm());
+      const oops::Geometry<fv3jedi::Traits> jediIncrGeom(jediIncrGeomConfig, this->getComm());
+      const oops::Geometry<fv3jedi::Traits> fv3IncrGeom(fv3IncrGeomConfig, this->getComm());
       
       // Setup variable change
-      std::unique_ptr<fv3jedi::VariableChange> vc;
-      vc.reset(new fv3jedi::VariableChange(varChangeConfig, stateGeom));
+      std::unique_ptr<oops::VariableChange<fv3jedi::Traits>> vc;
+      vc.reset(new oops::VariableChange<fv3jedi::Traits>(varChangeConfig, stateGeom));
 
       // Loop through ensemble member
       // ---------------------------------------------------------------------------------
@@ -113,10 +113,10 @@ namespace gdasapp {
         const eckit::LocalConfiguration anlOuputConfig(membersConfig[imem], "analysis to structured grid");        
 
         // Read background state
-        fv3jedi::State xxBkg(stateGeom, stateInputConfig);
+        oops::State<fv3jedi::Traits> xxBkg(stateGeom, stateInputConfig);
 
         // Read JEDI increment
-        fv3jedi::Increment dxJEDI(jediIncrGeom, jediIncrVars, xxBkg.validTime());
+        oops::Increment<fv3jedi::Traits> dxJEDI(jediIncrGeom, jediIncrVars, xxBkg.validTime());
         dxJEDI.read(jediIncrInputConfig);
 
         // Testing output for inputs
@@ -134,7 +134,7 @@ namespace gdasapp {
         // ---------------------------------------------------------------------------------
 
         // Add JEDI increment to background to get analysis
-        fv3jedi::State xxAnl(stateGeom, xxBkg);
+        oops::State<fv3jedi::Traits> xxAnl(stateGeom, xxBkg);
         xxAnl += dxJEDI;
 
         // Perform variables change on background and analysis
@@ -142,7 +142,7 @@ namespace gdasapp {
         vc->changeVar(xxAnl, varChangeIncrVars);
 
         // Get FV3 increment by subtracting background and analysis after variable change
-        fv3jedi::Increment dxFV3(fv3IncrGeom, fv3IncrVars, xxBkg.validTime());
+        oops::Increment<fv3jedi::Traits> dxFV3(fv3IncrGeom, fv3IncrVars, xxBkg.validTime());
         dxFV3.diff(xxAnl, xxBkg);
 
         // Put JEDI increment fields not created by variable change into FV3 increment
@@ -182,9 +182,9 @@ namespace gdasapp {
         dxFV3.write(fv3IncrOuputConfig);
 
         // Write analysis
-        //        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, xxAnl.geometry());
-        const oops::Geometry<fv3jedi::Traits> foo(stateGeomConfig, this->getComm());
-        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, foo);
+        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, xxAnl.geometry());
+        //        const oops::Geometry<fv3jedi::Traits> foo(stateGeomConfig, this->getComm());
+        //        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, foo);
         analysis.interpolateAndWrite(xxAnl);
       }