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 /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2014-01-27 16:50:46 +00:00
parent c380695ead b0cb741881
commit cecf49d576
11 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H
View File

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
View File

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

6
applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
View File

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

4
src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
View File

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

12
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License 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 // Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs // for the construction of the derived models and BCs

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/U
View File

@ -49,7 +49,7 @@ boundaryField
value uniform (0 0 0); value uniform (0 0 0);
} }
hull_wall hull
{ {
type fixedValue; type fixedValue;
value uniform (0 0 0); value uniform (0 0 0);

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
View File

@ -44,7 +44,7 @@ boundaryField
value $internalField; value $internalField;
} }
hull_wall hull
{ {
type zeroGradient; type zeroGradient;
} }

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/k
View File

@ -44,7 +44,7 @@ boundaryField
value $internalField; value $internalField;
} }
hull_wall hull
{ {
type kqRWallFunction; type kqRWallFunction;
value $internalField; value $internalField;

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut
View File

@ -42,7 +42,7 @@ boundaryField
type zeroGradient; type zeroGradient;
} }
hull_wall hull
{ {
type nutkWallFunction; type nutkWallFunction;
value $internalField; value $internalField;

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega
View File

@ -50,7 +50,7 @@ boundaryField
value $internalField; value $internalField;
} }
hull_wall hull
{ {
type omegaWallFunction; type omegaWallFunction;
value $internalField; value $internalField;

2
tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
View File

@ -48,7 +48,7 @@ boundaryField
value $internalField; value $internalField;
} }
hull_wall hull
{ {
type fixedFluxPressure; type fixedFluxPressure;
value $internalField; value $internalField;