OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use unit::convert::to instead of hard coded 86400 factor.

Browse Source
This commit is contained in:
Robert Kloefkorn committed 2014-10-07 09:48:57 +02:00
1 parent 355e68c63b
commit b250383ae0
4 files changed
+29 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/core/simulator/PIDTimeStepControl.cpp
+8 -6
View File
@@ -21,6 +21,7 @@
#include <cmath>
#include <iostream>
#include <opm/core/utility/Units.hpp>
#include <opm/core/simulator/PIDTimeStepControl.hpp>
namespace Opm
@@ -74,9 +75,10 @@ namespace Opm
if( error > tol_ )
{
// adjust dt by given tolerance
const double newDt = dt * tol_ / error;
if( verbose_ )
std::cout << "Computed step size (tol): " << (dt * tol_ / error )/86400.0 << " (days)" << std::endl;
return (dt * tol_ / error );
std::cout << "Computed step size (tol): " << unit::convert::to( newDt, unit::day ) << " (days)" << std::endl;
return newDt;
}
else
{
@@ -84,11 +86,11 @@ namespace Opm
const double kP = 0.075 ;
const double kI = 0.175 ;
const double kD = 0.01 ;
double newDt = (dt * std::pow( errors_[ 1 ] / errors_[ 2 ], kP ) *
std::pow( tol_ / errors_[ 2 ], kI ) *
std::pow( errors_[0]*errors_[0]/errors_[ 1 ]/errors_[ 2 ], kD ));
const double newDt = (dt * std::pow( errors_[ 1 ] / errors_[ 2 ], kP ) *
std::pow( tol_ / errors_[ 2 ], kI ) *
std::pow( errors_[0]*errors_[0]/errors_[ 1 ]/errors_[ 2 ], kD ));
if( verbose_ )
std::cout << "Computed step size (pow): " << newDt/86400.0 << " (days)" << std::endl;
std::cout << "Computed step size (pow): " << unit::convert::to( newDt, unit::day ) << " (days)" << std::endl;
return newDt;
}
}