zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge with master + fix conflicts

Browse Source
This commit is contained in:
andy
2009-07-21 19:16:01 +01:00
parent 6f28a1199f 70f453b435
commit 8ffb366209
143 changed files with 557 additions and 6304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
View File

@ -50,8 +50,7 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
const dictionary& dict
)
:
functionObject(),
name_(name),
functionObject(name),
time_(t),
dict_(dict),
regionName_(polyMesh::defaultRegion),
@ -92,7 +91,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::start()
(
new IOOutputFilter<OutputFilter>
(
name_,
name(),
time_.lookupObject<objectRegistry>(regionName_),
dictName_
)
@ -104,7 +103,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::start()
(
new OutputFilter
(
name_,
name(),
time_.lookupObject<objectRegistry>(regionName_),
dict_
)

9
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
View File

@ -63,9 +63,6 @@ class OutputFilterFunctionObject
{
// Private data
//- Output filter name
word name_;
//- Reference to the time database
const Time& time_;
@ -121,12 +118,6 @@ public:
// Access
//- Return name
virtual const word& name() const
{
return name_;
}
//- Return time database
virtual const Time& time() const
{

10
src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
View File

@ -36,7 +36,9 @@ int Foam::functionObject::debug(Foam::debug::debugSwitch("functionObject", 0));
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::functionObject::functionObject()
Foam::functionObject::functionObject(const word& name)
:
name_(name)
{}
@ -103,6 +105,12 @@ Foam::functionObject::~functionObject()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::word& Foam::functionObject::name() const
{
return name_;
}
bool Foam::functionObject::end()
{
return execute();

13
src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
View File

@ -57,6 +57,12 @@ class Time;
class functionObject
{
// Private data
//- Name
const word name_;
// Private Member Functions
//- Disallow default bitwise copy construct
@ -88,8 +94,8 @@ public:
// Constructors
//- Construct null
functionObject();
//- Construct from components
functionObject(const word& name);
//- Return clone
autoPtr<functionObject> clone() const
@ -137,6 +143,9 @@ public:
// Member Functions
//- Name
virtual const word& name() const;
//- Called at the start of the time-loop
virtual bool start() = 0;

3
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
View File

@ -133,6 +133,9 @@ public:
//- Return true if the List is empty (ie, size() is zero).
using PtrList<functionObject>::empty;
//- Access to the functionObjects
using PtrList<functionObject>::operator[];
//- Clear the list of function objects
virtual void clear();

11
src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
View File

@ -52,6 +52,17 @@ Foam::passiveParticleCloud::passiveParticleCloud
}
Foam::passiveParticleCloud::passiveParticleCloud
(
const polyMesh& mesh,
const word& cloudName,
const IDLList<passiveParticle>& particles
)
:
Cloud<passiveParticle>(mesh, cloudName, particles)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::passiveParticleCloud::readFields()

11
src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
View File

@ -63,6 +63,9 @@ class passiveParticleCloud
public:
//- Type of parcel the cloud was instantiated for
typedef passiveParticle parcelType;
// Constructors
//- Construct given mesh
@ -72,6 +75,14 @@ public:
const word& cloudName = "defaultCloud"
);
//- Construct from mesh, cloud name, and a list of particles
passiveParticleCloud
(
const polyMesh& mesh,
const word& cloudName,
const IDLList<passiveParticle>& particles
);
// Member Functions

23
src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
View File

@ -81,7 +81,11 @@ Foam::isoSurface::adaptPatchFields
{
const polyPatch& pp = patches[patchI];
if (isA<emptyPolyPatch>(pp))
if
(
isA<emptyPolyPatch>(pp)
&& pp.size() != sliceFld.boundaryField()[patchI].size()
)
{
// Clear old value. Cannot resize it since is a slice.
sliceFld.boundaryField().set(patchI, NULL);
@ -96,11 +100,18 @@ Foam::isoSurface::adaptPatchFields
sliceFld
)
);
sliceFld.boundaryField()[patchI] ==
mesh.boundary()[patchI].patchInternalField
(
sliceFld
);
// Note: cannot use patchInternalField since uses emptyFvPatch::size
// Do our own internalField instead.
const unallocLabelList& faceCells =
mesh.boundary()[patchI].patch().faceCells();
Field<Type>& pfld = sliceFld.boundaryField()[patchI];
pfld.setSize(faceCells.size());
forAll(faceCells, i)
{
pfld[i] = sliceFld[faceCells[i]];
}
}
else if (isA<cyclicPolyPatch>(pp))
{

53
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -37,7 +37,13 @@ License
namespace Foam
{
defineTypeNameAndDebug(sampledCuttingPlane, 0);
addNamedToRunTimeSelectionTable(sampledSurface, sampledCuttingPlane, word, cuttingPlane);
addNamedToRunTimeSelectionTable
(
sampledSurface,
sampledCuttingPlane,
word,
cuttingPlane
);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -118,7 +124,7 @@ void Foam::sampledCuttingPlane::createGeometry()
// Internal field
{
const pointField& cc = fvm.C();
const pointField& cc = fvm.cellCentres();
scalarField& fld = cellDistance.internalField();
forAll(cc, i)
@ -130,14 +136,45 @@ void Foam::sampledCuttingPlane::createGeometry()
// Patch fields
{
forAll(fvm.C().boundaryField(), patchI)
forAll(cellDistance.boundaryField(), patchI)
{
const pointField& cc = fvm.C().boundaryField()[patchI];
fvPatchScalarField& fld = cellDistance.boundaryField()[patchI];
forAll(fld, i)
if
(
isA<emptyFvPatchScalarField>
(
cellDistance.boundaryField()[patchI]
)
)
{
fld[i] = (cc[i] - plane_.refPoint()) & plane_.normal();
cellDistance.boundaryField().set
(
patchI,
new calculatedFvPatchScalarField
(
fvm.boundary()[patchI],
cellDistance
)
);
const polyPatch& pp = fvm.boundary()[patchI].patch();
pointField::subField cc = pp.patchSlice(fvm.faceCentres());
fvPatchScalarField& fld = cellDistance.boundaryField()[patchI];
fld.setSize(pp.size());
forAll(fld, i)
{
fld[i] = (cc[i] - plane_.refPoint()) & plane_.normal();
}
}
else
{
const pointField& cc = fvm.C().boundaryField()[patchI];
fvPatchScalarField& fld = cellDistance.boundaryField()[patchI];
forAll(fld, i)
{
fld[i] = (cc[i] - plane_.refPoint()) & plane_.normal();
}
}
}
}

4
src/turbulenceModels/compressible/RAS/Make/files
View File

@ -29,8 +29,8 @@ $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarFiel
omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
kQRWallFunctions = $(wallFunctions)/kQRWallFunctions
$(kQRWallFunctions)/kQRWallFunction/kQRWallFunctionFvPatchFields.C
kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
/* Patch fields */
derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C

8
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View File

@ -30,7 +30,7 @@ License
#include "alphatWallFunctionFvPatchScalarField.H"
#include "mutWallFunctionFvPatchScalarField.H"
#include "epsilonWallFunctionFvPatchScalarField.H"
#include "kQRWallFunctionFvPatchField.H"
#include "kqRWallFunctionFvPatchField.H"
#include "omegaWallFunctionFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -230,7 +230,7 @@ tmp<volScalarField> autoCreateK
autoCreateWallFunctionField
<
scalar,
RASModels::kQRWallFunctionFvPatchField<scalar>
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -249,7 +249,7 @@ tmp<volScalarField> autoCreateQ
autoCreateWallFunctionField
<
scalar,
RASModels::kQRWallFunctionFvPatchField<scalar>
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -268,7 +268,7 @@ tmp<volSymmTensorField> autoCreateR
autoCreateWallFunctionField
<
symmTensor,
RASModels::kQRWallFunctionFvPatchField<symmTensor>
RASModels::kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,

4
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
View File

@ -110,7 +110,9 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu75 = pow(Cmu, 0.75);
const fvPatchField<scalar>& kp =

4
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -115,7 +115,9 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu25 = pow(Cmu, 0.25);
const fvPatchField<scalar>& kp =

28
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C → src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "kQRWallFunctionFvPatchField.H"
#include "kqRWallFunctionFvPatchField.H"
#include "fvPatchFieldMapper.H"
#include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
@ -41,11 +41,11 @@ namespace RASModels
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void kQRWallFunctionFvPatchField<Type>::checkType()
void kqRWallFunctionFvPatchField<Type>::checkType()
{
if (!isA<wallFvPatch>(this->patch()))
{
FatalErrorIn("kQRWallFunctionFvPatchField::checkType()")
FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
<< "Invalid wall function specification" << nl
<< " Patch type for patch " << this->patch().name()
<< " must be wall" << nl
@ -58,7 +58,7 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@ -71,9 +71,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& ptf,
const kqRWallFunctionFvPatchField& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -86,7 +86,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@ -100,9 +100,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& tkqrwfpf
const kqRWallFunctionFvPatchField& tkqrwfpf
)
:
zeroGradientFvPatchField<Type>(tkqrwfpf)
@ -112,9 +112,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& tkqrwfpf,
const kqRWallFunctionFvPatchField& tkqrwfpf,
const DimensionedField<Type, volMesh>& iF
)
:
@ -127,7 +127,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
void kQRWallFunctionFvPatchField<Type>::evaluate
void kqRWallFunctionFvPatchField<Type>::evaluate
(
const Pstream::commsTypes commsType
)
@ -137,7 +137,7 @@ void kQRWallFunctionFvPatchField<Type>::evaluate
template<class Type>
void kQRWallFunctionFvPatchField<Type>::write(Ostream& os) const
void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
{
zeroGradientFvPatchField<Type>::write(os);
this->writeEntry("value", os);

38
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H → src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
View File

@ -23,19 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::compressible::RASModels::kQRWallFunctionFvPatchField
Foam::compressible::RASModels::kqRWallFunctionFvPatchField
Description
Boundary condition for turbulence k, Q, and R when using wall functions.
Simply acts as a zero gradient condition.
SourceFiles
kQRWallFunctionFvPatchField.C
kqRWallFunctionFvPatchField.C
\*---------------------------------------------------------------------------*/
#ifndef kQRWallFunctionFvPatchField_H
#define kQRWallFunctionFvPatchField_H
#ifndef kqRWallFunctionFvPatchField_H
#define kqRWallFunctionFvPatchField_H
#include "zeroGradientFvPatchField.H"
@ -49,11 +49,11 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
Class kQRWallFunctionFvPatchField Declaration
Class kqRWallFunctionFvPatchField Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
class kQRWallFunctionFvPatchField
class kqRWallFunctionFvPatchField
:
public zeroGradientFvPatchField<Type>
{
@ -67,20 +67,20 @@ class kQRWallFunctionFvPatchField
public:
//- Runtime type information
TypeName("compressible::kQRWallFunction");
TypeName("compressible::kqRWallFunction");
// Constructors
//- Construct from patch and internal field
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&
);
//- Construct from patch, internal field and dictionary
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
@ -88,20 +88,20 @@ public:
);
//- Construct by mapping given
// kQRWallFunctionFvPatchField
// kqRWallFunctionFvPatchField
// onto a new patch
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&,
const kqRWallFunctionFvPatchField&,
const fvPatch&,
const DimensionedField<Type, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&
const kqRWallFunctionFvPatchField&
);
//- Construct and return a clone
@ -109,14 +109,14 @@ public:
{
return tmp<fvPatchField<Type> >
(
new kQRWallFunctionFvPatchField(*this)
new kqRWallFunctionFvPatchField(*this)
);
}
//- Construct as copy setting internal field reference
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&,
const kqRWallFunctionFvPatchField&,
const DimensionedField<Type, volMesh>&
);
@ -128,7 +128,7 @@ public:
{
return tmp<fvPatchField<Type> >
(
new kQRWallFunctionFvPatchField(*this, iF)
new kqRWallFunctionFvPatchField(*this, iF)
);
}
@ -160,7 +160,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "kQRWallFunctionFvPatchField.C"
# include "kqRWallFunctionFvPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchFields.C → src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "kQRWallFunctionFvPatchFields.H"
#include "kqRWallFunctionFvPatchFields.H"
#include "fvPatchFields.H"
#include "addToRunTimeSelectionTable.H"
#include "volFields.H"
@ -40,7 +40,7 @@ namespace RASModels
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchFields(kQRWallFunction);
makePatchFields(kqRWallFunction);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchFields.H → src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
View File

@ -24,10 +24,10 @@ License
\*---------------------------------------------------------------------------*/
#ifndef kQRWallFunctionFvPatchFields_H
#define kQRWallFunctionFvPatchFields_H
#ifndef kqRWallFunctionFvPatchFields_H
#define kqRWallFunctionFvPatchFields_H
#include "kQRWallFunctionFvPatchField.H"
#include "kqRWallFunctionFvPatchField.H"
#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -41,7 +41,7 @@ namespace RASModels
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeFieldTypedefs(kQRWallFunction)
makePatchTypeFieldTypedefs(kqRWallFunction)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

6
src/turbulenceModels/incompressible/RAS/Make/files
View File

@ -10,7 +10,7 @@ SpalartAllmaras/SpalartAllmaras.C
LRR/LRR.C
LaunderGibsonRSTM/LaunderGibsonRSTM.C
LaunderSharmaKE/LaunderSharmaKE.C
QZeta/QZeta.C
qZeta/qZeta.C
LienCubicKE/LienCubicKE.C
LienCubicKELowRe/LienCubicKELowRe.C
NonlinearKEShih/NonlinearKEShih.C
@ -33,8 +33,8 @@ $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarFiel
omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
kQRWallFunctions = $(wallFunctions)/kQRWallFunctions
$(kQRWallFunctions)/kQRWallFunction/kQRWallFunctionFvPatchFields.C
kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
/* Patch fields */

8
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View File

@ -29,7 +29,7 @@ License
#include "calculatedFvPatchField.H"
#include "nutWallFunctionFvPatchScalarField.H"
#include "epsilonWallFunctionFvPatchScalarField.H"
#include "kQRWallFunctionFvPatchField.H"
#include "kqRWallFunctionFvPatchField.H"
#include "omegaWallFunctionFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -159,7 +159,7 @@ tmp<volScalarField> autoCreateK
autoCreateWallFunctionField
<
scalar,
RASModels::kQRWallFunctionFvPatchField<scalar>
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -178,7 +178,7 @@ tmp<volScalarField> autoCreateQ
autoCreateWallFunctionField
<
scalar,
RASModels::kQRWallFunctionFvPatchField<scalar>
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -197,7 +197,7 @@ tmp<volSymmTensorField> autoCreateR
autoCreateWallFunctionField
<
symmTensor,
RASModels::kQRWallFunctionFvPatchField<symmTensor>
RASModels::kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,

4
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
View File

@ -110,7 +110,9 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu75 = pow(Cmu, 0.75);
const fvPatchField<scalar>& kp =

4
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -115,7 +115,9 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
const scalar Cmu25 = pow(Cmu, 0.25);
const fvPatchField<scalar>& kp =

26
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C → src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,11 +41,11 @@ namespace RASModels
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void kQRWallFunctionFvPatchField<Type>::checkType()
void kqRWallFunctionFvPatchField<Type>::checkType()
{
if (!isA<wallFvPatch>(this->patch()))
{
FatalErrorIn("kQRWallFunctionFvPatchField::checkType()")
FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
<< "Invalid wall function specification" << nl
<< " Patch type for patch " << this->patch().name()
<< " must be wall" << nl
@ -58,7 +58,7 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@ -71,9 +71,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& ptf,
const kqRWallFunctionFvPatchField& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -86,7 +86,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@ -100,9 +100,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& tkqrwfpf
const kqRWallFunctionFvPatchField& tkqrwfpf
)
:
zeroGradientFvPatchField<Type>(tkqrwfpf)
@ -112,9 +112,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
template<class Type>
kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField& tkqrwfpf,
const kqRWallFunctionFvPatchField& tkqrwfpf,
const DimensionedField<Type, volMesh>& iF
)
:
@ -127,7 +127,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
void kQRWallFunctionFvPatchField<Type>::evaluate
void kqRWallFunctionFvPatchField<Type>::evaluate
(
const Pstream::commsTypes commsType
)
@ -137,7 +137,7 @@ void kQRWallFunctionFvPatchField<Type>::evaluate
template<class Type>
void kQRWallFunctionFvPatchField<Type>::write(Ostream& os) const
void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
{
zeroGradientFvPatchField<Type>::write(os);
this->writeEntry("value", os);

38
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H → src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
View File

@ -23,19 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::incompressible::RASModels::kQRWallFunctionFvPatchField
Foam::incompressible::RASModels::kqRWallFunctionFvPatchField
Description
Boundary condition for turbulence k, Q, and R when using wall functions.
Simply acts as a zero gradient condition.
SourceFiles
kQRWallFunctionFvPatchField.C
kqRWallFunctionFvPatchField.C
\*---------------------------------------------------------------------------*/
#ifndef kQRWallFunctionFvPatchField_H
#define kQRWallFunctionFvPatchField_H
#ifndef kqRWallFunctionFvPatchField_H
#define kqRWallFunctionFvPatchField_H
#include "zeroGradientFvPatchField.H"
@ -49,11 +49,11 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
Class kQRWallFunctionFvPatchField Declaration
Class kqRWallFunctionFvPatchField Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
class kQRWallFunctionFvPatchField
class kqRWallFunctionFvPatchField
:
public zeroGradientFvPatchField<Type>
{
@ -67,20 +67,20 @@ class kQRWallFunctionFvPatchField
public:
//- Runtime type information
TypeName("kQRWallFunction");
TypeName("kqRWallFunction");
// Constructors
//- Construct from patch and internal field
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&
);
//- Construct from patch, internal field and dictionary
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
@ -88,20 +88,20 @@ public:
);
//- Construct by mapping given
// kQRWallFunctionFvPatchField
// kqRWallFunctionFvPatchField
// onto a new patch
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&,
const kqRWallFunctionFvPatchField&,
const fvPatch&,
const DimensionedField<Type, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&
const kqRWallFunctionFvPatchField&
);
//- Construct and return a clone
@ -109,14 +109,14 @@ public:
{
return tmp<fvPatchField<Type> >
(
new kQRWallFunctionFvPatchField(*this)
new kqRWallFunctionFvPatchField(*this)
);
}
//- Construct as copy setting internal field reference
kQRWallFunctionFvPatchField
kqRWallFunctionFvPatchField
(
const kQRWallFunctionFvPatchField&,
const kqRWallFunctionFvPatchField&,
const DimensionedField<Type, volMesh>&
);
@ -128,7 +128,7 @@ public:
{
return tmp<fvPatchField<Type> >
(
new kQRWallFunctionFvPatchField(*this, iF)
new kqRWallFunctionFvPatchField(*this, iF)
);
}
@ -160,7 +160,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "kQRWallFunctionFvPatchField.C"
# include "kqRWallFunctionFvPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchFields.C → src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "kQRWallFunctionFvPatchFields.H"
#include "kqRWallFunctionFvPatchFields.H"
#include "fvPatchFields.H"
#include "addToRunTimeSelectionTable.H"
#include "volFields.H"
@ -40,7 +40,7 @@ namespace RASModels
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchFields(kQRWallFunction);
makePatchFields(kqRWallFunction);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchFields.H → src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
View File

@ -24,10 +24,10 @@ License
\*---------------------------------------------------------------------------*/
#ifndef kQRWallFunctionFvPatchFields_H
#define kQRWallFunctionFvPatchFields_H
#ifndef kqRWallFunctionFvPatchFields_H
#define kqRWallFunctionFvPatchFields_H
#include "kQRWallFunctionFvPatchField.H"
#include "kqRWallFunctionFvPatchField.H"
#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -41,7 +41,7 @@ namespace RASModels
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeFieldTypedefs(kQRWallFunction)
makePatchTypeFieldTypedefs(kqRWallFunction)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

22
src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C → src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "QZeta.H"
#include "qZeta.H"
#include "addToRunTimeSelectionTable.H"
#include "backwardsCompatibilityWallFunctions.H"
@ -40,12 +40,12 @@ namespace RASModels
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(QZeta, 0);
addToRunTimeSelectionTable(RASModel, QZeta, dictionary);
defineTypeNameAndDebug(qZeta, 0);
addToRunTimeSelectionTable(RASModel, qZeta, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
tmp<volScalarField> QZeta::fMu() const
tmp<volScalarField> qZeta::fMu() const
{
volScalarField Rt = q_*k_/(2.0*nu()*zeta_);
@ -62,7 +62,7 @@ tmp<volScalarField> QZeta::fMu() const
}
tmp<volScalarField> QZeta::f2() const
tmp<volScalarField> qZeta::f2() const
{
volScalarField Rt = q_*k_/(2.0*nu()*zeta_);
return scalar(1) - 0.3*exp(-sqr(Rt));
@ -71,7 +71,7 @@ tmp<volScalarField> QZeta::f2() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
QZeta::QZeta
qZeta::qZeta
(
const volVectorField& U,
const surfaceScalarField& phi,
@ -202,7 +202,7 @@ QZeta::QZeta
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
tmp<volSymmTensorField> QZeta::R() const
tmp<volSymmTensorField> qZeta::R() const
{
return tmp<volSymmTensorField>
(
@ -223,7 +223,7 @@ tmp<volSymmTensorField> QZeta::R() const
}
tmp<volSymmTensorField> QZeta::devReff() const
tmp<volSymmTensorField> qZeta::devReff() const
{
return tmp<volSymmTensorField>
(
@ -243,7 +243,7 @@ tmp<volSymmTensorField> QZeta::devReff() const
}
tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
{
return
(
@ -253,7 +253,7 @@ tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
}
bool QZeta::read()
bool qZeta::read()
{
if (RASModel::read())
{
@ -272,7 +272,7 @@ bool QZeta::read()
}
void QZeta::correct()
void qZeta::correct()
{
RASModel::correct();

18
src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H → src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
View File

@ -23,19 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::incompressible::RASModels::QZeta
Foam::incompressible::RASModels::qZeta
Description
Gibson and Dafa'Alla's q-zeta two-equation low-Re turbulence model
for incompressible flows
SourceFiles
QZeta.C
qZeta.C
\*---------------------------------------------------------------------------*/
#ifndef QZeta_H
#define QZeta_H
#ifndef qZeta_H
#define qZeta_H
#include "RASModel.H"
@ -49,10 +49,10 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
Class QZeta Declaration
Class qZeta Declaration
\*---------------------------------------------------------------------------*/
class QZeta
class qZeta
:
public RASModel
{
@ -87,12 +87,12 @@ class QZeta
public:
//- Runtime type information
TypeName("QZeta");
TypeName("qZeta");
// Constructors
//- Construct from components
QZeta
qZeta
(
const volVectorField& U,
const surfaceScalarField& phi,
@ -101,7 +101,7 @@ public:
//- Destructor
virtual ~QZeta()
virtual ~qZeta()
{}