OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into initialisation

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-10 13:24:35 +01:00
commit 1f2b2eadc5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/linalg/LinearSolverUmfpack.cpp
View File

@ -56,7 +56,7 @@ namespace Opm
const_cast<double*>(sa)
};
call_UMFPACK(&A, rhs, solution);
LinearSolverReport rep = {0};
LinearSolverReport rep = {};
rep.converged = true;
return rep;
}

5
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
View File

@ -100,8 +100,9 @@ namespace Opm
}
// Saturation table scaling
do_eps_ = false;
do_3pt_ = false;
do_hyst_ = false;
do_eps_ = false;
do_3pt_ = false;
if (deck.hasField("ENDSCALE")) {
//if (!phase_usage_.phase_used[Aqua] || !phase_usage_.phase_used[Liquid] || phase_usage_.phase_used[Vapour]) {
// OPM_THROW(std::runtime_error, "Currently endpoint-scaling limited to oil-water systems without gas.");