zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MRG: Integrated foundation code

Browse Source
This commit is contained in:
Andrew Heather
2016-12-12 12:10:29 +00:00
parent 2c7eff8d6b 83f3044db9
commit c0f44ac4f3
509 changed files with 8350 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace functionObjects
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::functionObjects::fieldAverage::resetFields()
{

2
src/functionObjects/field/fieldAverage/fieldAverage.H
View File

@ -189,7 +189,7 @@ protected:
label periodIndex_;
// Private Member Functions
// Protected Member Functions
// Initialisation routines

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

@ -213,11 +213,10 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType
if (faItems_[fieldi].iterBase())
{
dt = 1.0;
dt = 1;
Dt = scalar(totalIter_[fieldi]);
}
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
if (faItems_[fieldi].window() > 0)
@ -226,12 +225,11 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType
if (Dt - dt >= w)
{
alpha = (w - dt)/w;
beta = dt/w;
}
}
meanField = alpha*meanField + beta*baseField;
meanField = (1 - beta)*meanField + beta*baseField;
}
}
@ -277,11 +275,10 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType
if (faItems_[fieldi].iterBase())
{
dt = 1.0;
dt = 1;
Dt = scalar(totalIter_[fieldi]);
}
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
if (faItems_[fieldi].window() > 0)
@ -290,13 +287,12 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType
if (Dt - dt >= w)
{
alpha = (w - dt)/w;
beta = dt/w;
}
}
prime2MeanField =
alpha*prime2MeanField
(1 - beta)*prime2MeanField
+ beta*sqr(baseField)
- sqr(meanField);
}
@ -316,11 +312,7 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const
{
if (faItems_[i].prime2Mean())
{
calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2>
(
i
);
calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2>(i);
calculatePrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2>
(
i