Commit 59924796 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Added KeyType to MeshEntitySeed

parent 68856a3b

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

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



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

#include <TNL/Meshes/MeshDetails/initializer/MeshEntitySeedKey.h>



namespace TNL {

namespace Meshes {
@@ -32,6 +33,7 @@ class MeshEntitySeed 
      using GlobalIndexType = typename MeshTraits< MeshConfig >::GlobalIndexType;

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

      using IdArrayType     = typename SubvertexTraits::IdArrayType;

      using KeyType         = MeshEntitySeedKey< MeshConfig, EntityTopology >;



      static String getType() { return String( "MeshEntitySeed<>" ); }
@@ -71,6 +73,7 @@ class MeshEntitySeed< MeshConfig, MeshVertexTopology > 
      using GlobalIndexType = typename MeshTraits< MeshConfig >::GlobalIndexType;

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

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

      using KeyType         = MeshEntitySeedKey< MeshConfig, MeshVertexTopology >;



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

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

+2 −6
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


#pragma once



#include <TNL/Meshes/MeshDimensionTag.h>

#include <TNL/Meshes/MeshDimensionsTag.h>

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



namespace TNL {

namespace Meshes {
@@ -25,11 +26,6 @@ template< typename MeshConfig, 
          typename EntityTopology >

class MeshEntitySeed;



template< typename MeshConfig,

          typename EntityTopology,

          int Dimension >

class MeshSubentityTraits;



/****

 * Unique identification of a mesh entity by its vertices.

 * Uniqueness is preserved for entities of the same type only.

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

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <TNL/Meshes/MeshDetails/initializer/MeshSuperentityStorageInitializer.h>

#include <TNL/Meshes/MeshDetails/MeshEntityReferenceOrientation.h>

#include <TNL/Meshes/MeshDetails/initializer/MeshEntitySeed.h>

#include <TNL/Meshes/MeshDetails/initializer/MeshEntitySeedKey.h>



namespace TNL {

namespace Meshes {

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

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ namespace Meshes { 


template< typename MeshConfig, typename EntityTopology > class MeshEntity;

template< typename MeshConfig, typename EntityTopology > class MeshEntitySeed;

template< typename MeshConfig, typename EntityTopology > class MeshEntitySeedKey;

template< typename MeshConfig, typename EntityTopology > class MeshEntityReferenceOrientation;



template< typename MeshConfig,
@@ -70,10 +69,9 @@ public: 
   using EntityType                    = MeshEntity< MeshConfig, EntityTopology >;

   using SeedType                      = MeshEntitySeed< MeshConfig, EntityTopology >;

   using ReferenceOrientationType      = MeshEntityReferenceOrientation< MeshConfig, EntityTopology >;

   using Key                           = MeshEntitySeedKey< MeshConfig, EntityTopology >;



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

   using SeedIndexedSetType            = Containers::IndexedSet< Key, 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 >;

};