From 0b03e7e08cc41f2ba607bb3a4e6a6a2ad8a8145c Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 22 Jun 2010 18:17:00 +0100 Subject: [PATCH] BUG: Change of name for swirlFlowRateInlet and change in the constructor of dynLagrangian --- ...lFlowRateInletVelocityFvPatchVectorField.H | 36 +++++++++---------- .../LES/dynLagrangian/dynLagrangian.C | 5 +-- .../LES/dynLagrangian/dynLagrangian.H | 5 +-- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H index bef41d4655..199a995780 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::swirlMassFlowRateInletVelocityFvPatchVectorField + Foam::swirlFlowRateInletVelocityFvPatchVectorField Description Describes a volumetric/mass flow normal vector boundary condition by its @@ -39,7 +39,7 @@ Description @verbatim inlet { - type swirlMassFlowRateInletVelocity; + type swirlFlowRateInletVelocity; flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s] rpm 100; } @@ -49,12 +49,12 @@ Note - The value is positive inwards SourceFiles - swirlMassFlowRateInletVelocityFvPatchVectorField.C + swirlFlowRateInletVelocityFvPatchVectorField.C \*---------------------------------------------------------------------------*/ -#ifndef swirlMassFlowRateInletVelocityFvPatchVectorField_H -#define swirlMassFlowRateInletVelocityFvPatchVectorField_H +#ifndef swirlFlowRateInletVelocityFvPatchVectorField_H +#define swirlFlowRateInletVelocityFvPatchVectorField_H #include "fixedValueFvPatchFields.H" @@ -63,10 +63,10 @@ SourceFiles namespace Foam { /*---------------------------------------------------------------------------*\ - Class swirlMassFlowRateInletVelocityFvPatchVectorField Declaration + Class swirlFlowRateInletVelocityFvPatchVectorField Declaration \*---------------------------------------------------------------------------*/ -class swirlMassFlowRateInletVelocityFvPatchVectorField +class swirlFlowRateInletVelocityFvPatchVectorField : public fixedValueFvPatchVectorField { @@ -88,20 +88,20 @@ class swirlMassFlowRateInletVelocityFvPatchVectorField public: //- Runtime type information - TypeName("swirlMassFlowRateInletVelocity"); + TypeName("swirlFlowRateInletVelocity"); // Constructors //- Construct from patch and internal field - swirlMassFlowRateInletVelocityFvPatchVectorField + swirlFlowRateInletVelocityFvPatchVectorField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - swirlMassFlowRateInletVelocityFvPatchVectorField + swirlFlowRateInletVelocityFvPatchVectorField ( const fvPatch&, const DimensionedField&, @@ -111,18 +111,18 @@ public: //- Construct by mapping given // flowRateInletVelocityFvPatchVectorField // onto a new patch - swirlMassFlowRateInletVelocityFvPatchVectorField + swirlFlowRateInletVelocityFvPatchVectorField ( - const swirlMassFlowRateInletVelocityFvPatchVectorField&, + const swirlFlowRateInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - swirlMassFlowRateInletVelocityFvPatchVectorField + swirlFlowRateInletVelocityFvPatchVectorField ( - const swirlMassFlowRateInletVelocityFvPatchVectorField& + const swirlFlowRateInletVelocityFvPatchVectorField& ); //- Construct and return a clone @@ -130,14 +130,14 @@ public: { return tmp ( - new swirlMassFlowRateInletVelocityFvPatchVectorField(*this) + new swirlFlowRateInletVelocityFvPatchVectorField(*this) ); } //- Construct as copy setting internal field reference - swirlMassFlowRateInletVelocityFvPatchVectorField + swirlFlowRateInletVelocityFvPatchVectorField ( - const swirlMassFlowRateInletVelocityFvPatchVectorField&, + const swirlFlowRateInletVelocityFvPatchVectorField&, const DimensionedField& ); @@ -149,7 +149,7 @@ public: { return tmp ( - new swirlMassFlowRateInletVelocityFvPatchVectorField(*this, iF) + new swirlFlowRateInletVelocityFvPatchVectorField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C index f51c2fbb46..505aeeabba 100644 --- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C +++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C @@ -59,10 +59,11 @@ dynLagrangian::dynLagrangian ( const volVectorField& U, const surfaceScalarField& phi, - transportModel& transport + transportModel& transport, + const word& turbulenceModelName ) : - LESModel(typeName, U, phi, transport), + LESModel(typeName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), flm_ diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H index 15efe12655..0d82201d72 100644 --- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H +++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H @@ -58,7 +58,7 @@ Description @endverbatim Reference: - 1. Charles Meneveau, Thomas Lund and William Cabot + 1. Charles Meneveau, Thomas Lund and William Cabot "A Lagrangian dynamic subgrid-scale model of turbulence" J. Fluid Mech (1996), vol 319, pp. 353-385 @@ -129,7 +129,8 @@ public: ( const volVectorField& U, const surfaceScalarField& phi, - transportModel& transport + transportModel& transport, + const word& turbulenceModelName = turbulenceModel::typeName );