From a5b039b4ca91c99ae9a87c4902b8dd2c61626439 Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Fri, 13 Feb 2009 17:28:21 +0000 Subject: [PATCH] updates --- .../les/throttle/constant/LESProperties | 6 ++- .../les/throttle/system/fvSolution | 14 ++++++ .../les/throttle3D/constant/LESProperties | 6 ++- .../throttle3D/constant/turbulenceProperties | 21 ++++++++ .../les/throttle3D/system/fvSolution | 14 ++++++ .../cavitatingFoam/ras/throttle/0/k | 16 +++--- .../cavitatingFoam/ras/throttle/0/nut | 46 ++++++++++++++++++ .../cavitatingFoam/ras/throttle/0/omega | 16 +++--- .../ras/throttle/system/fvSolution | 14 ++++++ .../0-orig/{gamma => alpah1.org} | 0 .../0-orig/{gamma.org => alpha1} | 0 .../interDyMFoam/damBreakWithObstacle/0/U | 7 +-- .../damBreakWithObstacle/0/{gamma => alpha1} | 6 ++- .../0/{gamma.org => alpha1.org} | 0 .../constant/dynamicMeshDict | 10 +++- .../constant/turbulenceProperties | 21 ++++++++ .../damBreakWithObstacle/system/fvSchemes | 6 +-- .../damBreakWithObstacle/system/fvSolution | 6 +-- .../damBreakWithObstacle/system/setFieldsDict | 18 ++++++- .../multiphaseInterFoam/damBreak4phase/0/U | 0 .../damBreak4phase/0/alphaair | 0 .../damBreak4phase/0/alphamercury | 0 .../damBreak4phase/0/alphaoil | 0 .../damBreak4phase/0/alphas | 0 .../damBreak4phase/0/alphawater | 0 .../multiphaseInterFoam/damBreak4phase/0/pd | 0 .../constant/environmentalProperties.gz | Bin .../constant/motionProperties.gz | Bin .../constant/polyMesh/blockMeshDict | 0 .../damBreak4phase/constant/polyMesh/boundary | 0 .../constant/transportProperties | 0 .../damBreak4phase/system/controlDict | 0 .../damBreak4phase/system/decomposeParDict | 0 .../damBreak4phase/system/fvSchemes | 0 .../damBreak4phase/system/fvSolution | 0 .../damBreak4phase/system/setFieldsDict | 0 .../damBreak4phaseFine/0/U | 0 .../damBreak4phaseFine/0/alphaair | 0 .../damBreak4phaseFine/0/alphamercury | 0 .../damBreak4phaseFine/0/alphaoil | 0 .../damBreak4phaseFine/0/alphas | 0 .../damBreak4phaseFine/0/alphawater | 0 .../damBreak4phaseFine/0/pd | 0 .../constant/environmentalProperties.gz | Bin .../constant/motionProperties.gz | Bin .../constant/polyMesh/blockMeshDict | 0 .../constant/polyMesh/boundary | 0 .../constant/transportProperties | 0 .../damBreak4phaseFine/system/controlDict | 0 .../system/decomposeParDict | 0 .../damBreak4phaseFine/system/fvSchemes | 0 .../damBreak4phaseFine/system/fvSolution | 0 .../damBreak4phaseFine/system/fvSolution.par | 0 .../damBreak4phaseFine/system/setFieldsDict | 0 54 files changed, 192 insertions(+), 35 deletions(-) create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut rename tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/{gamma => alpah1.org} (100%) rename tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/{gamma.org => alpha1} (100%) rename tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/{gamma => alpha1} (99%) rename tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/{gamma.org => alpha1.org} (100%) create mode 100644 tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/U (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/alphaair (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/alphamercury (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/alphaoil (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/alphas (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/alphawater (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/0/pd (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/constant/transportProperties (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/system/controlDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/system/decomposeParDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/system/fvSchemes (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/system/fvSolution (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phase/system/setFieldsDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/U (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/alphaair (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/alphas (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/alphawater (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/0/pd (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/controlDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par (100%) rename tutorials/{ => multiphase}/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict (100%) diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index ef3e3809daa..b16fea4ab2f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -15,7 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel devOneEqEddy; +LESModel oneEqEddy; + +turbulence on; delta smooth; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution index 7aa0a3d54c1..b0f2c1c7719 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution @@ -50,6 +50,20 @@ solvers } p + { + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + } + + pFinal { solver GAMG; tolerance 1e-08; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index ef3e3809daa..b16fea4ab2f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -15,7 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel devOneEqEddy; +LESModel oneEqEddy; + +turbulence on; delta smooth; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties new file mode 100644 index 00000000000..9ddab1bfcd2 --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution index 7aa0a3d54c1..b0f2c1c7719 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution @@ -50,6 +50,20 @@ solvers } p + { + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + } + + pFinal { solver GAMG; tolerance 1e-08; diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k index 835c3a99928..732cdd4d128 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k +++ b/tutorials/multiphase/cavitatingFoam/ras/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ 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; +internalField uniform 10; boundaryField { @@ -26,21 +27,20 @@ boundaryField intensity 0.05; value uniform 0.05; } - outlet { type zeroGradient; } - walls { - type zeroGradient; + type kQRWallFunction; + value uniform 10; } - frontBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut new file mode 100644 index 00000000000..933ce47778c --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ 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; + value uniform 0; + } + frontBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega index 330a29d8c18..17b398f9c3e 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega +++ b/tutorials/multiphase/cavitatingFoam/ras/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ 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,25 +24,24 @@ boundaryField inlet { type turbulentMixingLengthFrequencyInlet; - mixingLength 0.5e-03; + mixingLength 0.0005; k k; value uniform 77200; } - outlet { type zeroGradient; } - walls { - type zeroGradient; + type omegaWallFunction; + value uniform 77200; } - frontBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution index 4f413e7ef14..f139c3dde47 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution @@ -50,6 +50,20 @@ solvers } p + { + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + } + + pFinal { solver GAMG; tolerance 1e-08; diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpah1.org similarity index 100% rename from tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpah1.org diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1 similarity index 100% rename from tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1 diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U index e791ef363f6..6d3ce2531bf 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U @@ -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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -23,7 +24,6 @@ boundaryField atmosphere { type pressureInletOutletVelocity; - phi phi; value uniform (0 0 0); } walls @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1 similarity index 99% rename from tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1 index 7602a0953b9..678ced5d4e7 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1 @@ -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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object gamma; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32804,4 +32805,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org similarity index 100% rename from tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict index 3ff397dfee0..0560899a729 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict @@ -20,14 +20,20 @@ dynamicFvMesh dynamicRefineFvMesh; dynamicRefineFvMeshCoeffs { refineInterval 1; - field gamma; + field alpha1; lowerRefineLevel 0.001; upperRefineLevel 0.999; unrefineLevel 10; nBufferLayers 1; maxRefinement 2; maxCells 200000; - correctFluxes ( ( phi U ) ); + correctFluxes + ( + ( + phi + U + ) + ); dumpLevel true; } diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties new file mode 100644 index 00000000000..886d34bdef1 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes index f08b9b1ac23..ffc5cd12c4f 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes @@ -30,8 +30,8 @@ gradSchemes divSchemes { div(rho*phi,U) Gauss upwind; - div(phi,gamma) Gauss vanLeer; - div(phirb,gamma) Gauss interfaceCompression; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss interfaceCompression; } laplacianSchemes @@ -54,7 +54,7 @@ fluxRequired default no; pd ; pcorr ; - gamma ; + alpha ; } diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution index e33d8a03f00..36d56bb9471 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution @@ -118,9 +118,9 @@ PISO momentumPredictor no; nCorrectors 3; nNonOrthogonalCorrectors 0; - nGammaCorr 1; - nGammaSubCycles 3; - cGamma 1; + nAlphaCorr 1; + nAlphaSubCycles 3; + cAlpha 1; pdRefCell 0; pdRefValue 0; pRefProbe diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict index 892a12e4429..21ee9f3f580 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict @@ -15,9 +15,23 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volScalarFieldValue gamma 0 volVectorFieldValue U ( 0 0 0 ) ); +defaultFieldValues +( + volScalarFieldValue alpha1 0 + volVectorFieldValue U ( 0 0 0 ) +); -regions ( boxToCell { box ( 0 0 0 ) ( 0.6 0.1875 0.75 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); +regions +( + boxToCell + { + box ( 0 0 0 ) ( 0.6 0.1875 0.75 ); + fieldValues + ( + volScalarFieldValue gamma 1 + ); + } + ); // ************************************************************************* // diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/U b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/U similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/U rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/U diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaair similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphaair rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaair diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphamercury similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphamercury rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphamercury diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaoil similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaoil diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphas rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphawater similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphawater rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphawater diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/0/pd rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/transportProperties rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/system/controlDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/system/decomposeParDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/system/fvSchemes rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/system/fvSolution rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phase/system/setFieldsDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/U b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/U similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/U rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/U diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaair similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaair rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaair diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphas rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphawater similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphawater rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphawater diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/pd rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/controlDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict similarity index 100% rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict -- GitLab