Added num comp parameter to template

Author: Kloepfer

src/MeshField.hpp

@@ -189,11 +189,11 @@ class OmegahMeshField {
     static_assert(dim == 1 || dim == 2 || dim == 3);
   }
 
-  template <typename DataType, size_t order>
+  template <typename DataType, size_t order, size_t numComp>
   // Ordering of field indexing changed to 'entity, node, component'
   auto CreateLagrangeField() {
     return MeshField::CreateLagrangeField<ExecutionSpace, Controller, DataType,
-                                          order, dim>(meshInfo);
+                                          order, dim, numComp>(meshInfo);
   }
 
   auto getCoordField() { return coordField; }

src/MeshField_ShapeField.hpp

@@ -158,7 +158,7 @@ template <typename VtxAccessor> struct LinearAccessor {
 template <typename ExecutionSpace,
           template <typename...>
           typename Controller = MeshField::KokkosController,
-          typename DataType, size_t order, size_t dim>
+          typename DataType, size_t order, size_t dim, size_t numComp>
 auto CreateLagrangeField(const MeshInfo &meshInfo) {
   static_assert((std::is_same_v<Real4, DataType> == true ||
                  std::is_same_v<Real8, DataType> == true),
@@ -179,10 +179,10 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
         std::is_same_v<
             Controller<ExecutionSpace, MemorySpace, DataType>,
             MeshField::CabanaController<ExecutionSpace, MemorySpace, DataType>>,
-        Controller<ExecutionSpace, MemorySpace, DataType[1][1]>,
+        Controller<ExecutionSpace, MemorySpace, DataType[1][numComp]>,
         Controller<MemorySpace, ExecutionSpace, DataType ***>>;
     // 1 dof with 1 component per vtx
-    auto createController = [](const int numComp, auto numVtx) {
+    auto createController = [](auto numVtx) {
       if constexpr (std::is_same_v<
                         Controller<ExecutionSpace, MemorySpace, DataType>,
                         MeshField::CabanaController<ExecutionSpace, MemorySpace,
@@ -192,7 +192,7 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
         return Ctrlr({/*field 0*/ numVtx, 1, numComp});
       }
     };
-    Ctrlr kk_ctrl = createController(1, meshInfo.numVtx);
+    Ctrlr kk_ctrl = createController(meshInfo.numVtx);
 #else
     using Ctrlr = Controller<MemorySpace, ExecutionSpace, DataType ***>;
     Ctrlr kk_ctrl({/*field 0*/ meshInfo.numVtx, 1, 1});
@@ -214,10 +214,11 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
         std::is_same_v<
             Controller<ExecutionSpace, MemorySpace, DataType>,
             MeshField::CabanaController<ExecutionSpace, MemorySpace, DataType>>,
-        Controller<ExecutionSpace, MemorySpace, DataType[1][1], DataType[1][1]>,
+        Controller<ExecutionSpace, MemorySpace, DataType[1][numComp],
+                   DataType[1][numComp]>,
         Controller<MemorySpace, ExecutionSpace, DataType ***, DataType ***>>;
     // 1 dof with 1 comp per vtx/edge
-    auto createController = [](const int numComp, auto numVtx, auto numEdge) {
+    auto createController = [](auto numVtx, auto numEdge) {
       if constexpr (std::is_same_v<
                         Controller<ExecutionSpace, MemorySpace, DataType>,
                         MeshField::CabanaController<ExecutionSpace, MemorySpace,
@@ -228,12 +229,12 @@ auto CreateLagrangeField(const MeshInfo &meshInfo) {
                       /*field 1*/ numEdge, 1, numComp});
       }
     };
-    Ctrlr kk_ctrl = createController(1, meshInfo.numVtx, meshInfo.numEdge);
+    Ctrlr kk_ctrl = createController(meshInfo.numVtx, meshInfo.numEdge);
 #else
     using Ctrlr =
         Controller<MemorySpace, ExecutionSpace, DataType ***, DataType ***>;
-    Ctrlr kk_ctrl({/*field 0*/ meshInfo.numVtx, 1, 1,
-                   /*field 1*/ meshInfo.numEdge, 1, 1});
+    Ctrlr kk_ctrl({/*field 0*/ meshInfo.numVtx, 1, numComp,
+                   /*field 1*/ meshInfo.numEdge, 1, numComp});
 #endif
     auto vtxField = MeshField::makeField<Ctrlr, 0>(kk_ctrl);
     auto edgeField = MeshField::makeField<Ctrlr, 1>(kk_ctrl);

test/testElement.cpp

@@ -41,7 +41,7 @@ void triangleLocalPointEval() {
   const auto numElms = 3; // provided by the mesh
   const MeshField::MeshInfo meshInfo{.numVtx = 5, .numTri = 3};
   auto field = MeshField::CreateLagrangeField<
-      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 1, 2>(
+      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 1, 2, 1>(
       meshInfo);
 
   MeshField::FieldElement f(numElms, field, MeshField::LinearTriangleShape(),
@@ -85,7 +85,7 @@ struct LinearEdgeToVertexField {
 void edgeLocalPointEval() {
   const MeshField::MeshInfo meshInfo{.numVtx = 5, .numEdge = 7, .dim = 1};
   auto field = MeshField::CreateLagrangeField<
-      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 1, 1>(
+      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 1, 1, 1>(
       meshInfo);
 
   MeshField::FieldElement f(meshInfo.numEdge, field,
@@ -137,7 +137,7 @@ void quadraticTriangleLocalPointEval() {
   const MeshField::MeshInfo meshInfo{
       .numVtx = 3, .numEdge = 3, .numTri = 1, .dim = 2};
   auto field = MeshField::CreateLagrangeField<
-      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 2, 2>(
+      ExecutionSpace, MeshField::KokkosController, MeshField::Real, 2, 2, 1>(
       meshInfo);
 
   MeshField::FieldElement f(meshInfo.numTri, field,
@@ -192,7 +192,7 @@ void quadraticTetrahedronLocalPointEval() {
   auto field =
       MeshField::CreateLagrangeField<ExecutionSpace,
                                      MeshField::KokkosController,
-                                     MeshField::Real, ShapeOrder, MeshDim>(
+                                     MeshField::Real, ShapeOrder, MeshDim, 1>(
           meshInfo);
 
   MeshField::FieldElement f(meshInfo.numTet, field,

test/testOmegahElement.cpp

@@ -172,7 +172,7 @@ void doRun(Omega_h::Mesh &mesh,
       const auto ShapeOrder = 1;
 
       auto field =
-          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder>();
+          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder, 1>();
       LinearFunction func = LinearFunction();
       setVertices(mesh, func, field);
       using FieldType = decltype(field);
@@ -187,7 +187,7 @@ void doRun(Omega_h::Mesh &mesh,
     {
       const auto ShapeOrder = 2;
       auto field =
-          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder>();
+          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder, 1>();
       auto func = QuadraticFunction();
       setVertices(mesh, func, field);
       setEdges(mesh, func, field);
@@ -203,7 +203,7 @@ void doRun(Omega_h::Mesh &mesh,
     {
       const auto ShapeOrder = 2;
       auto field =
-          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder>();
+          omf.template CreateLagrangeField<MeshField::Real, ShapeOrder, 1>();
       auto func = LinearFunction();
       setVertices(mesh, func, field);
       setEdges(mesh, func, field);