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

Merge pull request #3895 from bska/FluxCalc-API-Cleanup

Browse Source 
ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter
This commit is contained in:
Magne Sjaastad 2018-12-21 15:53:24 +01:00 committed by GitHub
commit f134cb06bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h
View File

@ -110,7 +110,7 @@ namespace RigFlowDiagInterfaceTools {
{ {
auto satfunc = Opm::ECLSaturationFunc(G, init); auto satfunc = Opm::ECLSaturationFunc(G, init);
Opm::ECLFluxCalc calc(G, init, 9.80665, true); Opm::ECLFluxCalc calc(G, init, 9.80665);
auto getFlux = [&calc, &rstrt] auto getFlux = [&calc, &rstrt]
(const Opm::ECLPhaseIndex p) (const Opm::ECLPhaseIndex p)

3
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLFluxCalc.cpp vendored
View File

@ -185,8 +185,7 @@ namespace Opm
ECLFluxCalc::ECLFluxCalc(const ECLGraph& graph, ECLFluxCalc::ECLFluxCalc(const ECLGraph& graph,
const ECLInitFileData& init, const ECLInitFileData& init,
const double grav, const double grav)
const bool /* useEPS */)
: graph_(graph) : graph_(graph)
, satfunc_(graph, init) , satfunc_(graph, init)
, rmap_(pvtnumVector(graph, init)) , rmap_(pvtnumVector(graph, init))

3
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLFluxCalc.hpp vendored
View File

@ -56,8 +56,7 @@ namespace Opm
/// result set. /// result set.
ECLFluxCalc(const ECLGraph& graph, ECLFluxCalc(const ECLGraph& graph,
const ECLInitFileData& init, const ECLInitFileData& init,
const double grav, const double grav);
const bool useEPS);
/// Retrive phase flux on all connections defined by \code /// Retrive phase flux on all connections defined by \code
/// graph.neighbours() \endcode. /// graph.neighbours() \endcode.