diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C index 2cdd6bb70b..86da03c2c1 100644 --- a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C +++ b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C @@ -54,11 +54,14 @@ void Foam::fieldAverage::resetLists(const label nItems) meanVectorFields_.clear(); meanVectorFields_.setSize(nItems); + meanSphericalTensorFields_.clear(); + meanSphericalTensorFields_.setSize(nItems); + meanSymmTensorFields_.clear(); meanSymmTensorFields_.setSize(nItems); - meanSphericalTensorFields_.clear(); - meanSphericalTensorFields_.setSize(nItems); + meanTensorFields_.clear(); + meanTensorFields_.setSize(nItems); prime2MeanScalarFields_.clear(); prime2MeanScalarFields_.setSize(nItems); @@ -88,13 +91,17 @@ void Foam::fieldAverage::initialise() { addMeanFields(i, meanVectorFields_); } + else if (obr_.foundObject(fieldName)) + { + addMeanFields(i, meanSphericalTensorFields_); + } else if (obr_.foundObject(fieldName)) { addMeanFields(i, meanSymmTensorFields_); } - else if (obr_.foundObject(fieldName)) + else if (obr_.foundObject(fieldName)) { - addMeanFields(i, meanSphericalTensorFields_); + addMeanFields(i, meanTensorFields_); } else { @@ -166,8 +173,9 @@ Foam::fieldAverage::fieldAverage faItems_(dict.lookup("fields")), meanScalarFields_(faItems_.size()), meanVectorFields_(faItems_.size()), - meanSymmTensorFields_(faItems_.size()), meanSphericalTensorFields_(faItems_.size()), + meanSymmTensorFields_(faItems_.size()), + meanTensorFields_(faItems_.size()), prime2MeanScalarFields_(faItems_.size()), prime2MeanSymmTensorFields_(faItems_.size()), totalIter_(faItems_.size(), 1), @@ -248,8 +256,9 @@ void Foam::fieldAverage::calcAverages() calculateMeanFields(meanScalarFields_); calculateMeanFields(meanVectorFields_); - calculateMeanFields(meanSymmTensorFields_); calculateMeanFields(meanSphericalTensorFields_); + calculateMeanFields(meanSymmTensorFields_); + calculateMeanFields(meanTensorFields_); calculatePrime2MeanFields(prime2MeanScalarFields_); calculatePrime2MeanFields(prime2MeanSymmTensorFields_); @@ -260,8 +269,9 @@ void Foam::fieldAverage::writeAverages() const { writeFieldList(meanScalarFields_); writeFieldList(meanVectorFields_); - writeFieldList(meanSymmTensorFields_); writeFieldList(meanSphericalTensorFields_); + writeFieldList(meanSymmTensorFields_); + writeFieldList(meanTensorFields_); writeFieldList(prime2MeanScalarFields_); writeFieldList(prime2MeanSymmTensorFields_); diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H index aabcd2cfa9..7ebe098446 100644 --- a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H +++ b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H @@ -132,8 +132,9 @@ protected: // Arithmetic mean fields PtrList meanScalarFields_; PtrList meanVectorFields_; - PtrList meanSymmTensorFields_; PtrList meanSphericalTensorFields_; + PtrList meanSymmTensorFields_; + PtrList meanTensorFields_; // Prime-squared fields - applicable to volVectorFields only PtrList prime2MeanScalarFields_;