Merge pull request #1430 from PrincetonUniversity/1178-ci2

1178 - check consistency between mesh coupled_interface and adjacency graph

Author: icui

CMakeLists.txt

@@ -246,7 +246,6 @@ add_library(
         src/io/mesh/impl/fortran/dim2/read_elements.cpp
         src/io/mesh/impl/fortran/dim2/read_material_properties.cpp
         src/io/mesh/impl/fortran/dim2/read_mesh_database.cpp
-        src/io/mesh/impl/fortran/dim2/read_interfaces.cpp
         src/io/mesh/impl/fortran/dim2/read_parameters.cpp
         src/io/mesh/impl/fortran/dim2/read_adjacency_graph.cpp
         # Fortran 3D meshfem part
@@ -340,17 +339,15 @@ endif()
 add_library(
         mesh
         # 2-D
-        src/mesh/dim2/mesh.cpp
         src/mesh/dim2/boundaries/forcing_boundaries.cpp
         src/mesh/dim2/boundaries/absorbing_boundaries.cpp
         src/mesh/dim2/boundaries/acoustic_free_surface.cpp
         src/mesh/dim2/elements/tangential_elements.cpp
         src/mesh/dim2/elements/axial_elements.cpp
         # src/mesh/mpi_interfaces/mpi_interfaces.cpp
-        src/mesh/dim2/coupled_interfaces/interface_container.cpp
-        src/mesh/dim2/coupled_interfaces/coupled_interfaces.cpp
         src/mesh/dim2/tags/tags.cpp
         src/mesh/dim2/adjacency_graph/assert_symmetry.cpp
+        src/mesh/dim2/mesh.cpp
         # 3-D
 
         src/mesh/dim3/adjacency_graph/assert_symmetry.cpp

docs/sections/api/mesh/dim2/coupled_interfaces/index.rst

@@ -13,6 +13,5 @@ SPECFEM++ 2D Mesh
 
     boundaries/index
     control_nodes/index
-    coupled_interfaces/index
     materials/index
     tags/index

docs/sections/api/mesh/dim2/index.rst

@@ -22,7 +22,6 @@ What the 3D mesh struct holds
     materials/index
     mass_matrix/index
     boundaries/index
-    coupled_interfaces/index
     coloring/index
     inner_outer/index
     mpi/index

docs/sections/api/mesh/dim3/coupled_interfaces/index.rst

@@ -3,7 +3,6 @@
 #include "adjacency_graph/adjacency_graph.hpp"
 #include "boundaries/boundaries.hpp"
 #include "control_nodes/control_nodes.hpp"
-#include "coupled_interfaces/coupled_interfaces.hpp"
 #include "elements/axial_elements.hpp"
 #include "elements/tangential_elements.hpp"
 #include "enumerations/dimension.hpp"
@@ -36,10 +35,6 @@ template <> struct mesh<specfem::dimension::type::dim2> {
                                                    ///< simulation launch
                                                    ///< parameters (never used)
 
-  specfem::mesh::coupled_interfaces<dimension>
-      coupled_interfaces; ///< Struct to store
-                          ///< coupled interfaces
-
   specfem::mesh::boundaries<dimension> boundaries; ///< Struct to store
                                                    ///< information at the
                                                    ///< boundaries
@@ -109,17 +104,16 @@ template <> struct mesh<specfem::dimension::type::dim2> {
   mesh(const int npgeo, const int nspec, const int nproc,
        const specfem::mesh::control_nodes<dimension> &control_nodes,
        const specfem::mesh::parameters<dimension> &parameters,
-       const specfem::mesh::coupled_interfaces<dimension> &coupled_interfaces,
        const specfem::mesh::boundaries<dimension> &boundaries,
        const specfem::mesh::tags<dimension> &tags,
        const specfem::mesh::elements::tangential_elements<dimension>
            &tangential_nodes,
        const specfem::mesh::elements::axial_elements<dimension> &axial_nodes,
        const specfem::mesh::materials<dimension> &materials)
       : npgeo(npgeo), nspec(nspec), nproc(nproc), control_nodes(control_nodes),
-        parameters(parameters), coupled_interfaces(coupled_interfaces),
-        boundaries(boundaries), tags(tags), tangential_nodes(tangential_nodes),
-        axial_nodes(axial_nodes), materials(materials) {};
+        parameters(parameters), boundaries(boundaries), tags(tags),
+        tangential_nodes(tangential_nodes), axial_nodes(axial_nodes),
+        materials(materials) {};
   ///@} // Constructors
 
   /**
@@ -160,7 +154,8 @@ template <> struct mesh<specfem::dimension::type::dim2> {
    * initialized and all components (control nodes, materials, boundaries)
    * have been populated from MESHFEM2D database files.
    */
-  void setup_coupled_interfaces();
+  void setup_coupled_interfaces(
+      const std::set<std::pair<int, int> > &coupled_interfaces);
 };
 } // namespace mesh
 } // namespace specfem