Removed 'dimension' attribute from Mesh (96bf0e56) · Commits · TNL / tnl-dev

src/TNL/Meshes/Mesh.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ class Mesh
		using CellType = typename MeshTraitsType::CellType;
		using VertexType = typename MeshTraitsType::VertexType;
		using PointType = typename MeshTraitsType::PointType;
		static constexpr int dimension = MeshTraitsType::meshDimension;

		template< int Dimension >
		using EntityTraits = typename MeshTraitsType::template EntityTraits< Dimension >;

src/TNL/Meshes/MeshDetails/MeshEntity_impl.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ template< typename MeshConfig,
		typename EntityTopology >
		constexpr int
		MeshEntity< MeshConfig, EntityTopology >::
		getEntityDimension() const
		getEntityDimension()
		{
		return EntityTopology::dimension;
		}
		@@ -111,7 +111,7 @@ template< typename MeshConfig,
		typename EntityTopology >
		constexpr typename MeshEntity< MeshConfig, EntityTopology >::LocalIndexType
		MeshEntity< MeshConfig, EntityTopology >::
		getNumberOfVertices() const
		getNumberOfVertices()
		{
		return SubentityTraits< 0 >::count;
		}
		@@ -199,7 +199,7 @@ operator!=( const MeshEntity& entity ) const
		template< typename MeshConfig >
		constexpr int
		MeshEntity< MeshConfig, MeshVertexTopology >::
		getEntityDimension() const
		getEntityDimension()
		{
		return EntityTopology::dimension;
		}
		@@ -230,4 +230,3 @@ std::ostream& operator<<( std::ostream& str, const MeshEntity< MeshConfig, Entit

		} // namespace Meshes
		} // namespace TNL

src/TNL/Meshes/MeshDetails/Mesh_impl.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ constexpr int
		Mesh< MeshConfig >::
		getMeshDimension()
		{
		return dimension;
		return MeshTraitsType::meshDimension;
		}

		template< typename MeshConfig >
		@@ -89,7 +89,7 @@ typename Mesh< MeshConfig >::GlobalIndexType
		Mesh< MeshConfig >::
		getNumberOfCells() const
		{
		return this->template getNumberOfEntities< dimension >();
		return this->template getNumberOfEntities< getMeshDimension() >();
		}

		template< typename MeshConfig >
		@@ -97,7 +97,7 @@ typename Mesh< MeshConfig >::CellType&
		Mesh< MeshConfig >::
		getCell( const GlobalIndexType& cellIndex )
		{
		return this->template getEntity< dimension >( cellIndex );
		return this->template getEntity< getMeshDimension() >( cellIndex );
		}

		template< typename MeshConfig >
		@@ -105,7 +105,7 @@ const typename Mesh< MeshConfig >::CellType&
		Mesh< MeshConfig >::
		getCell( const GlobalIndexType& cellIndex ) const
		{
		return this->template getEntity< dimension >( cellIndex );
		return this->template getEntity< getMeshDimension() >( cellIndex );
		}

		template< typename MeshConfig >

src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ class MeshInitializerLayer< MeshConfig,

		GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh )
		{
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::dimension >, DimensionTag >;
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
		std::set< typename SeedIndexedSet::key_type > seedSet;

		for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
		@@ -307,7 +307,7 @@ class MeshInitializerLayer< MeshConfig,
		const GlobalIndexType numberOfEntities = getNumberOfEntities( initializer, mesh );
		initializer.template setNumberOfEntities< DimensionTag::value >( numberOfEntities );

		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::dimension >, DimensionTag >;
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
		for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
		{
		auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) );
		@@ -369,7 +369,7 @@ class MeshInitializerLayer< MeshConfig,

		GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh )
		{
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::dimension >, DimensionTag >;
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
		std::set< typename SeedIndexedSet::key_type > seedSet;

		for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
		@@ -395,7 +395,7 @@ class MeshInitializerLayer< MeshConfig,
		initializer.template setNumberOfEntities< DimensionTag::value >( numberOfEntities );
		this->referenceOrientations.setSize( numberOfEntities );

		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::dimension >, DimensionTag >;
		using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
		for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
		{
		auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) );

src/TNL/Meshes/MeshEntity.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ class MeshEntity

		bool operator!=( const MeshEntity& entity ) const;

		constexpr int getEntityDimension() const;
		static constexpr int getEntityDimension();

		/****
		* Subentities
		@@ -82,7 +82,7 @@ class MeshEntity
		/****
		* Vertices
		*/
		constexpr LocalIndexType getNumberOfVertices() const;
		static constexpr LocalIndexType getNumberOfVertices();

		GlobalIndexType getVertexIndex( const LocalIndexType localIndex ) const;

		@@ -137,7 +137,7 @@ class MeshEntity< MeshConfig, MeshVertexTopology >

		bool operator!=( const MeshEntity& entity ) const;

		constexpr int getEntityDimension() const;
		static constexpr int getEntityDimension();

		/****
		* Superentities