From 9ffce97f107199e59d114bd20b41ea3ad9ab0d42 Mon Sep 17 00:00:00 2001
From: Juliette Rocha <julietterocha19@gmail.com>
Date: Wed, 12 Jun 2024 16:13:33 -0400
Subject: [PATCH 1/2] Addition of "Convert to Structured Grid" to gdas (#1167)

Added ConverttoStructuredGrid to gdas.cc

---------

Co-authored-by: Juliette Rocha <jrocha@hercules-login-3.hpc.msstate.edu>
---
 mains/gdas.cc | 5 +++++
 1 file changed, 5 insertions(+)
 mode change 100644 => 100755 mains/gdas.cc

diff --git a/mains/gdas.cc b/mains/gdas.cc
old mode 100644
new mode 100755
index 7fdbee0b1..4a894b365
--- 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",

From f5bbec0077bb5c8cbfdb0d03caa35e2aa016d243 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Thu, 13 Jun 2024 14:01:33 -0400
Subject: [PATCH 2/2] Fix to the halo issue in the variance partitioning code
 (#1171)

- fixes #1170
---
 utils/soca/gdas_soca_diagb.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/soca/gdas_soca_diagb.h b/utils/soca/gdas_soca_diagb.h
index c1e46c250..62cff84f7 100644
--- 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