Permalink
Browse files

Merge branch 'master' of github.com:OpenCFD/OpenFOAM-1.7.x

  • Loading branch information...
2 parents c7a96e7 + cb70c67 commit 89632999b758e3aec25e0281b2c8ad607ace98c8 mattijs committed Jun 8, 2011
Showing with 789 additions and 74 deletions.
  1. +12 −27 ...multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
  2. +5 −10 .../twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
  3. +5 −10 ...lvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
  4. +4 −10 ...s/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
  5. +4 −10 applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
  6. +1 −1 src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
  7. +2 −6 src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
  8. +43 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/R
  9. +39 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/T
  10. +43 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/U
  11. +43 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/alphat
  12. +43 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/epsilon
  13. +41 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/k
  14. +47 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/mut
  15. +47 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/omega
  16. +39 −0 tutorials/compressible/rhoPimpleFoam/cavity/0/p
  17. +25 −0 tutorials/compressible/rhoPimpleFoam/cavity/constant/RASProperties
  18. +63 −0 tutorials/compressible/rhoPimpleFoam/cavity/constant/polyMesh/blockMeshDict
  19. +40 −0 tutorials/compressible/rhoPimpleFoam/cavity/constant/polyMesh/boundary
  20. +22 −0 tutorials/compressible/rhoPimpleFoam/cavity/constant/thermophysicalProperties
  21. +21 −0 tutorials/compressible/rhoPimpleFoam/cavity/constant/turbulenceProperties
  22. +55 −0 tutorials/compressible/rhoPimpleFoam/cavity/system/controlDict
  23. +77 −0 tutorials/compressible/rhoPimpleFoam/cavity/system/fvSchemes
  24. +68 −0 tutorials/compressible/rhoPimpleFoam/cavity/system/fvSolution
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -73,34 +73,19 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
volScalarField bp = pow(beta, -2.65);
volScalarField Re = max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3));
- volScalarField Cds = 24.0*(1.0 + 0.15*pow(Re, 0.687))/Re;
+ volScalarField Cds =
+ neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
+ + pos(Re - 1000)*0.44;
- forAll(Re, celli)
- {
- if(Re[celli] > 1000.0)
- {
- Cds[celli] = 0.44;
- }
- }
-
// Wen and Yu (1966)
- tmp<volScalarField> tKWenYu = 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d();
- volScalarField& KWenYu = tKWenYu();
-
- // Ergun
- forAll (beta, cellj)
- {
- if (beta[cellj] <= 0.8)
- {
- KWenYu[cellj] =
- 150.0*alpha_[cellj]*phaseb_.nu().value()*phaseb_.rho().value()
- /sqr(beta[cellj]*phasea_.d().value())
- + 1.75*phaseb_.rho().value()*Ur[cellj]
- /(beta[cellj]*phasea_.d().value());
- }
- }
-
- return tKWenYu;
+ return
+ pos(beta - 0.8)
+ *(0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d())
+ + neg(beta - 0.8)
+ *(
+ 150.0*alpha_*phaseb_.nu()*phaseb_.rho()/(sqr(beta*phasea_.d()))
+ + 1.75*phaseb_.rho()*Ur/(beta*phasea_.d())
+ );
}
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,15 +72,10 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
volScalarField bp = pow(beta, -2.65);
volScalarField Re = max(beta*Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3));
- volScalarField Cds = 24.0*(scalar(1) + 0.15*pow(Re, 0.687))/Re;
-
- forAll(Re, celli)
- {
- if(Re[celli] > 1000.0)
- {
- Cds[celli] = 0.44;
- }
- }
+
+ volScalarField Cds =
+ neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
+ + pos(Re - 1000)*0.44;
return 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d();
}
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,15 +69,10 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
) const
{
volScalarField Re = max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3));
- volScalarField Cds = 24.0*(scalar(1) + 0.15*pow(Re, 0.687))/Re;
-
- forAll(Re, celli)
- {
- if(Re[celli] > 1000.0)
- {
- Cds[celli] = 0.44;
- }
- }
+
+ volScalarField Cds =
+ neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
+ + pos(Re - 1000)*0.44;
return 0.75*Cds*phaseb_.rho()*Ur/phasea_.d();
}
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -70,15 +70,9 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
{
volScalarField beta = max(scalar(1) - alpha_, scalar(1.0e-6));
volScalarField A = pow(beta, 4.14);
- volScalarField B = 0.8*pow(beta, 1.28);
-
- forAll (beta, celli)
- {
- if (beta[celli] > 0.85)
- {
- B[celli] = pow(beta[celli], 2.65);
- }
- }
+ volScalarField B =
+ neg(beta - 0.85)*(0.8*pow(beta, 1.28))
+ + pos(beta - 0.85)*(pow(beta, 2.65));
volScalarField Re = max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3));
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,15 +72,9 @@ Foam::tmp<Foam::volScalarField> Foam::WenYu::K
volScalarField bp = pow(beta, -2.65);
volScalarField Re = max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3));
- volScalarField Cds = 24.0*(scalar(1) + 0.15*pow(Re, 0.687))/Re;
-
- forAll(Re, celli)
- {
- if(Re[celli] > 1000.0)
- {
- Cds[celli] = 0.44;
- }
- }
+ volScalarField Cds =
+ neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
+ + pos(Re - 1000)*0.44;
return 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d();
}
@@ -397,7 +397,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU)
*max
(
dimensionedScalar("zero",dimensionSet(0, 0 , -2, 0, 0),0. ),
- zetaTilda2_*kappa_*S2*(L/Lvk2(S2))
+ zetaTilda2_*kappa_*S2*sqr(L/Lvk2(S2))
- 2.0/alphaPhi_*k_*grad_omega_k
)
);
@@ -27,17 +27,13 @@ Class
Description
kOmegaSSTSAS LES turbulence model for incompressible flows
- References:
-
- A Scale-Adaptive Simulation Model using Two-Equation Models
- AIAA 2005-1095
- F. R. Menter and Y. Egorov
+ Reference:
DESider A European Effort on Hybrid RANS-LES Modelling:
Results of the European-Union Funded Project, 2004 - 2007
(Notes on Numerical Fluid Mechanics and Multidisciplinary Design).
Chapter 8 Formulation of the Scale-Adaptive Simulation (SAS) Model during
- the DESIDER Project.
+ the DESIDER Project. Published in Springer-Verlag Berlin Heidelberg 2009.
F. R. Menter and Y. Egorov.
SourceFiles
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.7.x |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volSymmTensorField;
+ location "0";
+ object R;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [ 0 2 -2 0 0 0 0 ];
+
+internalField uniform ( 0 0 0 0 0 0 );
+
+boundaryField
+{
+ movingWall
+ {
+ type kqRWallFunction;
+ value uniform ( 0 0 0 0 0 0 );
+ }
+
+ fixedWalls
+ {
+ type kqRWallFunction;
+ value uniform ( 0 0 0 0 0 0 );
+ }
+
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.7.x |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 1 0 0 0];
+
+internalField uniform 300;
+
+boundaryField
+{
+ movingWall
+ {
+ type zeroGradient;
+ }
+
+ fixedWalls
+ {
+ type zeroGradient;
+ }
+
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+// ************************************************************************* //
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.7.x |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ movingWall
+ {
+ type fixedValue;
+ // Field Value
+ value uniform (1 0 0);
+ }
+
+ fixedWalls
+ {
+ type fixedValue;
+ // Field Value
+ value uniform (0 0 0);
+ }
+
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+// ************************************************************************* //
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.7.x |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ movingWall
+ {
+ type alphatWallFunction;
+ Prt 0.85;
+ value uniform 0;
+ }
+ fixedWalls
+ {
+ type alphatWallFunction;
+ Prt 0.85;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
Oops, something went wrong.

0 comments on commit 8963299

Please sign in to comment.