research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Time: Correct precision adjustment for user-time

Browse source
This commit is contained in:
Henry 2015-05-20 12:43:54 +01:00
parent 31fbd774b7
commit 54af0e3359
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/OpenFOAM/db/Time/Time.C
View file

@ -1086,7 +1086,7 @@ Foam::Time& Foam::Time::operator++()
deltaTSave_ = deltaT_;
// Save old time value and name
const scalar oldTimeValue = value();
const scalar oldTimeValue = timeToUserTime(value());
const word oldTimeName = dimensionedScalar::name();
// Increment time
@ -1276,19 +1276,22 @@ Foam::Time& Foam::Time::operator++()
// Adjust the precision of the time directory name if necessary
if (outputTime_)
{
// Tolerance used when testing time equivalence
const scalar timeTol =
max(min(pow(10.0, -precision_), 0.1*deltaT_), SMALL);
// User-time equivalent of deltaT
const scalar userDeltaT = timeToUserTime(deltaT_);
// Time value obtained by reading timeName
scalar timeNameValue = -VGREAT;
// Tolerance used when testing time equivalence
scalar timeTol =
max(min(pow(10.0, -precision_), 0.1*deltaT_), SMALL);
// Check that new time representation differs from old one
// reinterpretation of the word
if
(
readScalar(dimensionedScalar::name().c_str(), timeNameValue)
&& (mag(timeNameValue - oldTimeValue - deltaT_) > timeTol)
&& (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol)
)
{
int oldPrecision = precision_;
@ -1296,7 +1299,7 @@ Foam::Time& Foam::Time::operator++()
(
precision_ < maxPrecision_
&& readScalar(dimensionedScalar::name().c_str(), timeNameValue)
&& (mag(timeNameValue - oldTimeValue - deltaT_) > timeTol)
&& (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol)
)
{
precision_++;