wip: add CGVector to halo exchange

Author: TomMelt

core/src/include/Halo.hpp

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "Slice.hpp"
+#include "cgVector.hpp"
 #include "dgVector.hpp"
 #include "include/ModelArray.hpp"
 #include "include/ModelArraySlice.hpp"
@@ -53,6 +54,19 @@ class Halo {
         intializeHaloMetadata();
     }
 
+    /*!
+     * @brief Constructs a halo object from CGVector
+     */
+    template <int N> Halo(CGVector<N>& cgv)
+    {
+        m_numComps = 1;
+        isCG = true;
+        CGdegree = N;
+        isVertex = false;
+        setSpatialDims();
+        intializeHaloMetadata();
+    }
+
     /**
      * @brief Sets the spatial dimensions of the domain
      *
@@ -68,6 +82,11 @@ class Halo {
         m_innerNx = metadata.getLocalExtentX();
         m_innerNy = metadata.getLocalExtentY();
 
+        // extend dimensions for CGVectors
+        if (isCG) {
+            m_innerNy = m_innerNy * CGdegree + 1;
+            m_innerNx = m_innerNx * CGdegree + 1;
+        }
         // extend dimensions by 1 for vertex fields
         if (isVertex) {
             m_innerNx += 1;
@@ -183,7 +202,9 @@ class Halo {
 
     MPI_Win m_win; // RMA memory window object (used for sharing send buffers between ranks)
 
-    bool isVertex; // some ModelArrays can be of type VERTEX
+    bool isVertex = false; // some ModelArrays can be of type VERTEX
+    bool isCG = false; // is layout CGVector
+    int CGdegree = 0;
 
     std::vector<std::vector<double>>
         send; // buffer to store halo region that will be read by other ranks

core/test/HaloExchangeCB_test.cpp

@@ -14,15 +14,18 @@
 
 #include "ModelMPI.hpp"
 #include "ModelMetadata.hpp"
+#include "cgVector.hpp"
 #include "include/DGModelArray.hpp"
 #include "include/Halo.hpp"
+#include "include/Interpolations.hpp"
 
 namespace Nextsim {
 
 const std::string testFilesDir = TEST_FILES_DIR;
 const std::string file = testFilesDir + "/partition_metadata_3_cb.nc";
 
 static const int DG = 3;
+static const int CGDEGREE = 2;
 static const bool debug = false;
 
 // reference data for each process
@@ -239,7 +242,7 @@ MPI_TEST_CASE("DGField", 3)
     }
 }
 
-MPI_TEST_CASE("DGVector", 3)
+MPI_TEST_CASE("DGVector and CGVector", 3)
 {
     auto& modelMPI = ModelMPI::getInstance();
     auto& metadata = ModelMetadata::getInstance();
@@ -258,13 +261,13 @@ MPI_TEST_CASE("DGVector", 3)
     ParametricMesh smesh(CARTESIAN);
     smesh.nx = localNx;
     smesh.ny = localNy;
-    smesh.nnodes = localNx * localNy;
     smesh.nelements = localNx * localNy;
-    smesh.vertices.resize(smesh.nelements, Eigen::NoChange);
-    for (size_t i = 0; i < localNx; ++i) {
-        for (size_t j = 0; j < localNy; ++j) {
-            smesh.vertices(i * localNy + j, 0) = i;
-            smesh.vertices(i * localNy + j, 1) = j;
+    smesh.nnodes = (localNx + 1) * (localNy + 1);
+    smesh.vertices.resize(smesh.nnodes, Eigen::NoChange);
+    for (size_t i = 0; i < localNx + 1; ++i) {
+        for (size_t j = 0; j < localNy + 1; ++j) {
+            smesh.vertices(i * (localNy + 1) + j, 0) = i;
+            smesh.vertices(i * (localNy + 1) + j, 1) = j;
         }
     }
 
@@ -304,5 +307,14 @@ MPI_TEST_CASE("DGVector", 3)
             }
         }
     }
+
+    // initialize CGVector (after halo exchange on DGVector)
+    CGVector<CGDEGREE> cgVector;
+    cgVector.resize_by_mesh(smesh);
+    Interpolations::DG2CG(smesh, cgVector, testData);
+
+    // create halo for testData model array
+    Halo haloCG(testData);
+    // haloCG.exchangeHalos(cgVector);
 }
 }