BUG: Change of name for swirlFlowRateInlet and change

in the constructor of dynLagrangian
This commit is contained in:
sergio
2010-06-22 18:17:00 +01:00
parent bf5c4cc935
commit 0b03e7e08c
3 changed files with 24 additions and 22 deletions

View File

@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::swirlMassFlowRateInletVelocityFvPatchVectorField Foam::swirlFlowRateInletVelocityFvPatchVectorField
Description Description
Describes a volumetric/mass flow normal vector boundary condition by its Describes a volumetric/mass flow normal vector boundary condition by its
@ -39,7 +39,7 @@ Description
@verbatim @verbatim
inlet inlet
{ {
type swirlMassFlowRateInletVelocity; type swirlFlowRateInletVelocity;
flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s] flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
rpm 100; rpm 100;
} }
@ -49,12 +49,12 @@ Note
- The value is positive inwards - The value is positive inwards
SourceFiles SourceFiles
swirlMassFlowRateInletVelocityFvPatchVectorField.C swirlFlowRateInletVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef swirlMassFlowRateInletVelocityFvPatchVectorField_H #ifndef swirlFlowRateInletVelocityFvPatchVectorField_H
#define swirlMassFlowRateInletVelocityFvPatchVectorField_H #define swirlFlowRateInletVelocityFvPatchVectorField_H
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
@ -63,10 +63,10 @@ SourceFiles
namespace Foam namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class swirlMassFlowRateInletVelocityFvPatchVectorField Declaration Class swirlFlowRateInletVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class swirlMassFlowRateInletVelocityFvPatchVectorField class swirlFlowRateInletVelocityFvPatchVectorField
: :
public fixedValueFvPatchVectorField public fixedValueFvPatchVectorField
{ {
@ -88,20 +88,20 @@ class swirlMassFlowRateInletVelocityFvPatchVectorField
public: public:
//- Runtime type information //- Runtime type information
TypeName("swirlMassFlowRateInletVelocity"); TypeName("swirlFlowRateInletVelocity");
// Constructors // Constructors
//- Construct from patch and internal field //- Construct from patch and internal field
swirlMassFlowRateInletVelocityFvPatchVectorField swirlFlowRateInletVelocityFvPatchVectorField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<vector, volMesh>& const DimensionedField<vector, volMesh>&
); );
//- Construct from patch, internal field and dictionary //- Construct from patch, internal field and dictionary
swirlMassFlowRateInletVelocityFvPatchVectorField swirlFlowRateInletVelocityFvPatchVectorField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<vector, volMesh>&, const DimensionedField<vector, volMesh>&,
@ -111,18 +111,18 @@ public:
//- Construct by mapping given //- Construct by mapping given
// flowRateInletVelocityFvPatchVectorField // flowRateInletVelocityFvPatchVectorField
// onto a new patch // onto a new patch
swirlMassFlowRateInletVelocityFvPatchVectorField swirlFlowRateInletVelocityFvPatchVectorField
( (
const swirlMassFlowRateInletVelocityFvPatchVectorField&, const swirlFlowRateInletVelocityFvPatchVectorField&,
const fvPatch&, const fvPatch&,
const DimensionedField<vector, volMesh>&, const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper& const fvPatchFieldMapper&
); );
//- Construct as copy //- Construct as copy
swirlMassFlowRateInletVelocityFvPatchVectorField swirlFlowRateInletVelocityFvPatchVectorField
( (
const swirlMassFlowRateInletVelocityFvPatchVectorField& const swirlFlowRateInletVelocityFvPatchVectorField&
); );
//- Construct and return a clone //- Construct and return a clone
@ -130,14 +130,14 @@ public:
{ {
return tmp<fvPatchVectorField> return tmp<fvPatchVectorField>
( (
new swirlMassFlowRateInletVelocityFvPatchVectorField(*this) new swirlFlowRateInletVelocityFvPatchVectorField(*this)
); );
} }
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
swirlMassFlowRateInletVelocityFvPatchVectorField swirlFlowRateInletVelocityFvPatchVectorField
( (
const swirlMassFlowRateInletVelocityFvPatchVectorField&, const swirlFlowRateInletVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>& const DimensionedField<vector, volMesh>&
); );
@ -149,7 +149,7 @@ public:
{ {
return tmp<fvPatchVectorField> return tmp<fvPatchVectorField>
( (
new swirlMassFlowRateInletVelocityFvPatchVectorField(*this, iF) new swirlFlowRateInletVelocityFvPatchVectorField(*this, iF)
); );
} }

View File

@ -59,10 +59,11 @@ dynLagrangian::dynLagrangian
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, 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), GenEddyVisc(U, phi, transport),
flm_ flm_

View File

@ -129,7 +129,8 @@ public:
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
transportModel& transport transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
); );