diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C index f35eec69441a13ca1e5eb808d32dc7dedad3c545..9eb8d494ec13777f66f43d29dc9794c94a618a9e 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C @@ -129,43 +129,46 @@ Foam::functionObjects::turbulenceFields::turbulenceFields bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict) { - fvMeshFunctionObject::read(dict); - - if (dict.found("field")) - { - fieldSet_.insert(dict.get<word>("field")); - } - else + if (fvMeshFunctionObject::read(dict)) { - fieldSet_.insert(dict.get<wordList>("fields")); - } + if (dict.found("field")) + { + fieldSet_.insert(dict.get<word>("field")); + } + else + { + fieldSet_.insert(dict.get<wordList>("fields")); + } - Info<< type() << " " << name() << ": "; - if (fieldSet_.size()) - { - Info<< "storing fields:" << nl; - for (const word& f : fieldSet_) + Info<< type() << " " << name() << ": "; + if (fieldSet_.size()) { - Info<< " " << modelName_ << ':' << f << nl; + Info<< "storing fields:" << nl; + for (const word& f : fieldSet_) + { + Info<< " " << modelName_ << ':' << f << nl; + } + Info<< endl; } - Info<< endl; - } - else - { - Info<< "no fields requested to be stored" << nl << endl; + else + { + Info<< "no fields requested to be stored" << nl << endl; + } + + return true; } - return true; + return false; } bool Foam::functionObjects::turbulenceFields::execute() { - bool comp = compressible(); + const bool comp = compressible(); if (comp) { - const compressible::turbulenceModel& model = + const auto& model = obr_.lookupObject<compressible::turbulenceModel>(modelName_); for (const word& f : fieldSet_) @@ -242,7 +245,7 @@ bool Foam::functionObjects::turbulenceFields::execute() } else { - const incompressible::turbulenceModel& model = + const auto& model = obr_.lookupObject<incompressible::turbulenceModel>(modelName_); for (const word& f : fieldSet_) @@ -316,9 +319,11 @@ bool Foam::functionObjects::turbulenceFields::write() { for (const word& f : fieldSet_) { - const word fieldName = modelName_ + ':' + f; - writeObject(fieldName); + const word scopedName(modelName_ + ':' + f); + + writeObject(scopedName); } + Info<< endl; return true; } diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C index 5fa3970f178065963f5ea42b80a2fb95a6154898..e87440b46ef85a37f480737bc90608de5e252eb9 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C +++ b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C @@ -39,7 +39,7 @@ void Foam::functionObjects::turbulenceFields::processField { typedef GeometricField<Type, fvPatchField, volMesh> FieldType; - const word scopedName = modelName_ + ':' + fieldName; + const word scopedName(modelName_ + ':' + fieldName); FieldType* fldPtr = obr_.getObjectPtr<FieldType>(scopedName); @@ -99,17 +99,14 @@ Foam::functionObjects::turbulenceFields::L const Model& model ) const { - const scalar Cmu = 0.09; - // Assume k and epsilon are available - const volScalarField k(model.k()); - const volScalarField epsilon(model.epsilon()); - const dimensionedScalar eps0("eps0", epsilon.dimensions(), SMALL); + const scalar Cmu = 0.09; + const dimensionedScalar eps0(sqr(dimVelocity)/dimTime, SMALL); return tmp<volScalarField>::New ( "L.tmp", - pow(Cmu, 0.75)*pow(k, 1.5)/(epsilon + eps0) + pow(Cmu, 0.75)*pow(model.k(), 1.5)/(model.epsilon() + eps0) ); }