From 594d0883defe61bc800141347079e77dd8d3f358 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Wed, 14 Aug 2013 15:29:24 +0100 Subject: [PATCH] Tutorial updates --- .../constant/polyMesh/blockMeshDict | 30 ++--- .../chargedWire/constant/polyMesh/boundary | 3 +- .../movingConeMotion/constant/dynamicMeshDict | 2 +- .../constant/dynamicMeshDict | 2 +- .../fluid/constant/dynamicMeshDict | 2 +- .../newStressedFoam/plateHole/0/U | 3 +- .../bubble2D_r0.75mm/constant/dynamicMeshDict | 2 +- .../hydrofoil/constant/dynamicMeshDict | 2 +- .../ramp/constant/dynamicMeshDict | 2 +- .../sloshing2D/constant/dynamicMeshDict | 2 +- .../tank3D/constant/dynamicMeshDict | 2 +- .../FENE-P/system/fvSolution | 29 +---- .../Giesekus/system/fvSolution | 42 ++----- .../Oldroyd-B/system/fvSolution | 26 +---- .../S-MDCPP/system/fvSolution | 27 +---- .../XPP_DE/system/fvSolution | 104 +++++------------- 16 files changed, 71 insertions(+), 209 deletions(-) diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict index 4e9726965..9523f9a60 100644 --- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict +++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict @@ -29,17 +29,17 @@ vertices (0 0.114 0) (0 0.038 0) (0 0.001 0) - (0.001 0 0.5) - (0.038 0 0.5) - (0.076 0 0.5) - (0.076 0.02687 0.5) - (0.02687 0.02687 0.5) - (0.0007071 0.0007071 0.5) - (0.076 0.114 0.5) - (0.02687 0.114 0.5) - (0 0.114 0.5) - (0 0.038 0.5) - (0 0.001 0.5) + (0.001 0 0.01) + (0.038 0 0.01) + (0.076 0 0.01) + (0.076 0.02687 0.01) + (0.02687 0.02687 0.01) + (0.0007071 0.0007071 0.01) + (0.076 0.114 0.01) + (0.02687 0.114 0.01) + (0 0.114 0.01) + (0 0.038 0.01) + (0 0.001 0.01) ); blocks @@ -57,10 +57,10 @@ edges arc 5 10 (0.00038268 0.00092387 0) arc 1 4 (0.0351074 0.0145419 0) arc 4 9 (0.0145419 0.0351074 0) - arc 11 16 (0.00092387 0.00038268 0.5) - arc 16 21 (0.00038268 0.00092387 0.5) - arc 12 15 (0.0351074 0.0145419 0.5) - arc 15 20 (0.0145419 0.0351074 0.5) + arc 11 16 (0.00092387 0.00038268 0.01) + arc 16 21 (0.00038268 0.00092387 0.01) + arc 12 15 (0.0351074 0.0145419 0.01) + arc 15 20 (0.0145419 0.0351074 0.01) ); patches diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary index a4cf69f2f..97f564f03 100644 --- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary +++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary @@ -1,6 +1,6 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | | \\ / O peration | Version: 1.6-ext | | \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/dynamicMeshDict b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/dynamicMeshDict index e5e7bc63b..b4a14c3be 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/dynamicMeshDict +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/dynamicMeshDict @@ -18,7 +18,7 @@ twoDMotion yes; dynamicFvMesh dynamicMotionSolverFvMesh; -solver laplaceFaceDecomposition; +solver laplace; diffusivity file; // diffusivity uniform; diff --git a/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/constant/dynamicMeshDict index e34cbf6a3..dd1def56c 100644 --- a/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/constant/dynamicMeshDict +++ b/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/constant/dynamicMeshDict @@ -20,7 +20,7 @@ FoamFile dynamicFvMesh dynamicMotionSolverFvMesh; solver mesquiteMotionSolver; -//solver laplaceFaceDecomposition; +//solver laplace; //diffusivity uniform 1.0; //diffusivity quadratic; //distancePatches (topWall); diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict index 299fcb5cd..770443985 100644 --- a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict +++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict @@ -20,7 +20,7 @@ dynamicFvMesh dynamicMotionSolverFvMesh; twoDMotion yes; -solver laplaceFaceDecomposition; +solver laplace; diffusivity quadratic; diff --git a/tutorials/stressAnalysis/newStressedFoam/plateHole/0/U b/tutorials/stressAnalysis/newStressedFoam/plateHole/0/U index 69afd64c3..f96c81d1f 100644 --- a/tutorials/stressAnalysis/newStressedFoam/plateHole/0/U +++ b/tutorials/stressAnalysis/newStressedFoam/plateHole/0/U @@ -1,6 +1,6 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | | \\ / O peration | Version: 1.6-ext | | \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | @@ -62,4 +62,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/constant/dynamicMeshDict b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/constant/dynamicMeshDict index 4a543fa96..f610c9d00 100644 --- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/constant/dynamicMeshDict +++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/constant/dynamicMeshDict @@ -21,7 +21,7 @@ twoDMotion yes; motionPlaneNormal (0 0 1); -solver laplaceFaceDecomposition; +solver laplace; diffusivity quadratic; diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/constant/dynamicMeshDict b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/constant/dynamicMeshDict index 7b05f0918..fb5f9d039 100644 --- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/constant/dynamicMeshDict +++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/constant/dynamicMeshDict @@ -18,7 +18,7 @@ dynamicFvMesh dynamicMotionSolverFvMesh; twoDMotion yes; -solver laplaceFaceDecomposition; +solver laplace; diffusivity uniform 1.0; diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/dynamicMeshDict b/tutorials/surfaceTracking/interTrackFoam/ramp/constant/dynamicMeshDict index 7b05f0918..fb5f9d039 100644 --- a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/dynamicMeshDict +++ b/tutorials/surfaceTracking/interTrackFoam/ramp/constant/dynamicMeshDict @@ -18,7 +18,7 @@ dynamicFvMesh dynamicMotionSolverFvMesh; twoDMotion yes; -solver laplaceFaceDecomposition; +solver laplace; diffusivity uniform 1.0; diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/constant/dynamicMeshDict b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/constant/dynamicMeshDict index 59df0f14c..81e6eaa71 100644 --- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/constant/dynamicMeshDict +++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/constant/dynamicMeshDict @@ -18,7 +18,7 @@ dynamicFvMesh dynamicMotionSolverFvMesh; twoDMotion yes; -solver laplaceFaceDecomposition; +solver laplace; diffusivity uniform 1.0; diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/dynamicMeshDict b/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/dynamicMeshDict index c75e5c14f..7dfa69fba 100644 --- a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/dynamicMeshDict +++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/dynamicMeshDict @@ -19,7 +19,7 @@ dynamicFvMesh dynamicMotionSolverFvMesh; twoDMotion yes; -solver laplaceFaceDecomposition; +solver laplace; diffusivity quadratic; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSolution b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSolution index 3bb6fc021..66094e924 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSolution +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSolution @@ -19,21 +19,8 @@ solvers p { - solver PCG; - preconditioner - { -// preconditioner Cholesky; - preconditioner AMG; - cycle W-cycle; - policy AAMG; - nPreSweeps 0; - nPostSweeps 2; - groupSize 4; - minCoarseEqns 20; - nMaxLevels 100; - scale off; - smoother ILU; - } + solver CG; + preconditioner Cholesky; tolerance 1e-07; relTol 0; @@ -43,12 +30,8 @@ solvers U { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -58,12 +41,8 @@ solvers tau { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSolution b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSolution index b7308f1ef..b2dc4b25a 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSolution +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSolution @@ -19,21 +19,8 @@ solvers p { - solver PCG; - preconditioner - { -// preconditioner Cholesky; - preconditioner AMG; - cycle W-cycle; - policy AAMG; - nPreSweeps 0; - nPostSweeps 2; - groupSize 4; - minCoarseEqns 20; - nMaxLevels 100; - scale off; - smoother ILU; - } + solver CG; + preconditioner Cholesky; tolerance 1e-07; relTol 0; @@ -45,10 +32,7 @@ solvers { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -59,10 +43,7 @@ solvers taufirst { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -73,10 +54,7 @@ solvers tausecond { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -87,10 +65,7 @@ solvers tauthird { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -101,10 +76,7 @@ solvers taufourth { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution index 3bb6fc021..b7f25c2c5 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution @@ -20,20 +20,7 @@ solvers p { solver PCG; - preconditioner - { -// preconditioner Cholesky; - preconditioner AMG; - cycle W-cycle; - policy AAMG; - nPreSweeps 0; - nPostSweeps 2; - groupSize 4; - minCoarseEqns 20; - nMaxLevels 100; - scale off; - smoother ILU; - } + preconditioner Cholesky tolerance 1e-07; relTol 0; @@ -43,12 +30,8 @@ solvers U { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -60,10 +43,7 @@ solvers { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSolution b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSolution index 774be25fb..5e4d3cb76 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSolution +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSolution @@ -19,21 +19,8 @@ solvers p { - solver PCG; - preconditioner - { -// preconditioner Cholesky; - preconditioner AMG; - cycle W-cycle; - policy AAMG; - nPreSweeps 0; - nPostSweeps 2; - groupSize 4; - minCoarseEqns 20; - nMaxLevels 100; - scale off; - smoother ILU; - } + solver CG; + preconditioner Cholesky; tolerance 1e-07; relTol 0; @@ -45,10 +32,7 @@ solvers { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -59,10 +43,7 @@ solvers tau { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSolution b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSolution index 455383490..8b9f7b910 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSolution +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSolution @@ -20,20 +20,7 @@ solvers p { solver PCG; - preconditioner - { -// preconditioner Cholesky; - preconditioner AMG; - cycle W-cycle; - policy AAMG; - nPreSweeps 0; - nPostSweeps 2; - groupSize 4; - minCoarseEqns 20; - nMaxLevels 100; - scale off; - smoother ILU; - } + preconditioner DIC; tolerance 1e-07; relTol 0; @@ -45,10 +32,7 @@ solvers { solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -58,11 +42,8 @@ solvers Sfirst { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -72,11 +53,8 @@ solvers Ssecond { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -86,11 +64,8 @@ solvers Sthird { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -100,11 +75,8 @@ solvers Sfourth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -114,11 +86,8 @@ solvers Sfifth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -128,11 +97,8 @@ solvers Ssixth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -142,11 +108,8 @@ solvers Lambdafirst { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -156,11 +119,8 @@ solvers Lambdasecond { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -170,11 +130,8 @@ solvers Lambdathird { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -184,11 +141,8 @@ solvers Lambdafourth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -198,11 +152,8 @@ solvers Lambdafifth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0; @@ -212,11 +163,8 @@ solvers Lambdasixth { - solver BiCGStab; - preconditioner - { - preconditioner Cholesky; - } + solver BiCGStab; + preconditioner ILU0; tolerance 1e-6; relTol 0;