diff --git a/src/main.cpp b/src/main.cpp index 6f34e713ecba2de04440bb6146db0a3dc7aef6c4..762cfb573f01dad21d1688d706591f2fc8941a25 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -224,9 +224,9 @@ int main(int argc, char *argv[]) std::vector<BoundaryConditionHandler> bc_list; { - for (size_t i_boundary=0; i_boundary<mesh.connectivity().numberOfBoundaries(); ++i_boundary) { - const Boundary& boundary = mesh.connectivity().boundary(i_boundary); - const RefId& ref = boundary.refId(); + for (size_t i_ref_face_list=0; i_ref_face_list<mesh.connectivity().numberOfRefFaceList(); ++i_ref_face_list) { + const RefFaceList& ref_face_list = mesh.connectivity().refFaceList(i_ref_face_list); + const RefId& ref = ref_face_list.refId(); TinyVector<2> normal(0,0); if ((ref.tagName()== std::string("XMIN")) or (ref.tagName()=="XMAX")) { @@ -238,7 +238,7 @@ int main(int argc, char *argv[]) break; } - const Kokkos::View<const unsigned int*> nodes_ids = boundary.nodeList(); + const Kokkos::View<const unsigned int*> nodes_ids = ref_face_list.nodeList(); std::vector<unsigned int> node_boundary_vector(nodes_ids.extent(0)); for (size_t r=0; r<nodes_ids.extent(0); ++r) { node_boundary_vector[r] = nodes_ids[r]; diff --git a/src/mesh/Connectivity2D.hpp b/src/mesh/Connectivity2D.hpp index a8e7030589229dc7b7c80e0c7af8b7e189cb75fe..09a164906ecd547ed4fec02b04a084f817b4dcf4 100644 --- a/src/mesh/Connectivity2D.hpp +++ b/src/mesh/Connectivity2D.hpp @@ -11,14 +11,14 @@ #include <algorithm> #include <RefId.hpp> -#include <Boundary.hpp> +#include <RefFaceList.hpp> class Connectivity2D { public: static constexpr size_t dimension = 2; - std::vector<Boundary> m_boundary_list; + std::vector<RefFaceList> m_ref_face_list; private: const size_t m_number_of_cells; @@ -179,19 +179,19 @@ private: } public: - void addBoundary(const Boundary& boundary) + void addRefFaceList(const RefFaceList& ref_face_list) { - m_boundary_list.push_back(boundary); + m_ref_face_list.push_back(ref_face_list); } - size_t numberOfBoundaries() const + size_t numberOfRefFaceList() const { - return m_boundary_list.size(); + return m_ref_face_list.size(); } - const Boundary& boundary(const size_t& i) const + const RefFaceList& refFaceList(const size_t& i) const { - return m_boundary_list[i]; + return m_ref_face_list[i]; } const size_t& numberOfNodes() const diff --git a/src/mesh/GmshReader.cpp b/src/mesh/GmshReader.cpp index 4ea57611392395cd48d50b30efe3a08e0951108f..b658806de4a1f3b86222c9f29edaa7259806aadb 100644 --- a/src/mesh/GmshReader.cpp +++ b/src/mesh/GmshReader.cpp @@ -9,7 +9,7 @@ #include <Connectivity2D.hpp> #include <Mesh.hpp> -#include <Boundary.hpp> +#include <RefFaceList.hpp> #include <map> #include <regex> @@ -838,8 +838,7 @@ GmshReader::__proceedData() face_list[j]=ref_face_list.second[j]; } const PhysicalRefId& physical_ref_id = m_physical_ref_map.at(ref_face_list.first); - Boundary boundary(connectivity, physical_ref_id.refId(), face_list); - connectivity.addBoundary(boundary); + connectivity.addRefFaceList(RefFaceList(connectivity, physical_ref_id.refId(), face_list)); } const Kokkos::View<const unsigned int**> face_nodes = connectivity.faceNodes(); diff --git a/src/mesh/Boundary.hpp b/src/mesh/RefFaceList.hpp similarity index 70% rename from src/mesh/Boundary.hpp rename to src/mesh/RefFaceList.hpp index de92042e132d2940926f69d3e96c1dbd39451cd7..95223cdb28eaee16c4b6e3b27a5ee21d197866cf 100644 --- a/src/mesh/Boundary.hpp +++ b/src/mesh/RefFaceList.hpp @@ -1,12 +1,12 @@ -#ifndef BOUNDARY_HPP -#define BOUNDARY_HPP +#ifndef REF_FACE_LIST_HPP +#define REF_FACE_LIST_HPP #include <Kokkos_Core.hpp> #include <RefId.hpp> #include <set> -class Boundary +class RefFaceList { private: RefId m_ref_id; @@ -24,13 +24,14 @@ class Boundary return m_face_id_list; } - const Kokkos::View<const unsigned int*>& nodeList() const + [[deprecated("referenced face list should not know about nodes")]] + const Kokkos::View<const unsigned int*>& nodeList() const { return m_node_id_list; } template<typename ConnectivityType> - Boundary(const ConnectivityType& connectivity, + RefFaceList(const ConnectivityType& connectivity, const RefId& ref_id, const Kokkos::View<const unsigned int*>& face_id_list) : m_ref_id(ref_id), @@ -56,12 +57,12 @@ class Boundary m_node_id_list = node_id_list; } - Boundary& operator=(const Boundary&) = default; - Boundary& operator=(Boundary&&) = default; + RefFaceList& operator=(const RefFaceList&) = default; + RefFaceList& operator=(RefFaceList&&) = default; - Boundary() = default; - Boundary(const Boundary&) = default; - ~Boundary() = default; + RefFaceList() = default; + RefFaceList(const RefFaceList&) = default; + ~RefFaceList() = default; }; -#endif // BOUNDARY_HPP +#endif // REF_FACE_LIST_HPP