Read DISGAS and VAPOIL from deck and pass them to the simulator

This commit is contained in:
Tor Harald Sandve
2014-05-27 13:36:22 +02:00
parent aecfa3ed50
commit 8a600747fa
8 changed files with 33 additions and 10 deletions

View File

@@ -218,7 +218,10 @@ try
rock_comp->isActive() ? rock_comp.get() : 0,
wells,
*fis_solver,
grav);
grav,
deck->hasKeyword("DISGAS"),
deck->hasKeyword("VAPOIL") );
SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
++simtimer;

View File

@@ -104,7 +104,7 @@ try
Opm::NewtonIterationBlackoilSimple fis_solver(param);
Opm::FullyImplicitBlackoilSolver<UnstructuredGrid> solver(param, *g, props, geo, 0, *wells, fis_solver);
Opm::FullyImplicitBlackoilSolver<UnstructuredGrid> solver(param, *g, props, geo, 0, *wells, fis_solver, /*hasDisgas*/ true, /*hasVapoil=*/false);
Opm::BlackoilState state;
initStateBasic(*g, props0, param, 0.0, state);