From 06f1b49d252cf3c1f9045d3aa819c9e3a7574dd0 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 6 Aug 2014 10:47:59 +0100 Subject: [PATCH] BUG: turbulenceFields function object - removed execute from read ENH: turbulenceFields function object - Updated usage documentation --- .../utilities/turbulenceFields/postProcessingDict | 2 +- .../utilities/turbulenceFields/turbulenceFields.C | 4 +--- .../utilities/turbulenceFields/turbulenceFields.H | 6 +++--- .../utilities/turbulenceFields/turbulenceFieldsTemplates.C | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict index 4b8172167c..931c6ccff4 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict @@ -19,7 +19,7 @@ functions turbulenceFields1 { type turbulenceFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + functionObjectLibs ("libutilityFunctionObjects.so"); enabled true; outputControl timeStep; outputInterval 1; diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C index 9f25e517a7..3d89600cfa 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C @@ -143,7 +143,7 @@ void Foam::turbulenceFields::read(const dictionary& dict) Info<< "storing fields:" << nl; forAllConstIter(wordHashSet, fieldSet_, iter) { - Info<< " " << modelName << '.' << iter.key() << nl; + Info<< " " << modelName << ':' << iter.key() << nl; } Info<< endl; } @@ -151,8 +151,6 @@ void Foam::turbulenceFields::read(const dictionary& dict) { Info<< "no fields requested to be stored" << nl << endl; } - - execute(); } } diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H index 2ff4476dad..45e581cec1 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H @@ -32,16 +32,16 @@ Description further manipulation. Fields are stored as copies of the original, with the prefix - "tubulenceModel::", e.g. + "tubulenceModel:", e.g. - turbulenceModel::R + turbulenceModel:R Example of function object specification: \verbatim turbulenceFields1 { type turbulenceFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + functionObjectLibs ("libutilityFunctionObjects.so"); ... fields ( diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C index a3bcd7135f..0d067cc168 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C @@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField { typedef GeometricField FieldType; - const word scopedName = modelName + '.' + fieldName; + const word scopedName = modelName + ':' + fieldName; if (obr_.foundObject(scopedName)) {