Commit cb5e46ca authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed IdPermutationArrayAccessorType alias

parent 41d6487c

src/TNL/Meshes/MeshDetails/MeshEntityOrientation.h

+4 −9
Original line number Diff line number Diff line
@@ -29,20 +29,15 @@ class MeshEntityOrientation 
   friend class MeshEntityReferenceOrientation;



   public:

      using IdPermutationArrayAccessorType = typename MeshTraits< MeshConfig >::IdPermutationArrayAccessorType;

      using LocalIndexType = typename MeshTraits< MeshConfig >::LocalIndexType;

      using IdPermutationArrayType = typename MeshTraits< MeshConfig >::template SubentityTraits< EntityTopology, 0 >::IdPermutationArrayType;



      IdPermutationArrayAccessorType getSubvertexPermutation() const

      const IdPermutationArrayType& getSubvertexPermutation() const

      {

         IdPermutationArrayAccessorType accessor;

         accessor.bind( this->subvertexPermutation );

         return accessor;

         //return this->subvertexPermutation.subarray( 0, this->subvertexPermutation.getSize() );

         return subvertexPermutation;

      }



   private:

      using LocalIndexType = typename MeshTraits< MeshConfig >::LocalIndexType;

      using IdPermutationArrayType = typename MeshTraits< MeshConfig >::template SubentityTraits< EntityTopology, 0 >::IdPermutationArrayType;



      void setPermutationValue( LocalIndexType index, LocalIndexType value )

      {

         this->subvertexPermutation[ index ] = value;

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

+12 −12
Original line number Diff line number Diff line
@@ -92,10 +92,10 @@ public: 
   }



   template< int Subdimensions >

   typename MeshTraitsType::IdPermutationArrayAccessorType subentityOrientation( typename SubentityTraits< Subdimensions >::LocalIndexType index ) const

   typename SubentityTraits< Subdimensions >::IdPermutationArrayType getSubentityOrientation( typename SubentityTraits< Subdimensions >::LocalIndexType index ) const

   {

      Assert( 0 <= index && index < SubentityTraits< Subdimensions >::count, );

      return BaseType::subentityOrientation( MeshDimensionsTag< Subdimensions >(), index );

      return BaseType::getSubentityOrientation( MeshDimensionsTag< Subdimensions >(), index );

   }

};
@@ -124,7 +124,7 @@ protected: 
   using LocalIndexType         = typename MeshTraitsType::LocalIndexType;

   using IdArrayType            = typename SubentityTraitsType::IdArrayType;

   using OrientationArrayType   = typename SubentityTraitsType::OrientationArrayType;

   using IdPermutationArrayAccessorType = typename MeshTraitsType::IdPermutationArrayAccessorType;

   using IdPermutationArrayType = typename SubentityTraitsType::IdPermutationArrayType;



   MeshSubentityStorageLayer()

   {
@@ -194,8 +194,8 @@ protected: 
      return this->subentitiesIndices[ localIndex ];

   }



   using BaseType::subentityOrientation;

   IdPermutationArrayAccessorType subentityOrientation( DimensionTag, LocalIndexType index) const

   using BaseType::getSubentityOrientation;

   const IdPermutationArrayType& getSubentityOrientation( DimensionsTag, LocalIndexType index) const

   {

      Assert( 0 <= index && index < SubentityTraitsType::count, );
@@ -401,7 +401,7 @@ protected: 
   /***

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

    */

   void subentityOrientation() {}

   void getSubentityOrientation() {}

   void subentityOrientationsArray() {}



   IdArrayType verticesIndices;

src/TNL/Meshes/MeshDetails/traits/MeshTraits.h

+11 −12
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ public: 
   using PointArrayType    = Containers::Array< PointType, Devices::Host, GlobalIndexType >;

   using CellSeedArrayType = Containers::Array< CellSeedType, Devices::Host, GlobalIndexType >;

   using GlobalIdArrayType = Containers::Array< GlobalIndexType, Devices::Host, GlobalIndexType >;

   using IdPermutationArrayAccessorType = Containers::tnlConstSharedArray< LocalIndexType, Devices::Host, LocalIndexType >;



   template< int Dimensions >

   using EntityTraits = MeshEntityTraits< MeshConfig, Dimensions >;

src/TNL/Meshes/MeshEntity.h

+6 −7
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class MeshEntity 
       */

      using MeshSubentityStorageLayers< MeshConfig, EntityTopology_ >::getNumberOfSubentities;

      using MeshSubentityStorageLayers< MeshConfig, EntityTopology_ >::getSubentityIndex;

      using MeshSubentityStorageLayers< MeshConfig, EntityTopology_ >::subentityOrientation;

      using MeshSubentityStorageLayers< MeshConfig, EntityTopology_ >::getSubentityOrientation;



      /****

       * Superentities
@@ -121,7 +121,6 @@ class MeshEntity< MeshConfig, MeshVertexTopology > 
      using GlobalIndexType = typename MeshTraitsType::GlobalIndexType;

      using LocalIndexType  = typename MeshTraitsType::LocalIndexType;

      using PointType       = typename MeshTraitsType::PointType;

      using IdPermutationArrayAccessorType = typename MeshTraitsType::IdPermutationArrayAccessorType;



      template< int SuperDimensions >

      using SuperentityTraits = typename MeshTraitsType::template SuperentityTraits< EntityTopology, SuperDimensions >;