Skip to content
Snippets Groups Projects
Commit 4a0c8db0 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Rename members of TransferVectorTuple, for better readability

[[Imported from SVN: r9749]]
parent b9c0c16f
No related branches found
No related tags found
No related merge requests found
...@@ -13,11 +13,13 @@ class VectorCommunicator { ...@@ -13,11 +13,13 @@ class VectorCommunicator {
struct TransferVectorTuple { struct TransferVectorTuple {
typedef typename VectorType::value_type EntryType; typedef typename VectorType::value_type EntryType;
size_t row; size_t globalIndex_;
EntryType entry; EntryType value_;
TransferVectorTuple() {} TransferVectorTuple() {}
TransferVectorTuple(const size_t& r, const EntryType& e) : row(r), entry(e) {} TransferVectorTuple(const size_t& r, const EntryType& e)
: globalIndex_(r),
value_(e) {}
}; };
private: private:
...@@ -52,7 +54,7 @@ public: ...@@ -52,7 +54,7 @@ public:
VectorType globalVector(guIndex.nGlobalEntity()); VectorType globalVector(guIndex.nGlobalEntity());
for (size_t k = 0; k < globalVectorEntries.size(); ++k) for (size_t k = 0; k < globalVectorEntries.size(); ++k)
globalVector[globalVectorEntries[k].row] += globalVectorEntries[k].entry; globalVector[globalVectorEntries[k].globalIndex_] += globalVectorEntries[k].value_;
return globalVector; return globalVector;
} }
...@@ -64,7 +66,7 @@ public: ...@@ -64,7 +66,7 @@ public:
VectorType globalVector(guIndex.nGlobalEntity()); VectorType globalVector(guIndex.nGlobalEntity());
for (size_t k = 0; k < globalVectorEntries.size(); ++k) for (size_t k = 0; k < globalVectorEntries.size(); ++k)
globalVector[globalVectorEntries[k].row] = globalVectorEntries[k].entry; globalVector[globalVectorEntries[k].globalIndex_] = globalVectorEntries[k].value_;
return globalVector; return globalVector;
} }
...@@ -72,7 +74,7 @@ public: ...@@ -72,7 +74,7 @@ public:
VectorType scatter(const VectorType& global) VectorType scatter(const VectorType& global)
{ {
for (size_t k = 0; k < globalVectorEntries.size(); ++k) for (size_t k = 0; k < globalVectorEntries.size(); ++k)
globalVectorEntries[k].entry = global[globalVectorEntries[k].row]; globalVectorEntries[k].value_ = global[globalVectorEntries[k].globalIndex_];
const int localSize = localVectorEntriesSizes[guIndex.getGridView().comm().rank()]; const int localSize = localVectorEntriesSizes[guIndex.getGridView().comm().rank()];
...@@ -86,7 +88,7 @@ public: ...@@ -86,7 +88,7 @@ public:
// And translate solution again // And translate solution again
for (size_t k = 0; k < localVectorEntries.size(); ++k) for (size_t k = 0; k < localVectorEntries.size(); ++k)
x[guIndex.localIndex(localVectorEntries[k].row)] = localVectorEntries[k].entry; x[guIndex.localIndex(localVectorEntries[k].globalIndex_)] = localVectorEntries[k].value_;
return x; return x;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment