From 13122138e5cc00aabca180438fc291748136e72b Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 10:15:34 +0000 Subject: [PATCH 01/11] ENH: damBreak4Phase: cache agglomeration --- .../laminar/damBreak4phase/system/fvSolution | 4 ++-- .../laminar/damBreak4phaseFine/system/fvSolution | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index d0c3c2764f..9aa85279d9 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -35,10 +35,10 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; - mergeLevels 2; + mergeLevels 1; } tolerance 1e-05; relTol 0; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index c2eac8b775..d3fa6dfe61 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -35,10 +35,10 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; - mergeLevels 2; + mergeLevels 1; } tolerance 1e-05; relTol 0; From b95c4f9ee747423dc11d04a438cdeac8b746d852 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 24 Jan 2014 12:38:08 +0000 Subject: [PATCH 02/11] ENH: lagrangian tutorial updates --- .../counterFlowFlame2D/system/fvSolution | 2 +- .../MPPICFoam/column/system/fvSolution | 2 +- .../cylinder/system/fvSolution | 19 ++++++++--- .../constant/reactingCloud1Properties | 6 ++-- .../hotBoxes/system/fvSolution | 6 ++-- .../splashPanel/system/fvSolution | 33 +++++++++++------- .../system/wallFilmRegion/fvSolution | 10 +++--- .../filter/system/fvSolution | 20 +++++++++-- .../parcelInBox/system/fvSolution | 18 ++++++++-- .../verticalChannel/system/fvSolution | 32 ++++++++++------- .../sprayFoam/aachenBomb/system/fvSolution | 34 +++++++++++-------- 11 files changed, 120 insertions(+), 62 deletions(-) diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index 205e4f6276..615fe1fe28 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -25,7 +25,7 @@ solvers p { solver GAMG; - tolerance 0; + tolerance 1e-6; relTol 0.1; smoother GaussSeidel; nPreSweeps 0; diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution index 3603be1ce2..3d4ac58294 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -20,7 +20,7 @@ solvers p { solver GAMG; - tolerance 0; + tolerance 1e-6; relTol 0.01; smoother GaussSeidel; nPreSweeps 0; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution index b2d6387581..0891259e10 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution @@ -32,15 +32,16 @@ solvers relTol 0; } - "(U|h)" + U { solver smoothSolver; smoother symGaussSeidel; tolerance 0; relTol 0.1; + maxIter 50; } - "(U|h)Final" + UFinal { $U; relTol 0; @@ -73,9 +74,19 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(h|Yi|O2|N2|H2O)" { - $hFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + hFinal + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index c9d32f4468..e2ea29a4f8 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -83,12 +83,12 @@ subModels ((0.6 0.35 1.45) (0 0 -1)) ); - massTotal 10; + massTotal 5; parcelsPerInjector 20000; parcelsPerSecond 500; parcelBasisType mass; - flowRateProfile constant 0.1; - Umag constant 3.0; + flowRateProfile constant 1; + Umag constant 1; thetaInner constant 0; thetaOuter constant 45; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution index 331f1752d7..94c21573c2 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution @@ -34,9 +34,9 @@ solvers "(U|h|k|epsilon)" { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 0; + solver PBiCG; + preconditioner DILU; + tolerance 1e-5; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution index be992a7810..1933c385ed 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution @@ -32,31 +32,27 @@ solvers relTol 0; } - "(U|h)" + U { solver smoothSolver; smoother symGaussSeidel; tolerance 0; relTol 0.1; + maxIter 50; } - "(U|h)Final" + UFinal { $U; relTol 0; tolerance 1e-05; } - "(k|epsilon)" - { - $UFinal; - } - p_rgh { solver GAMG; tolerance 0; - relTol 0.1; + relTol 0.01; smoother GaussSeidel; nPreSweeps 0; nPostSweeps 2; @@ -64,18 +60,29 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; + maxIter 50; } p_rghFinal { $p_rgh; - tolerance 1e-06; + tolerance 1e-05; relTol 0; } - "(Yi|O2|N2|H2O)" + "(h|Yi|O2|N2|H2O)" { - $hFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + hFinal + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; } } @@ -90,11 +97,11 @@ relaxationFactors { fields { - ".*Final" 1; + ".*" 1; } equations { - ".*Final" 1; + ".*" 1; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution index e52ac35a05..91c65c4206 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver smoothSolver; - smoother symGaussSeidel; + solver PBiCG; + preconditioner DILU; tolerance 1e-10; relTol 0; } deltaf { - solver smoothSolver; - smoother symGaussSeidel; + solver PBiCG; + preconditioner DILU; tolerance 1e-10; relTol 0; } @@ -46,9 +46,11 @@ relaxationFactors { fields { + ".*" 1; } equations { + ".*" 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index 85d0e7b998..1ec56c204c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -32,7 +32,7 @@ solvers relTol 0; } - "(U|h|k|epsilon)" + "(U|k|epsilon)" { solver smoothSolver; smoother symGaussSeidel; @@ -40,7 +40,7 @@ solvers relTol 0.1; } - "(U|h|k|epsilon)Final" + "(U|k|epsilon)Final" { $U; tolerance 1e-06; @@ -70,7 +70,21 @@ solvers "(Yi|O2|N2|H2O)" { - $hFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + + h + { + $Yi; + relTol 0.1; + } + + hFinal + { + $Yi; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index a42e10c1b5..806319cad3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -32,7 +32,7 @@ solvers relTol 0; } - "(U|h|k|epsilon)" + "(U|k|epsilon)" { solver smoothSolver; smoother symGaussSeidel; @@ -40,7 +40,7 @@ solvers relTol 0.1; } - "(U|h|k|epsilon)Final" + "(U|k|epsilon)Final" { $U; tolerance 1e-05; @@ -71,7 +71,19 @@ solvers "(Yi|O2|N2|H2O)" { - $hFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + h + { + $Yi; + relTol 0.1; + } + hFinal + { + $Yi; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index d77e5f75e9..f75a11b10c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -32,7 +32,7 @@ solvers relTol 0; } - "(U|h|k|omega)" + "(U|k|omega)" { solver smoothSolver; smoother symGaussSeidel; @@ -40,7 +40,7 @@ solvers relTol 0.1; } - "(U|h|k|omega)Final" + "(U|k|omega)Final" { $U; tolerance 1e-06; @@ -59,7 +59,6 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - maxIter 50; } pFinal @@ -71,23 +70,31 @@ solvers "(Yi|O2|N2|H2O)" { - $hFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + h + { + $Yi; + relTol 0.1; + } + hFinal + { + $Yi; } } PIMPLE { - nCorrectors 3; + transonic no; + nOuterCorrectors 1; + nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; } -potentialFlow -{ - // used for potentialFoam initialisation - nNonOrthogonalCorrectors 5; -} - relaxationFactors { fields @@ -95,8 +102,9 @@ relaxationFactors } equations { - ".*" 1; + ".*Final" 1; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index b9bb909f5b..51cbc83c22 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -32,11 +32,11 @@ solvers relTol 0; } - "(U|h)" + "(U|k|epsilon)" { solver smoothSolver; smoother symGaussSeidel; - tolerance 1e-05; + tolerance 1e-06; relTol 0.1; } @@ -61,26 +61,30 @@ solvers relTol 0; } - "(U|h)Final" + "(U|k|epsilon)Final" { $U; - tolerance 1e-05; + tolerance 1e-06; relTol 0; } - "(k|epsilon)" - { - $U; - } - - "(k|epsilon)Final" - { - $UFinal; - } - "(Yi|O2|N2|H2O)" { - $UFinal; + solver PBiCG; + preconditioner DILU; + tolerance 1e-6; + relTol 0; + } + + h + { + $Yi; + relTol 0.1; + } + + hFinal + { + $Yi; } } From 67508b66810978e2bdc3bff71670a03712fabad9 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 12:41:46 +0000 Subject: [PATCH 03/11] ENH: flange: remove foamToFieldView9 --- tutorials/basic/laplacianFoam/flange/Allrun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun index a14f03b415..6e7fdd4f22 100755 --- a/tutorials/basic/laplacianFoam/flange/Allrun +++ b/tutorials/basic/laplacianFoam/flange/Allrun @@ -20,8 +20,8 @@ runAnsysToFoam() runAnsysToFoam flange.ans 0.001 runApplication $application -runApplication foamToFieldview9 runApplication foamToEnsight +runApplication foamToEnsightParts runApplication foamToVTK # ----------------------------------------------------------------- end-of-file From fbf7d51442726954608142f56327b54dc8654d14 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 12:57:01 +0000 Subject: [PATCH 04/11] ENH: pitzDaily: generated file --- .../pitzDaily/constant/polyMesh/boundary | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary deleted file mode 100644 index 313dcceba1..0000000000 --- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- 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 polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -5 -( - inlet - { - type patch; - nFaces 30; - startFace 24170; - } - outlet - { - type patch; - nFaces 57; - startFace 24200; - } - upperWall - { - type wall; - nFaces 223; - startFace 24257; - } - lowerWall - { - type wall; - nFaces 250; - startFace 24480; - } - frontAndBack - { - type empty; - nFaces 24450; - startFace 24730; - } -) - -// ************************************************************************* // From 072ee4ff2f4b0201d6c4c08c3737fda1393996cf Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 13:08:24 +0000 Subject: [PATCH 05/11] ENH: scalarTransportFoam: switch to linearUpwind --- tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes index 651009172b..7070ad800d 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { default none; - div(phi,T) Gauss limitedLinear 1; + div(phi,T) Gauss linearUpwind grad(T); } laplacianSchemes From 727650e61399b78ba725b9afb9b9c5793f969f4d Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 14:39:21 +0000 Subject: [PATCH 06/11] ENH: propeller: updated setup --- .../interPhaseChangeDyMFoam/propeller/0.org/U | 5 +- .../propeller/0.org/alpha.water | 12 +- .../propeller/0.org/epsilon | 11 +- .../interPhaseChangeDyMFoam/propeller/0.org/k | 11 +- .../propeller/0.org/nut | 11 +- .../propeller/0.org/p_rgh | 10 +- .../propeller/Allclean | 2 +- .../propeller/Allrun.pre | 28 ++--- .../system/createAMIFaces.topoSetDict | 110 ------------------ .../propeller/system/createBafflesDict | 58 --------- .../system/createInletOutletSets.topoSetDict | 2 +- .../propeller/system/createPatchDict | 35 +++++- .../system/removeRedundantZones.topoSetDict | 32 ----- .../propeller/system/snappyHexMeshDict | 36 +++--- 14 files changed, 83 insertions(+), 280 deletions(-) delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U index 3999564af9..a16efd4dac 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U @@ -21,6 +21,9 @@ internalField uniform (0 0 0); boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type uniformFixedValue; @@ -40,7 +43,7 @@ boundaryField value uniform (0 0 0); } - outerCylinder + innerCylinder { type fixedValue; value uniform (0 0 0); diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water index 3a2097df24..d7f3775efc 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water @@ -21,6 +21,9 @@ internalField uniform 1; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -33,17 +36,10 @@ boundaryField inletValue $internalField; } - outerCylinder + wall { type zeroGradient; value $internalField; - } - - "propeller.*" - { - type zeroGradient; - value $internalField; - } } // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon index c8a9ab3e88..9053f85218 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon @@ -21,6 +21,9 @@ internalField uniform 0.0495; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -34,13 +37,7 @@ boundaryField value $internalField; } - outerCylinder - { - type epsilonWallFunction; - value $internalField; - } - - "propeller.*" + wall { type epsilonWallFunction; value $internalField; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k index fa184b506d..83b933726f 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k @@ -21,6 +21,9 @@ internalField uniform 0.06; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -34,13 +37,7 @@ boundaryField value $internalField; } - outerCylinder - { - type kqRWallFunction; - value $internalField; - } - - "propeller.*" + wall { type kqRWallFunction; value $internalField; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut index 0c69619423..4918acab13 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut @@ -21,6 +21,9 @@ internalField uniform 0; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type calculated; @@ -33,13 +36,7 @@ boundaryField value uniform 0; } - outerCylinder - { - type nutkWallFunction; - value uniform 0; - } - - "propeller.*" + wall { type nutkWallFunction; value uniform 0; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh index 56c30c92f0..c40de26d4b 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh @@ -21,6 +21,9 @@ internalField uniform 1e5; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedFluxPressure; @@ -32,12 +35,7 @@ boundaryField value $internalField; } - outerCylinder - { - type fixedFluxPressure; - } - - "propeller.*" + wall { type fixedFluxPressure; } diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean index a1dffe125a..d6c94ef470 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # remove surface -\rm -f constant/triSurface/propellerTip.obj.gz +\rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre index 2abd5b41e1..793ccb9c4f 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre @@ -15,6 +15,9 @@ runApplication blockMesh runApplication surfaceFeatureExtract runApplication snappyHexMesh -overwrite + +runApplication renumberMesh -overwrite + # force removal of fields generated by snappy \rm -rf 0 cp -rf 0.org 0 @@ -22,34 +25,21 @@ cp -rf 0.org 0 # - generate face/cell sets and zones -#runApplication setSet -batch removeRedundantZones.setSet -#mv log.setSet log.removeRedundantZones.setSet -runApplication topoSet -dict system/removeRedundantZones.topoSetDict -mv log.topoSet log.removeRedundantZones.topoSet - #runApplication setSet -batch createInletOutletSets.setSet #mv log.setSet log.createInletOutletSets.setSet runApplication topoSet -dict system/createInletOutletSets.topoSetDict -mv log.topoSet log.createInletOutletSets.topoSet - -#runApplication setSet -batch createAMIFaces.setSet -#mv log.setSet log.createAMIFaces.setSet -runApplication topoSet -dict system/createAMIFaces.topoSetDict -mv log.topoSet log.createAMIFaces.topoSet +#mv log.topoSet log.createInletOutletSets.topoSet -# - create the inlet/outlet patches +# - create the inlet/outlet and AMI patches runApplication createPatch -overwrite +# - test by running moveDynamicMes +#runApplication moveDynamicMesh -checkAMI + + # - apply the initial fields cp -rf 0.org 0 - - -# - create the AMI faces by creating baffles, and then splitting the mesh - -runApplication createBaffles -overwrite - -runApplication mergeOrSplitBaffles -split -overwrite diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict deleted file mode 100644 index aafbfb6799..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict +++ /dev/null @@ -1,110 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object topoSetDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name innerCylinderSmall; - type cellSet; - action new; - source cylinderToCell; - sourceInfo - { - p1 (0 -0.08 0); - p2 (0 0.06 0); - radius 0.12; - } - } - { - name outerCells; - type cellSet; - action new; - source cellToCell; - sourceInfo - { - set innerCylinderSmall; - } - } - { - name outerCells; - type cellSet; - action invert; - } - - { - name innerCylinderSmall; - type cellZoneSet; - action new; - source setToCellZone; - sourceInfo - { - set innerCylinderSmall; - } - } - - - - { - name innerCylinderSmallFace; - type faceSet; - action new; - source cellToFace; - sourceInfo - { - set innerCylinderSmall; - option all; - } - } - { - name innerCylinderSmallFace; - type faceSet; - action subset; - source cellToFace; - sourceInfo - { - set outerCells; - option all; - } - } - { - name innerCylinderSmall; - type faceZoneSet; - action new; - source setsToFaceZone; - sourceInfo - { - faceSet innerCylinderSmallFace; - cellSet innerCylinderSmall; - } - } - - - // Dummy faceSet for creating initial patches - { - name dummyFaces; - type faceSet; - action new; - source labelToFace; - sourceInfo - { - value (); - } - } - -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict deleted file mode 100644 index f3a7eadc97..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object createBafflesDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// Whether to convert internal faces only (so leave boundary faces intact). -// This is only relevant if your face selection type can pick up boundary -// faces. -internalFacesOnly true; - - -// Baffles to create. -baffles -{ - baffleFaces - { - //- Use predefined faceZone to select faces and orientation. - type faceZone; - zoneName innerCylinderSmall; - - - patches - { - master - { - //- Master side patch - name AMI1; - type cyclicAMI; - matchTolerance 0.0001; - neighbourPatch AMI2; - transform noOrdering; - } - slave - { - //- Slave side patch - name AMI2; - type cyclicAMI; - matchTolerance 0.0001; - neighbourPatch AMI1; - transform noOrdering; - } - } - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict index ad10b2e643..4291261dbc 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict @@ -24,7 +24,7 @@ actions source patchToFace; sourceInfo { - name outerCylinder; + name innerCylinder; } } diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict index 1559be08dd..d83f0bc7c3 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict @@ -23,27 +23,50 @@ pointSync false; patches ( { - name inlet; + //- Master side patch + name AMI1; + patchInfo + { + type cyclicAMI; + matchTolerance 0.0001; + neighbourPatch AMI2; + transform noOrdering; + } + constructFrom patches; + patches (innerCylinderSmall); + } + { + //- Slave side patch + name AMI2; + patchInfo + { + type cyclicAMI; + matchTolerance 0.0001; + neighbourPatch AMI1; + transform noOrdering; + } + constructFrom patches; + patches (innerCylinderSmall_slave); + } + + + { + name inlet; patchInfo { type patch; } - constructFrom set; - set inletFaces; } { name outlet; - patchInfo { type patch; } - constructFrom set; - set outletFaces; } ); diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict deleted file mode 100644 index 5def0de369..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object topoSetDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name innerCylinder; - type cellZoneSet; - action remove; - } - { - name innerCylinderSmall; - type cellZoneSet; - action remove; - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict index d060b73f93..a426274ed5 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict @@ -204,13 +204,12 @@ castellatedMeshControls innerCylinder { level (2 3); - cellZone innerCylinder; - faceZone innerCylinder; - cellZoneInside inside; } innerCylinderSmall { level (4 4); + + faceType boundary; cellZone innerCylinderSmall; faceZone innerCylinderSmall; cellZoneInside inside; @@ -288,7 +287,7 @@ castellatedMeshControls // Whether any faceZones (as specified in the refinementSurfaces) // are only on the boundary of corresponding cellZones or also allow // free-standing zone faces. Not used if there are no faceZones. - allowFreeStandingZoneFaces true; + allowFreeStandingZoneFaces false; } @@ -312,10 +311,22 @@ snapControls // before upon reaching a correct mesh. nRelaxIter 5; - //- Highly experimental and wip: number of feature edge snapping - // iterations. Leave out altogether to disable. - // Do not use here since mesh resolution too low and baffles present - nFeatureSnapIter 20; + // Feature snapping + + // Number of feature edge snapping iterations. + // Leave out altogether to disable. + nFeatureSnapIter 10; + + // Detect (geometric only) features by sampling the surface + // (default=false). + implicitFeatureSnap true; + + // Use castellatedMeshControls::features (default = true) + explicitFeatureSnap false; + + // Detect features between multiple surfaces + // (only for explicitFeatureSnap, default = false) + multiRegionFeatureSnap true; } @@ -466,15 +477,6 @@ meshQualityControls } -// Advanced - -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. From 0cb2eaa6cba20e631cdd40bdaec54752ae8feac7 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 14:39:21 +0000 Subject: [PATCH 07/11] ENH: propeller: updated setup --- .../interPhaseChangeDyMFoam/propeller/0.org/U | 3 + .../propeller/0.org/alpha.water | 12 +- .../propeller/0.org/epsilon | 11 +- .../interPhaseChangeDyMFoam/propeller/0.org/k | 11 +- .../propeller/0.org/nut | 11 +- .../propeller/0.org/p_rgh | 10 +- .../propeller/Allclean | 2 +- .../propeller/Allrun.pre | 29 ++--- .../system/createAMIFaces.topoSetDict | 110 ------------------ .../propeller/system/createBafflesDict | 58 --------- .../propeller/system/createPatchDict | 35 +++++- .../system/removeRedundantZones.topoSetDict | 32 ----- .../propeller/system/snappyHexMeshDict | 45 +++---- .../system/surfaceFeatureExtractDict | 8 +- 14 files changed, 85 insertions(+), 292 deletions(-) delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U index 3999564af9..865aff56b8 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U @@ -21,6 +21,9 @@ internalField uniform (0 0 0); boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type uniformFixedValue; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water index 3a2097df24..d7f3775efc 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water @@ -21,6 +21,9 @@ internalField uniform 1; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -33,17 +36,10 @@ boundaryField inletValue $internalField; } - outerCylinder + wall { type zeroGradient; value $internalField; - } - - "propeller.*" - { - type zeroGradient; - value $internalField; - } } // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon index c8a9ab3e88..9053f85218 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon @@ -21,6 +21,9 @@ internalField uniform 0.0495; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -34,13 +37,7 @@ boundaryField value $internalField; } - outerCylinder - { - type epsilonWallFunction; - value $internalField; - } - - "propeller.*" + wall { type epsilonWallFunction; value $internalField; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k index fa184b506d..83b933726f 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k @@ -21,6 +21,9 @@ internalField uniform 0.06; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedValue; @@ -34,13 +37,7 @@ boundaryField value $internalField; } - outerCylinder - { - type kqRWallFunction; - value $internalField; - } - - "propeller.*" + wall { type kqRWallFunction; value $internalField; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut index 0c69619423..4918acab13 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut @@ -21,6 +21,9 @@ internalField uniform 0; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type calculated; @@ -33,13 +36,7 @@ boundaryField value uniform 0; } - outerCylinder - { - type nutkWallFunction; - value uniform 0; - } - - "propeller.*" + wall { type nutkWallFunction; value uniform 0; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh index 56c30c92f0..c40de26d4b 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh @@ -21,6 +21,9 @@ internalField uniform 1e5; boundaryField { + //- Set patchGroups for constraint patches + #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes" + inlet { type fixedFluxPressure; @@ -32,12 +35,7 @@ boundaryField value $internalField; } - outerCylinder - { - type fixedFluxPressure; - } - - "propeller.*" + wall { type fixedFluxPressure; } diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean index a1dffe125a..d6c94ef470 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # remove surface -\rm -f constant/triSurface/propellerTip.obj.gz +\rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre index 2abd5b41e1..a5ed0514a9 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre @@ -15,41 +15,30 @@ runApplication blockMesh runApplication surfaceFeatureExtract runApplication snappyHexMesh -overwrite + +runApplication renumberMesh -overwrite + # force removal of fields generated by snappy \rm -rf 0 -cp -rf 0.org 0 # - generate face/cell sets and zones -#runApplication setSet -batch removeRedundantZones.setSet -#mv log.setSet log.removeRedundantZones.setSet -runApplication topoSet -dict system/removeRedundantZones.topoSetDict -mv log.topoSet log.removeRedundantZones.topoSet - #runApplication setSet -batch createInletOutletSets.setSet #mv log.setSet log.createInletOutletSets.setSet runApplication topoSet -dict system/createInletOutletSets.topoSetDict -mv log.topoSet log.createInletOutletSets.topoSet - -#runApplication setSet -batch createAMIFaces.setSet -#mv log.setSet log.createAMIFaces.setSet -runApplication topoSet -dict system/createAMIFaces.topoSetDict -mv log.topoSet log.createAMIFaces.topoSet +#mv log.topoSet log.createInletOutletSets.topoSet -# - create the inlet/outlet patches +# - create the inlet/outlet and AMI patches runApplication createPatch -overwrite +# - test by running moveDynamicMes +#runApplication moveDynamicMesh -checkAMI + + # - apply the initial fields cp -rf 0.org 0 - - -# - create the AMI faces by creating baffles, and then splitting the mesh - -runApplication createBaffles -overwrite - -runApplication mergeOrSplitBaffles -split -overwrite diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict deleted file mode 100644 index aafbfb6799..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createAMIFaces.topoSetDict +++ /dev/null @@ -1,110 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object topoSetDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name innerCylinderSmall; - type cellSet; - action new; - source cylinderToCell; - sourceInfo - { - p1 (0 -0.08 0); - p2 (0 0.06 0); - radius 0.12; - } - } - { - name outerCells; - type cellSet; - action new; - source cellToCell; - sourceInfo - { - set innerCylinderSmall; - } - } - { - name outerCells; - type cellSet; - action invert; - } - - { - name innerCylinderSmall; - type cellZoneSet; - action new; - source setToCellZone; - sourceInfo - { - set innerCylinderSmall; - } - } - - - - { - name innerCylinderSmallFace; - type faceSet; - action new; - source cellToFace; - sourceInfo - { - set innerCylinderSmall; - option all; - } - } - { - name innerCylinderSmallFace; - type faceSet; - action subset; - source cellToFace; - sourceInfo - { - set outerCells; - option all; - } - } - { - name innerCylinderSmall; - type faceZoneSet; - action new; - source setsToFaceZone; - sourceInfo - { - faceSet innerCylinderSmallFace; - cellSet innerCylinderSmall; - } - } - - - // Dummy faceSet for creating initial patches - { - name dummyFaces; - type faceSet; - action new; - source labelToFace; - sourceInfo - { - value (); - } - } - -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict deleted file mode 100644 index f3a7eadc97..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createBafflesDict +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object createBafflesDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// Whether to convert internal faces only (so leave boundary faces intact). -// This is only relevant if your face selection type can pick up boundary -// faces. -internalFacesOnly true; - - -// Baffles to create. -baffles -{ - baffleFaces - { - //- Use predefined faceZone to select faces and orientation. - type faceZone; - zoneName innerCylinderSmall; - - - patches - { - master - { - //- Master side patch - name AMI1; - type cyclicAMI; - matchTolerance 0.0001; - neighbourPatch AMI2; - transform noOrdering; - } - slave - { - //- Slave side patch - name AMI2; - type cyclicAMI; - matchTolerance 0.0001; - neighbourPatch AMI1; - transform noOrdering; - } - } - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict index 1559be08dd..d83f0bc7c3 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict @@ -23,27 +23,50 @@ pointSync false; patches ( { - name inlet; + //- Master side patch + name AMI1; + patchInfo + { + type cyclicAMI; + matchTolerance 0.0001; + neighbourPatch AMI2; + transform noOrdering; + } + constructFrom patches; + patches (innerCylinderSmall); + } + { + //- Slave side patch + name AMI2; + patchInfo + { + type cyclicAMI; + matchTolerance 0.0001; + neighbourPatch AMI1; + transform noOrdering; + } + constructFrom patches; + patches (innerCylinderSmall_slave); + } + + + { + name inlet; patchInfo { type patch; } - constructFrom set; - set inletFaces; } { name outlet; - patchInfo { type patch; } - constructFrom set; - set outletFaces; } ); diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict deleted file mode 100644 index 5def0de369..0000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/removeRedundantZones.topoSetDict +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- 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 dictionary; - object topoSetDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name innerCylinder; - type cellZoneSet; - action remove; - } - { - name innerCylinderSmall; - type cellZoneSet; - action remove; - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict index d060b73f93..23c5f4ee71 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict @@ -201,16 +201,11 @@ castellatedMeshControls refinementSurfaces { - innerCylinder - { - level (2 3); - cellZone innerCylinder; - faceZone innerCylinder; - cellZoneInside inside; - } innerCylinderSmall { level (4 4); + + faceType boundary; cellZone innerCylinderSmall; faceZone innerCylinderSmall; cellZoneInside inside; @@ -266,11 +261,6 @@ castellatedMeshControls mode inside; levels ((1E15 4)); } - outerCylinder - { - mode inside; - levels ((1E15 0)); - } } @@ -288,7 +278,7 @@ castellatedMeshControls // Whether any faceZones (as specified in the refinementSurfaces) // are only on the boundary of corresponding cellZones or also allow // free-standing zone faces. Not used if there are no faceZones. - allowFreeStandingZoneFaces true; + allowFreeStandingZoneFaces false; } @@ -312,10 +302,22 @@ snapControls // before upon reaching a correct mesh. nRelaxIter 5; - //- Highly experimental and wip: number of feature edge snapping - // iterations. Leave out altogether to disable. - // Do not use here since mesh resolution too low and baffles present - nFeatureSnapIter 20; + // Feature snapping + + // Number of feature edge snapping iterations. + // Leave out altogether to disable. + nFeatureSnapIter 10; + + // Detect (geometric only) features by sampling the surface + // (default=false). + implicitFeatureSnap true; + + // Use castellatedMeshControls::features (default = true) + explicitFeatureSnap false; + + // Detect features between multiple surfaces + // (only for explicitFeatureSnap, default = false) + multiRegionFeatureSnap true; } @@ -466,15 +468,6 @@ meshQualityControls } -// Advanced - -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict index b6333ec29b..156b5c88c7 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict @@ -14,10 +14,10 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -innerCylinder.obj -{ - #include "surfaceFeatureExtractDictDefaults" -} +//innerCylinder.obj +//{ +// #include "surfaceFeatureExtractDictDefaults" +//} innerCylinderSmall.obj From 73e876c7fb766a71217f4753e605c99d73926096 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 24 Jan 2014 15:21:10 +0000 Subject: [PATCH 08/11] ENH: tutorial update - incompressible --- .../SRFSimpleFoam/mixer/system/fvSolution | 46 +---------- .../boundaryLaunderSharma/system/fvSchemes | 8 +- .../boundaryLaunderSharma/system/fvSolution | 30 +------ .../boundaryWallFunctions/system/fvSchemes | 8 +- .../boundaryWallFunctions/system/fvSolution | 30 +------ .../system/fvSchemes | 10 +-- .../system/fvSolution | 38 +-------- .../icoFoam/cavity/system/fvSolution | 4 +- .../icoFoam/cavityClipped/system/fvSolution | 4 +- .../icoFoam/cavityGrade/system/fvSolution | 4 +- .../icoFoam/elbow/system/fvSolution | 4 +- .../offsetCylinder/system/fvSolution | 18 +++-- .../movingCone/system/fvSolution | 26 ++++-- .../system/fvSolution | 6 +- .../system/fvSolution | 4 +- .../pimpleFoam/TJunction/system/fvSolution | 4 +- .../pimpleFoam/TJunctionFan/system/fvSolution | 4 +- .../pimpleFoam/channel395/system/fvSolution | 22 +++-- .../elipsekkLOmega/system/fvSolution | 15 ++-- .../pimpleFoam/pitzDaily/system/fvSolution | 6 +- .../les/motorBike/lesFiles/fvSolution | 80 ++++--------------- .../les/motorBike/motorBike/system/fvSolution | 37 +++------ .../pisoFoam/les/pitzDaily/system/fvSolution | 46 ++++------- .../les/pitzDailyMapped/system/fvSolution | 52 ++++-------- .../pisoFoam/ras/cavity/system/fvSolution | 51 +++--------- .../ras/cavityCoupledU/system/fvSolution | 43 +++------- .../squareBump/system/fvSolution | 4 +- .../simpleFoam/pipeCyclic/system/fvSolution | 14 +--- .../simpleFoam/pitzDaily/system/fvSolution | 48 +++-------- .../pitzDailyExptInlet/system/fvSolution | 48 +++-------- 30 files changed, 202 insertions(+), 512 deletions(-) diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution index d3b6f9d65b..99306fab01 100644 --- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution +++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution @@ -25,50 +25,10 @@ solvers relTol 0.01; } - Urel + "(Urel|k|epsilon|omega|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes index 893d5e28e7..815e258200 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes @@ -28,10 +28,10 @@ gradSchemes divSchemes { default none; - div(phi,k) Gauss linear; - div(phi,epsilon) Gauss linear; - div(phi,R) Gauss linear; - div(phi,nuTilda) Gauss linear; + div(phi,k) bounded Gauss linear; + div(phi,epsilon) bounded Gauss linear; + div(phi,R) bounded Gauss linear; + div(phi,nuTilda) bounded Gauss linear; div((nuEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution index 8ffa1bc5ff..ae4d2879b3 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution @@ -25,34 +25,10 @@ solvers relTol 0; } - k + "(k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes index 893d5e28e7..815e258200 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes @@ -28,10 +28,10 @@ gradSchemes divSchemes { default none; - div(phi,k) Gauss linear; - div(phi,epsilon) Gauss linear; - div(phi,R) Gauss linear; - div(phi,nuTilda) Gauss linear; + div(phi,k) bounded Gauss linear; + div(phi,epsilon) bounded Gauss linear; + div(phi,R) bounded Gauss linear; + div(phi,nuTilda) bounded Gauss linear; div((nuEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution index 16b9956a58..671565adb9 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution @@ -25,34 +25,10 @@ solvers relTol 0; } - k + "(k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes index 83e4172fbb..1d00381423 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes @@ -28,11 +28,11 @@ gradSchemes divSchemes { default none; - div(phi,k) Gauss linear; - div(phi,epsilon) Gauss linear; - div(phi,omega) Gauss linear; - div(phi,R) Gauss linear; - div(phi,nuTilda) Gauss linear; + div(phi,k) bounded Gauss linear; + div(phi,epsilon) bounded Gauss linear; + div(phi,omega) bounded Gauss linear; + div(phi,R) bounded Gauss linear; + div(phi,nuTilda) bounded Gauss linear; div((nuEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution index 050b262898..58ede59f1e 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution @@ -25,42 +25,10 @@ solvers relTol 0; } - k + "(k|epsilon|omega|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/system/fvSolution index cc4750f16c..f9e556f155 100644 --- a/tutorials/incompressible/icoFoam/cavity/system/fvSolution +++ b/tutorials/incompressible/icoFoam/cavity/system/fvSolution @@ -27,8 +27,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution index cc4750f16c..f9e556f155 100644 --- a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution +++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution @@ -27,8 +27,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution index cc4750f16c..f9e556f155 100644 --- a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution +++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution @@ -27,8 +27,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSolution b/tutorials/incompressible/icoFoam/elbow/system/fvSolution index b843da009f..009414f72c 100644 --- a/tutorials/incompressible/icoFoam/elbow/system/fvSolution +++ b/tutorials/incompressible/icoFoam/elbow/system/fvSolution @@ -27,8 +27,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution index 49c4c17faa..0d3d3d41f3 100644 --- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution +++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution @@ -19,16 +19,22 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution index 6c9287ac8c..1002548e26 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution @@ -19,18 +19,30 @@ solvers { pcorr { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0.02; relTol 0; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration no; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + solver GAMG; + tolerance 0; relTol 0.01; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration no; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal @@ -42,8 +54,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution index 0340484469..60cc53cf31 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution @@ -24,7 +24,7 @@ solvers smoother GaussSeidel; nPreSweeps 0; nPostSweeps 2; - cacheAgglomeration on; + cacheAgglomeration true; agglomerator faceAreaPair; nCellsInCoarsestLevel 10; mergeLevels 1; @@ -46,8 +46,8 @@ solvers "(U|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution index 7c31faeadb..850c27e7cd 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution @@ -19,8 +19,8 @@ solvers { p { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-12; relTol 0; } diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution index 8e0f165060..7812980b34 100644 --- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution @@ -43,8 +43,8 @@ solvers "(U|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution index 8e0f165060..7812980b34 100644 --- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution @@ -43,8 +43,8 @@ solvers "(U|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution index cc56bcbe20..3beda0be2d 100644 --- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution @@ -19,24 +19,30 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0.05; + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal { - solver PCG; - preconditioner DIC; + $p; + smoother DICGaussSeidel; tolerance 1e-06; relTol 0; } "(U|k)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution index b7fb9bc5f9..395e3f2cf2 100644 --- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution @@ -21,8 +21,8 @@ solvers { solver GAMG; tolerance 1e-06; - relTol 0.01; - smoother GaussSeidel; + relTol 0.1; + smoother DICGaussSeidel; cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; @@ -31,20 +31,15 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-06; relTol 0; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|kl|kt|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.01; } diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution index 880d7bef7b..9de4397498 100644 --- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-7; relTol 0.01; - smoother GaussSeidel; + smoother DICGaussSeidel; cacheAgglomeration true; nCellsInCoarsestLevel 10; @@ -39,8 +39,8 @@ solvers "(U|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution index c8105e447d..19904d0a37 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution @@ -18,76 +18,34 @@ solvers { p { - solver GAMG; - tolerance 1e-6; - relTol 0.1; + solver GAMG; + tolerance 1e-6; + relTol 0.1; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 50;//10; - agglomerator faceAreaPair; - mergeLevels 1; + agglomerator faceAreaPair; + mergeLevels 1; }; pFinal { - solver GAMG; - tolerance 1e-6; - relTol 0; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - - cacheAgglomeration true; - - nCellsInCoarsestLevel 50;//10; - agglomerator faceAreaPair; - mergeLevels 1; + $p; + tolerance 1e-6; + relTol 0; }; - U + "(U|k|B|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - - UFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - - nuTilda - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-07; + relTol 0; }; } @@ -97,12 +55,6 @@ PISO nNonOrthogonalCorrectors 1; } -PIMPLE -{ - nCorrectors 2; - nNonOrthogonalCorrectors 1; -} - relaxationFactors { "U.*" 1; diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution index de3282b0fe..de4bd756b9 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution @@ -30,37 +30,20 @@ solvers nCellsInCoarsestLevel 10; mergeLevels 1; } - U + + pFinal + { + $p; + tolerance 1e-6; + relTol 0; + }; + + "(U|nuTilda)" { solver smoothSolver; smoother GaussSeidel; tolerance 1e-08; relTol 0.1; - nSweeps 1; - } - k - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-08; - relTol 0.1; - nSweeps 1; - } - omega - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-08; - relTol 0.1; - nSweeps 1; - } - nuTilda - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-08; - relT 0.1; } } @@ -78,8 +61,6 @@ relaxationFactors { p 0.3; U 0.5; - k 0.7; - omega 0.7; nuTilda 0.5; } diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution index c25efa4212..1ae8d1c803 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution @@ -19,48 +19,30 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 1e-06; - relTol 0.05; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } pFinal { - solver PCG; - preconditioner DIC; + $p; + smoother DICGaussSeidel; tolerance 1e-06; relTol 0; } - U + "(U|k|B|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother GaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution index c25efa4212..3c6eb61dd2 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution @@ -19,48 +19,30 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0.05; + solver GAMG; + tolerance 1e-07; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } pFinal { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + $p; + smoother DICGaussSeidel; + tolerance 1e-6; relTol 0; - } + }; - U + "(U|k|B|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother GaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution index a067dc6fab..983e6dd804 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution @@ -19,56 +19,29 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 1e-06; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U + "(U|k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother GaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution index a115a11a44..f54b30c2e8 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution @@ -19,16 +19,21 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 1e-06; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } @@ -42,34 +47,10 @@ solvers relTol (0 0 0); } - k + "(k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother GaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution index 76309729fe..aa5358894e 100644 --- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution +++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution @@ -33,8 +33,8 @@ solvers hU { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother GaussSeidel; tolerance 1e-10; relTol 0.1; } diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution index 5d305469b4..155643b2f4 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution @@ -32,13 +32,7 @@ solvers pFinal { - solver GAMG; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - + $p; tolerance 1e-06; relTol 0; } @@ -46,16 +40,14 @@ solvers "(U|k|epsilon)" { solver smoothSolver; - smoother GaussSeidel; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U|k|epsilon)Final" { - solver PBiCG; - preconditioner DILU; - + $U; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution index 55696bd510..ed2f5b2fe9 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution @@ -19,48 +19,22 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 1e-06; - relTol 0.01; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } - k + "(U|k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution index 55696bd510..ed2f5b2fe9 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution @@ -19,48 +19,22 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 1e-06; - relTol 0.01; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration on; + agglomerator faceAreaPair; + nCellsInCoarsestLevel 10; + mergeLevels 1; } - k + "(U|k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } From 827456621de53afbd07860fcb27eeeac003a849d Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 24 Jan 2014 15:29:18 +0000 Subject: [PATCH 09/11] ENH: propeller: meshed to outerCylinder --- tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U | 2 +- .../incompressible/pimpleDyMFoam/propeller/Allrun.pre | 1 - .../pimpleDyMFoam/propeller/system/snappyHexMeshDict | 9 --------- .../propeller/system/surfaceFeatureExtractDict | 8 ++++---- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U index 69ad1d5c6f..ab73efdb21 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U @@ -37,7 +37,7 @@ boundaryField value uniform (0 0 0); } - innerCylinder + outerCylinder { type fixedValue; value uniform (0 0 0); diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre index 793ccb9c4f..a5ed0514a9 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre @@ -20,7 +20,6 @@ runApplication renumberMesh -overwrite # force removal of fields generated by snappy \rm -rf 0 -cp -rf 0.org 0 # - generate face/cell sets and zones diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict index a426274ed5..23c5f4ee71 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict @@ -201,10 +201,6 @@ castellatedMeshControls refinementSurfaces { - innerCylinder - { - level (2 3); - } innerCylinderSmall { level (4 4); @@ -265,11 +261,6 @@ castellatedMeshControls mode inside; levels ((1E15 4)); } - outerCylinder - { - mode inside; - levels ((1E15 0)); - } } diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict index b6333ec29b..156b5c88c7 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict @@ -14,10 +14,10 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -innerCylinder.obj -{ - #include "surfaceFeatureExtractDictDefaults" -} +//innerCylinder.obj +//{ +// #include "surfaceFeatureExtractDictDefaults" +//} innerCylinderSmall.obj From aa135c2fbb340d02e8bdb9db2288b99247bbf2b2 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 24 Jan 2014 15:58:38 +0000 Subject: [PATCH 10/11] ENH: film phase change model - updated for restarts --- .../thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C | 8 +++++++- .../thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H | 5 ++++- .../phaseChangeModel/phaseChangeModel/phaseChangeModel.C | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C index bf585579f6..bb9e5b9ccd 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,6 +60,12 @@ noPhaseChange::~noPhaseChange() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // +bool noPhaseChange::active() const +{ + return false; +} + + void noPhaseChange::correctModel ( const scalar, diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H index 8403ca9d7f..65a3a56636 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,6 +85,9 @@ public: // Evolution + //- Return the model 'active' status - default active = true + virtual bool active() const; + //- Correct virtual void correctModel ( diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C index ffc66761be..aae14e76ec 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,6 +81,11 @@ void phaseChangeModel::correct volScalarField& dEnergy ) { + if (!active()) + { + return; + } + correctModel ( dt, From 9a73599edd7abf1b16cd8c7a6669d547596fd356 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 24 Jan 2014 15:59:45 +0000 Subject: [PATCH 11/11] ENH: tutorial update --- .../lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O | 4 +++- .../lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 | 4 +++- .../lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 | 4 +++- .../lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O index 7c3d6d0044..cb57caaa92 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O @@ -24,7 +24,9 @@ boundaryField { sides { - type zeroGradient; + type inletOutlet; + inletValue $internalField; + value $internalField; } region0_to_wallFilmRegion_wallFilmFaces { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 index 501241274a..ef7ff824ab 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 @@ -24,7 +24,9 @@ boundaryField { sides { - type zeroGradient; + type inletOutlet; + inletValue $internalField; + value $internalField; } region0_to_wallFilmRegion_wallFilmFaces { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 index e581261f29..a9c3ccf847 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 @@ -24,7 +24,9 @@ boundaryField { sides { - type zeroGradient; + type inletOutlet; + inletValue $internalField; + value $internalField; } region0_to_wallFilmRegion_wallFilmFaces { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T index 26121abcf9..52d3650d61 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T @@ -23,8 +23,9 @@ boundaryField { sides { - type fixedValue; - value uniform 300; + type inletOutlet; + inletValue $internalField; + value $internalField; } region0_to_wallFilmRegion_wallFilmFaces {