Merge pull request #211 from PrincetonUniversity/issue-201

Implemented specfem::mesh::control_nodes with template specialization.
PrincetonUniversity · Dec 2, 2024 · edac764 · edac764
2 parents b5f6350 + 3bd0340
commit edac764
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/include/compute/compute_mesh.hpp b/include/compute/compute_mesh.hpp
@@ -101,7 +101,8 @@ struct quadrature {
   quadrature() = default;
 
   quadrature(const specfem::quadrature::quadratures &quadratures,
-             const specfem::mesh::control_nodes &control_nodes)
+             const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+                 &control_nodes)
       : gll(quadratures, control_nodes.ngnod) {}
 };
 
@@ -123,8 +124,10 @@ struct control_nodes {
   specfem::kokkos::HostMirror3d<type_real> h_coord;   ///< (x, z) for every
                                                       ///< distinct control node
 
-  control_nodes(const specfem::compute::mesh_to_compute_mapping &mapping,
-                const specfem::mesh::control_nodes &control_nodes);
+  control_nodes(
+      const specfem::compute::mesh_to_compute_mapping &mapping,
+      const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+          &control_nodes);
 
   control_nodes() = default;
 };
@@ -188,7 +191,8 @@ struct mesh {
   mesh() = default;
 
   mesh(const specfem::mesh::tags &tags,
-       const specfem::mesh::control_nodes &control_nodes,
+       const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+           &control_nodes,
        const specfem::quadrature::quadratures &quadratures);
 
   specfem::compute::points assemble();

diff --git a/include/mesh/control_nodes/control_nodes.hpp b/include/mesh/control_nodes/control_nodes.hpp
@@ -1,6 +1,7 @@
 #ifndef _MESH_CONTROL_NODES_HPP
 #define _MESH_CONTROL_NODES_HPP
 
+#include "enumerations/interface.hpp"
 #include "kokkos_abstractions.h"
 #include "specfem_setup.hpp"
 
@@ -11,9 +12,14 @@ namespace mesh {
  * @brief Control node information
  *
  */
-struct control_nodes {
-  using ViewType = Kokkos::View<type_real **, Kokkos::HostSpace>;
+template <specfem::dimension::type DimensionType> struct control_nodes;
+
+template <> struct control_nodes<specfem::dimension::type::dim2> {
 
+  // Use 'specfem::dimension::type::dim2' explicitly here
+  constexpr static auto dimension = specfem::dimension::type::dim2;
+
+  using ViewType = Kokkos::View<type_real **, Kokkos::HostSpace>;
   int ngnod; ///< Number of control nodes
   int nspec; ///< Number of spectral elements
   Kokkos::View<int **, Kokkos::HostSpace> knods; ///< Control node indices

diff --git a/include/mesh/mesh.hpp b/include/mesh/mesh.hpp
@@ -5,6 +5,7 @@
 #include "coupled_interfaces/coupled_interfaces.hpp"
 #include "elements/axial_elements.hpp"
 #include "elements/tangential_elements.hpp"
+#include "enumerations/interface.hpp"
 #include "materials/materials.hpp"
 #include "mesh/tags/tags.hpp"
 #include "properties/properties.hpp"
@@ -24,7 +25,8 @@ struct mesh {
   int npgeo; ///< Total number of spectral element control nodes
   int nspec; ///< Total number of spectral elements
   int nproc; ///< Total number of processors
-  specfem::mesh::control_nodes control_nodes; ///< Defines control nodes
+  specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+      control_nodes; ///< Defines control nodes
 
   specfem::mesh::properties parameters; ///< Struct to store simulation launch
                                         ///< parameters (never used)
@@ -59,7 +61,8 @@ struct mesh {
   mesh(){};
 
   mesh(const int npgeo, const int nspec, const int nproc,
-       const specfem::mesh::control_nodes &control_nodes,
+       const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+           &control_nodes,
        const specfem::mesh::properties &parameters,
        const specfem::mesh::coupled_interfaces &coupled_interfaces,
        const specfem::mesh::boundaries &boundaries,

diff --git a/src/IO/mesh.cpp b/src/IO/mesh.cpp
@@ -8,7 +8,7 @@
 #include "IO/mesh/impl/fortran/read_material_properties.hpp"
 #include "IO/mesh/impl/fortran/read_mesh_database.hpp"
 #include "IO/mesh/impl/fortran/read_properties.hpp"
-#include "enumerations/specfem_enums.hpp"
+#include "enumerations/interface.hpp"
 #include "kokkos_abstractions.h"
 #include "material/material.hpp"
 #include "mesh/tags/tags.hpp"

diff --git a/src/compute/compute_mesh.cpp b/src/compute/compute_mesh.cpp
@@ -158,7 +158,8 @@ assign_numbering(specfem::kokkos::HostView4d<double> global_coordinates) {
 
 specfem::compute::control_nodes::control_nodes(
     const specfem::compute::mesh_to_compute_mapping &mapping,
-    const specfem::mesh::control_nodes &control_nodes)
+    const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+        &control_nodes)
     : ngnod(control_nodes.ngnod), nspec(control_nodes.nspec),
       index_mapping("specfem::compute::control_nodes::index_mapping",
                     control_nodes.nspec, control_nodes.ngnod),
@@ -318,7 +319,8 @@ specfem::compute::mesh_to_compute_mapping::mesh_to_compute_mapping(
 
 specfem::compute::mesh::mesh(
     const specfem::mesh::tags &tags,
-    const specfem::mesh::control_nodes &m_control_nodes,
+    const specfem::mesh::control_nodes<specfem::dimension::type::dim2>
+        &m_control_nodes,
     const specfem::quadrature::quadratures &m_quadratures) {
 
   this->mapping = specfem::compute::mesh_to_compute_mapping(tags);