Commit a2a58982 authored by Johannes Hommel's avatar Johannes Hommel
Browse files

[naming] use dofIdxGlobal, vIdxGlobal, eIdxGlobal

As decided at the Dumux day.

Reviewed by Bernd.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13782 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 02fdf3ed
......@@ -1283,9 +1283,9 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......
......@@ -1655,14 +1655,14 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::printInteractionVolumes()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = interactionVolumes_[vIdxGlobal];
if (interactionVolume.getElementNumber() > 2)
{
interactionVolume.printInteractionVolumeInfo();
std::cout << "global vertex index: " << globalVertIdx << "\n";
std::cout << "global vertex index: " << vIdxGlobal << "\n";
if (interactionVolume.getElementNumber() == 3)
{
ElementPointer& elementPointer1 = interactionVolume.getSubVolumeElement(0);
......@@ -1710,9 +1710,9 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......
......@@ -223,9 +223,9 @@ void FvMpfaL2dPressureVelocity2p<TypeTag>::calculateVelocity()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = this->interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = this->interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......@@ -318,10 +318,10 @@ void FvMpfaL2dPressureVelocity2p<TypeTag>::calculateVelocity(const Intersection&
{
int localVertIdx = referenceElement.subEntity(indexInInside, dim - 1, vIdx, dim);
int globalVertIdx = problem_.variables().index(
int vIdxGlobal = problem_.variables().index(
*((*elementPtrI).template subEntity < dim > (localVertIdx)));
InteractionVolume& interactionVolume = this->interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = this->interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......
......@@ -232,9 +232,9 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = this->interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = this->interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......@@ -375,19 +375,19 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity(const Inter
{
int localVertIdx = referenceElement.subEntity(faceIdx, dim - 1, vIdx, dim);
int globalVertIdx = 0;
int vIdxGlobal = 0;
if (levelI >= levelJ)
{
globalVertIdx = problem_.variables().index(
vIdxGlobal = problem_.variables().index(
*((*elementPtrI).template subEntity < dim > (localVertIdx)));
}
else
{
globalVertIdx = problem_.variables().index(
vIdxGlobal = problem_.variables().index(
*((*elementPtrJ).template subEntity < dim > (localVertIdx)));
}
InteractionVolume& interactionVolume = this->interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = this->interactionVolumes_[vIdxGlobal];
if (interactionVolume.isInnerVolume())
{
......
......@@ -320,37 +320,37 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const
{
int globalIdx = problem_.variables().index(element);
int globalVertIdx = problem_.variables().vertexMapper().map(element, 0, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 7);
elemVertMap[globalVertIdx][7] = globalIdx;
int vIdxGlobal = problem_.variables().vertexMapper().map(element, 0, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 7);
elemVertMap[vIdxGlobal][7] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 1, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 6);
elemVertMap[globalVertIdx][6] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 1, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 6);
elemVertMap[vIdxGlobal][6] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 2, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 5);
elemVertMap[globalVertIdx][5] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 2, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 5);
elemVertMap[vIdxGlobal][5] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 3, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 4);
elemVertMap[globalVertIdx][4] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 3, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 4);
elemVertMap[vIdxGlobal][4] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 4, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 3);
elemVertMap[globalVertIdx][3] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 4, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 3);
elemVertMap[vIdxGlobal][3] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 5, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 2);
elemVertMap[globalVertIdx][2] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 5, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 2);
elemVertMap[vIdxGlobal][2] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 6, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 1);
elemVertMap[globalVertIdx][1] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 6, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 1);
elemVertMap[vIdxGlobal][1] = globalIdx;
globalVertIdx = problem_.variables().vertexMapper().map(element, 7, dim);
interactionVolumes_[globalVertIdx].setSubVolumeElement(element, 0);
elemVertMap[globalVertIdx][0] = globalIdx;
vIdxGlobal = problem_.variables().vertexMapper().map(element, 7, dim);
interactionVolumes_[vIdxGlobal].setSubVolumeElement(element, 0);
elemVertMap[vIdxGlobal][0] = globalIdx;
}
/*! \brief Stores information with respect to DUNE intersections in the interaction volumes
......@@ -418,11 +418,11 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
{
int localVertIdx = referenceElement.subEntity(indexInInside, 1, i, dim);
int globalVertIdx = problem_.variables().vertexMapper().map(element, localVertIdx, dim);
int vIdxGlobal = problem_.variables().vertexMapper().map(element, localVertIdx, dim);
InteractionVolume& interactionVolume = interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = interactionVolumes_[vIdxGlobal];
if (elemVertMap[globalVertIdx][0] == globalIdx)
if (elemVertMap[vIdxGlobal][0] == globalIdx)
{
if (indexInInside == 1)
{
......@@ -476,7 +476,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][1] == globalIdx)
if (elemVertMap[vIdxGlobal][1] == globalIdx)
{
if (indexInInside == 3)
{
......@@ -530,7 +530,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][2] == globalIdx)
if (elemVertMap[vIdxGlobal][2] == globalIdx)
{
if (indexInInside == 2)
{
......@@ -584,7 +584,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][3] == globalIdx)
if (elemVertMap[vIdxGlobal][3] == globalIdx)
{
if (indexInInside == 0)
{
......@@ -638,7 +638,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][4] == globalIdx)
if (elemVertMap[vIdxGlobal][4] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -692,7 +692,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][5] == globalIdx)
if (elemVertMap[vIdxGlobal][5] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -747,7 +747,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][6] == globalIdx)
if (elemVertMap[vIdxGlobal][6] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -801,7 +801,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][7] == globalIdx)
if (elemVertMap[vIdxGlobal][7] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -857,7 +857,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
if (isIt->boundary())
{
if (elemVertMap[globalVertIdx][0] == globalIdx)
if (elemVertMap[vIdxGlobal][0] == globalIdx)
{
if (indexInInside == 1)
{
......@@ -914,7 +914,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][1] == globalIdx)
if (elemVertMap[vIdxGlobal][1] == globalIdx)
{
if (indexInInside == 3)
{
......@@ -971,7 +971,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][2] == globalIdx)
if (elemVertMap[vIdxGlobal][2] == globalIdx)
{
if (indexInInside == 2)
{
......@@ -1028,7 +1028,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][3] == globalIdx)
if (elemVertMap[vIdxGlobal][3] == globalIdx)
{
if (indexInInside == 0)
{
......@@ -1085,7 +1085,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][4] == globalIdx)
if (elemVertMap[vIdxGlobal][4] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -1142,7 +1142,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][5] == globalIdx)
if (elemVertMap[vIdxGlobal][5] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -1199,7 +1199,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][6] == globalIdx)
if (elemVertMap[vIdxGlobal][6] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -1256,7 +1256,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
}
}
}
if (elemVertMap[globalVertIdx][7] == globalIdx)
if (elemVertMap[vIdxGlobal][7] == globalIdx)
{
if (indexInInside == 4)
{
......@@ -2064,9 +2064,9 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInteractionVolumeInfo()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = interactionVolumes_[vIdxGlobal];
if (interactionVolume.getElementNumber() == 8)
{
......
......@@ -107,9 +107,9 @@ public:
* have to be updated in an implicit treatment of the transport equation, it is necessary to get
* the complete set of vertices on a face: 4 corners + all hanging nodes.
*/
std::set<int>& faceVerticeIndices(int globalElemIdx, int faceIdx)
std::set<int>& faceVerticeIndices(int eIdxGlobal, int faceIdx)
{
return faceVertices_[globalElemIdx][faceIdx];
return faceVertices_[eIdxGlobal][faceIdx];
}
//! Constructs a FvMpfaL3dInteractionVolumeContainerAdaptive object
......@@ -1651,9 +1651,9 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = asImp_().interactionVolumes_[globalVertIdx];
InteractionVolume& interactionVolume = asImp_().interactionVolumes_[vIdxGlobal];
if (interactionVolume.getElementNumber() == 8)
{
......@@ -1700,16 +1700,16 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
asImp_().addRealFluxFaceArea_(interactionVolume.getFaceArea(4, 0), globalIdx5, interactionVolume.getIndexOnElement(4, 0));
asImp_().addRealFluxFaceArea_(interactionVolume.getFaceArea(5, 0), globalIdx6, interactionVolume.getIndexOnElement(5, 0));
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 0)].insert(globalVertIdx);
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 1)].insert(globalVertIdx);
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 2)].insert(globalVertIdx);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 0)].insert(globalVertIdx);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 1)].insert(globalVertIdx);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 2)].insert(globalVertIdx);
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 0)].insert(globalVertIdx);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 1)].insert(globalVertIdx);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 0)].insert(globalVertIdx);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 0)].insert(globalVertIdx);
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx1][interactionVolume.getIndexOnElement(0, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx2][interactionVolume.getIndexOnElement(1, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 0)].insert(vIdxGlobal);
if (interactionVolume.getHangingNodeType() != InteractionVolume::twoSmallCells)
{
......@@ -1728,20 +1728,20 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
asImp_().addRealFluxFaceArea_(interactionVolume.getFaceArea(7, 1), globalIdx8, interactionVolume.getIndexOnElement(7, 1));
asImp_().addRealFluxFaceArea_(interactionVolume.getFaceArea(7, 2), globalIdx8, interactionVolume.getIndexOnElement(7, 2));
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 1)].insert(globalVertIdx);
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 2)].insert(globalVertIdx);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 0)].insert(globalVertIdx);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 2)].insert(globalVertIdx);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 1)].insert(globalVertIdx);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 2)].insert(globalVertIdx);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 1)].insert(globalVertIdx);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 2)].insert(globalVertIdx);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 0)].insert(globalVertIdx);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 1)].insert(globalVertIdx);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 2)].insert(globalVertIdx);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 0)].insert(globalVertIdx);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 1)].insert(globalVertIdx);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 2)].insert(globalVertIdx);
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx3][interactionVolume.getIndexOnElement(2, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx4][interactionVolume.getIndexOnElement(3, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx5][interactionVolume.getIndexOnElement(4, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx6][interactionVolume.getIndexOnElement(5, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx7][interactionVolume.getIndexOnElement(6, 2)].insert(vIdxGlobal);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 0)].insert(vIdxGlobal);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 1)].insert(vIdxGlobal);
faceVertices_[globalIdx8][interactionVolume.getIndexOnElement(7, 2)].insert(vIdxGlobal);
}
}
......
......@@ -568,9 +568,9 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixRowSize()
for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
int vIdxGlobal = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(vIdxGlobal);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
{
......@@ -609,9 +609,9 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixIndices()
for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
int vIdxGlobal = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(vIdxGlobal);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
{
if (interactionVolume.hasSubVolumeElement(subVolumeIdx))
......@@ -639,9 +639,9 @@ void FvMpfaL3dPressure2p<TypeTag>::assemble()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(vIdxGlobal);
// inner interactionvolume
if (interactionVolume.isInnerVolume())
......
......@@ -300,9 +300,9 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
int vIdxGlobal = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
{
......@@ -321,7 +321,7 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
{
int globalVertIdxJ = problem_.variables().vertexMapper().map(*neighbor, vIdx, dim);
if (globalVertIdxJ != globalVertIdx)
if (globalVertIdxJ != vIdxGlobal)
{
InteractionVolume& interactionVolumeJ = this->interactionVolumes_.interactionVolume(
globalVertIdxJ);
......@@ -389,9 +389,9 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixIndices()
for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
int vIdxGlobal = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
{
if (interactionVolume.hasSubVolumeElement(subVolumeIdx))
......@@ -435,9 +435,9 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::assemble()
continue;
}
#endif
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
// inner interactionvolume
if (interactionVolume.isInnerVolume())
......
......@@ -218,9 +218,9 @@ void FvMpfaL3dPressureVelocity2p<TypeTag>::calculateVelocity()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
// inner interactionvolume
if (interactionVolume.isInnerVolume())
......@@ -318,10 +318,10 @@ void FvMpfaL3dPressureVelocity2p<TypeTag>::calculateVelocity(const Intersection&
{
int localVertIdx = referenceElement.subEntity(indexInInside, 1, vIdx, dim);
int globalVertIdx = problem_.variables().index(
int vIdxGlobal = problem_.variables().index(
*((*elementPtrI).template subEntity < dim > (localVertIdx)));
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
if (interactionVolume.isInnerVolume())
{
......
......@@ -219,9 +219,9 @@ void FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
VertexIterator vEndIt = problem_.gridView().template end<dim>();
for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
int vIdxGlobal = problem_.variables().index(*vIt);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(vIdxGlobal);
// inner interactionvolume
if (interactionVolume.isInnerVolume())
......@@ -337,20 +337,20 @@ void FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity(const Inter
cellDataJ.fluxData().setUpwindPotential(nPhaseIdx, indexInOutside, 0);
}
std::set<int> globalVertIdx;
std::set<int> vIdxGlobal;
if (levelI >= levelJ)
{
globalVertIdx = this->interactionVolumes_.faceVerticeIndices(globalIdxI, indexInInside);
vIdxGlobal = this->interactionVolumes_.faceVerticeIndices(globalIdxI, indexInInside);
}
else
{
globalVertIdx = this->interactionVolumes_.faceVerticeIndices(globalIdxJ, indexInOutside);
vIdxGlobal = this->interactionVolumes_.faceVerticeIndices(globalIdxJ, indexInOutside);
}
std