Jk/fix mapping

CMakeLists.txt

@@ -169,6 +169,7 @@ meshfields_add_exe(ElementJacobian2d test/testElementJacobian2d.cpp)
 meshfields_add_exe(CountIntegrator test/testCountIntegrator.cpp)
 meshfields_add_exe(OmegahElementTests test/testOmegahElement.cpp)
 meshfields_add_exe(ExceptionTest test/testExceptions.cpp)
+meshfields_add_exe(PointMapping test/testPointMapping.cpp)
 
 if(MeshFields_USE_Cabana)
   meshfields_add_exe(ControllerPerformance test/testControllerPerformance.cpp)
@@ -184,6 +185,7 @@ test_func(ElementJacobian1d ./ElementJacobian1d)
 test_func(ElementJacobian2d ./ElementJacobian2d)
 test_func(CountIntegrator ./CountIntegrator)
 test_func(OmegahElementTests ./OmegahElementTests)
+test_func(PointMapping ./PointMapping)
 if(MeshFields_USE_EXCEPTIONS)
   # exception caught - no error
   test_func(ExceptionTest ./ExceptionTest)

src/MeshField.hpp

@@ -81,13 +81,14 @@ struct LinearTriangleToVertexField {
     const auto vtxDim = 0;
     const auto ignored = -1;
     const auto localVtxIdx =
-        Omega_h::simplex_down_template(triDim, vtxDim, triNodeIdx, ignored);
+        (Omega_h::simplex_down_template(triDim, vtxDim, triNodeIdx, ignored) +
+         2) %
+        3;
     const auto triToVtxDegree = Omega_h::simplex_degree(triDim, vtxDim);
     const MeshField::LO vtx = triVerts[(tri * triToVtxDegree) + localVtxIdx];
     return {0, triCompIdx, vtx, MeshField::Vertex}; // node, comp, ent, topo
   }
 };
-
 struct QuadraticTriangleToField {
   Omega_h::LOs triVerts;
   Omega_h::LOs triEdges;
@@ -129,8 +130,10 @@ struct QuadraticTriangleToField {
       const auto triDim = 2;
       const auto vtxDim = 0;
       const auto ignored = -1;
-      const auto localVtxIdx =
-          Omega_h::simplex_down_template(triDim, vtxDim, dofHolderIdx, ignored);
+      const auto localVtxIdx = (Omega_h::simplex_down_template(
+                                    triDim, vtxDim, dofHolderIdx, ignored) +
+                                2) %
+                               3;
       const auto triToVtxDegree = Omega_h::simplex_degree(triDim, vtxDim);
       osh_ent = triVerts[(tri * triToVtxDegree) + localVtxIdx];
     } else if (dofHolderTopo == MeshField::Edge) {
@@ -140,7 +143,7 @@ struct QuadraticTriangleToField {
       // passing dofHolderIdx as Omega_h_simplex.hpp does not provide
       // a function that maps a triangle and edge index to a 'canonical' edge
       // index. This may need to be revisited...
-      osh_ent = triEdges[(tri * triToEdgeDegree) + dofHolderIdx];
+      osh_ent = triEdges[(tri * triToEdgeDegree) + (dofHolderIdx + 2) % 3];
     } else {
       assert(false);
     }

test/testPointMapping.cpp

@@ -0,0 +1,122 @@
+#include <Kokkos_Core.hpp>
+#include <MeshField.hpp>
+#include <Omega_h_build.hpp>
+#include <Omega_h_mesh.hpp>
+template <size_t order> void runTest(Omega_h::Mesh mesh) {
+  MeshField::OmegahMeshField<Kokkos::DefaultExecutionSpace, 2> mesh_field(mesh);
+  auto shape_field =
+      mesh_field.template CreateLagrangeField<double, order, 1>();
+
+  // initialize vertices
+  auto dim = mesh.dim();
+  auto coords = mesh.coords();
+  auto f = KOKKOS_LAMBDA(double x, double y)->double { return 2 * x + 3 * y; };
+  auto edge2vtx = mesh.ask_down(1, 0).ab2b;
+  auto edgeMap = mesh.ask_down(dim, 1).ab2b;
+  Kokkos::parallel_for(
+      mesh.nverts(), KOKKOS_LAMBDA(int vtx) {
+        auto x = coords[vtx * dim];
+        auto y = coords[vtx * dim + 1];
+        shape_field(vtx, 0, 0, MeshField::Mesh_Topology::Vertex) = f(x, y);
+      });
+  if (order == 2) {
+    Kokkos::parallel_for(
+        mesh.nedges(), KOKKOS_LAMBDA(int edge) {
+          const auto left = edge2vtx[edge * 2];
+          const auto right = edge2vtx[edge * 2 + 1];
+          const auto x = (coords[left * dim] + coords[right * dim]) / 2.0;
+          const auto y =
+              (coords[left * dim + 1] + coords[right * dim + 1]) / 2.0;
+          shape_field(edge, 0, 0, MeshField::Mesh_Topology::Edge) = f(x, y);
+        });
+  }
+  const auto numNodesPerElem = order == 2 ? 6 : 3;
+  Kokkos::View<double **> local_coords("", mesh.nelems() * numNodesPerElem, 3);
+  Kokkos::parallel_for(
+      "set", mesh.nelems() * numNodesPerElem, KOKKOS_LAMBDA(const int &i) {
+        const auto val = i % numNodesPerElem;
+        local_coords(i, 0) = (val == 0);
+        local_coords(i, 1) = (val == 1);
+        local_coords(i, 2) = (val == 2);
+        if constexpr (order == 2) {
+          if (val == 3) {
+            local_coords(i, 0) = 1 / 2.0;
+            local_coords(i, 1) = 1 / 2.0;
+          } else if (val == 4) {
+            local_coords(i, 1) = 1 / 2.0;
+            local_coords(i, 2) = 1 / 2.0;
+          } else if (val == 5) {
+            local_coords(i, 0) = 1 / 2.0;
+            local_coords(i, 2) = 1 / 2.0;
+          }
+        }
+      });
+
+  auto eval_results = mesh_field.triangleLocalPointEval(
+      local_coords, numNodesPerElem, shape_field);
+
+  int errors = 0;
+  const auto triVerts = mesh.ask_elem_verts();
+  const auto coordField = mesh_field.getCoordField();
+  Kokkos::parallel_reduce(
+      "test", mesh.nelems(),
+      KOKKOS_LAMBDA(const int &tri, int &errors) {
+        for (int node = 0; node < 3; ++node) {
+          const auto triDim = 2;
+          const auto vtxDim = 0;
+          const auto ignored = -1;
+          const auto localVtxIdx =
+              Omega_h::simplex_down_template(triDim, vtxDim, node, ignored);
+          const auto triToVtxDegree = Omega_h::simplex_degree(triDim, vtxDim);
+          int vtx = triVerts[(tri * triToVtxDegree) + localVtxIdx];
+          auto x = coords[vtx * dim];
+          auto y = coords[vtx * dim + 1];
+          auto expected = f(x, y);
+          auto actual = eval_results(tri * numNodesPerElem + node, 0);
+          if (Kokkos::fabs(expected - actual) > MeshField::MachinePrecision) {
+            ++errors;
+            Kokkos::printf(
+                "expected: %lf, actual: %lf, element: %d, node(vtx): %d\n",
+                expected, actual, tri, node);
+          }
+        }
+        for (int node = 3; node < numNodesPerElem; ++node) {
+          const auto triDim = 2;
+          const auto edgeDim = 1;
+          const auto triToEdgeDegree = Omega_h::simplex_degree(triDim, edgeDim);
+          const MeshField::LO triNode2DofHolder[3] = {0, 1, 2};
+          int edge =
+              edgeMap[(tri * triToEdgeDegree) + triNode2DofHolder[node - 3]];
+          auto left = edge2vtx[edge * 2];
+          auto right = edge2vtx[edge * 2 + 1];
+          auto x = (coords[left * dim] + coords[right * dim]) / 2.0;
+          auto y = (coords[left * dim + 1] + coords[right * dim + 1]) / 2.0;
+          auto expected = f(x, y);
+          auto actual = eval_results(tri * numNodesPerElem + node, 0);
+          if (Kokkos::fabs(expected - actual) > MeshField::MachinePrecision) {
+            ++errors;
+            Kokkos::printf(
+                "expected: %lf, actual: %lf, element: %d, node(edge): %d\n",
+                expected, actual, tri, node);
+          }
+        }
+      },
+      errors);
+  if (errors > 0) {
+    MeshField::fail("One or more mappings did not match\n");
+  }
+}
+int main(int argc, char **argv) {
+  // setup
+  Kokkos::initialize(argc, argv);
+  auto lib = Omega_h::Library(&argc, &argv);
+  {
+    auto world = lib.world();
+    auto mesh =
+        Omega_h::build_box(world, OMEGA_H_SIMPLEX, 1, 1, 1, 10, 10, 0, false);
+    runTest<1>(mesh);
+    runTest<2>(mesh);
+  }
+  Kokkos::finalize();
+  return 0;
+}