OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

timeError --> relativeChange.

Browse Source
This commit is contained in:
Robert Kloefkorn
2015-11-10 09:53:40 -07:00
parent 005a0c2930
commit d3af817ff2
4 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/timestepping/TimeStepControl.cpp
+5 -5
View File
@@ -55,7 +55,7 @@ namespace Opm
}
double SimpleIterationCountTimeStepControl::
computeTimeStepSize( const double dt, const int iterations, const SolutionTimeErrorInterface& /* timeError */ ) const
computeTimeStepSize( const double dt, const int iterations, const RelativeChangeInterface& /* relativeChange */ ) const
{
double dtEstimate = dt ;
@@ -90,7 +90,7 @@ namespace Opm
{}
double PIDTimeStepControl::
computeTimeStepSize( const double dt, const int /* iterations */, const SolutionTimeErrorInterface& errorObj ) const
computeTimeStepSize( const double dt, const int /* iterations */, const RelativeChangeInterface& relChange ) const
{
// shift errors
for( int i=0; i<2; ++i ) {
@@ -98,7 +98,7 @@ namespace Opm
}
// store new error
const double error = errorObj.timeError();
const double error = relChange.relativeChange();
errors_[ 2 ] = error;
if( error > tol_ )
@@ -141,9 +141,9 @@ namespace Opm
{}
double PIDAndIterationCountTimeStepControl::
computeTimeStepSize( const double dt, const int iterations, const SolutionTimeErrorInterface& errorObj ) const
computeTimeStepSize( const double dt, const int iterations, const RelativeChangeInterface& relChange ) const
{
double dtEstimate = BaseType :: computeTimeStepSize( dt, iterations, errorObj );
double dtEstimate = BaseType :: computeTimeStepSize( dt, iterations, relChange );
// further reduce step size if to many iterations were used
if( iterations > target_iterations_ )