OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

apply changes made in opm-core.

Browse Source
This commit is contained in:
Robert K 2014-10-06 15:53:17 +02:00
parent c42eeffdeb
commit a8c0f7df92
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
View File

@ -297,15 +297,15 @@ namespace Opm
typename FullyImplicitBlackoilSolver<T>::SolverParameter solverParam( param_ );
// sub stepping
std::unique_ptr< AdaptiveTimeStepping > subStepping;
// adaptive time stepping
std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
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
std::unique_ptr< TimeStepControlInterface >
std::unique_ptr< TimeStepControlInterface >
timeStepControl( new PIDAndIterationCountTimeStepControl( 50, 8e-4 ) );
// Main simulation loop.
@ -366,10 +366,10 @@ namespace Opm
// If sub stepping is enabled allow the solver to sub cycle
// in case the report steps are to large for the solver to converge
//
// \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
if( subStepping ) {
subStepping->step( solver, state, well_state,
if( adaptiveTimeStepping ) {
adaptiveTimeStepping->step( solver, state, well_state,
timer.simulationTimeElapsed(), timer.currentStepLength() );
}
else {