From fd14219e984f280efdc13a85fef04beb437b63f6 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Fri, 10 Oct 2014 18:14:17 +0000 Subject: [PATCH] Rename class GlobalUniqueIndex to GlobalIndexSet [[Imported from SVN: r9918]] --- dune/gfe/parallel/globalindex.hh | 4 ++-- dune/gfe/parallel/globalp2mapper.hh | 6 +++--- dune/gfe/riemanniantrsolver.cc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dune/gfe/parallel/globalindex.hh b/dune/gfe/parallel/globalindex.hh index 38ebb47b..4bcac666 100644 --- a/dune/gfe/parallel/globalindex.hh +++ b/dune/gfe/parallel/globalindex.hh @@ -70,7 +70,7 @@ namespace Dune { template<class GridView, int CODIM> -class GlobalUniqueIndex +class GlobalIndexSet { private: /** define data types */ @@ -191,7 +191,7 @@ public: /* later query the global index, by directly passing the entity in question: then the respective global */ /* index is returned. */ /**********************************************************************************************************************/ - GlobalUniqueIndex(const GridView& gridview) + GlobalIndexSet(const GridView& gridview) : gridview_(gridview), uniqueEntityPartition_(gridview) { diff --git a/dune/gfe/parallel/globalp2mapper.hh b/dune/gfe/parallel/globalp2mapper.hh index 95dab259..43fa20b6 100644 --- a/dune/gfe/parallel/globalp2mapper.hh +++ b/dune/gfe/parallel/globalp2mapper.hh @@ -36,9 +36,9 @@ namespace Dune { P2BasisMapper<GridView> p2Mapper(gridView); - GlobalUniqueIndex<GridView,2> globalVertexIndex(gridView); - GlobalUniqueIndex<GridView,1> globalEdgeIndex(gridView); - GlobalUniqueIndex<GridView,0> globalElementIndex(gridView); + GlobalIndexSet<GridView,2> globalVertexIndex(gridView); + GlobalIndexSet<GridView,1> globalEdgeIndex(gridView); + GlobalIndexSet<GridView,0> globalElementIndex(gridView); // total number of degrees of freedom nGlobalEntity_ = globalVertexIndex.nGlobalEntity() + globalEdgeIndex.nGlobalEntity() + globalElementIndex.nGlobalEntity(); diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc index 435bfcce..7866299a 100644 --- a/dune/gfe/riemanniantrsolver.cc +++ b/dune/gfe/riemanniantrsolver.cc @@ -181,7 +181,7 @@ setup(const GridType& grid, // If we are on more than 1 processors, join all local transfer matrices on rank 0, // and construct a single global transfer operator there. - typedef Dune::GlobalUniqueIndex<typename GridType::LeafGridView, gridDim> LeafP1GUIndex; + typedef Dune::GlobalIndexSet<typename GridType::LeafGridView, gridDim> LeafP1GUIndex; LeafP1GUIndex p1Index(grid_->leafGridView()); typedef typename TruncatedCompressedMGTransfer<CorrectionType>::TransferOperatorType TransferOperatorType; @@ -198,7 +198,7 @@ setup(const GridType& grid, // If we are on more than 1 processors, join all local transfer matrices on rank 0, // and construct a single global transfer operator there. - typedef Dune::GlobalUniqueIndex<typename GridType::LevelGridView, gridDim> LevelGUIndex; + typedef Dune::GlobalIndexSet<typename GridType::LevelGridView, gridDim> LevelGUIndex; LevelGUIndex fineGUIndex(grid_->levelGridView(i+2)); LevelGUIndex coarseGUIndex(grid_->levelGridView(i+1)); @@ -221,7 +221,7 @@ setup(const GridType& grid, // If we are on more than 1 processors, join all local transfer matrices on rank 0, // and construct a single global transfer operator there. - typedef Dune::GlobalUniqueIndex<typename GridType::LevelGridView, gridDim> LevelGUIndex; + typedef Dune::GlobalIndexSet<typename GridType::LevelGridView, gridDim> LevelGUIndex; LevelGUIndex fineGUIndex(grid_->levelGridView(i+1)); LevelGUIndex coarseGUIndex(grid_->levelGridView(i)); -- GitLab