Skip to content
Snippets Groups Projects
Commit bc8f449d authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Renamed Boundary -> RefFacelist

- this class actually defines list of faces for a given reference
- must remove node list which is irrelevant in this context
parent 0411e320
No related branches found
No related tags found
No related merge requests found
......@@ -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];
......
......@@ -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
......
......@@ -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();
......
#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;
}
[[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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment