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

fieldAverage: Corrected initialisation of iteration and time totals

Browse Source
This commit is contained in:
Will Bainbridge
2022-12-21 15:20:56 +00:00
parent 063ab567d4
commit c0d56c905a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/functionObjects/field/fieldAverage/fieldAverage.C
View File

@ -63,7 +63,7 @@ void Foam::functionObjects::fieldAverage::initialise()
{ {
if (totalTime_[fieldi] < 0) if (totalTime_[fieldi] < 0)
{ {
totalTime_[fieldi] = obr_.time().deltaTValue(); totalTime_[fieldi] = 0;
} }
} }
@ -89,7 +89,7 @@ void Foam::functionObjects::fieldAverage::restart()
Log << " Restarting averaging at time " << obr_.time().name() << nl; Log << " Restarting averaging at time " << obr_.time().name() << nl;
// Clear the times // Clear the times
totalIter_ = 1; totalIter_ = 0;
totalTime_ = -1; totalTime_ = -1;
// Clear mean fields // Clear mean fields
@ -144,6 +144,13 @@ void Foam::functionObjects::fieldAverage::calcAverages()
initialise(); initialise();
} }
// Increment the time and iteration totals
forAll(faItems_, fieldi)
{
totalIter_[fieldi]++;
totalTime_[fieldi] += obr_.time().deltaTValue();
}
Log << " Calculating averages" << nl; Log << " Calculating averages" << nl;
addMeanSqrToPrime2Mean<scalar, scalar>(); addMeanSqrToPrime2Mean<scalar, scalar>();
@ -158,12 +165,6 @@ void Foam::functionObjects::fieldAverage::calcAverages()
calculatePrime2MeanFields<scalar, scalar>(); calculatePrime2MeanFields<scalar, scalar>();
calculatePrime2MeanFields<vector, symmTensor>(); calculatePrime2MeanFields<vector, symmTensor>();
forAll(faItems_, fieldi)
{
totalIter_[fieldi]++;
totalTime_[fieldi] += obr_.time().deltaTValue();
}
Log << endl; Log << endl;
} }
@ -243,7 +244,7 @@ void Foam::functionObjects::fieldAverage::read
dict.lookup("fields"), dict.lookup("fields"),
fieldAverageItem::iNew(*this) fieldAverageItem::iNew(*this)
); );
totalIter_.setSize(faItems_.size(), 1); totalIter_.setSize(faItems_.size(), 0);
totalTime_.setSize(faItems_.size(), -1); totalTime_.setSize(faItems_.size(), -1);
typeIOobject<timeIOdictionary> propsDictHeader typeIOobject<timeIOdictionary> propsDictHeader
@ -321,7 +322,7 @@ void Foam::functionObjects::fieldAverage::read
dict.lookup("fields"), dict.lookup("fields"),
fieldAverageItem::iNew(*this) fieldAverageItem::iNew(*this)
); );
totalIter_.resize(faItems_.size(), 1); totalIter_.resize(faItems_.size(), 0);
totalTime_.resize(faItems_.size(), -1); totalTime_.resize(faItems_.size(), -1);
// Map from field to old-field index // Map from field to old-field index