Commit 51da0034 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Renamed MeshEntityId to MeshEntityIndex

parent 165475cc

src/TNL/Meshes/MeshDetails/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ ADD_SUBDIRECTORY( initializer ) 
ADD_SUBDIRECTORY( layers )

ADD_SUBDIRECTORY( traits )



SET( headers MeshEntityId.h

SET( headers MeshEntityIndex.h

             MeshEntityIntegrityChecker.h

             MeshEntityOrientation.h

             MeshEntityReferenceOrientation.h

src/TNL/Meshes/MeshDetails/MeshEntityId.h→src/TNL/Meshes/MeshDetails/MeshEntityIndex.h

+13 −12
Original line number Diff line number Diff line 
/***************************************************************************

                          MeshEntityId.h  -  description

                          MeshEntityIndex.h  -  description

                             -------------------

    begin                : Feb 28, 2014

    copyright            : (C) 2014 by Tomas Oberhuber et al.
@@ -21,28 +21,28 @@ 
namespace TNL {

namespace Meshes {



template< typename IDType,

          typename GlobalIndexType >

class MeshEntityId

template< typename IDType >

class MeshEntityIndex

{

public:

   MeshEntityId()

   // FIXME: IDType may be unsigned

   MeshEntityIndex()

      : id( -1 )

   {}



   const IDType& getId() const

   const IDType& getIndex() const

   {

      TNL_ASSERT( this->id >= 0, );

      return this->id;

   }



   bool operator==( const MeshEntityId< IDType, GlobalIndexType >& id ) const

   bool operator==( const MeshEntityIndex& id ) const

   {

      return ( this->id == id.id );

   }



protected:

   void setId( GlobalIndexType id )

   void setIndex( IDType id )

   {

      this->id = id;

   }
@@ -50,17 +50,18 @@ protected: 
   IDType id;

};



template< typename GlobalIndexType >

class MeshEntityId< void, GlobalIndexType >

template<>

class MeshEntityIndex< void >

{

public:

   bool operator==( const MeshEntityId< void, GlobalIndexType >& id ) const

   bool operator==( const MeshEntityIndex& id ) const

   {

      return true;

   }



protected:

   void setId( GlobalIndexType )

   template< typename Index >

   void setIndex( Index )

   {}

};

src/TNL/Meshes/MeshDetails/MeshEntity_impl.h

+2 −4
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ operator==( const MeshEntity& entity ) const 
{

   return ( MeshSubentityAccess< MeshConfig, EntityTopology >::operator==( entity ) &&

            MeshSuperentityAccess< MeshConfig, EntityTopology >::operator==( entity ) &&

            MeshEntityId< typename MeshConfig::IdType,

                          typename MeshConfig::GlobalIndexType >::operator==( entity ) );

            MeshEntityIndex< typename MeshConfig::IdType >::operator==( entity ) );

}



template< typename MeshConfig,
@@ -183,8 +182,7 @@ MeshEntity< MeshConfig, MeshVertexTopology >:: 
operator==( const MeshEntity& entity ) const

{

   return ( MeshSuperentityAccess< MeshConfig, MeshVertexTopology >::operator==( entity ) &&

            MeshEntityId< typename MeshConfig::IdType,

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

            MeshEntityIndex< typename MeshConfig::IdType >::operator==( entity ) &&

            point == entity.point );

}

src/TNL/Meshes/MeshDetails/initializer/MeshEntityInitializer.h

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 


   static void initEntity( EntityType& entity, const GlobalIndexType& entityIndex, const SeedType& entitySeed, InitializerType& initializer)

   {

      initializer.setEntityId( entity, entityIndex );

      initializer.setEntityIndex( entity, entityIndex );

      // this is necessary if we want to use existing entities instead of intermediate seeds to create subentity seeds

      for( LocalIndexType i = 0; i < entitySeed.getCornerIds().getSize(); i++ )

         initializer.template setSubentityIndex< 0 >( entity, entityIndex, i, entitySeed.getCornerIds()[ i ] );
@@ -98,7 +98,7 @@ public: 


   static void initEntity( VertexType& entity, const GlobalIndexType& entityIndex, const PointType& point, InitializerType& initializer)

   {

      initializer.setEntityId( entity, entityIndex );

      initializer.setEntityIndex( entity, entityIndex );

      initializer.setVertexPoint( entity, point );

   }

};

src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h

+2 −2
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ class MeshInitializer 
      }



      template< typename Entity, typename GlobalIndex >

      void setEntityId( Entity& entity, const GlobalIndex& index )

      void setEntityIndex( Entity& entity, const GlobalIndex& index )

      {

         entity.setId( index );

         entity.setIndex( index );

      }



      template< int Dimension >