From 7fb27394375dd2cefa305bdcbc1f51ef119863d4 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 22 May 2016 14:29:14 +0100 Subject: [PATCH] functionObjects: Standardized field template parameter names --- .../fieldAverage/fieldAverageTemplates.C | 85 +++++++++++-------- .../nearWallFields/nearWallFieldsTemplates.C | 14 +-- .../field/readFields/readFieldsTemplates.C | 16 ++-- .../surfaceInterpolateFieldsTemplates.C | 16 ++-- 4 files changed, 74 insertions(+), 57 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageTemplates.C index 0715b54493..d6c9166ad3 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageTemplates.C @@ -81,18 +81,21 @@ void Foam::functionObjects::fieldAverage::addMeanField(const label fieldi) { if (faItems_[fieldi].mean()) { - typedef GeometricField volFieldType; - typedef GeometricField surfFieldType; + typedef GeometricField + VolFieldType; + + typedef GeometricField + SurfaceFieldType; const word& fieldName = faItems_[fieldi].fieldName(); - if (obr_.foundObject(fieldName)) + if (obr_.foundObject(fieldName)) { - addMeanFieldType(fieldi); + addMeanFieldType(fieldi); } - else if (obr_.foundObject(fieldName)) + else if (obr_.foundObject(fieldName)) { - addMeanFieldType(fieldi); + addMeanFieldType(fieldi); } } } @@ -152,11 +155,11 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanFieldType template void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi) { - typedef GeometricField volFieldType1; - typedef GeometricField surfFieldType1; + typedef GeometricField VolFieldType1; + typedef GeometricField SurfaceFieldType1; - typedef GeometricField volFieldType2; - typedef GeometricField surfFieldType2; + typedef GeometricField VolFieldType2; + typedef GeometricField SurfaceFieldType2; if (faItems_[fieldi].prime2Mean()) { @@ -170,13 +173,16 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi) << fieldName << nl << exit(FatalError); } - if (obr_.foundObject(fieldName)) + if (obr_.foundObject(fieldName)) { - addPrime2MeanFieldType(fieldi); + addPrime2MeanFieldType(fieldi); } - else if (obr_.foundObject(fieldName)) + else if (obr_.foundObject(fieldName)) { - addPrime2MeanFieldType(fieldi); + addPrime2MeanFieldType + ( + fieldi + ); } } } @@ -230,15 +236,15 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType template void Foam::functionObjects::fieldAverage::calculateMeanFields() const { - typedef GeometricField volFieldType; - typedef GeometricField surfFieldType; + typedef GeometricField VolFieldType; + typedef GeometricField SurfaceFieldType; forAll(faItems_, i) { if (faItems_[i].mean()) { - calculateMeanFieldType(i); - calculateMeanFieldType(i); + calculateMeanFieldType(i); + calculateMeanFieldType(i); } } } @@ -297,18 +303,25 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType template void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const { - typedef GeometricField volFieldType1; - typedef GeometricField surfFieldType1; + typedef GeometricField VolFieldType1; + typedef GeometricField SurfaceFieldType1; - typedef GeometricField volFieldType2; - typedef GeometricField surfFieldType2; + typedef GeometricField VolFieldType2; + typedef GeometricField SurfaceFieldType2; forAll(faItems_, i) { if (faItems_[i].prime2Mean()) { - calculatePrime2MeanFieldType(i); - calculatePrime2MeanFieldType(i); + calculatePrime2MeanFieldType + ( + i + ); + + calculatePrime2MeanFieldType + ( + i + ); } } } @@ -340,18 +353,18 @@ void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2MeanType template void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2Mean() const { - typedef GeometricField volFieldType1; - typedef GeometricField surfFieldType1; + typedef GeometricField VolFieldType1; + typedef GeometricField SurfaceFieldType1; - typedef GeometricField volFieldType2; - typedef GeometricField surfFieldType2; + typedef GeometricField VolFieldType2; + typedef GeometricField SurfaceFieldType2; forAll(faItems_, i) { if (faItems_[i].prime2Mean()) { - addMeanSqrToPrime2MeanType(i); - addMeanSqrToPrime2MeanType(i); + addMeanSqrToPrime2MeanType(i); + addMeanSqrToPrime2MeanType(i); } } } @@ -374,22 +387,22 @@ void Foam::functionObjects::fieldAverage::writeFieldType template void Foam::functionObjects::fieldAverage::writeFields() const { - typedef GeometricField volFieldType; - typedef GeometricField surfFieldType; + typedef GeometricField VolFieldType; + typedef GeometricField SurfaceFieldType; forAll(faItems_, i) { if (faItems_[i].mean()) { const word& fieldName = faItems_[i].meanFieldName(); - writeFieldType(fieldName); - writeFieldType(fieldName); + writeFieldType(fieldName); + writeFieldType(fieldName); } if (faItems_[i].prime2Mean()) { const word& fieldName = faItems_[i].prime2MeanFieldName(); - writeFieldType(fieldName); - writeFieldType(fieldName); + writeFieldType(fieldName); + writeFieldType(fieldName); } } } diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C index dcb9b325eb..e740b8a9ac 100644 --- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C +++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C @@ -33,13 +33,13 @@ void Foam::functionObjects::nearWallFields::createFields PtrList>& sflds ) const { - typedef GeometricField vfType; + typedef GeometricField VolFieldType; - HashTable flds(obr_.lookupClass()); + HashTable flds(obr_.lookupClass()); - forAllConstIter(typename HashTable, flds, iter) + forAllConstIter(typename HashTable, flds, iter) { - const vfType& fld = *iter(); + const VolFieldType& fld = *iter(); if (fieldMap_.found(fld.name())) { @@ -61,7 +61,7 @@ void Foam::functionObjects::nearWallFields::createFields io.writeOpt() = IOobject::NO_WRITE; io.rename(sampleFldName); - sflds.set(sz, new vfType(io, fld)); + sflds.set(sz, new VolFieldType(io, fld)); Info<< " created " << sflds[sz].name() << " to sample " << fld.name() << endl; @@ -127,12 +127,12 @@ void Foam::functionObjects::nearWallFields::sampleFields PtrList>& sflds ) const { - typedef GeometricField vfType; + typedef GeometricField VolFieldType; forAll(sflds, i) { const word& fldName = reverseFieldMap_[sflds[i].name()]; - const vfType& fld = obr_.lookupObject(fldName); + const VolFieldType& fld = obr_.lookupObject(fldName); // Take over internal and boundary values sflds[i] == fld; diff --git a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C index 9e9feb90eb..4f26c37bb9 100644 --- a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C +++ b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C @@ -38,10 +38,10 @@ void Foam::functionObjects::readFields::loadField PtrList>& sflds ) const { - typedef GeometricField vfType; - typedef GeometricField sfType; + typedef GeometricField VolFieldType; + typedef GeometricField SurfaceFieldType; - if (obr_.foundObject(fieldName)) + if (obr_.foundObject(fieldName)) { if (debug) { @@ -49,7 +49,7 @@ void Foam::functionObjects::readFields::loadField << endl; } } - else if (obr_.foundObject(fieldName)) + else if (obr_.foundObject(fieldName)) { if (debug) { @@ -71,26 +71,26 @@ void Foam::functionObjects::readFields::loadField if ( fieldHeader.headerOk() - && fieldHeader.headerClassName() == vfType::typeName + && fieldHeader.headerClassName() == VolFieldType::typeName ) { // store field locally Info<< " Reading " << fieldName << endl; label sz = vflds.size(); vflds.setSize(sz+1); - vflds.set(sz, new vfType(fieldHeader, mesh_)); + vflds.set(sz, new VolFieldType(fieldHeader, mesh_)); } else if ( fieldHeader.headerOk() - && fieldHeader.headerClassName() == sfType::typeName + && fieldHeader.headerClassName() == SurfaceFieldType::typeName ) { // store field locally Info<< " Reading " << fieldName << endl; label sz = sflds.size(); sflds.setSize(sz+1); - sflds.set(sz, new sfType(fieldHeader, mesh_)); + sflds.set(sz, new SurfaceFieldType(fieldHeader, mesh_)); } } } diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C index 689daea858..3ed285f220 100644 --- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C +++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C @@ -35,8 +35,8 @@ void Foam::functionObjects::surfaceInterpolateFields::interpolateFields PtrList>& sflds ) const { - typedef GeometricField vfType; - typedef GeometricField sfType; + typedef GeometricField VolFieldType; + typedef GeometricField SurfaceFieldType; // Convert field to map HashTable fieldMap(2*fieldSet_.size()); @@ -46,11 +46,11 @@ void Foam::functionObjects::surfaceInterpolateFields::interpolateFields } - HashTable flds(obr_.lookupClass()); + HashTable flds(obr_.lookupClass()); - forAllConstIter(typename HashTable, flds, iter) + forAllConstIter(typename HashTable, flds, iter) { - const vfType& fld = *iter(); + const VolFieldType& fld = *iter(); if (fieldMap.found(fld.name())) { @@ -66,7 +66,11 @@ void Foam::functionObjects::surfaceInterpolateFields::interpolateFields { label sz = sflds.size(); sflds.setSize(sz+1); - sflds.set(sz, new sfType(sName, linearInterpolate(fld))); + sflds.set + ( + sz, + new SurfaceFieldType(sName, linearInterpolate(fld)) + ); Info<< " interpolated " << fld.name() << " to create " << sflds[sz].name() << endl;