Commit 8cbbfe9a authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Cosmetic changes

parent c3480c11

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

+36 −52
Original line number Diff line number Diff line
@@ -61,25 +61,20 @@ class MeshSubentityStorageLayer< MeshConfig, 
                                      typename DimensionsTag::Decrement > BaseType;



protected:

   static const int Dimensions = DimensionsTag::value;

   typedef MeshTraits< MeshConfig >                                                          MeshTraitsType;

   typedef typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >   SubentityTraitsType;

   typedef typename MeshTraitsType::GlobalIndexType                                          GlobalIndexType;

   typedef typename MeshTraitsType::LocalIndexType                                           LocalIndexType;

   typedef typename SubentityTraitsType::IdArrayType                                         IdArrayType;

   typedef typename SubentityTraitsType::OrientationArrayType                                OrientationArrayType;

   typedef typename MeshTraitsType::IdPermutationArrayAccessorType                           IdPermutationArrayAccessorType;

   static constexpr int Dimensions = DimensionsTag::value;

   using MeshTraitsType                 = MeshTraits< MeshConfig >;

   using SubentityTraitsType            = typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >;

   using GlobalIndexType                = typename MeshTraitsType::GlobalIndexType;

   using LocalIndexType                 = typename MeshTraitsType::LocalIndexType;

   using IdArrayType                    = typename SubentityTraitsType::IdArrayType;

   using OrientationArrayType           = typename SubentityTraitsType::OrientationArrayType;

   using IdPermutationArrayAccessorType = typename MeshTraitsType::IdPermutationArrayAccessorType;



   MeshSubentityStorageLayer()

   {

      this->subentitiesIndices.setValue( -1 );

   }



   ~MeshSubentityStorageLayer()

   {

      //cout << "      Destroying " << this->sharedSubentitiesIndices.getSize() << " subentities with "<< DimensionTag::value << " dimensions." << std::endl;

   }



   MeshSubentityStorageLayer& operator=( const MeshSubentityStorageLayer& layer )

   {

      BaseType::operator=( layer );
@@ -144,18 +139,18 @@ protected: 
   }



   using BaseType::subentityIdsArray;

   IdArrayType& subentityIdsArray( DimensionTag ) { return this->subentitiesIndices; }

   IdArrayType& subentityIdsArray( DimensionsTag ) { return this->subentitiesIndices; }



   using BaseType::subentityOrientation;

   IdPermutationArrayAccessorType subentityOrientation( DimensionTag, LocalIndexType index) const

   {

      TNL_ASSERT( 0 <= index && index < SubentityTraitsType::count, );

      Assert( 0 <= index && index < SubentityTraitsType::count, );



      return this->subentityOrientations[ index ].getSubvertexPermutation();

   }



   using BaseType::subentityOrientationsArray;

	OrientationArrayType& subentityOrientationsArray( DimensionTag ) { return this->subentityOrientations; }

	OrientationArrayType& subentityOrientationsArray( DimensionsTag ) { return this->subentityOrientations; }



private:

   IdArrayType subentitiesIndices;
@@ -181,23 +176,18 @@ class MeshSubentityStorageLayer< MeshConfig, 
                                      typename DimensionsTag::Decrement > BaseType;



protected:

   static const int Dimensions = DimensionsTag::value;

   typedef MeshTraits< MeshConfig >                                                          MeshTraitsType;

   typedef typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >   SubentityTraitsType;

   typedef typename MeshTraitsType::GlobalIndexType                                          GlobalIndexType;

   typedef typename MeshTraitsType::LocalIndexType                                           LocalIndexType;

   typedef typename SubentityTraitsType::IdArrayType                                         IdArrayType;

   static constexpr int Dimensions = DimensionsTag::value;

   using MeshTraitsType      = MeshTraits< MeshConfig >;

   using SubentityTraitsType = typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >;

   using GlobalIndexType     = typename MeshTraitsType::GlobalIndexType;

   using LocalIndexType      = typename MeshTraitsType::LocalIndexType;

   using IdArrayType         = typename SubentityTraitsType::IdArrayType;



   MeshSubentityStorageLayer()

   {

      this->subentitiesIndices.setValue( -1 );

   }



   ~MeshSubentityStorageLayer()

   {

      //cout << "      Destroying " << this->sharedSubentitiesIndices.getSize() << " subentities with "<< DimensionTag::value << " dimensions." << std::endl;

   }



   MeshSubentityStorageLayer& operator=( const MeshSubentityStorageLayer& layer )

   {

      BaseType::operator=( layer );
@@ -262,7 +252,7 @@ protected: 
   }



   using BaseType::subentityIdsArray;

   IdArrayType& subentityIdsArray( DimensionTag ) { return this->subentitiesIndices; }

   IdArrayType& subentityIdsArray( DimensionsTag ) { return this->subentitiesIndices; }



   using BaseType::subentityOrientationsArray;

   void subentityOrientationsArray() {}
@@ -297,24 +287,18 @@ class MeshSubentityStorageLayer< MeshConfig, 
   typedef MeshDimensionTag< 0 >                           DimensionTag;



protected:

   static const int Dimensions = 0;

   typedef MeshTraits< MeshConfig >                                                          MeshTraitsType;

   typedef typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimension >   SubentityTraitsType;

   typedef typename MeshTraitsType::GlobalIndexType                                          GlobalIndexType;

   typedef typename MeshTraitsType::LocalIndexType                                           LocalIndexType;

   typedef typename SubentityTraitsType::IdArrayType                                         IdArrayType;

   static constexpr int Dimensions = 0;

   using MeshTraitsType      = MeshTraits< MeshConfig >;

   using SubentityTraitsType = typename MeshTraitsType::template SubentityTraits< EntityTopology, Dimensions >;

   using GlobalIndexType     = typename MeshTraitsType::GlobalIndexType;

   using LocalIndexType      = typename MeshTraitsType::LocalIndexType;

   using IdArrayType         = typename SubentityTraitsType::IdArrayType;



   MeshSubentityStorageLayer()

   {

      this->verticesIndices.setValue( -1 );

   }



   ~MeshSubentityStorageLayer()

   {

      //cout << "      Destroying " << this->sharedVerticesIndices.getSize() << " subentities with "<< DimensionTag::value << " dimensions." << std::endl;

   }





   MeshSubentityStorageLayer& operator=( const MeshSubentityStorageLayer& layer )

   {

      this->verticesIndices = layer.verticesIndices;
@@ -363,11 +347,11 @@ protected: 
      this->verticesIndices[ localIndex ] = globalIndex;

   }



   IdArrayType& subentityIdsArray( DimensionTag ) { return this->verticesIndices; }

   IdArrayType& subentityIdsArray( DimensionsTag ) { return this->verticesIndices; }



protected:

   /***

    *  Necessary because of 'using TBase::...;' in the derived classes

    *  Necessary because of 'using BaseType::...;' in the derived classes

    */

   void subentityOrientation() {}

   void subentityOrientationsArray() {}