removed default dimension and added static assert

Author: Kloepfer

src/MeshField.hpp

@@ -32,10 +32,9 @@ MeshField::MeshInfo getMeshInfo(Omega_h::Mesh &mesh) {
   return meshInfo;
 }
 
-template <typename ExecutionSpace,
+template <typename ExecutionSpace, size_t dim,
           template <typename...>
-          typename Controller = MeshField::KokkosController,
-          size_t dim>
+          typename Controller = MeshField::KokkosController>
 decltype(MeshField::CreateCoordinateField<ExecutionSpace, Controller, dim>(
     MeshField::MeshInfo()))
 createCoordinateField(const MeshField::MeshInfo &mesh_info,
@@ -170,24 +169,25 @@ template <int ShapeOrder> auto getTriangleElement(Omega_h::Mesh &mesh) {
 
 } // namespace Omegah
 
-template <typename ExecutionSpace,
+template <typename ExecutionSpace, size_t dim,
           template <typename...> typename Controller =
-              MeshField::KokkosController,
-          size_t dim = 3>
+              MeshField::KokkosController>
 class OmegahMeshField {
 private:
   Omega_h::Mesh &mesh;
   const MeshField::MeshInfo meshInfo;
   using CoordField =
-      decltype(createCoordinateField<ExecutionSpace, Controller, dim>(
+      decltype(createCoordinateField<ExecutionSpace, dim, Controller>(
           MeshField::MeshInfo(), Omega_h::Reals()));
   CoordField coordField;
 
 public:
   OmegahMeshField(Omega_h::Mesh &mesh_in)
       : mesh(mesh_in), meshInfo(getMeshInfo(mesh)),
-        coordField(createCoordinateField<ExecutionSpace, Controller, dim>(
-            getMeshInfo(mesh_in), mesh_in.coords())) {}
+        coordField(createCoordinateField<ExecutionSpace, dim, Controller>(
+            getMeshInfo(mesh_in), mesh_in.coords())) {
+    static_assert(dim == 1 || dim == 2 || dim == 3);
+  }
 
   template <typename DataType, size_t order>
   // Ordering of field indexing changed to 'entity, node, component'

test/testCountIntegrator.cpp

@@ -60,8 +60,8 @@ int main(int argc, char **argv) {
   Kokkos::initialize(argc, argv);
   auto lib = Omega_h::Library(&argc, &argv);
   auto mesh = createMeshTri18(lib);
-  MeshField::OmegahMeshField<ExecutionSpace, MeshField::KokkosController> omf(
-      mesh);
+  MeshField::OmegahMeshField<ExecutionSpace, 2, MeshField::KokkosController>
+      omf(mesh);
 
   const auto ShapeOrder = 1;
   auto field = omf.getCoordField();

test/testOmegahElement.cpp

@@ -143,7 +143,7 @@ void doFail(std::string_view order, std::string_view function,
 
 template <template <typename...> typename Controller>
 void doRun(Omega_h::Mesh &mesh,
-           MeshField::OmegahMeshField<ExecutionSpace, Controller, 2> &omf) {
+           MeshField::OmegahMeshField<ExecutionSpace, 2, Controller> &omf) {
 
   // setup field with values from the analytic function
   static const size_t OnePtPerElem = 1;
@@ -225,14 +225,14 @@ int main(int argc, char **argv) {
 #ifdef MESHFIELDS_ENABLE_CABANA
   {
     auto mesh = createMeshTri18(lib);
-    MeshField::OmegahMeshField<ExecutionSpace, MeshField::CabanaController, 2>
+    MeshField::OmegahMeshField<ExecutionSpace, 2, MeshField::CabanaController>
         omf(mesh);
     doRun<MeshField::CabanaController>(mesh, omf);
   }
 #endif
   {
     auto mesh = createMeshTri18(lib);
-    MeshField::OmegahMeshField<ExecutionSpace, MeshField::KokkosController, 2>
+    MeshField::OmegahMeshField<ExecutionSpace, 2, MeshField::KokkosController>
         omf(mesh);
     doRun<MeshField::KokkosController>(mesh, omf);
   }