Commit 2b037e77 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Refactoring mesh traits: removed Seed, SeedArrayType and StorageArrayType

parent 56b2bbb3

src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ public: 
   {

      using IndexType = typename Mesh::GlobalIndexType;

      using DeviceType = typename Mesh::DeviceType;

      using StorageArrayType = typename Mesh::template EntityTraits< Dimension >::StorageArrayType;



      if( Dimension == 0 )

         permutePoints( mesh, perm, iperm );

src/TNL/Meshes/MeshDetails/MeshLayers/StorageLayer.h

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ public: 
   using MeshTraitsType   = MeshTraits< MeshConfig, Device >;

   using GlobalIndexType  = typename MeshTraitsType::GlobalIndexType;

   using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionTag::value >;

   using StorageArrayType = typename EntityTraitsType::StorageArrayType;

   using EntityType       = typename EntityTraitsType::EntityType;

   using EntityTopology   = typename EntityTraitsType::EntityTopology;

   using SubentityStorageBaseType = SubentityStorageLayerFamily< MeshConfig, Device, EntityTopology >;

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

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class SubentitySeedsCreator 
   static constexpr LocalIndexType SUBENTITY_VERTICES_COUNT = MeshTraitsType::template SubentityTraits< SubentityTopology, 0 >::count;



public:

   using SubentitySeedArray = typename SubentityTraits::SeedArrayType;

   using SubentitySeedArray = Containers::StaticArray< SubentityTraits::count, EntitySeed< MeshConfig, SubentityTopology > >;



   static SubentitySeedArray create( const SubvertexAccessorType& subvertices )

   {
@@ -84,9 +84,10 @@ class SubentitySeedsCreator< MeshConfig, EntityDimensionTag, DimensionTag< 0 > > 
   using EntityTopology        = typename EntityTraitsType::EntityTopology;

   using SubvertexAccessorType = typename MeshTraitsType::template SubentityTraits< EntityTopology, 0 >::SubentityAccessorType;

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

   using SubentityTopology     = typename SubentityTraits::SubentityTopology;



public:

   using SubentitySeedArray = typename SubentityTraits::SeedArrayType;

   using SubentitySeedArray = Containers::StaticArray< SubentityTraits::count, EntitySeed< MeshConfig, SubentityTopology > >;



   static SubentitySeedArray create( const SubvertexAccessorType& subvertices )

   {

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

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public: 
   using SeedType                      = EntitySeed< MeshConfig, EntityTopology >;

   using ReferenceOrientationType      = MeshEntityReferenceOrientation< MeshConfig, EntityTopology >;



   using StorageArrayType              = Containers::Array< EntityType, Device, GlobalIndexType >;

   using SeedIndexedSetType            = Containers::UnorderedIndexedSet< SeedType, GlobalIndexType, typename SeedType::HashType, typename SeedType::KeyEqual >;

   using SeedSetType                   = std::unordered_set< typename SeedIndexedSetType::key_type, typename SeedIndexedSetType::hasher, typename SeedIndexedSetType::key_equal >;

   using ReferenceOrientationArrayType = std::vector< ReferenceOrientationType >;

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

+0 −6
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ namespace Meshes { 


template< typename MeshConfig, typename EntityTopology >

class MeshEntityOrientation;

template< typename MeshConfig, typename EntityTopology >

class EntitySeed;



template< typename MeshConfig,

          typename Device,
@@ -48,7 +46,6 @@ public: 


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

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

   using Seed              = EntitySeed< MeshConfig, SubentityTopology >;

   using Orientation       = MeshEntityOrientation< MeshConfig, SubentityTopology >;



   /****
@@ -58,9 +55,6 @@ public: 
   using StorageNetworkType     = Containers::Multimaps::StaticEllpackIndexMultimap< count, GlobalIndexType, Device, LocalIndexType, 32 >;

   using SubentityAccessorType  = typename StorageNetworkType::ValuesAccessorType;



   // static array used in MeshSubentitySeedCreator

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



   // orientation and its accessor

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

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