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

Transmissibility::computeHalfTrans_: use return value instead of out-param

Browse Source 
and make it static
This commit is contained in:
Arne Morten Kvarving 2025-01-17 11:45:45 +01:00
parent 3695ea8b0b
commit 9ce9fe49f2
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/simulators/flow/Transmissibility.hpp
View File

@ -251,11 +251,10 @@ protected:
void extractDispersion_();
void computeHalfTrans_(Scalar& halfTrans,
const DimVector& areaNormal,
int faceIdx, // in the reference element that contains the intersection
const DimVector& distance,
const DimMatrix& perm) const;
static Scalar computeHalfTrans_(const DimVector& areaNormal,
int faceIdx, // in the reference element that contains the intersection
const DimVector& distance,
const DimMatrix& perm);
void computeHalfDiffusivity_(Scalar& halfDiff,
const DimVector& areaNormal,

51
opm/simulators/flow/Transmissibility_impl.hpp
View File

@ -259,13 +259,11 @@ update(bool global, const TransUpdateQuantities update_quantities,
auto faceAreaNormal = intersection.centerUnitOuterNormal();
faceAreaNormal *= geometry.volume();
Scalar transBoundaryIs;
computeHalfTrans_(transBoundaryIs,
faceAreaNormal,
intersection.indexInInside(),
distanceVector_(faceCenterInside,
elemIdx),
permeability_[elemIdx]);
Scalar transBoundaryIs =
computeHalfTrans_(faceAreaNormal,
intersection.indexInInside(),
distanceVector_(faceCenterInside, elemIdx),
permeability_[elemIdx]);
// normally there would be two half-transmissibilities that would be
// averaged. on the grid boundary there only is the half
@ -355,21 +353,16 @@ update(bool global, const TransUpdateQuantities update_quantities,
faceAreaNormal,
isCpGrid);
Scalar halfTrans1;
Scalar halfTrans2;
computeHalfTrans_(halfTrans1,
faceAreaNormal,
insideFaceIdx,
distanceVector_(faceCenterInside,
elemIdx),
permeability_[elemIdx]);
computeHalfTrans_(halfTrans2,
faceAreaNormal,
outsideFaceIdx,
distanceVector_(faceCenterOutside,
outsideElemIdx),
permeability_[outsideElemIdx]);
Scalar halfTrans1 =
computeHalfTrans_(faceAreaNormal,
insideFaceIdx,
distanceVector_(faceCenterInside, elemIdx),
permeability_[elemIdx]);
Scalar halfTrans2 =
computeHalfTrans_(faceAreaNormal,
outsideFaceIdx,
distanceVector_(faceCenterOutside, outsideElemIdx),
permeability_[outsideElemIdx]);
applyNtg_(halfTrans1, insideFaceIdx, elemIdx, ntg);
applyNtg_(halfTrans2, outsideFaceIdx, outsideElemIdx, ntg);
@ -1321,19 +1314,21 @@ applyNncMultreg_(const std::unordered_map<std::size_t,int>& cartesianToCompresse
}
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
computeHalfTrans_(Scalar& halfTrans,
const DimVector& areaNormal,
Scalar
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
computeHalfTrans_(const DimVector& areaNormal,
int faceIdx, // in the reference element that contains the intersection
const DimVector& distance,
const DimMatrix& perm) const
const DimMatrix& perm)
{
assert(faceIdx >= 0);
unsigned dimIdx = faceIdx/2;
unsigned dimIdx = faceIdx / 2;
assert(dimIdx < dimWorld);
halfTrans = perm[dimIdx][dimIdx];
Scalar halfTrans = perm[dimIdx][dimIdx];
halfTrans *= std::abs(Dune::dot(areaNormal, distance));
halfTrans /= distance.two_norm2();
return halfTrans;
}
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>