adding (missed) volTensorFields

This commit is contained in:
andy
2008-05-20 12:59:17 +01:00
parent 9c92a12cfe
commit be61421fd2
2 changed files with 19 additions and 8 deletions

View File

@ -54,11 +54,14 @@ void Foam::fieldAverage::resetLists(const label nItems)
meanVectorFields_.clear(); meanVectorFields_.clear();
meanVectorFields_.setSize(nItems); meanVectorFields_.setSize(nItems);
meanSphericalTensorFields_.clear();
meanSphericalTensorFields_.setSize(nItems);
meanSymmTensorFields_.clear(); meanSymmTensorFields_.clear();
meanSymmTensorFields_.setSize(nItems); meanSymmTensorFields_.setSize(nItems);
meanSphericalTensorFields_.clear(); meanTensorFields_.clear();
meanSphericalTensorFields_.setSize(nItems); meanTensorFields_.setSize(nItems);
prime2MeanScalarFields_.clear(); prime2MeanScalarFields_.clear();
prime2MeanScalarFields_.setSize(nItems); prime2MeanScalarFields_.setSize(nItems);
@ -88,13 +91,17 @@ void Foam::fieldAverage::initialise()
{ {
addMeanFields<vector>(i, meanVectorFields_); addMeanFields<vector>(i, meanVectorFields_);
} }
else if (obr_.foundObject<volSphericalTensorField>(fieldName))
{
addMeanFields<sphericalTensor>(i, meanSphericalTensorFields_);
}
else if (obr_.foundObject<volSymmTensorField>(fieldName)) else if (obr_.foundObject<volSymmTensorField>(fieldName))
{ {
addMeanFields<symmTensor>(i, meanSymmTensorFields_); addMeanFields<symmTensor>(i, meanSymmTensorFields_);
} }
else if (obr_.foundObject<volSphericalTensorField>(fieldName)) else if (obr_.foundObject<volTensorField>(fieldName))
{ {
addMeanFields<sphericalTensor>(i, meanSphericalTensorFields_); addMeanFields<tensor>(i, meanTensorFields_);
} }
else else
{ {
@ -166,8 +173,9 @@ Foam::fieldAverage::fieldAverage
faItems_(dict.lookup("fields")), faItems_(dict.lookup("fields")),
meanScalarFields_(faItems_.size()), meanScalarFields_(faItems_.size()),
meanVectorFields_(faItems_.size()), meanVectorFields_(faItems_.size()),
meanSymmTensorFields_(faItems_.size()),
meanSphericalTensorFields_(faItems_.size()), meanSphericalTensorFields_(faItems_.size()),
meanSymmTensorFields_(faItems_.size()),
meanTensorFields_(faItems_.size()),
prime2MeanScalarFields_(faItems_.size()), prime2MeanScalarFields_(faItems_.size()),
prime2MeanSymmTensorFields_(faItems_.size()), prime2MeanSymmTensorFields_(faItems_.size()),
totalIter_(faItems_.size(), 1), totalIter_(faItems_.size(), 1),
@ -248,8 +256,9 @@ void Foam::fieldAverage::calcAverages()
calculateMeanFields<scalar>(meanScalarFields_); calculateMeanFields<scalar>(meanScalarFields_);
calculateMeanFields<vector>(meanVectorFields_); calculateMeanFields<vector>(meanVectorFields_);
calculateMeanFields<symmTensor>(meanSymmTensorFields_);
calculateMeanFields<sphericalTensor>(meanSphericalTensorFields_); calculateMeanFields<sphericalTensor>(meanSphericalTensorFields_);
calculateMeanFields<symmTensor>(meanSymmTensorFields_);
calculateMeanFields<tensor>(meanTensorFields_);
calculatePrime2MeanFields<scalar>(prime2MeanScalarFields_); calculatePrime2MeanFields<scalar>(prime2MeanScalarFields_);
calculatePrime2MeanFields<vector>(prime2MeanSymmTensorFields_); calculatePrime2MeanFields<vector>(prime2MeanSymmTensorFields_);
@ -260,8 +269,9 @@ void Foam::fieldAverage::writeAverages() const
{ {
writeFieldList<scalar>(meanScalarFields_); writeFieldList<scalar>(meanScalarFields_);
writeFieldList<vector>(meanVectorFields_); writeFieldList<vector>(meanVectorFields_);
writeFieldList<symmTensor>(meanSymmTensorFields_);
writeFieldList<sphericalTensor>(meanSphericalTensorFields_); writeFieldList<sphericalTensor>(meanSphericalTensorFields_);
writeFieldList<symmTensor>(meanSymmTensorFields_);
writeFieldList<tensor>(meanTensorFields_);
writeFieldList<scalar>(prime2MeanScalarFields_); writeFieldList<scalar>(prime2MeanScalarFields_);
writeFieldList<symmTensor>(prime2MeanSymmTensorFields_); writeFieldList<symmTensor>(prime2MeanSymmTensorFields_);

View File

@ -132,8 +132,9 @@ protected:
// Arithmetic mean fields // Arithmetic mean fields
PtrList<volScalarField> meanScalarFields_; PtrList<volScalarField> meanScalarFields_;
PtrList<volVectorField> meanVectorFields_; PtrList<volVectorField> meanVectorFields_;
PtrList<volSymmTensorField> meanSymmTensorFields_;
PtrList<volSphericalTensorField> meanSphericalTensorFields_; PtrList<volSphericalTensorField> meanSphericalTensorFields_;
PtrList<volSymmTensorField> meanSymmTensorFields_;
PtrList<volTensorField> meanTensorFields_;
// Prime-squared fields - applicable to volVectorFields only // Prime-squared fields - applicable to volVectorFields only
PtrList<volScalarField> prime2MeanScalarFields_; PtrList<volScalarField> prime2MeanScalarFields_;