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

Renamed getNumberOf* to get*Count

parent 0b4ca7b9

src/TNL/Meshes/Mesh.h

+2 −3
Original line number Diff line number Diff line
@@ -61,9 +61,8 @@ class Mesh 
      template< int Dimension >

      static constexpr bool entitiesAvailable();



      // TODO: rename to getEntitiesCount

      template< int Dimension >

      GlobalIndexType getNumberOfEntities() const;

      GlobalIndexType getEntitiesCount() const;



      template< int Dimension >

      EntityType< Dimension >& getEntity( const GlobalIndexType& entityIndex );
@@ -71,7 +70,7 @@ class Mesh 
      template< int Dimension >

      const EntityType< Dimension >& getEntity( const GlobalIndexType& entityIndex ) const;



      GlobalIndexType getNumberOfCells() const;

      GlobalIndexType getCellsCount() const;



      CellType& getCell( const GlobalIndexType& entityIndex );

src/TNL/Meshes/MeshDetails/MeshEntity_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ template< typename MeshConfig, 
          typename EntityTopology >

constexpr typename MeshEntity< MeshConfig, EntityTopology >::LocalIndexType

MeshEntity< MeshConfig, EntityTopology >::

getNumberOfVertices()

getVerticesCount()

{

   return SubentityTraits< 0 >::count;

}

src/TNL/Meshes/MeshDetails/MeshIntegrityCheckerLayer.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class MeshIntegrityCheckerLayer< MeshType, 
         typedef typename ContainerType::IndexType                                       GlobalIndexType;

        std::cout << "Checking entities with dimension " << dimension << " ..." << std::endl;

         for( GlobalIndexType entityIdx = 0;

              entityIdx < mesh.template getNumberOfEntities< dimension >();

              entityIdx < mesh.template getEntitiesCount< dimension >();

              entityIdx++ )

         {

           std::cout << "Entity no. " << entityIdx << "               \r" << std::flush;
@@ -73,7 +73,7 @@ class MeshIntegrityCheckerLayer< MeshType, 
         typedef typename ContainerType::IndexType                                       GlobalIndexType;

        std::cout << "Checking entities with dimension " << dimension << " ..." << std::endl;

         for( GlobalIndexType entityIdx = 0;

              entityIdx < mesh.template getNumberOfEntities< dimension >();

              entityIdx < mesh.template getEntitiesCount< dimension >();

              entityIdx++ )

         {

           std::cout << "Entity no. " << entityIdx << "          \r" << std::flush;

src/TNL/Meshes/MeshDetails/MeshWriterNetgen.h

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class MeshWriterNetgen 
      const int meshDimension = MeshType::meshDimension;

      typedef typename MeshType::template EntitiesTraits< 0 >::GlobalIndexType VerticesIndexType;

      typedef typename MeshType::PointType                                     PointType;

      const VerticesIndexType numberOfVertices = mesh.getNumberOfVertices();

      const VerticesIndexType numberOfVertices = mesh.getVerticesCount();

      outputFile << numberOfVertices << std::endl;

      for( VerticesIndexType i = 0; i < numberOfVertices; i++ )

      {
@@ -63,7 +63,7 @@ class MeshWriterNetgen 
      typedef typename MeshType::template EntitiesTraits< meshDimension >::Type            CellType;

      typedef typename CellType::LocalIndexType                                             LocalIndexType;



      const CellIndexType numberOfCells = mesh.template getNumberOfEntities< meshDimension >();

      const CellIndexType numberOfCells = mesh.template getEntitiesCount< meshDimension >();

      outputFile << numberOfCells << std::endl;

      for( CellIndexType cellIdx = 0; cellIdx < numberOfCells; cellIdx++ )

      {

src/TNL/Meshes/MeshDetails/MeshWriterVTKLegacy.h

+9 −9
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ class MeshWriterVTKLegacy 
      file << "ASCII" << std::endl;

      file << "DATASET UNSTRUCTURED_GRID" << std::endl;

      file << std::endl;

      file << "POINTS " << mesh.template getNumberOfEntities< 0 >() << " double" << std::endl;

      for( int i = 0; i < mesh.template getNumberOfEntities< 0 >(); i++ )

      file << "POINTS " << mesh.template getEntitiesCount< 0 >() << " double" << std::endl;

      for( int i = 0; i < mesh.template getEntitiesCount< 0 >(); i++ )

      {

         mesh.template getEntity< 0 >( i ).getPoint().write( file );

         for( int j = MeshType::dimension; j < 3; j++ )
@@ -101,22 +101,22 @@ class MeshWriterVTKLegacy 
         file << std::endl;

      }

      file << std::endl;

      file << "CELLS " << mesh.getNumberOfCells();

      file << "CELLS " << mesh.getCellsCount();

      long int listSize( 0 );

      for( int i = 0; i < mesh.getNumberOfCells(); i++ )

         listSize += mesh.getCell( i ).template getNumberOfSubentities< 0 >() + 1;

      for( int i = 0; i < mesh.getCellsCount(); i++ )

         listSize += mesh.getCell( i ).template getSubentitiesCount< 0 >() + 1;

      file << " " << listSize << std::endl;

      for( int i = 0; i < mesh.getNumberOfCells(); i++ )

      for( int i = 0; i < mesh.getCellsCount(); i++ )

      {

         int numberOfVertices = mesh.getCell( i ).template getNumberOfSubentities< 0 >();

         int numberOfVertices = mesh.getCell( i ).template getSubentitiesCount< 0 >();

         file << numberOfVertices << " ";

         for( int j = 0; j < numberOfVertices - 1; j++ )

            file << mesh.getCell( i ).template getSubentityIndex< 0 >( j ) << " ";

         file << mesh.getCell( i ).template getSubentityIndex< 0 >( numberOfVertices - 1 ) << std::endl;

      }

      file << std::endl;

      file << "CELL_TYPES " <<  mesh.getNumberOfCells() << std::endl;

      for( int i = 0; i < mesh.getNumberOfCells(); i++ )

      file << "CELL_TYPES " <<  mesh.getCellsCount() << std::endl;

      for( int i = 0; i < mesh.getCellsCount(); i++ )

      {

         file << MeshEntityVTKType< CellType >::VTKType << std::endl;

      }