From 1008b40a9632bfdf73975dc0ee9483cb71bd4fbe Mon Sep 17 00:00:00 2001
From: csmemoe <csmemoe@aquaveo.com>
Date: Tue, 8 Mar 2022 13:22:51 -0700
Subject: [PATCH] Fix related to bug #0013573: Interpolation tests are broken
 with changes to xmsextractor: Update the centroid Z values based on the
 surrounding polygon points before adding the centroid to the cell points.
 Also fix issues with compiling this library with XMS.

---
 xmsextractor/ugrid/XmUGridTriangles2d.cpp     | 50 +++++++++++++++++--
 .../ugrid/XmUGridTriangulatorBase.cpp         |  7 +++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/xmsextractor/ugrid/XmUGridTriangles2d.cpp b/xmsextractor/ugrid/XmUGridTriangles2d.cpp
index 39059e1..54fa926 100644
--- a/xmsextractor/ugrid/XmUGridTriangles2d.cpp
+++ b/xmsextractor/ugrid/XmUGridTriangles2d.cpp
@@ -286,6 +286,49 @@ using namespace xms;
 
 #include <xmscore/testing/TestTools.h>
 
+#include <xmsgrid/geometry/geoms.h>
+
+namespace
+{
+//------------------------------------------------------------------------------
+/// \brief Assert two points are equal.
+/// \brief Template function returning true or false to help debug tests.
+/// \param a_file: file.
+/// \param a_line: line.
+/// \param a_pts1: First vector of points.
+/// \param a_pts2: Second vector of points.
+/// \param a_delta: Tolerance.
+//------------------------------------------------------------------------------
+template <class Pt1, class Pt2>
+void iAssertDeltaVecPt3d(const char* a_file,
+                         int a_line,
+                         const Pt1& a_pts1,
+                         const Pt2& a_pts2,
+                         double a_delta)
+{
+  if (a_pts1.size() != a_pts2.size())
+  {
+    std::stringstream msg;
+    msg << "Incorrect size Expecting size: " << a_pts1.size() << " Found size: " << a_pts2.size();
+    _TS_FAIL(a_file, a_line, msg.str().c_str());
+  }
+  else
+  {
+    for (size_t i = 0; i < a_pts1.size(); ++i)
+    {
+      if (!xms::gmEqualPointsXYZ(a_pts1.at(i).x, a_pts1.at(i).y, a_pts1.at(i).z, a_pts2.at(i).x,
+                                 a_pts2.at(i).y, a_pts2.at(i).z, a_delta))
+      {
+        std::stringstream msg;
+        msg << "Incorrect value at position : " << i << " Expecting: " << a_pts1.at(i)
+            << " Found: " << a_pts2.at(i);
+        _TS_FAIL(a_file, a_line, msg.str().c_str());
+      }
+    }
+  }
+} // iAssertDeltaVecPt3d
+} // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 /// \class XmUGridTriangles2dUnitTests
 /// \brief Class to to test XmUGridTriangles2d
@@ -307,7 +350,8 @@ void XmUGridTriangles2dUnitTests::testBuildCentroidTrianglesOnTriangle()
   VecPt3d triPointsOut = triangles.GetPoints();
   VecPt3d triPointsExpected = {{0, 0, 0},      {1, 0, 0},      {0.5, 1, 0},      {0.5, 0, 0},
                                {0.75, 0.5, 0}, {0.25, 0.5, 0}, {0.5, 1 / 3.0, 0}};
-  TS_ASSERT_DELTA_VECPT3D(triPointsExpected, triPointsOut, delta);
+
+  iAssertDeltaVecPt3d(__FILE__, __LINE__, triPointsExpected, triPointsOut, delta);
 
   VecInt trianglesOut = triangles.GetTriangles();
   VecInt trianglesExpected = {0, 3, 6, 3, 1, 6, 1, 4, 6, 4, 2, 6, 2, 5, 6, 5, 0, 6};
@@ -342,7 +386,7 @@ void XmUGridTriangles2dUnitTests::testBuildCentroidTrianglesOnTriangle()
 
   triPointsOut = triangles.GetPoints();
   triPointsExpected = {{0, 0, 0}, {1, 0, 0}, {0.5, 1, 0}, {0.5, 1 / 3.0, 0}};
-  TS_ASSERT_DELTA_VECPT3D(triPointsExpected, triPointsOut, delta);
+  iAssertDeltaVecPt3d(__FILE__, __LINE__, triPointsExpected, triPointsOut, delta);
 
   trianglesOut = triangles.GetTriangles();
   trianglesExpected = {0, 1, 3, 1, 2, 3, 2, 0, 3};
@@ -472,7 +516,7 @@ void XmUGridTriangles2dUnitTests::testBuildCentroidTriangles2dCellTypes()
   };
   // clang-format on
   double delta = 1.0e-6;
-  TS_ASSERT_DELTA_VECPT3D(triPointsExpected, triPointsOut, delta);
+  iAssertDeltaVecPt3d(__FILE__, __LINE__, triPointsExpected, triPointsOut, delta);
 
   VecInt trianglesOut = triangles.GetTriangles();
   // clang-format off
diff --git a/xmsextractor/ugrid/XmUGridTriangulatorBase.cpp b/xmsextractor/ugrid/XmUGridTriangulatorBase.cpp
index b8bf492..9d21cb9 100644
--- a/xmsextractor/ugrid/XmUGridTriangulatorBase.cpp
+++ b/xmsextractor/ugrid/XmUGridTriangulatorBase.cpp
@@ -322,6 +322,13 @@ bool XmUGridTriangulatorBase::GenerateCentroidTriangles(int a_cellIdx,
     return false;
   }
 
+  // Compute the centroid Z value from the polygon points
+  double z = 0.0;
+  for (auto &&pt : polygon)
+    z += pt.z;
+  z /= polygon.size();
+  centroid.z = z;
+
   // add centroid to list of points
   int centroidIdx = AddCentroidPoint(a_cellIdx, centroid);