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

Removed unused types

parent cbbacee6
No related branches found
No related tags found
No related merge requests found
...@@ -197,15 +197,12 @@ class MeshInitializerLayer< MeshConfig, ...@@ -197,15 +197,12 @@ class MeshInitializerLayer< MeshConfig,
using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >; using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >;
using EntityTopology = typename EntityTraitsType::EntityTopology; using EntityTopology = typename EntityTraitsType::EntityTopology;
using GlobalIndexType = typename MeshTraitsType::GlobalIndexType; using GlobalIndexType = typename MeshTraitsType::GlobalIndexType;
using CellTopology = typename MeshTraitsType::CellTopology;
using StorageArrayType = typename EntityTraitsType::StorageArrayType;
using InitializerType = MeshInitializer< MeshConfig >; using InitializerType = MeshInitializer< MeshConfig >;
using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >; using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;
using CellSeedArrayType = typename MeshTraitsType::CellSeedArrayType; using CellSeedArrayType = typename MeshTraitsType::CellSeedArrayType;
using LocalIndexType = typename MeshTraitsType::LocalIndexType; using LocalIndexType = typename MeshTraitsType::LocalIndexType;
using PointArrayType = typename MeshTraitsType::PointArrayType; using PointArrayType = typename MeshTraitsType::PointArrayType;
using SeedType = MeshEntitySeed< MeshConfig, CellTopology >;
public: public:
...@@ -266,19 +263,16 @@ class MeshInitializerLayer< MeshConfig, ...@@ -266,19 +263,16 @@ class MeshInitializerLayer< MeshConfig,
: public MeshInitializerLayer< MeshConfig, : public MeshInitializerLayer< MeshConfig,
typename DimensionsTag::Decrement > typename DimensionsTag::Decrement >
{ {
using MeshTraitsType = MeshTraits< MeshConfig >;
using BaseType = MeshInitializerLayer< MeshConfig, typename DimensionsTag::Decrement >; using BaseType = MeshInitializerLayer< MeshConfig, typename DimensionsTag::Decrement >;
using MeshType = Mesh< MeshConfig >; using MeshType = Mesh< MeshConfig >;
using MeshTraitsType = MeshTraits< MeshConfig >;
using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >; using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >;
using EntityTopology = typename EntityTraitsType::EntityTopology; using EntityTopology = typename EntityTraitsType::EntityTopology;
using GlobalIndexType = typename MeshTraitsType::GlobalIndexType; using GlobalIndexType = typename MeshTraitsType::GlobalIndexType;
using CellTopology = typename MeshTraitsType::CellTopology;
using StorageArrayType = typename EntityTraitsType::StorageArrayType;
using InitializerType = MeshInitializer< MeshConfig >; using InitializerType = MeshInitializer< MeshConfig >;
using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >; using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;
using EntitySeedArrayType = typename EntityTraitsType::SeedArrayType;
using LocalIndexType = typename MeshTraitsType::LocalIndexType; using LocalIndexType = typename MeshTraitsType::LocalIndexType;
using PointArrayType = typename MeshTraitsType::PointArrayType; using PointArrayType = typename MeshTraitsType::PointArrayType;
using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >; using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >;
...@@ -288,7 +282,7 @@ class MeshInitializerLayer< MeshConfig, ...@@ -288,7 +282,7 @@ class MeshInitializerLayer< MeshConfig,
GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh ) GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh )
{ {
using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< CellTopology::dimensions >, DimensionsTag >; using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< MeshType::dimensions >, DimensionsTag >;
std::set< typename SeedIndexedSet::key_type > seedSet; std::set< typename SeedIndexedSet::key_type > seedSet;
for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ ) for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
...@@ -313,7 +307,7 @@ class MeshInitializerLayer< MeshConfig, ...@@ -313,7 +307,7 @@ class MeshInitializerLayer< MeshConfig,
const GlobalIndexType numberOfEntities = getNumberOfEntities( initializer, mesh ); const GlobalIndexType numberOfEntities = getNumberOfEntities( initializer, mesh );
initializer.template setNumberOfEntities< DimensionsTag::value >( numberOfEntities ); initializer.template setNumberOfEntities< DimensionsTag::value >( numberOfEntities );
using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< CellTopology::dimensions >, DimensionsTag >; using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< MeshType::dimensions >, DimensionsTag >;
for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ ) for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
{ {
auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) ); auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) );
...@@ -362,15 +356,11 @@ class MeshInitializerLayer< MeshConfig, ...@@ -362,15 +356,11 @@ class MeshInitializerLayer< MeshConfig,
using EntityTraitsType = typename MeshType::template EntityTraits< DimensionsTag::value >; using EntityTraitsType = typename MeshType::template EntityTraits< DimensionsTag::value >;
using EntityTopology = typename EntityTraitsType::EntityTopology; using EntityTopology = typename EntityTraitsType::EntityTopology;
using GlobalIndexType = typename MeshTraitsType::GlobalIndexType; using GlobalIndexType = typename MeshTraitsType::GlobalIndexType;
using CellTopology = typename MeshTraitsType::CellTopology;
using InitializerType = MeshInitializer< MeshConfig >; using InitializerType = MeshInitializer< MeshConfig >;
using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >; using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;
using CellSeedArrayType = typename MeshTraitsType::CellSeedArrayType;
using LocalIndexType = typename MeshTraitsType::LocalIndexType; using LocalIndexType = typename MeshTraitsType::LocalIndexType;
using PointArrayType = typename MeshTraitsType::PointArrayType; using PointArrayType = typename MeshTraitsType::PointArrayType;
using EntityArrayType = typename EntityTraitsType::StorageArrayType;
using SeedArrayType = typename EntityTraitsType::SeedArrayType;
using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >; using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >;
using ReferenceOrientationType = typename EntityTraitsType::ReferenceOrientationType; using ReferenceOrientationType = typename EntityTraitsType::ReferenceOrientationType;
using ReferenceOrientationArrayType = typename EntityTraitsType::ReferenceOrientationArrayType; using ReferenceOrientationArrayType = typename EntityTraitsType::ReferenceOrientationArrayType;
...@@ -379,7 +369,7 @@ class MeshInitializerLayer< MeshConfig, ...@@ -379,7 +369,7 @@ class MeshInitializerLayer< MeshConfig,
GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh ) GlobalIndexType getNumberOfEntities( InitializerType& initializer, MeshType& mesh )
{ {
using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< CellTopology::dimensions >, DimensionsTag >; using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< MeshType::dimensions >, DimensionsTag >;
std::set< typename SeedIndexedSet::key_type > seedSet; std::set< typename SeedIndexedSet::key_type > seedSet;
for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ ) for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
...@@ -405,7 +395,7 @@ class MeshInitializerLayer< MeshConfig, ...@@ -405,7 +395,7 @@ class MeshInitializerLayer< MeshConfig,
initializer.template setNumberOfEntities< DimensionsTag::value >( numberOfEntities ); initializer.template setNumberOfEntities< DimensionsTag::value >( numberOfEntities );
this->referenceOrientations.setSize( numberOfEntities ); this->referenceOrientations.setSize( numberOfEntities );
using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< CellTopology::dimensions >, DimensionsTag >; using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, MeshDimensionsTag< MeshType::dimensions >, DimensionsTag >;
for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ ) for( GlobalIndexType i = 0; i < mesh.getNumberOfCells(); i++ )
{ {
auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) ); auto subentitySeeds = SubentitySeedsCreator::create( initializer.getSubvertices( mesh.getCell( i ), i ) );
...@@ -468,14 +458,13 @@ class MeshInitializerLayer< MeshConfig, ...@@ -468,14 +458,13 @@ class MeshInitializerLayer< MeshConfig,
using MeshTraitsType = typename MeshType::MeshTraitsType; using MeshTraitsType = typename MeshType::MeshTraitsType;
using DimensionsTag = MeshDimensionsTag< 0 >; using DimensionsTag = MeshDimensionsTag< 0 >;
using EntityTraitsType = typename MeshType::template EntityTraits< DimensionsTag::value >; using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >;
using EntityTopology = typename EntityTraitsType::EntityTopology; using EntityTopology = typename EntityTraitsType::EntityTopology;
using InitializerType = MeshInitializer< MeshConfig >; using InitializerType = MeshInitializer< MeshConfig >;
using GlobalIndexType = typename MeshTraits< MeshConfig >::GlobalIndexType; using GlobalIndexType = typename MeshTraits< MeshConfig >::GlobalIndexType;
using LocalIndexType = typename MeshTraits< MeshConfig >::LocalIndexType; using LocalIndexType = typename MeshTraits< MeshConfig >::LocalIndexType;
using PointArrayType = typename MeshTraits< MeshConfig >::PointArrayType; using PointArrayType = typename MeshTraits< MeshConfig >::PointArrayType;
using EntityArrayType = typename EntityTraitsType::StorageArrayType;
using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >; using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;
using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >; using SeedType = MeshEntitySeed< MeshConfig, EntityTopology >;
......
...@@ -72,7 +72,6 @@ public: ...@@ -72,7 +72,6 @@ public:
using StorageArrayType = Containers::Array< EntityType, Devices::Host, GlobalIndexType >; using StorageArrayType = Containers::Array< EntityType, Devices::Host, GlobalIndexType >;
using SeedIndexedSetType = Containers::IndexedSet< typename SeedType::KeyType, GlobalIndexType >; using SeedIndexedSetType = Containers::IndexedSet< typename SeedType::KeyType, GlobalIndexType >;
using SeedArrayType = Containers::Array< SeedType, Devices::Host, GlobalIndexType >;
using ReferenceOrientationArrayType = Containers::Array< ReferenceOrientationType, Devices::Host, GlobalIndexType >; using ReferenceOrientationArrayType = Containers::Array< ReferenceOrientationType, Devices::Host, GlobalIndexType >;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment