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

[naming] replace faceIdx by fIdx

As decided at the Dumux day.

Made by Bernd, reviewed by Johannes.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13783 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent a2a58982
......@@ -61,16 +61,16 @@ public:
{
ElementIterator eIt = gridView_.template begin<0>();
int faceIdx = 0;
int fIdx = 0;
IntersectionIterator isEndIt = gridView_.iend(*eIt);
for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int idxInInside = isIt->indexInInside();
standardLocalIdxMap_[idxInInside] = faceIdx;
standardLocalIdxMap_[idxInInside] = fIdx;
faceIdx++;
fIdx++;
}
}
......@@ -84,45 +84,45 @@ public:
return elementMapper_.map(element);
}
int map(int elemIdx, int faceIdx)
int map(int elemIdx, int fIdx)
{
return intersectionMapGlobal_[elemIdx][faceIdx];
return intersectionMapGlobal_[elemIdx][fIdx];
}
int map(int elemIdx, int faceIdx) const
int map(int elemIdx, int fIdx) const
{
return (intersectionMapGlobal_[elemIdx].find(faceIdx))->second;//use find() for const function!
return (intersectionMapGlobal_[elemIdx].find(fIdx))->second;//use find() for const function!
}
int map(const Element& element, int faceIdx)
int map(const Element& element, int fIdx)
{
return intersectionMapGlobal_[map(element)][faceIdx];
return intersectionMapGlobal_[map(element)][fIdx];
}
int map(const Element& element, int faceIdx) const
int map(const Element& element, int fIdx) const
{
return intersectionMapGlobal_[map(element)].find(faceIdx)->second;//use find() for const function!
return intersectionMapGlobal_[map(element)].find(fIdx)->second;//use find() for const function!
}
int maplocal(int elemIdx, int faceIdx)
int maplocal(int elemIdx, int fIdx)
{
return intersectionMapLocal_[elemIdx][faceIdx];
return intersectionMapLocal_[elemIdx][fIdx];
}
int maplocal(int elemIdx, int faceIdx) const
int maplocal(int elemIdx, int fIdx) const
{
return (intersectionMapLocal_[elemIdx].find(faceIdx))->second;//use find() for const function!
return (intersectionMapLocal_[elemIdx].find(fIdx))->second;//use find() for const function!
}
int maplocal(const Element& element, int faceIdx)
int maplocal(const Element& element, int fIdx)
{
return intersectionMapLocal_[map(element)][faceIdx];
return intersectionMapLocal_[map(element)][fIdx];
}
int maplocal(const Element& element, int faceIdx) const
int maplocal(const Element& element, int fIdx) const
{
return (intersectionMapLocal_[map(element)].find(faceIdx))->second;//use find() for const function!
return (intersectionMapLocal_[map(element)].find(fIdx))->second;//use find() for const function!
}
// return number intersections
......@@ -155,15 +155,15 @@ public:
{
int globalIdx = map(*eIt);
int faceIdx = 0;
int fIdx = 0;
// run through all intersections with neighbors
IntersectionIterator isEndIt = gridView_.iend(*eIt);
for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
intersectionMapLocal_[globalIdx][faceIdx] = indexInInside;
intersectionMapLocal_[globalIdx][fIdx] = indexInInside;
faceIdx++;
fIdx++;
}
}
......@@ -172,7 +172,7 @@ public:
{
int globalIdx = map(*eIt);
int faceIdx = 0;
int fIdx = 0;
// run through all intersections with neighbors
IntersectionIterator isEndIt = gridView_.iend(*eIt);
for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
......@@ -206,17 +206,17 @@ public:
}
}
intersectionMapGlobal_[globalIdx][faceIdx] = globalIntersectionIdx;
intersectionMapGlobal_[globalIdx][fIdx] = globalIntersectionIdx;
intersectionMapGlobal_[globalIdxNeighbor][faceIdxNeighbor] = globalIntersectionIdx;
globalIntersectionIdx ++;
}
}
else
{
intersectionMapGlobal_[globalIdx][faceIdx] = globalIntersectionIdx;
intersectionMapGlobal_[globalIdx][fIdx] = globalIntersectionIdx;
globalIntersectionIdx ++;
}
faceIdx++;
fIdx++;
}
}
size_ = globalIntersectionIdx;
......
......@@ -153,9 +153,9 @@ public:
for (int dimIdx = 0; dimIdx < dim; dimIdx++)
{
refVelocity[dimIdx] = -flux[dim - 1 - dimIdx];
for (int faceIdx = 0; faceIdx < dim + 1; faceIdx++)
for (int fIdx = 0; fIdx < dim + 1; fIdx++)
{
refVelocity[dimIdx] += flux[faceIdx]/(dim + 1);
refVelocity[dimIdx] += flux[fIdx]/(dim + 1);
}
}
}
......
......@@ -61,11 +61,11 @@ public:
//! Constructs a FluxData1P object
FluxData1P()
{
for (int faceIdx = 0; faceIdx < 2*dim; faceIdx++)
for (int fIdx = 0; fIdx < 2*dim; fIdx++)
{
velocity_[faceIdx] = DimVector(0.0);
potential_[faceIdx] = 0.0;
velocityMarker_[faceIdx] = false;
velocity_[fIdx] = DimVector(0.0);
potential_[fIdx] = 0.0;
velocityMarker_[fIdx] = false;
}
}
......
......@@ -228,9 +228,9 @@ public:
for (int dimIdx = 0; dimIdx < dim; dimIdx++)
{
refVelocity[dimIdx] = -fluxW[dim - 1 - dimIdx];
for (int faceIdx = 0; faceIdx < dim + 1; faceIdx++)
for (int fIdx = 0; fIdx < dim + 1; fIdx++)
{
refVelocity[dimIdx] += fluxW[faceIdx]/(dim + 1);
refVelocity[dimIdx] += fluxW[fIdx]/(dim + 1);
}
}
}
......@@ -265,9 +265,9 @@ public:
for (int dimIdx = 0; dimIdx < dim; dimIdx++)
{
refVelocity[dimIdx] = -fluxNw[dim - 1 - dimIdx];
for (int faceIdx = 0; faceIdx < dim + 1; faceIdx++)
for (int fIdx = 0; fIdx < dim + 1; fIdx++)
{
refVelocity[dimIdx] += fluxNw[faceIdx]/(dim + 1);
refVelocity[dimIdx] += fluxNw[fIdx]/(dim + 1);
}
}
}
......
......@@ -1683,9 +1683,9 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
for (int elemIdx = 0; elemIdx < 2 * dim; elemIdx++)
{
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......@@ -1731,16 +1731,16 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
pc += gravityDiff; //minus because of gravity definition!
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isBoundaryFace(intVolFaceIdx))
{
if (interactionVolume.getBoundaryType(intVolFaceIdx).isDirichlet(pressEqIdx))
{
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, faceIdx);
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, fIdx);
const ReferenceElement& referenceElement = ReferenceElements::general(
elementPointer->geometry().type());
......@@ -1754,7 +1754,7 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
DimVector unitDistVec(distVec);
unitDistVec /= dist;
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, faceIdx);
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, fIdx);
// get pc and lambda at the boundary
Scalar satWBound = cellData.saturation(wPhaseIdx);
......
......@@ -2379,9 +2379,9 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
for (int elemIdx = 0; elemIdx < 2 * dim; elemIdx++)
{
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......@@ -2427,16 +2427,16 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
pc += gravityDiff; //minus because of gravity definition!
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isBoundaryFace(intVolFaceIdx))
{
if (interactionVolume.getBoundaryType(intVolFaceIdx).isDirichlet(pressEqIdx))
{
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, faceIdx);
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, fIdx);
const ReferenceElement& referenceElement = ReferenceElements::general(
elementPointer->geometry().type());
......@@ -2450,7 +2450,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
DimVector unitDistVec(distVec);
unitDistVec /= dist;
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, faceIdx);
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, fIdx);
// get pc and lambda at the boundary
Scalar satWBound = cellData.saturation(wPhaseIdx);
......
......@@ -256,9 +256,9 @@ void FvMpfaL2dPressureVelocity2p<TypeTag>::calculateVelocity()
for (int elemIdx = 0; elemIdx < 2 * dim; elemIdx++)
{
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......
......@@ -293,9 +293,9 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
for (int elemIdx = 0; elemIdx < 2 * dim; elemIdx++)
{
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......@@ -350,10 +350,10 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity(const Inter
int indexInInside = intersection.indexInInside();
int indexInOutside = intersection.indexInOutside();
int faceIdx = indexInInside;
int fIdx = indexInInside;
if (levelI < levelJ)
faceIdx = indexInOutside;
fIdx = indexInOutside;
std::vector<CellData> cellDataTemp(0);
......@@ -373,7 +373,7 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity(const Inter
for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int localVertIdx = referenceElement.subEntity(faceIdx, dim - 1, vIdx, dim);
int localVertIdx = referenceElement.subEntity(fIdx, dim - 1, vIdx, dim);
int vIdxGlobal = 0;
if (levelI >= levelJ)
......
......@@ -747,15 +747,15 @@ void FvMpfaL2dVelocity2p<TypeTag>::calculateBoundaryInteractionVolumeVelocity(In
Dune::FieldVector < Scalar, numPhases > lambda(cellData.mobility(wPhaseIdx));
lambda[nPhaseIdx] = cellData.mobility(nPhaseIdx);
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isBoundaryFace(intVolFaceIdx))
{
if (interactionVolume.getBoundaryType(intVolFaceIdx).isDirichlet(pressureEqIdx))
{
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, faceIdx);
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, fIdx);
const ReferenceElement& referenceElement = ReferenceElements::general(
elementPointer->geometry().type());
......@@ -865,7 +865,7 @@ void FvMpfaL2dVelocity2p<TypeTag>::calculateBoundaryInteractionVolumeVelocity(In
}
else if (interactionVolume.getBoundaryType(intVolFaceIdx).isNeumann(pressureEqIdx))
{
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, faceIdx);
int boundaryFaceIdx = interactionVolume.getIndexOnElement(elemIdx, fIdx);
const ReferenceElement& referenceElement = ReferenceElements::general(
elementPointer->geometry().type());
......@@ -888,9 +888,9 @@ void FvMpfaL2dVelocity2p<TypeTag>::calculateBoundaryInteractionVolumeVelocity(In
DimVector velocityW(unitDistVec);
DimVector velocityNw(unitDistVec);
velocityW *= boundValues[wPhaseIdx] / (2 * interactionVolume.getFaceArea(elemIdx, faceIdx));
velocityW *= boundValues[wPhaseIdx] / (2 * interactionVolume.getFaceArea(elemIdx, fIdx));
velocityNw *= boundValues[nPhaseIdx]
/ (2 * interactionVolume.getFaceArea(elemIdx, faceIdx));
/ (2 * interactionVolume.getFaceArea(elemIdx, fIdx));
//store potentials for further calculations (saturation, ...)
cellData.fluxData().addUpwindPotential(wPhaseIdx, boundaryFaceIdx, boundValues[wPhaseIdx]);
......
......@@ -281,13 +281,13 @@ public:
}
protected:
void addRealFluxFaceArea_(Scalar faceArea, int globalIdx, int faceIdx)
void addRealFluxFaceArea_(Scalar faceArea, int globalIdx, int fIdx)
{
realFluxFaceArea_[globalIdx][faceIdx][fluxFaceArea] += faceArea;
realFluxFaceArea_[globalIdx][fIdx][fluxFaceArea] += faceArea;
}
void addRealFaceArea_(Scalar faceArea, int globalIdx, int faceIdx)
void addRealFaceArea_(Scalar faceArea, int globalIdx, int fIdx)
{
realFluxFaceArea_[globalIdx][faceIdx][realFaceArea] += faceArea;
realFluxFaceArea_[globalIdx][fIdx][realFaceArea] += faceArea;
}
Problem& problem_;
......
......@@ -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 eIdxGlobal, int faceIdx)
std::set<int>& faceVerticeIndices(int eIdxGlobal, int fIdx)
{
return faceVertices_[eIdxGlobal][faceIdx];
return faceVertices_[eIdxGlobal][fIdx];
}
//! Constructs a FvMpfaL3dInteractionVolumeContainerAdaptive object
......@@ -674,9 +674,9 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
{
for (int j = 0; j < 4; j++)
{
int faceIdx = IndexTranslator::getFaceIndexFromElements(elemIdxOld[i], elemIdxOld[j]);
if (faceIdx >= 0)
zeroFaceIdxVec.insert(faceIdx);
int fIdx = IndexTranslator::getFaceIndexFromElements(elemIdxOld[i], elemIdxOld[j]);
if (fIdx >= 0)
zeroFaceIdxVec.insert(fIdx);
}
}
......@@ -1431,9 +1431,9 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
{
for (int j = 0; j < 6; j++)
{
int faceIdx = IndexTranslator::getFaceIndexFromElements(elemIdxOld[i], elemIdxOld[j]);
if (faceIdx >= 0)
zeroFaceIdxVec.insert(faceIdx);
int fIdx = IndexTranslator::getFaceIndexFromElements(elemIdxOld[i], elemIdxOld[j]);
if (fIdx >= 0)
zeroFaceIdxVec.insert(fIdx);
}
}
......
......@@ -2269,9 +2269,9 @@ void FvMpfaL3dPressure2p<TypeTag>::assembleBoundaryInteractionVolume(Interaction
continue;
}
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......@@ -2319,21 +2319,21 @@ void FvMpfaL3dPressure2p<TypeTag>::assembleBoundaryInteractionVolume(Interaction
pc += gravityDiff; //minus because of gravity definition!
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isBoundaryFace(intVolFaceIdx))
{
if (interactionVolume.getBoundaryType(intVolFaceIdx).isDirichlet(pressureEqIdx))
{
const GlobalPosition& globalPosFace = interactionVolume.getFacePosition(elemIdx, faceIdx);
const GlobalPosition& globalPosFace = interactionVolume.getFacePosition(elemIdx, fIdx);
DimVector distVec(globalPosFace - globalPos);
Scalar dist = distVec.two_norm();
DimVector& normal = interactionVolume.getNormal(elemIdx, faceIdx);
DimVector& normal = interactionVolume.getNormal(elemIdx, fIdx);
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, faceIdx);
Scalar faceArea = interactionVolume.getFaceArea(elemIdx, fIdx);
// get pc and lambda at the boundary
Scalar satWBound = cellData.saturation(wPhaseIdx);
......
......@@ -257,9 +257,9 @@ void FvMpfaL3dPressureVelocity2p<TypeTag>::calculateVelocity()
continue;
}
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......
......@@ -267,9 +267,9 @@ void FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
continue;
}
bool isOutside = false;
for (int faceIdx = 0; faceIdx < dim; faceIdx++)
for (int fIdx = 0; fIdx < dim; fIdx++)
{
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, faceIdx);
int intVolFaceIdx = interactionVolume.getFaceIndexFromSubVolume(elemIdx, fIdx);
if (interactionVolume.isOutsideFace(intVolFaceIdx))
{
isOutside = true;
......
......@@ -158,7 +158,7 @@ public:
CellData & cellData1, CellData & cellData2, CellData & cellData3, CellData & cellData4,
CellData & cellData5, CellData & cellData6, CellData & cellData7, CellData & cellData8,
InteractionVolumeContainer& interactionVolumes,
TransmissibilityCalculator& transmissibilityCalculator, int faceIdx = -1);
TransmissibilityCalculator& transmissibilityCalculator, int fIdx = -1);
void calculateBoundaryInteractionVolumeVelocity(InteractionVolume& interactionVolume,
CellData& cellData, int elemIdx);
......@@ -296,14 +296,14 @@ private:
* \param cellData8 <tt>CellData</tt> object of an IMPES model for sub-volume 8
* \param interactionVolumes Container including the interaction volume information for the complete grid
* \param transmissibilityCalculator Object including the methods for calculating the transmissibilities
* \param faceIdx Index of the flux face for which the velocity has to be calculated. If no face index is given, <tt>faceIdx</tt> = -1
* \param fIdx Index of the flux face for which the velocity has to be calculated. If no face index is given, <tt>fIdx</tt> = -1
* and velocities for all flux faces in the interaction volume are calculated!
*/
template<class TypeTag>
void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(InteractionVolume& interactionVolume,
CellData & cellData1, CellData & cellData2, CellData & cellData3, CellData & cellData4,
CellData & cellData5, CellData & cellData6, CellData & cellData7, CellData & cellData8,
InteractionVolumeContainer& interactionVolumes, TransmissibilityCalculator& transmissibilityCalculator, int faceIdx)
InteractionVolumeContainer& interactionVolumes, TransmissibilityCalculator& transmissibilityCalculator, int fIdx)
{
ElementPointer& elementPointer1 = interactionVolume.getSubVolumeElement(0);
ElementPointer& elementPointer2 = interactionVolume.getSubVolumeElement(1);
......@@ -462,7 +462,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
Dune::FieldVector<Scalar, 2 * dim - dim + 1> u(0);
TransmissibilityType T(0);
if (faceIdx < 0 || faceIdx == 0)
if (fIdx < 0 || fIdx == 0)
{
// calculate the flux through the subvolumeface 1 (subVolumeFaceIdx = 0)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 0, 1, 2, 3,
......@@ -558,7 +558,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 1)
if (fIdx < 0 || fIdx == 1)
{
// calculate the flux through the subvolumeface 2 (subVolumeFaceIdx = 1)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 1, 3, 0, 2, 5,
......@@ -654,7 +654,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 2)
if (fIdx < 0 || fIdx == 2)
{
// calculate the flux through the subvolumeface 3 (subVolumeFaceIdx = 2)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 3, 2, 1, 0, 7,
......@@ -750,7 +750,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 3)
if (fIdx < 0 || fIdx == 3)
{
// calculate the flux through the subvolumeface 4 (subVolumeFaceIdx = 3)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 2, 0, 3, 1, 6,
......@@ -846,7 +846,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 4)
if (fIdx < 0 || fIdx == 4)
{
// calculate the flux through the subvolumeface 5 (subVolumeFaceIdx = 4)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 5, 4, 7, 6, 1,
......@@ -942,7 +942,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 5)
if (fIdx < 0 || fIdx == 5)
{
// calculate the flux through the subvolumeface 6 (subVolumeFaceIdx = 5)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 7, 5, 6, 4, 3,
......@@ -1038,7 +1038,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 6)
if (fIdx < 0 || fIdx == 6)
{
// calculate the flux through the subvolumeface 7 (subVolumeFaceIdx = 6)
int caseL = transmissibilityCalculator.transmissibility(T, interactionVolume, lambda, 6, 7, 4, 5, 2,
......@@ -1134,7 +1134,7 @@ void FvMpfaL3dVelocity2p<TypeTag>::calculateInnerInteractionVolumeVelocity(Inter
}
}
if (faceIdx < 0 || faceIdx == 7)
if (fIdx < 0 || fIdx == 7)
{
// calculate the flux through the subvolumeface 8 (subVolumeFaceIdx = 7)