zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeControl: Moved timeToNextWrite functionality from timeControlFunctionObject

Browse Source 
to simplify the interface and make it more extensible
This commit is contained in:
Henry Weller
2023-06-13 15:54:09 +01:00
parent 618d9d33b2
commit aa89c7806e
4 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -178,7 +178,7 @@ bool Foam::timeControl::execute()
case timeControls::runTime:
case timeControls::adjustableRunTime:
{
label executionIndex = label
const label executionIndex = label
(
(
(time_.value() - time_.beginTime().value())
@ -197,7 +197,7 @@ bool Foam::timeControl::execute()
case timeControls::cpuTime:
{
label executionIndex = label
const label executionIndex = label
(
returnReduce(time_.elapsedCpuTime(), maxOp<double>())
/interval_
@ -212,7 +212,7 @@ bool Foam::timeControl::execute()
case timeControls::clockTime:
{
label executionIndex = label
const label executionIndex = label
(
returnReduce(label(time_.elapsedClockTime()), maxOp<label>())
/interval_
@ -244,4 +244,46 @@ bool Foam::timeControl::execute()
}
Foam::scalar Foam::timeControl::timeToNextWrite()
{
switch (timeControl_)
{
case timeControls::timeStep:
case timeControls::writeTime:
case timeControls::outputTime:
case timeControls::runTime:
case timeControls::cpuTime:
case timeControls::clockTime:
case timeControls::none:
{
return vGreat;
break;
}
case timeControls::adjustableRunTime:
{
return
max
(
0.0,
(executionIndex_ + 1)*interval_
- (time_.value() - time_.beginTime().value())
);
break;
}
default:
{
FatalErrorInFunction
<< "Undefined output control: "
<< timeControlNames_[timeControl_] << nl
<< abort(FatalError);
break;
}
}
return vGreat;
}
// ************************************************************************* //