mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Fixed solveGravity(): now properly modifies surfacevolume.
Also: - solveGravity() interface changed to take surface volume as a parameter, - gravity vector is now given in initGravity() instead of solveGravity(), for consistency with the incompressible solver.
This commit is contained in:
parent
638eee501b
commit
cf3511663c
@ -245,7 +245,6 @@ namespace Opm
|
|||||||
wells_(wells_manager.c_wells()),
|
wells_(wells_manager.c_wells()),
|
||||||
src_(src),
|
src_(src),
|
||||||
bcs_(bcs),
|
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_residual_tolerance", 0.0),
|
||||||
param.getDefault("nl_pressure_change_tolerance", 1.0),
|
param.getDefault("nl_pressure_change_tolerance", 1.0),
|
||||||
@ -279,7 +278,7 @@ namespace Opm
|
|||||||
num_transport_substeps_ = param.getDefault("num_transport_substeps", 1);
|
num_transport_substeps_ = param.getDefault("num_transport_substeps", 1);
|
||||||
use_segregation_split_ = param.getDefault("use_segregation_split", false);
|
use_segregation_split_ = param.getDefault("use_segregation_split", false);
|
||||||
if (gravity != 0 && use_segregation_split_){
|
if (gravity != 0 && use_segregation_split_){
|
||||||
tsolver_.initGravity();
|
tsolver_.initGravity(gravity);
|
||||||
extractColumn(grid_, columns_);
|
extractColumn(grid_, columns_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -453,7 +452,7 @@ namespace Opm
|
|||||||
transport_src, stepsize, injected, produced);
|
transport_src, stepsize, injected, produced);
|
||||||
if (gravity_ != 0 && use_segregation_split_) {
|
if (gravity_ != 0 && use_segregation_split_) {
|
||||||
tsolver_.solveGravity(columns_, &state.pressure()[0], &initial_porevol[0],
|
tsolver_.solveGravity(columns_, &state.pressure()[0], &initial_porevol[0],
|
||||||
stepsize, gravity_, state.saturation());
|
stepsize, state.saturation(), state.surfacevol());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
transport_timer.stop();
|
transport_timer.stop();
|
||||||
|
Loading…
Reference in New Issue
Block a user