mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Rely on insideCartElemIdx<outsideCartElemIdx in allpyAllZMultipliers_
and simpily code under that assumption.
This commit is contained in:
parent
11f9eb9d88
commit
d2a2d5074d
@ -475,14 +475,13 @@ private:
|
|||||||
if (insideFaceIdx > 3) { // top or or bottom
|
if (insideFaceIdx > 3) { // top or or bottom
|
||||||
Scalar mult = 1e20;
|
Scalar mult = 1e20;
|
||||||
unsigned cartElemIdx = insideCartElemIdx;
|
unsigned cartElemIdx = insideCartElemIdx;
|
||||||
// pick the smallest multiplier while looking down the pillar untill reaching the other end of the connection
|
assert(insideFaceIdx==5); // as insideCartElemIdx < outsideCartElemIdx holds for the Z column
|
||||||
// for the inbetween cells we apply it from both sides
|
// pick the smallest multiplier for Z+ while looking down the pillar untill reaching the other end of the connection
|
||||||
|
// While Z- is not all used here. There is a call after this function that does
|
||||||
|
// applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult)
|
||||||
|
// and hence treats the other direction
|
||||||
while (cartElemIdx != outsideCartElemIdx) {
|
while (cartElemIdx != outsideCartElemIdx) {
|
||||||
if (insideFaceIdx == 4 || cartElemIdx !=insideCartElemIdx )
|
mult = std::min(mult, transMult.getMultiplier(cartElemIdx, Opm::FaceDir::ZPlus));
|
||||||
mult = std::min(mult, transMult.getMultiplier(cartElemIdx, Opm::FaceDir::ZMinus));
|
|
||||||
if (insideFaceIdx == 5 || cartElemIdx !=insideCartElemIdx)
|
|
||||||
mult = std::min(mult, transMult.getMultiplier(cartElemIdx, Opm::FaceDir::ZPlus));
|
|
||||||
|
|
||||||
cartElemIdx += cartDims[0]*cartDims[1];
|
cartElemIdx += cartDims[0]*cartDims[1];
|
||||||
}
|
}
|
||||||
trans *= mult;
|
trans *= mult;
|
||||||
|
Loading…
Reference in New Issue
Block a user