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

Clean-up

parent 74e4cbd3
No related branches found
No related tags found
1 merge request!136Displace NamedBoundaryDescriptor and NumberedBoundaryDescriptor
......@@ -3,7 +3,6 @@
#include <algebra/TinyVector.hpp>
#include <mesh/IBoundaryDescriptor.hpp>
#include <mesh/ItemValue.hpp>
#include <mesh/RefItemList.hpp>
#include <utils/Array.hpp>
......@@ -14,14 +13,14 @@ template <typename ConnectivityType>
class Mesh;
template <size_t Dimension>
class MeshFaceBoundary // clazy:exclude=copyable-polymorphic
class [[nodiscard]] MeshFaceBoundary // clazy:exclude=copyable-polymorphic
{
protected:
Array<const FaceId> m_face_list;
std::string m_boundary_name;
std::array<TinyVector<Dimension>, Dimension*(Dimension - 1)> _getBounds(
const Mesh<Connectivity<Dimension>>& mesh) const;
std::array<TinyVector<Dimension>, Dimension*(Dimension - 1)> _getBounds(const Mesh<Connectivity<Dimension>>& mesh)
const;
public:
template <size_t MeshDimension>
......@@ -31,8 +30,7 @@ class MeshFaceBoundary // clazy:exclude=copyable-polymorphic
MeshFaceBoundary& operator=(const MeshFaceBoundary&) = default;
MeshFaceBoundary& operator=(MeshFaceBoundary&&) = default;
const Array<const FaceId>&
faceList() const
const Array<const FaceId>& faceList() const
{
return m_face_list;
}
......
......@@ -4,7 +4,8 @@
#include <mesh/MeshNodeBoundary.hpp>
template <size_t Dimension>
class MeshFlatNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy:exclude=copyable-polymorphic
class [[nodiscard]] MeshFlatNodeBoundary final
: public MeshNodeBoundary<Dimension> // clazy:exclude=copyable-polymorphic
{
public:
using Rd = TinyVector<Dimension, double>;
......@@ -14,16 +15,13 @@ class MeshFlatNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy
Rd _getNormal(const Mesh<Connectivity<Dimension>>& mesh);
void _checkBoundaryIsFlat(const TinyVector<Dimension, double>& normal,
const TinyVector<Dimension, double>& origin,
const double length,
const Mesh<Connectivity<Dimension>>& mesh) const;
void _checkBoundaryIsFlat(const TinyVector<Dimension, double>& normal, const TinyVector<Dimension, double>& origin,
const double length, const Mesh<Connectivity<Dimension>>& mesh) const;
Rd _getOutgoingNormal(const Mesh<Connectivity<Dimension>>& mesh);
public:
const Rd&
outgoingNormal() const
const Rd& outgoingNormal() const
{
return m_outgoing_normal;
}
......
......@@ -5,7 +5,8 @@
#include <mesh/MeshNodeBoundary.hpp>
template <size_t Dimension>
class MeshLineNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy:exclude=copyable-polymorphic
class [[nodiscard]] MeshLineNodeBoundary final
: public MeshNodeBoundary<Dimension> // clazy:exclude=copyable-polymorphic
{
public:
using Rd = TinyVector<Dimension, double>;
......@@ -16,10 +17,8 @@ class MeshLineNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy
template <size_t MeshDimension>
TinyVector<MeshDimension> _getDirection(const Mesh<Connectivity<MeshDimension>>&);
void _checkBoundaryIsLine(const TinyVector<Dimension, double>& direction,
const TinyVector<Dimension, double>& origin,
const double length,
const Mesh<Connectivity<Dimension>>& mesh) const;
void _checkBoundaryIsLine(const TinyVector<Dimension, double>& direction, const TinyVector<Dimension, double>& origin,
const double length, const Mesh<Connectivity<Dimension>>& mesh) const;
public:
template <size_t MeshDimension>
......@@ -27,8 +26,7 @@ class MeshLineNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy
const IBoundaryDescriptor& boundary_descriptor);
PUGS_INLINE
const Rd&
direction() const
const Rd& direction() const
{
return m_direction;
}
......@@ -39,9 +37,7 @@ class MeshLineNodeBoundary final : public MeshNodeBoundary<Dimension> // clazy
private:
MeshLineNodeBoundary(const Mesh<Connectivity<Dimension>>& mesh, const RefEdgeList& ref_edge_list)
: MeshNodeBoundary<Dimension>(mesh, ref_edge_list), m_direction(_getDirection(mesh))
{
;
}
{}
MeshLineNodeBoundary(const Mesh<Connectivity<Dimension>>& mesh, const RefFaceList& ref_face_list)
: MeshNodeBoundary<Dimension>(mesh, ref_face_list), m_direction(_getDirection(mesh))
......
......@@ -3,7 +3,6 @@
#include <algebra/TinyVector.hpp>
#include <mesh/IBoundaryDescriptor.hpp>
#include <mesh/ItemValue.hpp>
#include <mesh/RefItemList.hpp>
#include <utils/Array.hpp>
......@@ -14,14 +13,14 @@ template <typename ConnectivityType>
class Mesh;
template <size_t Dimension>
class MeshNodeBoundary // clazy:exclude=copyable-polymorphic
class [[nodiscard]] MeshNodeBoundary // clazy:exclude=copyable-polymorphic
{
protected:
Array<const NodeId> m_node_list;
std::string m_boundary_name;
std::array<TinyVector<Dimension>, Dimension*(Dimension - 1)> _getBounds(
const Mesh<Connectivity<Dimension>>& mesh) const;
std::array<TinyVector<Dimension>, Dimension*(Dimension - 1)> _getBounds(const Mesh<Connectivity<Dimension>>& mesh)
const;
public:
template <size_t MeshDimension>
......@@ -31,8 +30,7 @@ class MeshNodeBoundary // clazy:exclude=copyable-polymorphic
MeshNodeBoundary& operator=(const MeshNodeBoundary&) = default;
MeshNodeBoundary& operator=(MeshNodeBoundary&&) = default;
const Array<const NodeId>&
nodeList() const
const Array<const NodeId>& nodeList() const
{
return m_node_list;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment