OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2776 from blattms/apply-all-multz

Browse Source 
Apply minimum of Z multiplier for PINCH(5)==ALL, Prepare for PINCH(5)==TOP
This commit is contained in:
Bård Skaflestad 2020-09-11 16:29:00 +02:00 committed by GitHub
commit 09412bea62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ebos/ecltransmissibility.hh
View File

@ -345,11 +345,19 @@ public:
// for the inside ... // for the inside ...
if (useSmallestMultiplier) if (useSmallestMultiplier)
applyAllZMultipliers_(trans, insideFaceIdx, insideCartElemIdx, outsideCartElemIdx, transMult, cartDims); {
// Currently PINCH(4) is never queries and hence PINCH(4) == TOPBOT is assumed
// and in this branch PINCH(5) == ALL holds
applyAllZMultipliers_(trans, insideFaceIdx, outsideFaceIdx, insideCartElemIdx,
outsideCartElemIdx, transMult, cartDims,
/* pinchTop= */ false);
}
else else
{
applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, transMult); applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, transMult);
// ... and outside elements // ... and outside elements
applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult); applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult);
}
// apply the region multipliers (cf. the MULTREGT keyword) // apply the region multipliers (cf. the MULTREGT keyword)
Opm::FaceDir::DirEnum faceDir; Opm::FaceDir::DirEnum faceDir;
@ -465,29 +473,44 @@ private:
} }
} }
/// \brief Apply the Multipliers for the case PINCH(4)==TOPBOT
///
/// \param pinchTop Whether PINCH(5) is TOP, otherwise ALL is assumed.
void applyAllZMultipliers_(Scalar& trans, void applyAllZMultipliers_(Scalar& trans,
unsigned insideFaceIdx, unsigned insideFaceIdx,
unsigned outsideFaceIdx,
unsigned insideCartElemIdx, unsigned insideCartElemIdx,
unsigned outsideCartElemIdx, unsigned outsideCartElemIdx,
const Opm::TransMult& transMult, const Opm::TransMult& transMult,
const std::array<int, dimWorld>& cartDims) const std::array<int, dimWorld>& cartDims,
bool pinchTop)
{ {
if (insideFaceIdx > 3) { // top or or bottom if (insideFaceIdx > 3) { // top or or bottom
Scalar mult = 1e20;
unsigned cartElemIdx = insideCartElemIdx;
assert(insideFaceIdx==5); // as insideCartElemIdx < outsideCartElemIdx holds for the Z column assert(insideFaceIdx==5); // as insideCartElemIdx < outsideCartElemIdx holds for the Z column
// pick the smallest multiplier for Z+ while looking down the pillar untill reaching the other end of the connection assert(outsideCartElemIdx > insideCartElemIdx);
// While Z- is not all used here. There is a call after this function that does auto lastCartElemIdx = outsideCartElemIdx - cartDims[0]*cartDims[1];
// applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult) // Last multiplier
// and hence treats the other direction Scalar mult = transMult.getMultiplier(lastCartElemIdx , Opm::FaceDir::ZPlus);
while (cartElemIdx != outsideCartElemIdx) {
mult = std::min(mult, transMult.getMultiplier(cartElemIdx, Opm::FaceDir::ZPlus)); if ( !pinchTop )
cartElemIdx += cartDims[0]*cartDims[1]; {
// pick the smallest multiplier for Z+ while looking down the pillar until reaching the other end of the connection
// While Z- is not all used here.
for(auto cartElemIdx = insideCartElemIdx; cartElemIdx < lastCartElemIdx;
cartElemIdx += cartDims[0]*cartDims[1])
{
mult = std::min(mult, transMult.getMultiplier(cartElemIdx, Opm::FaceDir::ZPlus));
}
} }
trans *= mult; trans *= mult;
applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult);
} }
else else
{
applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, transMult); applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, transMult);
applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult);
}
} }
void updateFromEclState_() void updateFromEclState_()