OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2381 from akva2/use_compressed_ntg

Browse Source 
use compressed field properties applying NTG
This commit is contained in:
Arne Morten Kvarving 2020-03-02 14:49:59 +01:00 committed by GitHub
commit 9f00c3dfe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ebos/ecltransmissibility.hh
View File

@ -137,7 +137,7 @@ public:
ElementMapper elemMapper(gridView, Dune::mcmgElementLayout()); ElementMapper elemMapper(gridView, Dune::mcmgElementLayout());
// get the ntg values, the ntg values are modified for the cells merged with minpv // get the ntg values, the ntg values are modified for the cells merged with minpv
const std::vector<double>& ntg = eclState.fieldProps().get_global_double("NTG"); const std::vector<double>& ntg = eclState.fieldProps().get_double("NTG");
unsigned numElements = elemMapper.size(); unsigned numElements = elemMapper.size();
@ -377,8 +377,8 @@ public:
axisCentroids), axisCentroids),
permeability_[outsideElemIdx]); permeability_[outsideElemIdx]);
applyNtg_(halfTrans1, insideFaceIdx, insideCartElemIdx, ntg); applyNtg_(halfTrans1, insideFaceIdx, elemIdx, ntg);
applyNtg_(halfTrans2, outsideFaceIdx, outsideCartElemIdx, ntg); applyNtg_(halfTrans2, outsideFaceIdx, outsideElemIdx, ntg);
// convert half transmissibilities to full face // convert half transmissibilities to full face
// transmissibilities using the harmonic mean // transmissibilities using the harmonic mean
@ -876,7 +876,7 @@ private:
void applyNtg_(Scalar& trans, void applyNtg_(Scalar& trans,
unsigned faceIdx, unsigned faceIdx,
unsigned cartElemIdx, unsigned elemIdx,
const std::vector<double>& ntg) const const std::vector<double>& ntg) const
{ {
// apply multiplyer for the transmissibility of the face. (the // apply multiplyer for the transmissibility of the face. (the
@ -884,17 +884,17 @@ private:
// contains the intersection of interest.) // contains the intersection of interest.)
switch (faceIdx) { switch (faceIdx) {
case 0: // left case 0: // left
trans *= ntg[cartElemIdx]; trans *= ntg[elemIdx];
break; break;
case 1: // right case 1: // right
trans *= ntg[cartElemIdx]; trans *= ntg[elemIdx];
break; break;
case 2: // front case 2: // front
trans *= ntg[cartElemIdx]; trans *= ntg[elemIdx];
break; break;
case 3: // back case 3: // back
trans *= ntg[cartElemIdx]; trans *= ntg[elemIdx];
break; break;
// NTG does not apply to top and bottom faces // NTG does not apply to top and bottom faces