mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
apply changes made in opm-core.
This commit is contained in:
parent
c42eeffdeb
commit
a8c0f7df92
@ -297,11 +297,11 @@ namespace Opm
|
|||||||
|
|
||||||
typename FullyImplicitBlackoilSolver<T>::SolverParameter solverParam( param_ );
|
typename FullyImplicitBlackoilSolver<T>::SolverParameter solverParam( param_ );
|
||||||
|
|
||||||
// sub stepping
|
// adaptive time stepping
|
||||||
std::unique_ptr< AdaptiveTimeStepping > subStepping;
|
std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
|
||||||
if( param_.getDefault("timestep.adaptive", bool(false) ) )
|
if( param_.getDefault("timestep.adaptive", bool(false) ) )
|
||||||
{
|
{
|
||||||
subStepping = std::unique_ptr< AdaptiveTimeStepping > (new AdaptiveTimeStepping( param_ ));
|
adaptiveTimeStepping = std::unique_ptr< AdaptiveTimeStepping > (new AdaptiveTimeStepping( param_ ));
|
||||||
}
|
}
|
||||||
|
|
||||||
// create time step control object, TODO introduce parameter
|
// create time step control object, TODO introduce parameter
|
||||||
@ -368,8 +368,8 @@ namespace Opm
|
|||||||
//
|
//
|
||||||
// \Note: The report steps are met in any case
|
// \Note: The report steps are met in any case
|
||||||
// \Note: The sub stepping will require a copy of the state variables
|
// \Note: The sub stepping will require a copy of the state variables
|
||||||
if( subStepping ) {
|
if( adaptiveTimeStepping ) {
|
||||||
subStepping->step( solver, state, well_state,
|
adaptiveTimeStepping->step( solver, state, well_state,
|
||||||
timer.simulationTimeElapsed(), timer.currentStepLength() );
|
timer.simulationTimeElapsed(), timer.currentStepLength() );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
Loading…
Reference in New Issue
Block a user