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

functionObjects::fieldAverage: Added support for internal fields

Browse Source 
Patch contributed by Timo Niemi, VTT.
Resolves patch request https://bugs.openfoam.org/view.php?id=3682
This commit is contained in:
Henry Weller
2021-06-08 16:40:38 +01:00
parent d739b7e36f
commit d92434cad0
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/functionObjects/field/fieldAverage/fieldAverageTemplates.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-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,6 +81,8 @@ void Foam::functionObjects::fieldAverage::addMeanField(const label fieldi)
typedef GeometricField<Type, fvPatchField, volMesh> typedef GeometricField<Type, fvPatchField, volMesh>
VolFieldType; VolFieldType;
typedef typename VolFieldType::Internal InternalType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> typedef GeometricField<Type, fvsPatchField, surfaceMesh>
SurfaceFieldType; SurfaceFieldType;
@ -90,6 +92,10 @@ void Foam::functionObjects::fieldAverage::addMeanField(const label fieldi)
{ {
addMeanFieldType<VolFieldType>(fieldi); addMeanFieldType<VolFieldType>(fieldi);
} }
else if (obr_.foundObject<InternalType>(fieldName))
{
addMeanFieldType<InternalType>(fieldi);
}
else if (obr_.foundObject<SurfaceFieldType>(fieldName)) else if (obr_.foundObject<SurfaceFieldType>(fieldName))
{ {
addMeanFieldType<SurfaceFieldType>(fieldi); addMeanFieldType<SurfaceFieldType>(fieldi);
@ -151,9 +157,11 @@ template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi) void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi)
{ {
typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1; typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1;
typedef typename VolFieldType1::Internal InternalType1;
typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1; typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2; typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2;
typedef typename VolFieldType2::Internal InternalType2;
typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2; typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2;
if (faItems_[fieldi].prime2Mean()) if (faItems_[fieldi].prime2Mean())
@ -172,6 +180,10 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi)
{ {
addPrime2MeanFieldType<VolFieldType1, VolFieldType2>(fieldi); addPrime2MeanFieldType<VolFieldType1, VolFieldType2>(fieldi);
} }
else if (obr_.foundObject<InternalType1>(fieldName))
{
addPrime2MeanFieldType<InternalType1, InternalType2>(fieldi);
}
else if (obr_.foundObject<SurfaceFieldType1>(fieldName)) else if (obr_.foundObject<SurfaceFieldType1>(fieldName))
{ {
addPrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2> addPrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2>
@ -228,6 +240,7 @@ template<class Type>
void Foam::functionObjects::fieldAverage::calculateMeanFields() const void Foam::functionObjects::fieldAverage::calculateMeanFields() const
{ {
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType; typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
typedef typename VolFieldType::Internal InternalType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType; typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType;
forAll(faItems_, i) forAll(faItems_, i)
@ -235,6 +248,7 @@ void Foam::functionObjects::fieldAverage::calculateMeanFields() const
if (faItems_[i].mean()) if (faItems_[i].mean())
{ {
calculateMeanFieldType<VolFieldType>(i); calculateMeanFieldType<VolFieldType>(i);
calculateMeanFieldType<InternalType>(i);
calculateMeanFieldType<SurfaceFieldType>(i); calculateMeanFieldType<SurfaceFieldType>(i);
} }
} }
@ -291,9 +305,11 @@ template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const
{ {
typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1; typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1;
typedef typename VolFieldType1::Internal InternalType1;
typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1; typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2; typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2;
typedef typename VolFieldType2::Internal InternalType2;
typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2; typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2;
forAll(faItems_, i) forAll(faItems_, i)
@ -301,6 +317,7 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const
if (faItems_[i].prime2Mean()) if (faItems_[i].prime2Mean())
{ {
calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2>(i); calculatePrime2MeanFieldType<VolFieldType1, VolFieldType2>(i);
calculatePrime2MeanFieldType<InternalType1, InternalType2>(i);
calculatePrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2> calculatePrime2MeanFieldType<SurfaceFieldType1, SurfaceFieldType2>
( (
i i
@ -335,9 +352,11 @@ template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2Mean() const void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2Mean() const
{ {
typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1; typedef GeometricField<Type1, fvPatchField, volMesh> VolFieldType1;
typedef typename VolFieldType1::Internal InternalType1;
typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1; typedef GeometricField<Type1, fvsPatchField, surfaceMesh> SurfaceFieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2; typedef GeometricField<Type2, fvPatchField, volMesh> VolFieldType2;
typedef typename VolFieldType2::Internal InternalType2;
typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2; typedef GeometricField<Type2, fvsPatchField, surfaceMesh> SurfaceFieldType2;
forAll(faItems_, i) forAll(faItems_, i)
@ -345,6 +364,7 @@ void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2Mean() const
if (faItems_[i].prime2Mean()) if (faItems_[i].prime2Mean())
{ {
addMeanSqrToPrime2MeanType<VolFieldType1, VolFieldType2>(i); addMeanSqrToPrime2MeanType<VolFieldType1, VolFieldType2>(i);
addMeanSqrToPrime2MeanType<InternalType1, InternalType2>(i);
addMeanSqrToPrime2MeanType<SurfaceFieldType1, SurfaceFieldType2>(i); addMeanSqrToPrime2MeanType<SurfaceFieldType1, SurfaceFieldType2>(i);
} }
} }
@ -369,6 +389,7 @@ template<class Type>
void Foam::functionObjects::fieldAverage::writeFields() const void Foam::functionObjects::fieldAverage::writeFields() const
{ {
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType; typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
typedef typename VolFieldType::Internal InternalType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType; typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType;
forAll(faItems_, i) forAll(faItems_, i)
@ -377,12 +398,14 @@ void Foam::functionObjects::fieldAverage::writeFields() const
{ {
const word& fieldName = faItems_[i].meanFieldName(); const word& fieldName = faItems_[i].meanFieldName();
writeFieldType<VolFieldType>(fieldName); writeFieldType<VolFieldType>(fieldName);
writeFieldType<InternalType>(fieldName);
writeFieldType<SurfaceFieldType>(fieldName); writeFieldType<SurfaceFieldType>(fieldName);
} }
if (faItems_[i].prime2Mean()) if (faItems_[i].prime2Mean())
{ {
const word& fieldName = faItems_[i].prime2MeanFieldName(); const word& fieldName = faItems_[i].prime2MeanFieldName();
writeFieldType<VolFieldType>(fieldName); writeFieldType<VolFieldType>(fieldName);
writeFieldType<InternalType>(fieldName);
writeFieldType<SurfaceFieldType>(fieldName); writeFieldType<SurfaceFieldType>(fieldName);
} }
} }