Add support for miscibilty in the relperms

This commit is contained in:
Tor Harald Sandve
2015-12-02 14:38:49 +01:00
parent bbee43ef7a
commit 238e7c19f3
6 changed files with 88 additions and 8 deletions

View File

@@ -54,9 +54,10 @@ namespace Opm
, has_solvent_(has_solvent)
, deck_(deck)
, solvent_props_(solvent_props)
, is_miscible_(false)
{
if(deck->hasKeyword("MISCIBLE")) {
std::cerr << "MISICIBLE keyword is present. Mixing is not currently supported" << std::endl;
is_miscible_ = true;
}
}
@@ -80,7 +81,8 @@ namespace Opm
BaseType::has_disgas_,
BaseType::has_vapoil_,
BaseType::terminal_output_,
has_solvent_));
has_solvent_,
is_miscible_));
if (!BaseType::threshold_pressures_by_face_.empty()) {
model->setThresholdPressures(BaseType::threshold_pressures_by_face_);