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

Make SaturationPropsFromDeck work for two-phase cases.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-21 15:27:52 +02:00
parent 682f53fdc5
commit c65ad8292b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
View File

@ -82,7 +82,7 @@ namespace Opm
{ {
assert(cells != 0); assert(cells != 0);
const int np = BlackoilPhases::MaxNumPhases; const int np = numPhases();
if (dkrds) { if (dkrds) {
ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_); ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_);
fluidState.setSaturationArray(s); fluidState.setSaturationArray(s);
@ -141,7 +141,7 @@ namespace Opm
{ {
assert(cells != 0); assert(cells != 0);
const int np = BlackoilPhases::MaxNumPhases; const int np = numPhases();
if (dpcds) { if (dpcds) {
ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_); ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_);
typedef ExplicitArraysSatDerivativesFluidState::Evaluation Evaluation; typedef ExplicitArraysSatDerivativesFluidState::Evaluation Evaluation;
@ -196,7 +196,7 @@ namespace Opm
int gpos = phaseUsage_.phase_pos[BlackoilPhases::Vapour]; int gpos = phaseUsage_.phase_pos[BlackoilPhases::Vapour];
int opos = phaseUsage_.phase_pos[BlackoilPhases::Liquid]; int opos = phaseUsage_.phase_pos[BlackoilPhases::Liquid];
const int np = phaseUsage_.num_phases; const int np = numPhases();
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
const auto& scaledDrainageInfo = const auto& scaledDrainageInfo =
materialLawManager_->oilWaterScaledEpsInfoDrainage(cells[i]); materialLawManager_->oilWaterScaledEpsInfoDrainage(cells[i]);