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 branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus

Browse Source
This commit is contained in:
Andrew Heather
2016-04-21 13:03:10 +01:00
parent b846422eec 40e13d2a1a
commit 9b3009e25f
7 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/compressible/rhoSimpleFoam/createFields.H
View File

@ -69,9 +69,9 @@ dimensionedScalar rhoMin
);
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::RASModel> turbulence
autoPtr<compressible::turbulenceModel> turbulence
(
compressible::New<compressible::RASModel>
compressible::turbulenceModel::New
(
rho,
U,

18
applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
View File

@ -38,7 +38,23 @@ volVectorField U
);
Info<< "Calculating wall distance field" << endl;
const volScalarField& y(wallDist::New(mesh).y());
volScalarField y
(
IOobject
(
"y",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("zero", dimLength, 0.0),
zeroGradientFvPatchScalarField::typeName
);
y.internalField() = wallDist::New(mesh).y().internalField();
y.correctBoundaryConditions();
// Set the mean boundary-layer thickness
dimensionedScalar ybl("ybl", dimLength, 0);

4
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
View File

@ -62,9 +62,9 @@ Description
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappa lookup;
KappaName kappa;
kappaName kappa;
thicknessLayers (0.1 0.2 0.3 0.4);
kappaLayers (1 2 3 4)
kappaLayers (1 2 3 4);
value uniform 300;
}
\endverbatim

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
View File

@ -55,7 +55,7 @@ Description
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
kappa lookup;
KappaName kappa;
kappaName kappa;
QrNbr Qr; // or none. Name of Qr field on neighbour region
Qr Qr; // or none. Name of Qr field on local region
thicknessLayers (0.1 0.2 0.3 0.4);

26
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -457,7 +457,29 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::k() const
{
const volScalarField chi(this->chi());
const volScalarField fv1(this->fv1(chi));
return sqr(this->nut()/ck_/dTilda(chi, fv1, fvc::grad(this->U_)));
tmp<volScalarField> tdTilda
(
new volScalarField
(
IOobject
(
"dTilda",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
this->mesh_,
dimensionedScalar("0", dimLength, 0.0),
zeroGradientFvPatchField<vector>::typeName
)
);
volScalarField& dTildaF = tdTilda();
dTildaF = dTilda(chi, fv1, fvc::grad(this->U_));
dTildaF.correctBoundaryConditions();
return sqr(this->nut()/ck_/dTildaF);
}

11
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -94,7 +94,7 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
{
tmp<volScalarField> tk(this->k());
return tmp<volScalarField>
tmp<volScalarField> tepsilon
(
new volScalarField
(
@ -106,9 +106,14 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
IOobject::NO_READ,
IOobject::NO_WRITE
),
Ce_*tk()*sqrt(tk())/this->delta()
Ce_*tk()*sqrt(tk())/this->delta(),
zeroGradientFvPatchScalarField::typeName
)
);
volScalarField& epsilon = tepsilon();
epsilon.correctBoundaryConditions();
return tepsilon;
}

11
src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
View File

@ -300,6 +300,11 @@ tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::DnuTildaEff() const
template<class BasicTurbulenceModel>
tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::k() const
{
WarningInFunction
<< "Turbulence kinetic energy not defined for "
<< "Spalart-Allmaras model. Returning zero field"
<< endl;
return tmp<volScalarField>
(
new volScalarField
@ -311,7 +316,8 @@ tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::k() const
this->mesh_
),
this->mesh_,
dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0),
zeroGradientFvPatchField<vector>::typeName
)
);
}
@ -336,7 +342,8 @@ tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::epsilon() const
this->mesh_
),
this->mesh_,
dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0),
zeroGradientFvPatchField<vector>::typeName
)
);
}