Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
Henry
2014-01-27 16:30:42 +00:00
5 changed files with 21 additions and 7 deletions

View File

@ -2,8 +2,8 @@
volScalarField& he1 = thermo1.he();
volScalarField& he2 = thermo2.he();
volScalarField Cpv1(thermo1.Cpv());
volScalarField Cpv2(thermo2.Cpv());
volScalarField Cpv1("Cpv1", thermo1.Cpv());
volScalarField Cpv2("Cpv2", thermo2.Cpv());
volScalarField heatTransferCoeff(fluid.heatTransferCoeff());

View File

@ -66,6 +66,7 @@
volVectorField DDtU1
(
"DDtU1",
fvc::ddt(U1)
+ fvc::div(phi1, U1)
- fvc::div(phi1)*U1
@ -73,6 +74,7 @@
volVectorField DDtU2
(
"DDtU2",
fvc::ddt(U2)
+ fvc::div(phi2, U2)
- fvc::div(phi2)*U2

View File

@ -1,6 +1,6 @@
{
surfaceScalarField alpha1f(fvc::interpolate(alpha1));
surfaceScalarField alpha2f(scalar(1) - alpha1f);
surfaceScalarField alpha1f("alpha1f", fvc::interpolate(alpha1));
surfaceScalarField alpha2f("alpha2f", scalar(1) - alpha1f);
rAU1 = 1.0/U1Eqn.A();
rAU2 = 1.0/U2Eqn.A();
@ -189,7 +189,7 @@
if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField mSfGradp(pEqnIncomp.flux()/rAUf);
surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
phi1.boundaryField() ==
mrfZones.relative

View File

@ -603,6 +603,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
// Update k, epsilon and G at the wall
kl.boundaryField().updateCoeffs();
epsilonl.boundaryField().updateCoeffs();
Gc().checkOut();
}
tmp<volScalarField> Gd;
@ -621,6 +623,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
// Update k, epsilon and G at the wall
kg.boundaryField().updateCoeffs();
epsilong.boundaryField().updateCoeffs();
Gd().checkOut();
}
// Mixture turbulence generation

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -79,7 +79,15 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
)
),
delta_(LESdelta::New("delta", U.mesh(), LESDict_))
delta_
(
LESdelta::New
(
IOobject::groupName("delta", U.group()),
U.mesh(),
LESDict_
)
)
{
// Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs