Merge branch 'develop' into feature/devgdasapp

NOAA-EMC · Jun 14, 2024 · e1d9349 · e1d9349
2 parents e4a3e6c + f5bbec0
commit e1d9349
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mains/gdas.cc b/mains/gdas.cc
@@ -14,6 +14,7 @@
 #include "ufo/instantiateObsFilterFactory.h"
 #include "ufo/ObsTraits.h"
 
+#include "oops/runs/ConvertToStructuredGrid.h"
 #include "oops/runs/ConvertState.h"
 #include "oops/runs/HofX4D.h"
 #include "oops/runs/LocalEnsembleDA.h"
@@ -52,6 +53,9 @@ int runApp(int argc, char** argv, const std::string traits, const std::string ap
   // Define a map from app names to lambda functions that create unique_ptr to Applications
   std::map<std::string, std::function<std::unique_ptr<oops::Application>()>> apps;
 
+  apps["converttostructuredgrid"] = []() {
+      return std::make_unique<oops::ConvertToStructuredGrid<Traits>>();
+  };	
   apps["convertstate"] = []() {
       return std::make_unique<oops::ConvertState<Traits>>();
   };
@@ -96,6 +100,7 @@ int main(int argc,  char ** argv) {
   // Check that the application is recognized
   // ----------------------------------------
   const std::set<std::string> validApps = {
+    "converttostructuredgrid",
     "convertstate",
     "hofx4d",
     "localensembleda",

diff --git a/utils/soca/gdas_soca_diagb.h b/utils/soca/gdas_soca_diagb.h
@@ -300,12 +300,12 @@ namespace gdasapp {
       }
 
       // Update the layer thickness halo
-      xbFs["hocn"].haloExchange();
+      nodeColumns.haloExchange(xbFs["hocn"]);
 
       // Loop through variables
       for (auto & var : configD.socaVars.variables()) {
         // Update the halo
-        xbFs[var].haloExchange();
+        nodeColumns.haloExchange(xbFs[var]);
 
         // Skip the layer thickness variable
         if (var == "hocn") {
@@ -361,7 +361,7 @@ namespace gdasapp {
           // Horizontal averaging
           for (int iter = 0; iter < configD.niterHoriz; ++iter) {
             // Update the halo points
-            bkgErrFs[var].haloExchange();
+            nodeColumns.haloExchange(bkgErrFs[var]);
             auto stdDevBkg = atlas::array::make_view<double, 2>(bkgErrFs[var]);
 
             // Loops through nodes and levels