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

Renamed IndexPermutationVector to GlobalIndexVector

parent 48c9672e

src/TNL/Meshes/Mesh.h

+4 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <ostream>

#include <TNL/Object.h>

#include <TNL/Logger.h>

#include <TNL/Containers/Vector.h>

#include <TNL/Meshes/MeshEntity.h>

#include <TNL/Meshes/MeshDetails/ConfigValidator.h>

#include <TNL/Meshes/MeshDetails/traits/MeshTraits.h>
@@ -71,7 +72,7 @@ class Mesh 
      using LocalIndexType  = typename MeshTraitsType::LocalIndexType;

      using PointType       = typename MeshTraitsType::PointType;

      using RealType        = typename PointType::RealType;

      using IndexPermutationVector = Containers::Vector< GlobalIndexType, DeviceType, GlobalIndexType >;

      using GlobalIndexVector = Containers::Vector< GlobalIndexType, DeviceType, GlobalIndexType >;



      // shortcuts, compatibility with grids

      using HostType = Mesh< MeshConfig, Devices::Host >;
@@ -150,8 +151,8 @@ class Mesh 
       * M is the entity with index iperm[j] in M'.

       */

      template< int Dimension >

      void reorderEntities( const IndexPermutationVector& perm,

                            const IndexPermutationVector& iperm );

      void reorderEntities( const GlobalIndexVector& perm,

                            const GlobalIndexVector& iperm );





      bool save( File& file ) const;

src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h

+11 −11
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ template< typename Mesh, int Dimension > 
struct IndexPermutationApplier

{

private:

   using IndexPermutationVector = typename Mesh::IndexPermutationVector;

   using GlobalIndexVector = typename Mesh::GlobalIndexVector;



   template< int Subdimension,

             bool Enabled =
@@ -30,7 +30,7 @@ private: 
             >

   struct _SubentitiesStorageWorker

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& perm )

      static void exec( Mesh& mesh, const GlobalIndexVector& perm )

      {

         auto& subentitiesStorage = mesh.template getSubentityStorageNetwork< Dimension, Subdimension >();

         permuteMultimapKeys( subentitiesStorage, perm );
@@ -40,7 +40,7 @@ private: 
   template< int Subdimension >

   struct _SubentitiesStorageWorker< Subdimension, false >

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm ) {}

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm ) {}

   };
@@ -51,7 +51,7 @@ private: 
             >

   struct _SuperentitiesStorageWorker

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& perm )

      static void exec( Mesh& mesh, const GlobalIndexVector& perm )

      {

         auto& superentitiesStorage = mesh.template getSuperentityStorageNetwork< Dimension, Superdimension >();

         permuteMultimapKeys( superentitiesStorage, perm );
@@ -61,7 +61,7 @@ private: 
   template< int Superdimension >

   struct _SuperentitiesStorageWorker< Superdimension, false >

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm ) {}

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm ) {}

   };
@@ -72,7 +72,7 @@ private: 
             >

   struct IndexPermutationApplierSubentitiesWorker

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm )

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm )

      {

         auto& superentitiesStorage = mesh.template getSuperentityStorageNetwork< Subdimension, Dimension >();

         permuteMultimapValues( superentitiesStorage, iperm );
@@ -82,7 +82,7 @@ private: 
   template< int Subdimension >

   struct IndexPermutationApplierSubentitiesWorker< Subdimension, false >

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm ) {}

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm ) {}

   };
@@ -93,7 +93,7 @@ private: 
             >

   struct IndexPermutationApplierSuperentitiesWorker

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm )

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm )

      {

         auto& subentitiesStorage = mesh.template getSubentityStorageNetwork< Superdimension, Dimension >();

         permuteMultimapValues( subentitiesStorage, iperm );
@@ -103,7 +103,7 @@ private: 
   template< int Superdimension >

   struct IndexPermutationApplierSuperentitiesWorker< Superdimension, false >

   {

      static void exec( Mesh& mesh, const IndexPermutationVector& iperm ) {}

      static void exec( Mesh& mesh, const GlobalIndexVector& iperm ) {}

   };
@@ -122,8 +122,8 @@ private: 


public:

   static void exec( Mesh& mesh,

                     const IndexPermutationVector& perm,

                     const IndexPermutationVector& iperm )

                     const GlobalIndexVector& perm,

                     const GlobalIndexVector& iperm )

   {

      using IndexType = typename Mesh::GlobalIndexType;

      using DeviceType = typename Mesh::DeviceType;

src/TNL/Meshes/MeshDetails/Mesh_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ template< typename MeshConfig, typename Device > 
   template< int Dimension >

void

Mesh< MeshConfig, Device >::

reorderEntities( const IndexPermutationVector& perm,

                 const IndexPermutationVector& iperm )

reorderEntities( const GlobalIndexVector& perm,

                 const GlobalIndexVector& iperm )

{

   static_assert( entitiesAvailable< Dimension >(), "Entities which are not stored cannot be reordered." );

src/TNL/Meshes/MeshDetails/MeshEntity_impl.h

+2 −2

File changed.

Contains only whitespace changes.