Commit 08ec00ed authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Cosmetic changes

parent d990d353
Loading
Loading
Loading
Loading
+104 −109
Original line number Diff line number Diff line
@@ -49,10 +49,9 @@ class MeshStorageLayer< MeshConfig,
                                          typename MeshTraits< MeshConfig >::template EntityTraits< DimensionsTag::value >::EntityTopology >
{
public:
      static constexpr int Dimensions = DimensionsTag::value;
   using BaseType = MeshStorageLayer< MeshConfig, typename DimensionsTag::Decrement >;
   using MeshTraitsType   = MeshTraits< MeshConfig >;
      using EntityTraitsType = typename MeshTraitsType::template EntityTraits< Dimensions >;
   using EntityTraitsType = typename MeshTraitsType::template EntityTraits< DimensionsTag::value >;
   using StorageArrayType = typename EntityTraitsType::StorageArrayType;
   using AccessArrayType  = typename EntityTraitsType::AccessArrayType;
   using GlobalIndexType  = typename EntityTraitsType::GlobalIndexType;
@@ -71,29 +70,29 @@ class MeshStorageLayer< MeshConfig,
   {
   }

      GlobalIndexType getNumberOfEntities( DimensionTag ) const
   GlobalIndexType getNumberOfEntities( DimensionsTag ) const
   {
      return this->entities.getSize();
   }

      EntityType& getEntity( DimensionTag,
   EntityType& getEntity( DimensionsTag,
                          const GlobalIndexType entityIndex )
   {
      return this->entities[ entityIndex ];
   }

      const EntityType& getEntity( DimensionTag,
   const EntityType& getEntity( DimensionsTag,
                                const GlobalIndexType entityIndex ) const
   {
      return this->entities[ entityIndex ];
   }

      AccessArrayType& getEntities( DimensionTag )
   AccessArrayType& getEntities( DimensionsTag )
   {
      return this->entitiesAccess;
   }

      const AccessArrayType& getEntities( DimensionTag ) const
   const AccessArrayType& getEntities( DimensionsTag ) const
   {
      return this->entitiesAccess;
   }
@@ -104,7 +103,7 @@ class MeshStorageLayer< MeshConfig,
          ! SuperentityStorageBaseType::save( file ) ||
          ! this->entities.save( file ) )
      {
            std::cerr << "Saving of the mesh entities with " << DimensionTag::value << " dimensions failed." << std::endl;
         std::cerr << "Saving of the mesh entities with " << DimensionsTag::value << " dimensions failed." << std::endl;
         return false;
      }
      return true;
@@ -116,7 +115,7 @@ class MeshStorageLayer< MeshConfig,
          ! SuperentityStorageBaseType::load( file ) ||
          ! this->entities.load( file ) )
      {
            std::cerr << "Loading of the mesh entities with " << DimensionTag::value << " dimensions failed." << std::endl;
         std::cerr << "Loading of the mesh entities with " << DimensionsTag::value << " dimensions failed." << std::endl;
         return false;
      }
      this->entitiesAccess.bind( this->entities );
@@ -126,7 +125,7 @@ class MeshStorageLayer< MeshConfig,
   void print( std::ostream& str ) const
   {
      BaseType::print( str );
         str << "The entities with " << DimensionTag::value << " dimensions are: " << std::endl;
      str << "The entities with " << DimensionsTag::value << " dimensions are: " << std::endl;
      for( GlobalIndexType i = 0; i < entities.getSize();i ++ )
         str << i << " " << entities[ i ] << std::endl;
      SuperentityStorageBaseType::print( str );
@@ -155,7 +154,7 @@ class MeshStorageLayer< MeshConfig,
   using BaseType::getSuperentityStorageNetwork;
   template< typename SuperdimensionsTag >
   typename MeshTraitsType::template SuperentityTraits< EntityTopology, SuperdimensionsTag::value >::StorageNetworkType&
      getSuperentityStorageNetwork( MeshDimensionTag< EntityTopology::dimensions > )
   getSuperentityStorageNetwork( MeshDimensionsTag< EntityTopology::dimensions > )
   {
      return SuperentityStorageBaseType::getSuperentityStorageNetwork( SuperdimensionsTag() );
   }
@@ -172,16 +171,13 @@ template< typename MeshConfig >
class MeshStorageLayer< MeshConfig, MeshDimensionsTag< 0 >, true >
   : public MeshSuperentityStorageLayers< MeshConfig,
                                          MeshVertexTopology >

{
public:
   using DimensionsTag              = MeshDimensionsTag< 0 >;

   using SuperentityStorageBaseType = MeshSuperentityStorageLayers< MeshConfig, MeshVertexTopology >;

   using MeshTraitsType             = MeshTraits< MeshConfig >;
   using EntityTraitsType           = typename MeshTraitsType::template EntityTraits< 0 >;

   using StorageArrayType           = typename EntityTraitsType::StorageArrayType;
   using AccessArrayType            = typename EntityTraitsType::AccessArrayType;
   using GlobalIndexType            = typename EntityTraitsType::GlobalIndexType;
@@ -290,7 +286,6 @@ public:
   }

private:

   StorageArrayType vertices;

   AccessArrayType verticesAccess;