From 155da3eb307a2ac1771d1df10f1e53658c919767 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 10 Oct 2014 20:06:46 +0000
Subject: [PATCH] Rename method 'globalIndex' to 'index'
That's what this method is called in the dune-grid IndexSet
interface.
[[Imported from SVN: r9919]]
---
dune/gfe/parallel/globalindex.hh | 4 ++--
dune/gfe/parallel/globalp2mapper.hh | 8 ++++----
dune/gfe/parallel/matrixcommunicator.hh | 2 +-
dune/gfe/parallel/vectorcommunicator.hh | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/gfe/parallel/globalindex.hh b/dune/gfe/parallel/globalindex.hh
index 4bcac666..3ae58d0c 100644
--- a/dune/gfe/parallel/globalindex.hh
+++ b/dune/gfe/parallel/globalindex.hh
@@ -306,7 +306,7 @@ public:
/** \brief Given a local index, retrieve its index globally unique over all processes. */
- int globalIndex(const int& localIndex) const {
+ int index(const int& localIndex) const {
return localGlobalMap_.find(localIndex)->second;
}
@@ -314,7 +314,7 @@ public:
return globalLocalMap_.find(globalIndex)->second;
}
- int globalIndex(const typename GridView::template Codim<CODIM>::Entity& entity) const
+ int index(const typename GridView::template Codim<CODIM>::Entity& entity) const
{
return localGlobalMap_.find(gridview_.indexSet().index(entity))->second;
}
diff --git a/dune/gfe/parallel/globalp2mapper.hh b/dune/gfe/parallel/globalp2mapper.hh
index 43fa20b6..a99ccd28 100644
--- a/dune/gfe/parallel/globalp2mapper.hh
+++ b/dune/gfe/parallel/globalp2mapper.hh
@@ -56,7 +56,7 @@ namespace Dune {
{
//int localIndex = globalVertexIndex.localIndex (*it->template subEntity<2>(i));
int localIndex = p2Mapper.map(*it, i, 2);
- int globalIndex = globalVertexIndex.globalIndex(*it->template subEntity<2>(i));
+ int globalIndex = globalVertexIndex.index(*it->template subEntity<2>(i));
localGlobalMap_[localIndex] = globalIndex;
globalLocalMap_[globalIndex] = localIndex;
@@ -71,7 +71,7 @@ namespace Dune {
{
//int localIndex = globalEdgeIndex.localIndex (*it->template subEntity<1>(i)) + gridView.size(2);
int localIndex = p2Mapper.map(*it, i, 1);
- int globalIndex = globalEdgeIndex.globalIndex(*it->template subEntity<1>(i)) + globalVertexIndex.nGlobalEntity();
+ int globalIndex = globalEdgeIndex.index(*it->template subEntity<1>(i)) + globalVertexIndex.nGlobalEntity();
localGlobalMap_[localIndex] = globalIndex;
globalLocalMap_[globalIndex] = localIndex;
@@ -85,7 +85,7 @@ namespace Dune {
{
//int localIndex = globalEdgeIndex.localIndex (*it->template subEntity<1>(i)) + gridView.size(2);
int localIndex = p2Mapper.map(*it, 0, 0);
- int globalIndex = globalElementIndex.globalIndex(*it->template subEntity<0>(0))
+ int globalIndex = globalElementIndex.index(*it->template subEntity<0>(0))
+ globalEdgeIndex.nGlobalEntity()
+ globalVertexIndex.nGlobalEntity();
@@ -98,7 +98,7 @@ namespace Dune {
}
/** \brief Given a local index, retrieve its index globally unique over all processes. */
- int globalIndex(const int& localIndex) const {
+ int index(const int& localIndex) const {
return localGlobalMap_.find(localIndex)->second;
}
diff --git a/dune/gfe/parallel/matrixcommunicator.hh b/dune/gfe/parallel/matrixcommunicator.hh
index 66b15256..aad79302 100644
--- a/dune/gfe/parallel/matrixcommunicator.hh
+++ b/dune/gfe/parallel/matrixcommunicator.hh
@@ -34,7 +34,7 @@ class MatrixCommunicator {
const int i = rIt.index();
const int j = cIt.index();
- localMatrixEntries.push_back(TransferMatrixTuple(guIndex1_.globalIndex(i), guIndex2_.globalIndex(j), *cIt));
+ localMatrixEntries.push_back(TransferMatrixTuple(guIndex1_.index(i), guIndex2_.index(j), *cIt));
}
// Get number of matrix entries on each process
diff --git a/dune/gfe/parallel/vectorcommunicator.hh b/dune/gfe/parallel/vectorcommunicator.hh
index 2dd2b7fb..cb7de259 100644
--- a/dune/gfe/parallel/vectorcommunicator.hh
+++ b/dune/gfe/parallel/vectorcommunicator.hh
@@ -29,7 +29,7 @@ private:
// Translate vector entries
for (size_t k=0; k<localVector.size(); k++)
- localVectorEntries.push_back(TransferVectorTuple(guIndex.globalIndex(k), localVector[k]));
+ localVectorEntries.push_back(TransferVectorTuple(guIndex.index(k), localVector[k]));
// Get number of vector entries on each process
localVectorEntriesSizes = MPIFunctions::shareSizes(guIndex.getGridView(), localVectorEntries.size());
--
GitLab