OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-22 09:16:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #898 from atgeirr/fix-expensive-call-in-flux-calc

Browse Source 
Avoid call to FaceDir::FromIntersectionIndex() in hot path.
This commit is contained in:
Bård Skaflestad 2024-04-27 22:48:04 +02:00 committed by GitHub
commit d370945992
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/models/blackoil/blackoillocalresidualtpfa.hh
View File

@ -116,7 +116,7 @@ public:
double faceArea;
double thpres;
double dZg;
int dirId;
FaceDir::DirEnum faceDir;
double Vin;
double Vex;
double inAlpha;
@ -272,7 +272,7 @@ public:
const auto& globalIndexEx = stencil.globalSpaceIndex(exteriorDofIdx);
Scalar trans = problem.transmissibility(elemCtx, interiorDofIdx, exteriorDofIdx);
Scalar faceArea = scvf.area();
const auto dirid = scvf.dirId();
const auto faceDir = faceDirFromDirId(scvf.dirId());
Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx);
// estimate the gravity correction: for performance reasons we use a simplified
@ -298,7 +298,7 @@ public:
const Scalar diffusivity = problem.diffusivity(globalIndexEx, globalIndexIn);
const Scalar dispersivity = problem.dispersivity(globalIndexEx, globalIndexIn);
const ResidualNBInfo res_nbinfo {trans, faceArea, thpres, distZ * g, dirid, Vin, Vex, inAlpha, outAlpha, diffusivity, dispersivity};
const ResidualNBInfo res_nbinfo {trans, faceArea, thpres, distZ * g, faceDir, Vin, Vex, inAlpha, outAlpha, diffusivity, dispersivity};
calculateFluxes_(flux,
darcy,
@ -324,7 +324,7 @@ public:
const Scalar thpres = nbInfo.thpres;
const Scalar trans = nbInfo.trans;
const Scalar faceArea = nbInfo.faceArea;
FaceDir::DirEnum facedir = faceDirFromDirId(nbInfo.dirId);
FaceDir::DirEnum facedir = nbInfo.faceDir;
for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
if (!FluidSystem::phaseIsActive(phaseIdx))

6
opm/models/discretization/common/tpfalinearizer.hh
View File

@ -469,8 +469,10 @@ private:
if (simulator_().vanguard().eclState().getSimulationConfig().rock_config().dispersion()) {
dispersivity = problem_().dispersivity(myIdx, neighborIdx);
}
auto dirId = scvf.dirId();
loc_nbinfo[dofIdx - 1] = NeighborInfo{neighborIdx, {trans, area, thpres, dZg, dirId, Vin, Vex, inAlpha, outAlpha, diffusivity, dispersivity}, nullptr};
const auto dirId = scvf.dirId();
auto faceDir = dirId < 0 ? FaceDir::DirEnum::Unknown
: FaceDir::FromIntersectionIndex(dirId);
loc_nbinfo[dofIdx - 1] = NeighborInfo{neighborIdx, {trans, area, thpres, dZg, faceDir, Vin, Vex, inAlpha, outAlpha, diffusivity, dispersivity}, nullptr};
}
}