From b95c4f9ee747423dc11d04a438cdeac8b746d852 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 24 Jan 2014 12:38:08 +0000 Subject: [PATCH] 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; } }