From cf1fa7115f488ee66fb892ae83dba03fb77b7d6b Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 13:01:14 +0100 Subject: [PATCH] Tutorial updates -- incomplete. These changes are pushed to avoid continuous merge conflicts caused by scripted changes to all the tutorial files. --- .../hotRoom/constant/polyMesh/boundary | 2 +- .../hotRoom/system/fvSchemes | 6 ++---- .../hotRoom/system/fvSolution | 7 ++++--- .../iglooWithFridges/constant/polyMesh/boundary | 2 +- .../iglooWithFridges/system/controlDict | 2 +- .../iglooWithFridges/system/fvSchemes | 16 ++++++++-------- .../iglooWithFridges/system/fvSolution | 14 +++++++------- .../ras/throttle/constant/polyMesh/boundary | 2 +- .../cavitatingFoam/ras/throttle/system/fvSchemes | 8 ++++---- 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary index b66c382b6a..0d4d0e498d 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes index 5471bec4f4..7547301c0a 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes @@ -32,8 +32,6 @@ divSchemes div(phi,T) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; - div(phi,R) Gauss upwind; - div(R) Gauss linear; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -41,7 +39,7 @@ laplacianSchemes { default none; laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; + laplacian((1|A(U)),p_rgh) Gauss linear corrected; laplacian(kappaEff,T) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -61,7 +59,7 @@ snGradSchemes fluxRequired { default no; - p ; + p_rgh ; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution index e27eae3fe5..672d6cc22c 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + p_rgh { solver PCG; preconditioner DIC; @@ -37,14 +37,15 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; + p_rghRefCell 0; + p_rghRefValue 0; pRefValue 0; } relaxationFactors { rho 1; - p 0.7; + p_rgh 0.7; U 0.2; T 0.7; "(k|epsilon|R)" 0.7; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary index ed36d6f6c4..e0608ea9d7 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict index 9ed612f7fd..5d61414e9e 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 1000; +endTime 2000; deltaT 1; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes index 5471bec4f4..c08ba97414 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(kappaEff,T) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; + laplacian(nuEff,U) Gauss linear limited 0.333; + laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333; + laplacian(kappaEff,T) Gauss linear limited 0.333; + laplacian(DkEff,k) Gauss linear limited 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; + laplacian(DREff,R) Gauss linear limited 0.333; } interpolationSchemes @@ -55,13 +55,13 @@ interpolationSchemes snGradSchemes { - default corrected; + default limited 0.333; } fluxRequired { default no; - p ; + p_rgh ; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution index b04fdc8e05..0e0e41fd80 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + p_rgh { solver PCG; preconditioner DIC; @@ -25,7 +25,7 @@ solvers relTol 0.01; } - "(U|T|k|epsilon|R)" + "(U|T|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -37,17 +37,17 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; + p_rghRefCell 0; + p_rghRefValue 0; pRefValue 0; } relaxationFactors { - rho 1; - p 0.3; - U 0.7; + p_rgh 0.8; + U 0.2; T 0.7; - "(k|epsilon|R)" 0.7; + "(k|epsilon)" 0.7; } diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary index b5008d95cd..03d26bcf3c 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes index 3aa1b53f3f..0a25b3fe77 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes @@ -28,10 +28,10 @@ interpolationSchemes divSchemes { default none; - div(phiv,rho) Gauss limitedLinear 0.2; - div(phi,U) Gauss limitedLinearV 0.2; - div(phiv,omega) Gauss limitedLinear 0.2; - div(phiv,k) Gauss limitedLinear 0.2; + div(phiv,rho) Gauss limitedLinear 1; + div(phi,U) Gauss limitedLinearV 1; + div(phiv,omega) Gauss limitedLinear 1; + div(phiv,k) Gauss limitedLinear 1; } gradSchemes