Commit 59a78e50 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed unused types

parent a7ad5aba

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

+13 −37
Original line number Diff line number Diff line
@@ -137,9 +137,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
   static constexpr int Dimensions = DimensionsTag::value;

   using MeshTraitsType            = MeshTraits< MeshConfig >;

   using SubentityTraitsType       = typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >;

   using SubentityContainerType    = typename SubentityTraitsType::SubentityContainerType;

   using SharedContainerType       = typename SubentityTraitsType::AccessArrayType;

   using GlobalIndexType           = typename SharedContainerType::ElementType;

   using GlobalIndexType           = typename SubentityTraitsType::GlobalIndexType;



   using InitializerType           = MeshInitializer< MeshConfig >;

   using EntityInitializerType     = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -194,9 +192,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
                                                typename DimensionsTag::Decrement >;



   using SubentitiesTraits         = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using SubentityContainerType    = typename SubentitiesTraits::SubentityContainerType;

   using SharedContainerType       = typename SubentitiesTraits::AccessArrayType;

   using GlobalIndexType           = typename SharedContainerType::ElementType;

   using GlobalIndexType           = typename SubentitiesTraits::GlobalIndexType;



   using InitializerType           = MeshInitializer< MeshConfig >;

   using EntityInitializerType     = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -255,9 +251,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
                                                typename DimensionsTag::Decrement >;



   using SubentitiesTraits         = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using SubentityContainerType    = typename SubentitiesTraits::SubentityContainerType;

   using SharedContainerType       = typename SubentitiesTraits::SharedContainerType;

   using GlobalIndexType           = typename SharedContainerType::ElementType;

   using GlobalIndexType           = typename SubentitiesTraits::GlobalIndexType;



   using InitializerType           = MeshInitializer< MeshConfig >;

   using EntityInitializerType     = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -305,14 +299,8 @@ class MeshEntityInitializerLayer< MeshConfig, 
   using BaseType = MeshEntityInitializerLayer< MeshConfig,

                                                EntityTopology,

                                                typename DimensionsTag::Decrement >;

   using SubentityContainerType = typename MeshSubentityTraits< MeshConfig,

                                                                EntityTopology,

                                                                DimensionsTag::value >::SubentityContainerType;

   using SharedContainerType = typename MeshSubentityTraits< MeshConfig,

                                                             EntityTopology,

                                                             DimensionsTag::value >::SharedContainerType;



   using GlobalIndexType           = typename SharedContainerType::ElementType;

   using SubentitiesTraits         = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using GlobalIndexType           = typename SubentitiesTraits::GlobalIndexType;

   using LocalIndexType            = typename MeshTraits< MeshConfig >::LocalIndexType;

   using InitializerType           = MeshInitializer< MeshConfig >;

   using EntityInitializerType     = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -353,14 +341,9 @@ class MeshEntityInitializerLayer< MeshConfig, 
   using BaseType = MeshEntityInitializerLayer< MeshConfig,

                                                EntityTopology,

                                                typename DimensionsTag::Decrement >;

   using SubentityContainerType = typename MeshSubentityTraits< MeshConfig,

                                                                EntityTopology,

                                                                DimensionsTag::value >::SubentityContainerType;

   using SharedContainerType = typename MeshSubentityTraits< MeshConfig,

                                                             EntityTopology,

                                                             DimensionsTag::value >::SharedContainerType;



   using GlobalIndexType           = typename SharedContainerType::DataType;

   using SubentitiesTraits         = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using GlobalIndexType           = typename SubentitiesTraits::GlobalIndexType;

   using LocalIndexType            = typename MeshTraits< MeshConfig >::LocalIndexType;

   using InitializerType           = MeshInitializer< MeshConfig >;

   using EntityInitializerType     = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -412,12 +395,8 @@ class MeshEntityInitializerLayer< MeshConfig, 
                                  true >

{

   using DimensionsTag = MeshDimensionsTag< 0 >;

   using SubentitiesTraits = MeshSubentityTraits< MeshConfig,

                                                  EntityTopology,

                                                  DimensionsTag::value >;



   using SharedContainerType   = typename SubentitiesTraits::AccessArrayType;

   using GlobalIndexType       = typename SharedContainerType::ElementType;

   using SubentitiesTraits     = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using GlobalIndexType       = typename SubentitiesTraits::GlobalIndexType;

   using LocalIndexType        = typename MeshTraits< MeshConfig >::LocalIndexType;

   using InitializerType       = MeshInitializer< MeshConfig >;

   using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;
@@ -450,8 +429,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
   using InitializerType     = MeshInitializer< MeshConfig >;

   using DimensionsTag       = MeshDimensionsTag< 0 >;

   using SubentitiesTraits   = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using SharedContainerType = typename SubentitiesTraits::SharedContainerType;

   using GlobalIndexType     = typename SharedContainerType::ElementType;

   using GlobalIndexType     = typename SubentitiesTraits::GlobalIndexType;

   using EntityType          = MeshEntity< MeshConfig, EntityTopology >;

   using SeedType            = MeshEntitySeed< MeshConfig, EntityTopology >;
@@ -474,8 +452,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
   using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;

   using DimensionsTag         = MeshDimensionsTag< 0 >;

   using SubentitiesTraits     = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using SharedContainerType   = typename SubentitiesTraits::SharedContainerType;

   using GlobalIndexType       = typename SharedContainerType::ElementType;

   using GlobalIndexType       = typename SubentitiesTraits::GlobalIndexType;

   using EntityType            = MeshEntity< MeshConfig, EntityTopology >;



protected:
@@ -496,8 +473,7 @@ class MeshEntityInitializerLayer< MeshConfig, 
   using EntityInitializerType = MeshEntityInitializer< MeshConfig, EntityTopology >;

   using DimensionsTag         = MeshDimensionsTag< 0 >;

   using SubentitiesTraits     = MeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >;

   using SharedContainerType   = typename SubentitiesTraits::SharedContainerType;

   using GlobalIndexType       = typename SharedContainerType::ElementType;

   using GlobalIndexType       = typename SubentitiesTraits::GlobalIndexType;

   using EntityType            = MeshEntity< MeshConfig, EntityTopology >;



protected:

src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h

+7 −10
Original line number Diff line number Diff line
@@ -39,19 +39,16 @@ public: 


   using GlobalIndexType   = typename MeshConfig::GlobalIndexType;

   using LocalIndexType    = typename MeshConfig::LocalIndexType;

   using Subtopology            = MeshSubtopology< EntityTopology, Dimensions >;

   using SubentityTopology      = typename Subtopology::Topology;

   using SubentityType          = MeshEntity< MeshConfig, SubentityTopology >;

   using SubentityTopology = typename MeshEntityTraits< MeshConfig, Dimensions >::EntityTopology;

   using SubentityType     = typename MeshEntityTraits< MeshConfig, Dimensions >::EntityType;

   using Seed              = MeshEntitySeed< MeshConfig, SubentityTopology >;

   using Orientation       = MeshEntityOrientation< MeshConfig, SubentityTopology >;





   static constexpr int count = Subtopology::count;

   static constexpr int count = MeshSubtopology< EntityTopology, Dimensions >::count;



   using StorageArrayType       = Containers::StaticArray< count, GlobalIndexType >;

   using AccessArrayType        = Containers::SharedArray< GlobalIndexType, Devices::Host, LocalIndexType >;

   using IdArrayType            = Containers::StaticArray< count, GlobalIndexType >;

   using SubentityContainerType = Containers::StaticArray< count, SubentityType >;

   using SeedArrayType          = Containers::StaticArray< count, Seed >;

   using OrientationArrayType   = Containers::StaticArray< count, Orientation >;

   using IdPermutationArrayType = Containers::StaticArray< count, LocalIndexType >;

src/TNL/Meshes/MeshDetails/traits/MeshSuperentityTraits.h

+0 −15
Original line number Diff line number Diff line
@@ -43,26 +43,11 @@ public: 
   using SuperentityTopology = typename EntityTraits::EntityTopology;

   using SuperentityType     = typename EntityTraits::EntityType;





   /****

    * Type of container for storing of the superentities indices.

    */

   using StorageArrayType        = Containers::Array< GlobalIndexType, Devices::Host, LocalIndexType >;



   using StorageNetworkType      = EllpackIndexMultimap< GlobalIndexType, Devices::Host, LocalIndexType >;

   using SuperentityAccessorType = typename StorageNetworkType::ValuesAccessorType;



   /****

    * Type for passing the superentities indices by the getSuperentityIndices()

    * method. We introduce it because of the compatibility with the subentities

    * which are usually stored in static array.

    */

   using AccessArrayType = Containers::SharedArray< GlobalIndexType, Devices::Host, LocalIndexType >;



   /****

    * This is used by the mesh initializer.

    */

   using GrowableContainerType = List< GlobalIndexType >;

};



} // namespace Meshes