From ea3aa9668b227d10927abd1f73c0f64fb34cb0fa Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 12 May 2008 17:48:01 +0100 Subject: [PATCH 1/9] re-locating field average library --- src/postProcessing/Allwmake | 2 ++ .../sampling => src/postProcessing}/fieldAverage/Make/files | 0 .../sampling => src/postProcessing}/fieldAverage/Make/options | 0 .../sampling => src/postProcessing}/fieldAverage/controlDict | 2 +- .../postProcessing}/fieldAverage/fieldAverage/IOFieldAverage.H | 0 .../postProcessing}/fieldAverage/fieldAverage/fieldAverage.C | 0 .../postProcessing}/fieldAverage/fieldAverage/fieldAverage.H | 0 .../fieldAverage/fieldAverage/fieldAverageTemplates.C | 0 .../fieldAverageFunctionObject/fieldAverageFunctionObject.C | 0 .../fieldAverageFunctionObject/fieldAverageFunctionObject.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.C | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItemIO.C | 0 13 files changed, 3 insertions(+), 1 deletion(-) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/Make/files (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/Make/options (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/controlDict (97%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverage/IOFieldAverage.H (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverage/fieldAverage.C (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverage/fieldAverage.H (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverage/fieldAverageTemplates.C (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverageItem/fieldAverageItem.C (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverageItem/fieldAverageItem.H (100%) rename {applications/utilities/postProcessing/sampling => src/postProcessing}/fieldAverage/fieldAverageItem/fieldAverageItemIO.C (100%) diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake index 2af3a8dd33..ed91892bde 100755 --- a/src/postProcessing/Allwmake +++ b/src/postProcessing/Allwmake @@ -3,3 +3,5 @@ set -x wmake libo postCalc wmake libso forces +wmake libso fieldAverage + diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/Make/files b/src/postProcessing/fieldAverage/Make/files similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/Make/files rename to src/postProcessing/fieldAverage/Make/files diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/Make/options b/src/postProcessing/fieldAverage/Make/options similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/Make/options rename to src/postProcessing/fieldAverage/Make/options diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/controlDict b/src/postProcessing/fieldAverage/controlDict similarity index 97% rename from applications/utilities/postProcessing/sampling/fieldAverage/controlDict rename to src/postProcessing/fieldAverage/controlDict index b20a0d1fdb..5dc2b007f9 100644 --- a/applications/utilities/postProcessing/sampling/fieldAverage/controlDict +++ b/src/postProcessing/fieldAverage/controlDict @@ -62,7 +62,7 @@ functions // Where to load it from (if not already in solver) functionObjectLibs ("libfieldAverage.so"); - // Fields to be probed. runTime modifiable! + // Fields to be averaged - runTime modifiable fields ( U diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/IOFieldAverage.H b/src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/IOFieldAverage.H rename to src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverage.C rename to src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverage.H rename to src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverage/fieldAverageTemplates.C rename to src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C b/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C rename to src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H b/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H rename to src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItem.C rename to src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItem.H rename to src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H diff --git a/applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C similarity index 100% rename from applications/utilities/postProcessing/sampling/fieldAverage/fieldAverageItem/fieldAverageItemIO.C rename to src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C From 7077a768ea91e9bf6e250fa5393955e41edb5b26 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 12 May 2008 18:04:11 +0100 Subject: [PATCH 2/9] updated LES oodles tutorials to use the fieldAverage function object --- .../Xoodles/pitzDaily/system/controlDict | 29 +++++++++++++++++++ .../Xoodles/pitzDaily3D/system/controlDict | 29 +++++++++++++++++++ .../channel395/system/controlDict | 29 +++++++++++++++++++ .../coodles/pitzDaily/system/controlDict | 29 +++++++++++++++++++ tutorials/oodles/pitzDaily/system/controlDict | 26 +++++++++++++++++ 5 files changed, 142 insertions(+) diff --git a/tutorials/Xoodles/pitzDaily/system/controlDict b/tutorials/Xoodles/pitzDaily/system/controlDict index 9b1ce77209..344451bb19 100644 --- a/tutorials/Xoodles/pitzDaily/system/controlDict +++ b/tutorials/Xoodles/pitzDaily/system/controlDict @@ -52,5 +52,34 @@ timePrecision 6; runTimeModifiable yes; +functions +( + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be averaged - runTime modifiable + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +); + // ************************************************************************* // diff --git a/tutorials/Xoodles/pitzDaily3D/system/controlDict b/tutorials/Xoodles/pitzDaily3D/system/controlDict index 3106ce414e..4d89aa89bd 100644 --- a/tutorials/Xoodles/pitzDaily3D/system/controlDict +++ b/tutorials/Xoodles/pitzDaily3D/system/controlDict @@ -52,5 +52,34 @@ timePrecision 6; runTimeModifiable yes; +functions +( + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be averaged - runTime modifiable + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +); + // ************************************************************************* // diff --git a/tutorials/channelOodles/channel395/system/controlDict b/tutorials/channelOodles/channel395/system/controlDict index f7f0dcf1a5..35ab190f4e 100644 --- a/tutorials/channelOodles/channel395/system/controlDict +++ b/tutorials/channelOodles/channel395/system/controlDict @@ -52,5 +52,34 @@ timePrecision 6; runTimeModifiable yes; +functions +( + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be averaged - runTime modifiable + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +); + // ************************************************************************* // diff --git a/tutorials/coodles/pitzDaily/system/controlDict b/tutorials/coodles/pitzDaily/system/controlDict index 8153554997..9920022739 100644 --- a/tutorials/coodles/pitzDaily/system/controlDict +++ b/tutorials/coodles/pitzDaily/system/controlDict @@ -52,5 +52,34 @@ timePrecision 6; runTimeModifiable yes; +functions +( + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be averaged - runTime modifiable + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +); + // ************************************************************************* // diff --git a/tutorials/oodles/pitzDaily/system/controlDict b/tutorials/oodles/pitzDaily/system/controlDict index bbef227c15..2d6b2ce39b 100644 --- a/tutorials/oodles/pitzDaily/system/controlDict +++ b/tutorials/oodles/pitzDaily/system/controlDict @@ -80,6 +80,32 @@ functions p ); } + + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be averaged - runTime modifiable + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + p + { + mean on; + prime2Mean on; + base time; + } + ); + } ); // ************************************************************************* // From 8cdd1a844b375581ea7f24b7aeec9c626a1ac570 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 12 May 2008 18:24:13 +0100 Subject: [PATCH 3/9] renamed ensemble average as iteration average --- .../fieldAverage/fieldAverage/fieldAverage.C | 12 ++++++------ .../fieldAverage/fieldAverage/fieldAverage.H | 17 +++++++++++++---- .../fieldAverage/fieldAverageTemplates.C | 9 +++++---- .../fieldAverageItem/fieldAverageItem.C | 4 ++-- .../fieldAverageItem/fieldAverageItem.H | 10 +++++----- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C index 72dfc00201..2cdd6bb70b 100644 --- a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C +++ b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C @@ -66,8 +66,8 @@ void Foam::fieldAverage::resetLists(const label nItems) prime2MeanSymmTensorFields_.clear(); prime2MeanSymmTensorFields_.setSize(nItems); - nSteps_.clear(); - nSteps_.setSize(nItems, 1); + totalIter_.clear(); + totalIter_.setSize(nItems, 1); totalTime_.clear(); totalTime_.setSize(nItems, obr_.time().deltaT().value()); @@ -170,7 +170,7 @@ Foam::fieldAverage::fieldAverage meanSphericalTensorFields_(faItems_.size()), prime2MeanScalarFields_(faItems_.size()), prime2MeanSymmTensorFields_(faItems_.size()), - nSteps_(faItems_.size(), 1), + totalIter_(faItems_.size(), 1), totalTime_(faItems_.size(), obr_.time().deltaT().value()) { // Check if the available mesh is an fvMesh otherise deactivate @@ -239,7 +239,7 @@ void Foam::fieldAverage::calcAverages() Info<< "Calculating averages" << nl << endl; forAll(faItems_, i) { - nSteps_[i]++; + totalIter_[i]++; totalTime_[i] += obr_.time().deltaT().value(); } @@ -287,7 +287,7 @@ void Foam::fieldAverage::writeAveragingProperties() const { const word fieldName = faItems_[i].fieldName(); propsDict.add(fieldName, dictionary()); - propsDict.subDict(fieldName).add("nSteps", nSteps_[i]); + propsDict.subDict(fieldName).add("totalIter", totalIter_[i]); propsDict.subDict(fieldName).add("totalTime", totalTime_[i]); } @@ -317,7 +317,7 @@ void Foam::fieldAverage::readAveragingProperties() { dictionary fieldDict(propsDict.subDict(fieldName)); - nSteps_[i] = readLabel(fieldDict.lookup("nSteps")); + totalIter_[i] = readLabel(fieldDict.lookup("totalIter")); totalTime_[i] = readScalar(fieldDict.lookup("totalTime")); } } diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H index 8fbad3dea6..aabcd2cfa9 100644 --- a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H +++ b/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H @@ -29,19 +29,28 @@ Description Calculates the field averages given list of fieldAverageItems, e.g. @verbatim + fieldAverage1 + { + // Type of functionObject + type fieldAverage; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldAverage.so"); + + // Fields to be probed. runTime modifiable! fields ( U { mean on; prime2Mean on; - base time; // ensemble + base time; } p { mean on; prime2Mean on; - base time; // ensemble + base time; } ); @endverbatim @@ -133,8 +142,8 @@ protected: // Counters - //- Integration steps counter - List