zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-6

Browse Source
This commit is contained in:
Henry Weller
2019-03-15 11:53:09 +00:00
parent a9f850781a fdfb5b1825
commit fa2ea1098a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/meshes/data/data.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 | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -45,7 +45,7 @@ Foam::data::data(const objectRegistry& obr)
IOobject::NO_WRITE IOobject::NO_WRITE
) )
), ),
prevTimeIndex_(0) prevTimeIndex_(-1)
{ {
set("solverPerformance", dictionary()); set("solverPerformance", dictionary());
} }

11
src/OpenFOAM/meshes/data/dataTemplates.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 | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,10 +40,15 @@ void Foam::data::setSolverPerformance
List<SolverPerformance<Type>> perfs; List<SolverPerformance<Type>> perfs;
if (prevTimeIndex_ != this->time().timeIndex()) const label timeIndex =
this->time().subCycling()
? this->time().prevTimeState().timeIndex()
: this->time().timeIndex();
if (prevTimeIndex_ != timeIndex)
{ {
// Reset solver performance between iterations // Reset solver performance between iterations
prevTimeIndex_ = this->time().timeIndex(); prevTimeIndex_ = timeIndex;
dict.clear(); dict.clear();
} }
else else