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

ENH: runTimeControl - updated time for maxDuration and minTimeStep conditions

Browse Source
This commit is contained in:
Andrew Heather 2019-06-19 09:57:11 +01:00
parent 12afb3d34a
commit c901f9bc7f
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/functionObjects/utilities/runTimeControl/runTimeCondition/maxDurationCondition/maxDurationCondition.C
View File

@ -2,10 +2,8 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -73,8 +71,6 @@ maxDurationCondition
{ {
initialised_ = true; initialised_ = true;
} }
duration_ = obr_.time().userTimeToTime(duration_);
} }

6
src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation | Copyright (C) 2015 OpenFOAM Foundation
@ -62,7 +62,9 @@ minTimeStepCondition
: :
runTimeCondition(name, obr, dict, state), runTimeCondition(name, obr, dict, state),
minValue_(dict.get<scalar>("minValue")) minValue_(dict.get<scalar>("minValue"))
{} {
minValue_ = obr_.time().userTimeToTime(minValue_);
}
// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //

2
src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
View File

@ -62,7 +62,7 @@ protected:
// Protected data // Protected data
//- Minimum time step value to compare //- Minimum time step value to compare
const scalar minValue_; scalar minValue_;
public: public: