From 0d5dc4d1efce0e7fd2a127b89c14a08308138881 Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Sun, 17 Oct 2010 11:16:23 +0200 Subject: [PATCH 1/4] Added "-P" to the linuxGcc wmake general rules file in order to compile on GCC-4.4.4 --- wmake/rules/linuxGcc/general | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index f245d7475..6616d2a10 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,4 +1,4 @@ -CPP = cpp $(GFLAGS) +CPP = cpp $(GFLAGS) -P LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -ldl From bdab371f9a86e15a7002af37afcfb9676099cdd4 Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Sun, 17 Oct 2010 12:44:22 +0200 Subject: [PATCH 2/4] Fix tutorials: pimpleFoam tutorial t-junction now goes through. --- tutorials/incompressible/pimpleFoam/t-junction/0/U | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U index 937d3966b..cbf1580ed 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/0/U +++ b/tutorials/incompressible/pimpleFoam/t-junction/0/U @@ -22,7 +22,7 @@ boundaryField { inlet { - type pressureInletOutletVelocity; + type pressureInletVelocity; value uniform (0 0 0); } From bc6ff7b9e3552b56ef636e23378d26d0655fa891 Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Sun, 17 Oct 2010 13:58:33 +0200 Subject: [PATCH 3/4] Fix tutorials: cavitatingFoam tutorial throttle now works fine. * allRun modified to use cavitatingFoam instead of rasCavitatingFoam * turbulenceProperties file added, with simulationType entry * pFinal entry appended to fvSolution * fvSolution modified to new solver specification format * Modified k and omega fields to use the new wall functions * nut field added --- .../multiphase/cavitatingFoam/throttle/0/k | 12 +++-- .../multiphase/cavitatingFoam/throttle/0/nut | 51 +++++++++++++++++++ .../cavitatingFoam/throttle/0/omega | 18 ++++--- .../multiphase/cavitatingFoam/throttle/Allrun | 2 +- .../throttle/constant/turbulenceProperties | 19 +++++++ .../cavitatingFoam/throttle/system/fvSolution | 32 ++++++++++-- 6 files changed, 117 insertions(+), 17 deletions(-) create mode 100644 tutorials/multiphase/cavitatingFoam/throttle/0/nut create mode 100644 tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/k b/tutorials/multiphase/cavitatingFoam/throttle/0/k index 835c3a999..dfc98ecbf 100644 --- a/tutorials/multiphase/cavitatingFoam/throttle/0/k +++ b/tutorials/multiphase/cavitatingFoam/throttle/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0]; +dimensions [0 2 -2 0 0 0 0]; internalField uniform 10.0; @@ -34,7 +35,8 @@ boundaryField walls { - type zeroGradient; + type kqRWallFunction; + value uniform 10.0; } frontBack diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/throttle/0/nut new file mode 100644 index 000000000..05530161f --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/throttle/0/nut @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object nut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + + outlet + { + type calculated; + value uniform 0; + } + + walls + { + type nutWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0; + } + + frontBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/throttle/0/omega index 330a29d8c..1890f4070 100644 --- a/tutorials/multiphase/cavitatingFoam/throttle/0/omega +++ b/tutorials/multiphase/cavitatingFoam/throttle/0/omega @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 -1 0 0]; +dimensions [0 0 -1 0 0 0 0]; internalField uniform 77200; @@ -23,7 +24,7 @@ boundaryField inlet { type turbulentMixingLengthFrequencyInlet; - mixingLength 0.5e-03; + mixingLength 0.0005; k k; value uniform 77200; } @@ -35,7 +36,12 @@ boundaryField walls { - type zeroGradient; + type omegaWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + beta1 0.075; + value uniform 77200; } frontBack diff --git a/tutorials/multiphase/cavitatingFoam/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/throttle/Allrun index 972d1f37c..288660de7 100755 --- a/tutorials/multiphase/cavitatingFoam/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/throttle/Allrun @@ -3,7 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="rasCavitatingFoam" +application="cavitatingFoam" refineMeshByCellSet() { diff --git a/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties new file mode 100644 index 000000000..0474fdb0e --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties @@ -0,0 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + +// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution index f6bad1ada..c1239ed97 100644 --- a/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution @@ -16,36 +16,58 @@ FoamFile solvers { - omega PBiCG + omega { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - k PBiCG + k { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - rho PBiCG + rho { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - p GAMG + p { + solver GAMG; + tolerance 1e-8; + relTol 0; + + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + + cacheAgglomeration true; + + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + + pFinal + { + solver GAMG; tolerance 1e-8; relTol 0; From 8bf86955bebd582ea4448686524dba31cb502935 Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Sun, 17 Oct 2010 15:51:25 +0200 Subject: [PATCH 4/4] Fix tutorials: compressibleInterFoam tutorials depthCharge2D and depthCharge3D should work now. * Note: depthCharge3D has a mesh size of over 1 Million cells, and it was not possible to run it on my system --> SOMEONE PLEASE CHECK IT --- .../depthCharge2D/0/{pd.org => p.org} | 2 +- .../depthCharge2D/Allclean | 5 +++ .../depthCharge2D/Allrun | 4 +-- .../depthCharge2D/constant/g | 22 +++++++++++++ .../depthCharge2D/constant/polyMesh/boundary | 7 +++-- .../constant/turbulenceProperties | 21 +++++++++++++ .../depthCharge2D/system/fvSchemes | 4 +-- .../depthCharge2D/system/fvSolution | 31 ++++++++++++------- .../depthCharge2D/system/setFieldsDict | 4 +-- .../depthCharge3D/0/{pd.org => p.org} | 2 +- .../depthCharge3D/Allclean | 2 +- .../depthCharge3D/Allrun | 5 +-- .../depthCharge3D/constant/g | 22 +++++++++++++ .../depthCharge3D/constant/polyMesh/boundary | 7 +++-- .../constant/turbulenceProperties | 21 +++++++++++++ .../depthCharge3D/system/fvSchemes | 4 +-- .../depthCharge3D/system/fvSolution | 31 ++++++++++++------- .../depthCharge3D/system/setFieldsDict | 4 +-- 18 files changed, 155 insertions(+), 43 deletions(-) rename tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/{pd.org => p.org} (98%) create mode 100755 tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean create mode 100644 tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g create mode 100644 tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties rename tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/{pd.org => p.org} (97%) create mode 100644 tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g create mode 100644 tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/p.org similarity index 98% rename from tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/p.org index dd6d6631c..99f61c9cb 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean new file mode 100755 index 000000000..99cd62d92 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean @@ -0,0 +1,5 @@ +#!/bin/sh + +foamCleanTutorials cases +rm -rf processor* +rm -rf 0/p.gz 0/alpha1.gz diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun index 35a6c6623..f2a0345d6 100755 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun @@ -3,10 +3,10 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Get application name from directory -application="compressibleLesInterFoam" +application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g new file mode 100644 index 000000000..27d4d3248 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 -9.81 0 ); + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary index e1e2119e3..4078ddf01 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties new file mode 100644 index 000000000..f2fbf353e --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes index ee05b3ed1..ee6e467d2 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1.0; - div(phi,pd) Gauss upwind; //vanLeer; //linear; + div(phi,p) Gauss upwind; //vanLeer; //linear; div(phi,k) Gauss vanLeer; @@ -56,7 +56,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; pcorr; gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution index f751b5148..54fcff163 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution @@ -16,8 +16,9 @@ FoamFile solvers { - pcorr PCG + pcorr { + solver PCG; preconditioner { type GAMG; @@ -40,11 +41,14 @@ solvers maxIter 100; }; - rho diagonal - {}; - - pd GAMG + rho { + solver diagonal; + }; + + p + { + solver GAMG; tolerance 1e-7; relTol 0.01; @@ -59,8 +63,9 @@ solvers mergeLevels 1; }; - pdFinal PCG + pFinal { + solver PCG; preconditioner { type GAMG; @@ -85,28 +90,32 @@ solvers maxIter 20; }; - U smoothSolver + U { + solver smoothSolver; smoother GaussSeidel; tolerance 1e-6; relTol 0; nSweeps 1; }; - k PBiCG + k { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - B PBiCG + B { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - nuTilda PBiCG + nuTilda { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; @@ -122,7 +131,7 @@ PISO nNonOrthogonalCorrectors 0; nAlphaCorr 1; nAlphaSubCycles 1; - cGamma 1; + cAlpha 4; } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict index 510871c44..3083f2aae 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict @@ -17,7 +17,7 @@ FoamFile defaultFieldValues ( volScalarFieldValue alpha1 1 - volScalarFieldValue pd 1e5 + volScalarFieldValue p 1e5 ); regions @@ -30,7 +30,7 @@ regions fieldValues ( volScalarFieldValue alpha1 0 - volScalarFieldValue pd 10e5 + volScalarFieldValue p 10e5 ); } diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/p.org similarity index 97% rename from tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/p.org index 57bee3434..480d39551 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd.org; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean index c422ce058..99cd62d92 100755 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean @@ -2,4 +2,4 @@ foamCleanTutorials cases rm -rf processor* -rm -rf 0/pd.gz 0/alpha1.gz +rm -rf 0/p.gz 0/alpha1.gz diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun index fbaf073e3..c29b2f19c 100755 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun @@ -3,12 +3,13 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Get application name from directory -application="compressibleLesInterFoam" +application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields +# runApplication $application runApplication decomposePar hostname > system/machines runParallel $application 4 system/machines diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g new file mode 100644 index 000000000..27d4d3248 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 -9.81 0 ); + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary index 178b2ace0..560fc3e74 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties new file mode 100644 index 000000000..f2fbf353e --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes index ee05b3ed1..ee6e467d2 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1.0; - div(phi,pd) Gauss upwind; //vanLeer; //linear; + div(phi,p) Gauss upwind; //vanLeer; //linear; div(phi,k) Gauss vanLeer; @@ -56,7 +56,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; pcorr; gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution index f751b5148..81fbc2bc2 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution @@ -16,8 +16,9 @@ FoamFile solvers { - pcorr PCG + pcorr { + solver PCG; preconditioner { type GAMG; @@ -40,11 +41,14 @@ solvers maxIter 100; }; - rho diagonal - {}; - - pd GAMG + rho { + solver diagonal; + }; + + p + { + solver GAMG; tolerance 1e-7; relTol 0.01; @@ -59,8 +63,9 @@ solvers mergeLevels 1; }; - pdFinal PCG + pFinal { + solver PCG; preconditioner { type GAMG; @@ -85,28 +90,32 @@ solvers maxIter 20; }; - U smoothSolver + U { + solver smoothSolver; smoother GaussSeidel; tolerance 1e-6; relTol 0; nSweeps 1; }; - k PBiCG + k { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - B PBiCG + B { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - nuTilda PBiCG + nuTilda { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; @@ -122,7 +131,7 @@ PISO nNonOrthogonalCorrectors 0; nAlphaCorr 1; nAlphaSubCycles 1; - cGamma 1; + cAlpha 4; } // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict index d0e435037..08419e35c 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict @@ -17,7 +17,7 @@ FoamFile defaultFieldValues ( volScalarFieldValue alpha1 1 - volScalarFieldValue pd 1e5 + volScalarFieldValue p 1e5 ); regions @@ -30,7 +30,7 @@ regions fieldValues ( volScalarFieldValue alpha1 0 - volScalarFieldValue pd 10e5 + volScalarFieldValue p 10e5 ); }