OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly check for a == b before creating scale_factor = a/b

Browse Source
This commit is contained in:
Joakim Hove
2021-11-02 16:18:36 +01:00
parent 26a4a38579
commit 3e623d4182
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp
View File

@@ -482,7 +482,15 @@ private:
return unscaledPcnw*alpha;
}
else if (params.config().enablePcScaling()) {
Scalar alpha = params.scaledPoints().maxPcnw()/params.unscaledPoints().maxPcnw();
const auto& scaled_maxPcnw = params.scaledPoints().maxPcnw();
const auto& unscaled_maxPcnw = params.unscaledPoints().maxPcnw();
Scalar alpha;
if (scaled_maxPcnw == unscaled_maxPcnw)
alpha = 1.0;
else
alpha = params.scaledPoints().maxPcnw()/params.unscaledPoints().maxPcnw();
return unscaledPcnw*alpha;
}
@@ -497,7 +505,15 @@ private:
return scaledPcnw/alpha;
}
else if (params.config().enablePcScaling()) {
Scalar alpha = params.unscaledPoints().maxPcnw()/params.scaledPoints().maxPcnw();
const auto& scaled_maxPcnw = params.scaledPoints().maxPcnw();
const auto& unscaled_maxPcnw = params.unscaledPoints().maxPcnw();
Scalar alpha;
if (scaled_maxPcnw == unscaled_maxPcnw)
alpha = 1.0;
else
alpha = params.scaledPoints().maxPcnw()/params.unscaledPoints().maxPcnw();
return scaledPcnw/alpha;
}