Commit 761f7347 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed IdArrayType from MeshSubentityTraits 

Clang still did not like it, and me too - it is an implementation detail
independent of the configuration, so it can be directly in the
MeshEntitySeed class.
parent 58f07626

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class MeshEntitySeed 
   public:

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

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

      using IdArrayType     = typename SubvertexTraits::IdArrayType;

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

      using KeyType         = MeshEntitySeedKey< MeshConfig, EntityTopology >;



      static String getType() { return String( "MeshEntitySeed<>" ); }

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

+1 −6
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


#pragma once



#include <TNL/Meshes/DimensionTag.h>

#include <TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h>



namespace TNL {

namespace Meshes {
@@ -35,9 +32,7 @@ template< typename MeshConfig, 
class MeshEntitySeedKey

{

   using EntitySeedType = MeshEntitySeed< MeshConfig, EntityTopology >;

   using IdArrayType = typename MeshSubentityTraits< MeshConfig,

                                                     EntityTopology,

                                                     0 >::IdArrayType;

   using IdArrayType = typename EntitySeedType::IdArrayType;



public:

   MeshEntitySeedKey( const EntitySeedType& entitySeed )

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

+2 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public: 


   static constexpr bool storageEnabled = MeshConfig::subentityStorage( EntityTopology(), Dimension );

   static constexpr bool orientationEnabled = MeshConfig::subentityOrientationStorage( EntityTopology(), Dimension );

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



   using GlobalIndexType   = typename MeshConfig::GlobalIndexType;

   using LocalIndexType    = typename MeshConfig::LocalIndexType;
@@ -49,17 +50,13 @@ public: 
   using Seed              = MeshEntitySeed< MeshConfig, SubentityTopology >;

   using Orientation       = MeshEntityOrientation< MeshConfig, SubentityTopology >;





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



   /****

    * Type of container for storing of the subentities indices.

    */

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

   using SubentityAccessorType  = typename StorageNetworkType::ValuesAccessorType;



   // static arrays used by MeshEntitySeed etc.

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

   // static array used in MeshSubentitySeedCreator

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



   // orientation and its accessor