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

fieldAverageTemplates: General clean-up

Browse Source
This commit is contained in:
Henry Weller
2016-12-09 14:28:04 +00:00
parent 9edf3b5215
commit 3f0468fe32
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
View File

@ -210,11 +210,10 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType
if (faItems_[fieldi].iterBase()) if (faItems_[fieldi].iterBase())
{ {
dt = 1.0; dt = 1;
Dt = scalar(totalIter_[fieldi]); Dt = scalar(totalIter_[fieldi]);
} }
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt; scalar beta = dt/Dt;
if (faItems_[fieldi].window() > 0) if (faItems_[fieldi].window() > 0)
@ -223,12 +222,11 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType
if (Dt - dt >= w) if (Dt - dt >= w)
{ {
alpha = (w - dt)/w;
beta = dt/w; beta = dt/w;
} }
} }
meanField = alpha*meanField + beta*baseField; meanField = (1 - beta)*meanField + beta*baseField;
} }
} }
@ -274,11 +272,10 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType
if (faItems_[fieldi].iterBase()) if (faItems_[fieldi].iterBase())
{ {
dt = 1.0; dt = 1;
Dt = scalar(totalIter_[fieldi]); Dt = scalar(totalIter_[fieldi]);
} }
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt; scalar beta = dt/Dt;
if (faItems_[fieldi].window() > 0) if (faItems_[fieldi].window() > 0)
@ -287,13 +284,12 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType
if (Dt - dt >= w) if (Dt - dt >= w)
{ {
alpha = (w - dt)/w;
beta = dt/w; beta = dt/w;
} }
} }
prime2MeanField = prime2MeanField =
alpha*prime2MeanField (1 - beta)*prime2MeanField
+ beta*sqr(baseField) + beta*sqr(baseField)
- sqr(meanField); - sqr(meanField);
} }
@ -313,11 +309,7 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const
{ {
if (faItems_[i].prime2Mean()) if (faItems_[i].prime2Mean())
{ {
calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2> calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2>(i);
(
i
);
calculatePrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2> calculatePrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2>
( (
i i