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

Clened up access to entity traits

parent d4a68b5e

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

+4 −7
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


#pragma once



#include <TNL/Meshes/MeshDimensionTag.h>

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

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

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

#include <TNL/Meshes/MeshDimensionsTag.h>

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

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

#include <TNL/Meshes/MeshDetails/initializer/MeshSuperentityStorageInitializer.h>
@@ -70,7 +67,7 @@ class Mesh; 
template< typename MeshConfig,

          typename DimensionTag,

          bool EntityStorage =

             MeshEntityTraits< MeshConfig, DimensionTag::value >::storageEnabled,

             MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::storageEnabled,

          bool EntityReferenceOrientationStorage =

             MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::orientationNeeded >

class MeshInitializerLayer;
@@ -285,7 +282,7 @@ class MeshInitializerLayer< MeshConfig, 
   using LocalIndexType        = typename MeshTraitsType::LocalIndexType;

   using PointArrayType        = typename MeshTraitsType::PointArrayType;

   using SeedType              = MeshEntitySeed< MeshConfig, EntityTopology >;

   using SeedIndexedSet = typename MeshEntityTraits< MeshConfig, DimensionsTag::value >::SeedIndexedSetType;

   using SeedIndexedSet        = typename MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::SeedIndexedSetType;



   public:
@@ -438,7 +435,7 @@ class MeshInitializerLayer< MeshConfig, 


   private:



      using SeedIndexedSet = typename MeshEntityTraits< MeshConfig, DimensionsTag::value >::SeedIndexedSetType;

      using SeedIndexedSet = typename MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::SeedIndexedSetType;

      SeedIndexedSet seedsIndexedSet;

      ReferenceOrientationArrayType referenceOrientations;

};

src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <TNL/File.h>

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

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

#include <TNL/Meshes/MeshDetails/layers/MeshSubentityStorageLayer.h>

#include <TNL/Meshes/MeshDetails/layers/MeshSuperentityStorageLayer.h>
@@ -26,8 +25,8 @@ namespace TNL { 
namespace Meshes {



template< typename MeshConfig,

          typename DimensionTag,

          bool EntityStorage = MeshEntityTraits< MeshConfig, DimensionTag::value >::storageEnabled >

          typename DimensionsTag,

          bool EntityStorage = MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::storageEnabled >

class MeshStorageLayer;

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

+2 −3
Original line number Diff line number Diff line
@@ -41,9 +41,8 @@ public: 
   using GlobalIndexType     = typename MeshConfig::GlobalIndexType;

   using LocalIndexType      = typename MeshConfig::LocalIndexType;

   using EntityType          = MeshEntity< MeshConfig, EntityTopology >;

   using EntityTraits        = MeshEntityTraits< MeshConfig, Dimensions >;

   using SuperentityTopology = typename EntityTraits::EntityTopology;

   using SuperentityType     = typename EntityTraits::EntityType;

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

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



   /****

    * Type of container for storing of the superentities indices.

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

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


   using PointArrayType    = Containers::Array< PointType, Devices::Host, GlobalIndexType >;

   using CellSeedArrayType = Containers::Array< CellSeedType, Devices::Host, GlobalIndexType >;

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



   template< int Dimensions >

   using EntityTraits = MeshEntityTraits< MeshConfig, Dimensions >;