songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: Time: have separate timer for secondary write interval

Browse Source
This commit is contained in:
mattijs 2012-10-16 14:15:14 +01:00
parent 2116d4ded6
commit e4f7c306ab
4 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/OpenFOAM/db/Time/Time.C
View File

@ -79,21 +79,35 @@ Foam::word Foam::Time::controlDictName("controlDict");
void Foam::Time::adjustDeltaT()
{
bool adjustTime = false;
scalar timeToNextWrite = VGREAT;
if (writeControl_ == wcAdjustableRunTime)
{
scalar interval = writeInterval_;
if (secondaryWriteControl_ == wcAdjustableRunTime)
{
interval = min(interval, secondaryWriteInterval_);
}
scalar timeToNextWrite = max
adjustTime = true;
timeToNextWrite = max
(
0.0,
(outputTimeIndex_ + 1)*interval - (value() - startTime_)
(outputTimeIndex_ + 1)*writeInterval_ - (value() - startTime_)
);
}
if (secondaryWriteControl_ == wcAdjustableRunTime)
{
adjustTime = true;
timeToNextWrite = max
(
0.0,
min
(
timeToNextWrite,
(secondaryOutputTimeIndex_ + 1)*secondaryWriteInterval_
- (value() - startTime_)
)
);
}
if (adjustTime)
{
scalar nSteps = timeToNextWrite/deltaT_ - SMALL;
// For tiny deltaT the label can overflow!
@ -1130,10 +1144,10 @@ Foam::Time& Foam::Time::operator++()
/ secondaryWriteInterval_
);
if (outputIndex > outputTimeIndex_)
if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputIndex;
secondaryOutputTimeIndex_ = outputIndex;
}
}
break;
@ -1145,10 +1159,10 @@ Foam::Time& Foam::Time::operator++()
returnReduce(elapsedCpuTime(), maxOp<double>())
/ secondaryWriteInterval_
);
if (outputIndex > outputTimeIndex_)
if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputIndex;
secondaryOutputTimeIndex_ = outputIndex;
}
}
break;
@ -1160,10 +1174,10 @@ Foam::Time& Foam::Time::operator++()
returnReduce(label(elapsedClockTime()), maxOp<label>())
/ secondaryWriteInterval_
);
if (outputIndex > outputTimeIndex_)
if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputIndex;
secondaryOutputTimeIndex_ = outputIndex;
}
}
break;

22
src/OpenFOAM/db/Time/TimeIO.C
View File

@ -51,6 +51,8 @@ void Foam::Time::readDict()
}
scalar oldWriteInterval = writeInterval_;
scalar oldSecondaryWriteInterval = secondaryWriteInterval_;
if (controlDict_.readIfPresent("writeInterval", writeInterval_))
{
if (writeControl_ == wcTimeStep && label(writeInterval_) < 1)
@ -124,6 +126,26 @@ void Foam::Time::readDict()
break;
}
}
if (oldSecondaryWriteInterval != secondaryWriteInterval_)
{
switch (secondaryWriteControl_)
{
case wcRunTime:
case wcAdjustableRunTime:
// Recalculate secondaryOutputTimeIndex_ to be in units of
// current writeInterval.
secondaryOutputTimeIndex_ = label
(
secondaryOutputTimeIndex_
* oldSecondaryWriteInterval
/ secondaryWriteInterval_
);
break;
default:
break;
}
}
if (controlDict_.readIfPresent("purgeWrite", purgeWrite_))
{

3
src/OpenFOAM/db/Time/TimeState.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,6 +37,7 @@ Foam::TimeState::TimeState()
deltaT0_(0),
deltaTchanged_(false),
outputTimeIndex_(0),
secondaryOutputTimeIndex_(0),
outputTime_(false)
{}

4
src/OpenFOAM/db/Time/TimeState.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,9 +61,9 @@ protected:
bool deltaTchanged_;
label outputTimeIndex_;
label secondaryOutputTimeIndex_;
bool outputTime_;
public:
// Constructors