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

Time: Simplification and rationalisation of userTime

Browse Source 
First step towards merging userTime into Time so that post-processing tools
operate with the same userTime mode as the solvers.
This commit is contained in:
Henry Weller
2021-10-14 15:05:14 +01:00
parent 45c8a4695a
commit 686f7fb21a
53 changed files with 136 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.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) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,7 +47,7 @@ adaptiveLinear::adaptiveLinear
relaxationModel(typeName, relaxationDict, runTime),
relaxationStart_(coeffDict().lookup<scalar>("relaxationStart")),
relaxationEnd_(coeffDict().lookup<scalar>("relaxationEnd")),
lastTimeValue_(runTime_.time().timeOutputValue()),
lastTimeValue_(runTime_.time().userTime()),
relaxation_(relaxationStart_)
{}
@ -56,7 +56,7 @@ adaptiveLinear::adaptiveLinear
scalar adaptiveLinear::relaxation()
{
if (runTime_.time().timeOutputValue() > lastTimeValue_)
if (runTime_.time().userTime() > lastTimeValue_)
{
scalar currentRelaxation = relaxation_;
@ -65,13 +65,13 @@ scalar adaptiveLinear::relaxation()
/(
(
runTime_.time().endTime().value()
- runTime_.time().timeOutputValue()
- runTime_.time().userTime()
)
/(runTime_.time().timeOutputValue() - lastTimeValue_)
/(runTime_.time().userTime() - lastTimeValue_)
+ 1
);
lastTimeValue_ = runTime_.time().timeOutputValue();
lastTimeValue_ = runTime_.time().userTime();
return currentRelaxation;
}

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.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) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,7 +62,7 @@ rampHoldFall::rampHoldFall
scalar rampHoldFall::relaxation()
{
scalar t = runTime_.time().timeOutputValue();
scalar t = runTime_.time().userTime();
scalar tStart = runTime_.time().startTime().value();
scalar tEnd = runTime_.time().endTime().value();