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

Debuging mesh initializer.

parent a4dc883c

src/mesh/config/tnlMeshConfigBase.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ template< typename Cell, 
          typename Id = void >

struct tnlMeshConfigBase

{

   typedef Cell        CellType;

   typedef Cell        CellTopology;

   typedef Real        RealType;

   typedef GlobalIndex GlobalIndexType;

   typedef LocalIndex  LocalIndexType;

src/mesh/config/tnlMeshConfigValidator.h

+5 −5
Original line number Diff line number Diff line
@@ -79,19 +79,19 @@ class tnlMeshConfigValidatorLayer< MeshConfig, 0 > 


template< typename MeshConfig >

class tnlMeshConfigValidatorLayerCell :

   public tnlMeshConfigValidatorLayer< MeshConfig, MeshConfig::CellType::dimensions - 1 >//,

   public tnlMeshConfigValidatorLayer< MeshConfig, MeshConfig::CellTopology::dimensions - 1 >//,

//   public tnlMeshConfigValidatorSubtopologyLayer< MeshConfig, typename MeshConfig::CellType, MeshConfig::CellType::dimensions - 1 >

{

	typedef typename MeshConfig::CellType    CellType;

 	static const int dimensions =  CellType::dimensions;

	typedef typename MeshConfig::CellTopology    CellTopology;

 	static const int dimensions =  CellTopology::dimensions;



	static_assert( !MeshConfig::entityStorage( dimensions ) || MeshConfig::subentityStorage( CellType(), 0 ), "subvertices of all stored entities must be stored");

	static_assert( !MeshConfig::entityStorage( dimensions ) || MeshConfig::subentityStorage( CellTopology(), 0 ), "subvertices of all stored entities must be stored");

};



template<typename MeshConfig >

class tnlMeshConfigValidator : public tnlMeshConfigValidatorLayerCell< MeshConfig >

{

	static const int meshDimensions = MeshConfig::CellType::dimensions;

	static const int meshDimensions = MeshConfig::CellTopology::dimensions;



	static_assert(1 <= meshDimensions, "zero dimensional meshes are not supported");

	static_assert( meshDimensions <= MeshConfig::worldDimensions, "world dimension must not be less than mesh dimension");

src/mesh/layers/tnlMeshSuperentityAccess.h

+12 −3
Original line number Diff line number Diff line
@@ -73,14 +73,20 @@ class tnlMeshSuperentityAccessLayer< MeshConfig, 
template< typename MeshConfig,

          typename MeshEntity,

          typename Dimensions >

class tnlMeshSuperentityAccessLayer< MeshConfig, MeshEntity, Dimensions, tnlStorageTraits< false > > :

class tnlMeshSuperentityAccessLayer< MeshConfig,

                                     MeshEntity,

                                     Dimensions,

                                     tnlStorageTraits< false > > :

   public tnlMeshSuperentityAccessLayer< MeshConfig, MeshEntity, typename Dimensions::Decrement >

{

};



template< typename MeshConfig,

          typename MeshEntity >

class tnlMeshSuperentityAccessLayer< MeshConfig, MeshEntity, tnlDimensionsTag< MeshEntity::dimensions >, tnlStorageTraits< false > >

class tnlMeshSuperentityAccessLayer< MeshConfig,

                                     MeshEntity,

                                     tnlDimensionsTag< MeshEntity::dimensions >,

                                     tnlStorageTraits< false > >

{

   protected:

	   /***
@@ -92,7 +98,10 @@ class tnlMeshSuperentityAccessLayer< MeshConfig, MeshEntity, tnlDimensionsTag< M 


template< typename MeshConfig,

          typename MeshEntity >

class tnlMeshSuperentityAccessLayer< MeshConfig, MeshEntity, tnlDimensionsTag< MeshEntity::dimensions >, tnlStorageTraits< true > >

class tnlMeshSuperentityAccessLayer< MeshConfig,

                                     MeshEntity,

                                     tnlDimensionsTag< MeshEntity::dimensions >,

                                     tnlStorageTraits< true > >

{

   protected:

	   /***

src/mesh/tnlMeshBuilder.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class tnlMeshBuilder 
      typedef typename MeshTraits::GlobalIndexType     GlobalIndexType;

      typedef typename MeshTraits::LocalIndexType      LocalIndexType;

      typedef typename MeshTraits::PointType           PointType;

      typedef typename MeshTraits::CellType            CellType;

      typedef typename MeshTraits::CellTopology        CellTopology;

      typedef typename MeshTraits::CellSeedType        CellSeedType;



   bool setPointsCount( const GlobalIndexType& points )

src/mesh/tnlMeshEntity.h

+2 −1
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ class tnlMeshEntity< ConfigTag, tnlMeshVertexTag > 
    */

   typedef ConfigTag         MeshConfigTag;

   typedef tnlMeshVertexTag  Tag;

   typedef tnlMeshEntitySeed< ConfigTag, tnlMeshVertexTag >            SeedType;

   typedef typename tnlMeshTraits< ConfigTag >::PointType PointType;

   enum { dimensions = Tag::dimensions };

   enum { meshDimensions = tnlMeshTraits< ConfigTag >::meshDimensions };
@@ -382,7 +383,7 @@ class tnlMeshEntity< ConfigTag, tnlMeshVertexTag > 


   bool operator==( const tnlMeshEntity& entity ) const

   {

      return ( tnlMeshSuperentityAccess< ConfigTag, tnlMeshVertexTag >::operator==( entity ) &&

      return ( //tnlMeshSuperentityAccess< ConfigTag, tnlMeshVertexTag >::operator==( entity ) &&

               tnlMeshEntityId< typename ConfigTag::IdType,

                                typename ConfigTag::GlobalIndexType >::operator==( entity ) &&

               point == entity.point );