Commit 8cf8b912 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Refactoring mesh entity.

parent bb2384b8

src/mesh/initializer/tnlMeshEntityInitializer.h

+3 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ class tnlMeshEntityInitializerLayer< MeshConfig, 
   typedef tnlMeshTraits< MeshConfig >                                                          MeshTraits;

   typedef typename MeshTraits:: template SubentityTraits< EntityTopology, Dimensions >         SubentityTraits;

   typedef typename SubentityTraits::SubentityContainerType                                     SubentityContainerType;

   typedef typename SubentityTraits::SharedContainerType                                        SharedContainerType;

   typedef typename SubentityTraits::AccessArrayType                                        SharedContainerType;

   typedef typename SharedContainerType::ElementType                                            GlobalIndexType;



   typedef tnlMeshInitializer< MeshConfig >                                                     InitializerType;
@@ -210,7 +210,7 @@ class tnlMeshEntityInitializerLayer< MeshConfig, 


   typedef tnlMeshSubentityTraits< MeshConfig, EntityTopology, DimensionsTag::value >                     SubentitiesTraits;

   typedef typename SubentitiesTraits::SubentityContainerType                                  SubentityContainerType;

   typedef typename SubentitiesTraits::SharedContainerType                                     SharedContainerType;

   typedef typename SubentitiesTraits::AccessArrayType                                     SharedContainerType;

   typedef typename SharedContainerType::ElementType                                           GlobalIndexType;



   typedef tnlMeshInitializer< MeshConfig >                                                          InitializerType;
@@ -436,7 +436,7 @@ class tnlMeshEntityInitializerLayer< MeshConfig, 
                                     EntityTopology,

                                     DimensionsTag::value >                 SubentitiesTraits;



   typedef typename SubentitiesTraits::SharedContainerType           SharedContainerType;

   typedef typename SubentitiesTraits::AccessArrayType           SharedContainerType;

   typedef typename SharedContainerType::ElementType                 GlobalIndexType;



   typedef tnlMeshInitializer< MeshConfig >                           InitializerType;

src/mesh/initializer/tnlMeshEntitySeed.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class tnlMeshEntitySeed 
      typedef typename tnlMeshTraits< MeshConfig >::GlobalIndexType                                      GlobalIndexType;

      typedef typename tnlMeshTraits< MeshConfig >::LocalIndexType                                       LocalIndexType;

      typedef typename tnlMeshTraits< MeshConfig >::IdArrayAccessorType                                  IdArrayAccessorType;

      typedef typename SubvertexTraits::ContainerType                                                          IdArrayType;

      typedef typename SubvertexTraits::IdArrayType                                                      IdArrayType;



      static tnlString getType() { return tnlString( "tnlMeshEntitySeed<>" ); }

src/mesh/initializer/tnlMeshEntitySeedKey.h

+5 −5
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ class tnlMeshEntitySeedKey 
   typedef typename

      tnlMeshSubentityTraits< MeshConfig,

                                EntityTopology,

                                0 >::ContainerType ContainerType;

                                0 >::StorageArrayType  StorageArrayType;



   public:



   explicit tnlMeshEntitySeedKey( const EntitySeedType& entitySeed )

   {

      for( typename ContainerType::IndexType i = 0; 

      for( typename StorageArrayType::IndexType i = 0; 

           i < entitySeed.getCornersCount();

           i++ )

         this->sortedCorners[ i ] = entitySeed.getCornerIds()[ i ];
@@ -58,8 +58,8 @@ class tnlMeshEntitySeedKey 


   bool operator<( const tnlMeshEntitySeedKey& other ) const

   {

      for( typename ContainerType::IndexType i = 0;

           i < ContainerType::size;

      for( typename StorageArrayType::IndexType i = 0;

           i < StorageArrayType::size;

           i++)

      {

         if( sortedCorners[ i ] < other.sortedCorners[ i ] )
@@ -73,7 +73,7 @@ class tnlMeshEntitySeedKey 


   private:



   ContainerType sortedCorners;

   StorageArrayType sortedCorners;

};

src/mesh/initializer/tnlMeshInitializer.h

+3 −3
Original line number Diff line number Diff line
@@ -93,21 +93,21 @@ class tnlMeshInitializer 
   static typename tnlMeshTraits< MeshConfig >::template SubentityTraits< typename EntityType::EntityTopology, SubDimensionsTag::value >::IdArrayType&

   subentityIdsArray( EntityType& entity )

   {

      return entity.template subentityIdsArray< SubDimensionsTag >();

      return entity.template subentityIdsArray< SubDimensionsTag::value >();

   }

   

   template< typename SuperDimensionsTag, typename MeshEntity>

   static typename tnlMeshTraits< MeshConfig >::IdArrayAccessorType&

   superentityIdsArray( MeshEntity& entity )

   {

      return entity.template superentityIdsArray< SuperDimensionsTag >();

      return entity.template superentityIdsArray< SuperDimensionsTag::value >();

   }

   

   template<typename SubDimensionsTag, typename MeshEntity >

	static typename tnlMeshTraits< MeshConfig >::template SubentityTraits< typename MeshEntity::EntityTopology, SubDimensionsTag::value >::OrientationArrayType&

   subentityOrientationsArray( MeshEntity &entity )

   {

      return entity.template subentityOrientationsArray< SubDimensionsTag >();

      return entity.template subentityOrientationsArray< SubDimensionsTag::value >();

   }

   

   template< typename DimensionsTag >

src/mesh/tnlMeshEntity.h

+131 −454

File changed.

Preview size limit exceeded, changes collapsed.