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

more protection to unset fields

Browse Source
This commit is contained in:
andy
2008-06-27 17:08:41 +01:00
parent 076be91979
commit 14407bb265
1 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C
View File

@ -74,7 +74,7 @@ void Foam::fieldAverage::addPrime2MeanField
PtrList<GeometricField<Type2, fvPatchField, volMesh> >& prime2MeanFieldList PtrList<GeometricField<Type2, fvPatchField, volMesh> >& prime2MeanFieldList
) )
{ {
if (faItems_[fieldi].mean()) if (faItems_[fieldi].mean() && meanFieldList.set(fieldi))
{ {
typedef GeometricField<Type1, fvPatchField, volMesh> fieldType1; typedef GeometricField<Type1, fvPatchField, volMesh> fieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> fieldType2; typedef GeometricField<Type2, fvPatchField, volMesh> fieldType2;
@ -117,9 +117,7 @@ void Foam::fieldAverage::calculateMeanFields
forAll(faItems_, i) forAll(faItems_, i)
{ {
if (meanFieldList.set(i)) if (faItems_[i].mean() && meanFieldList.set(i))
{
if (faItems_[i].mean())
{ {
const word& fieldName = faItems_[i].fieldName(); const word& fieldName = faItems_[i].fieldName();
const fieldType& baseField = const fieldType& baseField =
@ -142,7 +140,6 @@ void Foam::fieldAverage::calculateMeanFields
meanField = alpha*meanField + beta*baseField; meanField = alpha*meanField + beta*baseField;
} }
} }
}
} }
@ -160,9 +157,12 @@ void Foam::fieldAverage::calculatePrime2MeanFields
forAll(faItems_, i) forAll(faItems_, i)
{ {
if (prime2MeanFieldList.set(i)) if
{ (
if (faItems_[i].prime2Mean()) faItems_[i].prime2Mean()
&& meanFieldList.set(i)
&& prime2MeanFieldList.set(i)
)
{ {
const word& fieldName = faItems_[i].fieldName(); const word& fieldName = faItems_[i].fieldName();
const fieldType1& baseField = const fieldType1& baseField =
@ -189,7 +189,6 @@ void Foam::fieldAverage::calculatePrime2MeanFields
- sqr(meanField); - sqr(meanField);
} }
} }
}
} }
@ -205,9 +204,12 @@ void Foam::fieldAverage::addMeanSqrToPrime2Mean
forAll(faItems_, i) forAll(faItems_, i)
{ {
if (prime2MeanFieldList.set(i)) if
{ (
if (faItems_[i].prime2Mean()) faItems_[i].prime2Mean()
&& meanFieldList.set(i)
&& prime2MeanFieldList.set(i)
)
{ {
const fieldType1& meanField = meanFieldList[i]; const fieldType1& meanField = meanFieldList[i];
fieldType2& prime2MeanField = prime2MeanFieldList[i]; fieldType2& prime2MeanField = prime2MeanFieldList[i];
@ -215,7 +217,6 @@ void Foam::fieldAverage::addMeanSqrToPrime2Mean
prime2MeanField += sqr(meanField); prime2MeanField += sqr(meanField);
} }
} }
}
} }