Skip to content
Snippets Groups Projects
Commit 8a424666 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Mesh: removed unused includes and type aliases from Geometry functions

parent 5e2e3758
No related branches found
No related tags found
1 merge request!93Polygonal + polyhedral mesh
#pragma once
#include <TNL/Meshes/Mesh.h>
#include <TNL/Meshes/MeshEntity.h>
#include <TNL/Meshes/MeshBuilder.h>
#include <TNL/Meshes/Topologies/Triangle.h>
#include <TNL/Meshes/Topologies/Polygon.h>
#include <TNL/Meshes/Topologies/Polyhedron.h>
#include <TNL/Meshes/Geometry/getEntityCenter.h>
#include <TNL/Meshes/Geometry/getEntityMeasure.h>
#include <functional>
namespace TNL {
namespace Meshes {
......@@ -19,7 +16,7 @@ enum class EntityDecomposerVersion
template< typename MeshConfig,
typename Topology,
EntityDecomposerVersion EntityDecomposerVersion_ = EntityDecomposerVersion::ConnectEdgesToCentroid,
EntityDecomposerVersion EntityDecomposerVersion_ = EntityDecomposerVersion::ConnectEdgesToCentroid,
EntityDecomposerVersion SubentityDecomposerVersion = EntityDecomposerVersion::ConnectEdgesToCentroid >
struct EntityDecomposer;
......@@ -31,10 +28,9 @@ struct EntityDecomposer< MeshConfig, Topologies::Polygon, EntityDecomposerVersio
using Topology = Topologies::Polygon;
using MeshEntityType = MeshEntity< MeshConfig, Device, Topology >;
using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
using PointType = typename VertexMeshEntityType::PointType;
using GlobalIndexType = typename MeshConfig::GlobalIndexType;
using LocalIndexType = typename MeshConfig::LocalIndexType;
static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
{
const auto pointsCount = entity.template getSubentitiesCount< 0 >();
......@@ -80,7 +76,6 @@ struct EntityDecomposer< MeshConfig, Topologies::Polygon, EntityDecomposerVersio
using Topology = Topologies::Polygon;
using MeshEntityType = MeshEntity< MeshConfig, Device, Topology >;
using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
using PointType = typename VertexMeshEntityType::PointType;
using GlobalIndexType = typename MeshConfig::GlobalIndexType;
using LocalIndexType = typename MeshConfig::LocalIndexType;
......@@ -116,11 +111,10 @@ struct EntityDecomposer< MeshConfig, Topologies::Polyhedron, EntityDecomposerVer
using FaceTopology = Topologies::Polygon;
using MeshEntityType = MeshEntity< MeshConfig, Device, CellTopology >;
using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
using PointType = typename VertexMeshEntityType::PointType;
using GlobalIndexType = typename MeshConfig::GlobalIndexType;
using LocalIndexType = typename MeshConfig::LocalIndexType;
using SubentityDecomposer = EntityDecomposer< MeshConfig, FaceTopology, SubentityDecomposerVersion >;
static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
{
const auto& mesh = entity.getMesh();
......@@ -170,12 +164,10 @@ struct EntityDecomposer< MeshConfig, Topologies::Polyhedron, EntityDecomposerVer
using MeshEntityType = MeshEntity< MeshConfig, Device, CellTopology >;
using MeshSubentityType = MeshEntity< MeshConfig, Device, FaceTopology >;
using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
using PointType = typename VertexMeshEntityType::PointType;
using GlobalIndexType = typename MeshConfig::GlobalIndexType;
using LocalIndexType = typename MeshConfig::LocalIndexType;
using RealType = typename MeshConfig::RealType;
using SubentityDecomposer = EntityDecomposer< MeshConfig, FaceTopology, SubentityDecomposerVersion >;
static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
{
const auto& mesh = entity.getMesh();
......@@ -232,4 +224,4 @@ private:
};
} // namespace Meshes
} // namespace TNL
\ No newline at end of file
} // namespace TNL
......@@ -36,7 +36,6 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh )
using TriangleMesh = Mesh< TriangleMeshConfig, Devices::Host >;
using MeshBuilder = MeshBuilder< TriangleMesh >;
using GlobalIndexType = typename TriangleMesh::GlobalIndexType;
using LocalIndexType = typename TriangleMesh::LocalIndexType;
using PointType = typename TriangleMesh::PointType;
using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polygon, DecomposerVersion >;
constexpr int CellDimension = TriangleMesh::getMeshDimension();
......@@ -138,7 +137,6 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh )
using TetrahedronMesh = Mesh< TetrahedronMeshConfig, Devices::Host >;
using MeshBuilder = MeshBuilder< TetrahedronMesh >;
using GlobalIndexType = typename TetrahedronMesh::GlobalIndexType;
using LocalIndexType = typename TetrahedronMesh::LocalIndexType;
using PointType = typename TetrahedronMesh::PointType;
using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polyhedron, DecomposerVersion, SubdecomposerVersion >;
constexpr int CellDimension = TetrahedronMesh::getMeshDimension();
......
......@@ -34,7 +34,6 @@ planarCorrection( const Mesh< MeshConfig, Devices::Host >& inMesh )
using LocalIndexType = typename PolygonMesh::LocalIndexType;
using PointType = typename PolygonMesh::PointType;
using RealType = typename PolygonMesh::RealType;
using BoolVector = Containers::Vector< bool, Devices::Host, GlobalIndexType >;
using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polygon, DecomposerVersion >;
constexpr int CellDimension = PolygonMesh::getMeshDimension();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment