support cab controller WIP

SCOREC · Sep 27, 2024 · 141e212 · 141e212
1 parent e118072
commit 141e212
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/MeshField_ShapeField.hpp b/src/MeshField_ShapeField.hpp
@@ -2,6 +2,7 @@
 #define MESHFIELD_SHAPEFIELD_HPP
 
 #include "KokkosController.hpp"
+#include "CabanaController.hpp"
 #include "MeshField.hpp"
 #include "MeshField_Shape.hpp"
 #include <type_traits> //decltype
@@ -65,7 +66,7 @@ template <typename VtxAccessor> struct LinearAccessor {
   }
 };
 
-template <typename ExecutionSpace, typename DataType, size_t order, size_t dim>
+template <typename ExecutionSpace, class CtrlrType, typename DataType, size_t order, size_t dim>
 auto CreateLagrangeField(MeshInfo &meshInfo) {
   static_assert((std::is_same_v<Real4, DataType> == true ||
                  std::is_same_v<Real8, DataType> == true),
@@ -74,13 +75,18 @@ auto CreateLagrangeField(MeshInfo &meshInfo) {
   static_assert(
       (order == 1 || order == 2),
       "CreateLagrangeField only supports linear and quadratic fields\n");
+  // https://godbolt.org/z/b8TEG8M8E - static_assert for templated type
+  static_assert(
+      ( std::is_same_v<CtrlrType,Controller::KokkosController> ||
+        std::is_same_v<CtrlrType,Controller::CabanaController>   ),
+      "CreateLagrangeField only supports field storage using Kokkos or Cabana\n");
   static_assert((dim == 1 || dim == 2 || dim == 3),
                 "CreateLagrangeField only supports 1d, 2d, and 3d meshes\n");
   using MemorySpace = typename ExecutionSpace::memory_space;
   if constexpr (order == 1 && (dim == 1 || dim == 2)) {
     assert(meshInfo.numVtx > 0);
     using Ctrlr =
-        Controller::KokkosController<MemorySpace, ExecutionSpace, DataType ***>;
+        CtrlrType<MemorySpace, ExecutionSpace, DataType ***>;
     // 1 dof with 1 component per vtx
     Ctrlr kk_ctrl({/*field 0*/ 1, 1, meshInfo.numVtx});
     MeshField<Ctrlr> kokkosMeshField(kk_ctrl);

diff --git a/test/testElement.cpp b/test/testElement.cpp
@@ -40,8 +40,8 @@ void triangleLocalPointEval() {
   meshInfo.numVtx = 5;
   meshInfo.numTri = 3;
   auto field =
-      MeshField::CreateLagrangeField<ExecutionSpace, MeshField::Real, 1, 2>(
-          meshInfo);
+      MeshField::CreateLagrangeField<ExecutionSpace,
+        Controller::KokkosController, MeshField::Real, 1, 2>(meshInfo);
 
   MeshField::Element elm{MeshField::LinearTriangleShape(),
                          LinearTriangleToVertexField()};
@@ -84,8 +84,8 @@ void edgeLocalPointEval() {
   meshInfo.numVtx = 5;
   meshInfo.numEdge = 7;
   auto field =
-      MeshField::CreateLagrangeField<ExecutionSpace, MeshField::Real, 1, 1>(
-          meshInfo);
+      MeshField::CreateLagrangeField<ExecutionSpace,
+        Controller::KokkosController, MeshField::Real, 1, 1>(meshInfo);
 
   MeshField::Element elm{MeshField::LinearEdgeShape(),
                          LinearEdgeToVertexField()};
@@ -136,8 +136,8 @@ void quadraticTriangleLocalPointEval() {
   meshInfo.numEdge = 3;
   meshInfo.numTri = 1;
   auto field =
-      MeshField::CreateLagrangeField<ExecutionSpace, MeshField::Real, 2, 2>(
-          meshInfo);
+      MeshField::CreateLagrangeField<ExecutionSpace,
+        Controller::KokkosController, MeshField::Real, 2, 2>(meshInfo);
 
   MeshField::Element elm{MeshField::QuadraticTriangleShape(),
                          QuadraticTriangleToField()};
@@ -188,8 +188,8 @@ void quadraticTetrahedronLocalPointEval() {
   meshInfo.numTri = 4;
   meshInfo.numTet = 1;
   auto field =
-      MeshField::CreateLagrangeField<ExecutionSpace, MeshField::Real, 2, 3>(
-          meshInfo);
+      MeshField::CreateLagrangeField<ExecutionSpace,
+        Controller::KokkosController, MeshField::Real, 2, 3>(meshInfo);
 
   MeshField::Element elm{MeshField::QuadraticTetrahedronShape(),
                          QuadraticTetrahedronToField()};