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

Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics

Browse Source 
Conflicts:
	opm/core/props/satfunc/RelpermDiagnostics.cpp
This commit is contained in:
Liu Ming
2016-01-22 13:04:01 +08:00
parent 6efd22c637 50c1bbdc85
commit 675f730b01
17 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/props/satfunc/RelpermDiagnostics.cpp
View File

@@ -19,6 +19,8 @@
#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
#include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp>
#include <opm/core/utility/compressedToCartesian.hpp>
namespace Opm{

3
opm/core/props/satfunc/RelpermDiagnostics.hpp
View File

@@ -40,6 +40,9 @@
namespace Opm {
class Sof2Table;
class SgwfnTable;
///This class is intend to be a relpmer diganostics, to detect
///wrong input of relperm table and endpoints.
class RelpermDiagnostics