Chase changes to some interfaces after merging.

This commit is contained in:
Atgeirr Flø Rasmussen 2012-08-22 11:16:51 +02:00
parent 1fc5c8988f
commit 70d33843e4

View File

@ -277,7 +277,7 @@ namespace Opm
src_(src),
bcs_(bcs),
gravity_(gravity),
psolver_(grid, props, /* rock_comp, */ linsolver,
psolver_(grid, props, rock_comp, linsolver,
param.getDefault("nl_pressure_residual_tolerance", 0.0),
param.getDefault("nl_pressure_change_tolerance", 1.0),
param.getDefault("nl_pressure_maxiter", 10),
@ -476,8 +476,9 @@ namespace Opm
std::cout << "Making " << num_transport_substeps_ << " transport substeps." << std::endl;
}
for (int tr_substep = 0; tr_substep < num_transport_substeps_; ++tr_substep) {
tsolver_.solve(&state.faceflux()[0], &state.pressure()[0], &state.surfacevol()[0],
&porevol[0], &initial_porevol[0], &transport_src[0], stepsize, state.saturation());
tsolver_.solve(&state.faceflux()[0], &state.pressure()[0],
&porevol[0], &initial_porevol[0], &transport_src[0], stepsize,
state.saturation(), state.surfacevol());
Opm::computeInjectedProduced(props_,
state.pressure(), state.surfacevol(), state.saturation(),
transport_src, stepsize, injected, produced);