Commit 5ce0ae64 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Used inheritance for storing entities in Mesh

parent 06a5a647

src/TNL/Meshes/Mesh.h

+6 −7
Original line number Diff line number Diff line
@@ -29,9 +29,12 @@ namespace Meshes { 


template< typename MeshConfig > //,

          //typename Device = Devices::Host >

class Mesh : public Object/*,

                public MeshStorageLayers< MeshConfig >*/

class Mesh

   : public Object,

     protected MeshStorageLayers< MeshConfig >

{

      using StorageBaseType = MeshStorageLayers< MeshConfig >;



   public:

 

      typedef MeshConfig                                        Config;
@@ -90,17 +93,13 @@ class Mesh : public Object/*, 
      typename MeshTraitsType::template SuperentityTraits< EntityTopology, SuperdimensionsTag::value >::StorageNetworkType&

      getSuperentityStorageNetwork()

      {

         return entitiesStorage.template getSuperentityStorageNetwork< SuperdimensionsTag >( MeshDimensionTag< EntityTopology::dimensions >() );

         return StorageBaseType::template getSuperentityStorageNetwork< SuperdimensionsTag >( MeshDimensionsTag< EntityTopology::dimensions >() );

      }

 

      bool init( const typename MeshTraitsType::PointArrayType& points,

                 const typename MeshTraitsType::CellSeedArrayType& cellSeeds );

 

 

   protected:

 

      MeshStorageLayers< MeshConfig > entitiesStorage;

 

      MeshConfigValidator< MeshConfig > configValidator;

};

src/TNL/Meshes/MeshDetails/Mesh_impl.h

+11 −11
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ typename Mesh< MeshConfig >::GlobalIndexType 
Mesh< MeshConfig >::

getNumberOfEntities() const

{

   return entitiesStorage.getNumberOfEntities( MeshDimensionTag< Dimension >() );

   return StorageBaseType::getNumberOfEntities( MeshDimensionsTag< Dimensions >() );

}



template< typename MeshConfig >
@@ -68,7 +68,7 @@ typename Mesh< MeshConfig >::GlobalIndexType 
Mesh< MeshConfig >::

template getNumberOfCells() const

{

   return entitiesStorage.getNumberOfEntities( MeshDimensionTag< dimensions >() );

   return StorageBaseType::getNumberOfEntities( MeshDimensionsTag< dimensions >() );

}



template< typename MeshConfig >
@@ -76,7 +76,7 @@ typename Mesh< MeshConfig >::CellType& 
Mesh< MeshConfig >::

getCell( const GlobalIndexType cellIndex )

{

   return entitiesStorage.getEntity( MeshDimensionTag< dimensions >(), cellIndex );

   return StorageBaseType::getEntity( MeshDimensionsTag< dimensions >(), cellIndex );

}



template< typename MeshConfig >
@@ -84,7 +84,7 @@ const typename Mesh< MeshConfig >::CellType& 
Mesh< MeshConfig >::

getCell( const GlobalIndexType cellIndex ) const

{

   return entitiesStorage.getEntity( MeshDimensionTag< dimensions >(), cellIndex );

   return StorageBaseType::getEntity( MeshDimensionsTag< dimensions >(), cellIndex );

}



template< typename MeshConfig >
@@ -93,7 +93,7 @@ typename Mesh< MeshConfig >::template EntityType< Dimension >& 
Mesh< MeshConfig >::

getEntity( const GlobalIndexType entityIndex )

{

   return entitiesStorage.getEntity( MeshDimensionTag< Dimension >(), entityIndex );

   return StorageBaseType::getEntity( MeshDimensionsTag< Dimensions >(), entityIndex );

}



template< typename MeshConfig >
@@ -102,7 +102,7 @@ const typename Mesh< MeshConfig >::template EntityType< Dimension >& 
Mesh< MeshConfig >::

getEntity( const GlobalIndexType entityIndex ) const

{

   return entitiesStorage.getEntity( MeshDimensionTag< Dimension >(), entityIndex );

   return StorageBaseType::getEntity( MeshDimensionsTag< Dimensions >(), entityIndex );

}

 

template< typename MeshConfig >
@@ -111,7 +111,7 @@ Mesh< MeshConfig >:: 
save( File& file ) const

{

   if( ! Object::save( file ) ||

       ! entitiesStorage.save( file ) )

       ! StorageBaseType::save( file ) )

   {

      std::cerr << "Mesh saving failed." << std::endl;

      return false;
@@ -125,7 +125,7 @@ Mesh< MeshConfig >:: 
load( File& file )

{

   if( ! Object::load( file ) ||

       ! entitiesStorage.load( file ) )

       ! StorageBaseType::load( file ) )

   {

      std::cerr << "Mesh loading failed." << std::endl;

      return false;
@@ -138,7 +138,7 @@ void 
Mesh< MeshConfig >::

print( std::ostream& str ) const

{

   entitiesStorage.print( str );

   StorageBaseType::print( str );

}



template< typename MeshConfig >
@@ -146,7 +146,7 @@ bool 
Mesh< MeshConfig >::

operator==( const Mesh& mesh ) const

{

   return entitiesStorage.operator==( mesh.entitiesStorage );

   return StorageBaseType::operator==( mesh );

}



template< typename MeshConfig >
@@ -155,7 +155,7 @@ typename Mesh< MeshConfig >::template EntityTraits< DimensionTag::value >::Stora 
Mesh< MeshConfig >::

entitiesArray()

{

   return entitiesStorage.entitiesArray( DimensionTag() );

   return StorageBaseType::entitiesArray( DimensionsTag() );

}



template< typename MeshConfig >