From b362957124c6fe97c0dd10ffff20d1fdbd83c8fe Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 7 Oct 2010 13:52:51 +0100 Subject: [PATCH] ENH: Multiple tutorial updates --- .../aachenBomb/constant/sprayProperties | 4 +- .../les/smallPoolFire2D/system/fvSolution | 65 +++++-------------- .../ras/counterFlowFlame2D/system/fvSolution | 2 +- .../constant/thermophysicalProperties | 9 ++- .../mixerVessel2D/system/fvSolution | 30 +++------ .../t-junction-with-fan/system/fvSolution | 23 +------ .../pimpleFoam/t-junction/system/fvSolution | 23 +------ .../simplifiedSiwek/system/fvSolution | 29 +++++++++ .../panel/constant/surfaceFilmProperties | 26 ++------ .../panel/constant/thermophysicalProperties | 26 +++++--- .../panel/system/wallFilmRegion/fvSchemes | 1 + 11 files changed, 92 insertions(+), 146 deletions(-) diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index 878439295f..c8cfa62f0b 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -127,8 +127,8 @@ hollowConeInjectorCoeffs { minValue 1e-06; maxValue 0.00015; - d ( 0.00015 ); - n ( 3 ); + d 0.00015; + n 3; } exponentialPDF diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution index e71c1e85db..e97f1de618 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution @@ -20,10 +20,17 @@ solvers { rho { - solver PCG; - preconditioner DIC; - tolerance 0; - relTol 0; + solver PCG; + preconditioner DIC; + tolerance 1e-7; + relTol 0.1; + }; + + rhoFinal + { + $rho; + tolerance 1e-7; + relTol 0; }; p @@ -40,37 +47,13 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-7; relTol 0; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; - ft - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-7; - relTol 0; - nSweeps 1; - }; - - fu - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-7; - relTol 0; - nSweeps 1; - }; - - - U + "(U|ft|fu|k|hs)" { solver smoothSolver; smoother GaussSeidel; @@ -79,31 +62,13 @@ solvers nSweeps 1; }; - UFinal + "(U|ft|fu|k|hs)Final" { - solver smoothSolver; - smoother GaussSeidel; + $U; tolerance 1e-7; relTol 0; - nSweeps 1; }; - k - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-7; - relTol 0; - nSweeps 1; - }; - - hs - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-7; - relTol 0; - }; Ii { diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution index ad29357a94..38b8f5dbcc 100755 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution @@ -32,7 +32,7 @@ solvers relTol 0.0; } - "(U|Yi|h|k|epsilon)" + "(U|Yi|hs|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties index 04ef086ac6..e30c05b865 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties @@ -15,11 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Pr Pr [ 0 0 0 0 0 0 0 ] 0.72; +Pr 0.72; thermoType ePsiThermo>>>>; -mixture N2 1 28.01348 100 10000 1000 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 1.458e-06 110; +mixture N2 + 1 28.01348 + 100 10000 1000 + 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 + 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 + 1.458e-06 110; // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution index 4ebcefc07d..2e74c6af29 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution @@ -22,6 +22,13 @@ solvers solver PCG; preconditioner DIC; tolerance 1e-5; + relTol 0.1; + } + + rhoFinal + { + $rho; + tolerance 1e-5; relTol 0; } @@ -65,7 +72,7 @@ solvers mergeLevels 1; } - h + "(U|h|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -73,26 +80,9 @@ solvers relTol 0.1; } - hFinal + "(U|h|k|epsilon)Final" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-5; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-5; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-5; relTol 0; } diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution index 1b7fb06c4d..637611c63f 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution @@ -41,7 +41,7 @@ solvers mergeLevels 1; } - U + "(U|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -49,26 +49,9 @@ solvers relTol 0.1; } - UFinal + "(U|k|epsilon)Final" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-05; relTol 0; } diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution index 1b7fb06c4d..637611c63f 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution @@ -41,7 +41,7 @@ solvers mergeLevels 1; } - U + "(U|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -49,26 +49,9 @@ solvers relTol 0.1; } - UFinal + "(U|k|epsilon)Final" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-05; relTol 0; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index ffb16df0c0..20d0f46217 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -22,6 +22,13 @@ solvers solver PCG; preconditioner DIC; tolerance 1e-05; + relTol 0.1; + } + + "(rho|G)Final" + { + $rho; + tolerance 1e-05; relTol 0; } @@ -30,6 +37,13 @@ solvers solver PBiCG; preconditioner DILU; tolerance 1e-06; + relTol 0.1; + } + + pFinal + { + $p; + tolerance 1e-06; relTol 0; } @@ -38,6 +52,13 @@ solvers solver PBiCG; preconditioner DILU; tolerance 1e-05; + relTol 0.1; + } + + "(U|hs|R|k|epsilon)Final" + { + $U; + tolerance 1e-05; relTol 0; } @@ -46,6 +67,14 @@ solvers solver PBiCG; preconditioner DILU; tolerance 1e-06; + relTol 0.1; + } + + "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final" + { + $Yi; + preconditioner DILU; + tolerance 1e-06; relTol 0; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/surfaceFilmProperties index 9ff37a7d55..73c1c06c67 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/surfaceFilmProperties @@ -16,7 +16,6 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // surfaceFilmModel kinematicSingleLayer; -//surfaceFilmModel thermoSingleLayer; filmRegionName wallFilmRegion; @@ -24,30 +23,13 @@ active true; kinematicSingleLayerCoeffs { - deltaStable deltaStable [0 1 0 0 0] 0; + thermoModel constant; Cf 0.005; - rho rho [1 -3 0 0 0] 1000; - mu mu [1 -1 -1 0 0] 1e-3; - sigma sigma [1 0 -2 0 0] 0.07; + rho0 rho0 [1 -3 0 0 0] 1000; + mu0 mu0 [1 -1 -1 0 0] 1e-3; + sigma0 sigma0 [1 0 -2 0 0] 0.07; injectionModel none; } - -thermoSingleLayerCoeffs -{ - deltaStable deltaStable [0 1 0 0 0] 0; - Cf 0.005; - htcw htcw [1 0 -3 -1 0] 1e-8; // 0.0; - htcs htcs [1 0 -3 -1 0] 1e-8; // 0.0; - - rho rho [1 -3 0 0 0] 1000; - mu mu [1 -1 -1 0 0] 1e-3; - sigma sigma [1 0 -2 0 0] 0.07; - cp cp [0 2 -2 -1 0] 4187; - - injectionModel none; - - phaseChangeModel none; -} diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties index acfbe00bce..e57087805d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties @@ -23,17 +23,25 @@ foamChemistryFile "$FOAM_CASE/chemkin/foam.inp"; foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat"; -liquidComponents -( - H2O -); - -solidComponents -(); - inertSpecie N2; -H2O H2O defaultCoeffs; +liquids +{ + liquidComponents + ( + H2O + ); + + H2O H2O defaultCoeffs; +} + +solids +{ + solidComponents + (); +} + + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/fvSchemes index b6a31afe89..0471d1d8f9 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/fvSchemes @@ -36,6 +36,7 @@ gradSchemes { default none; grad(pL) Gauss linear; + grad(sigmaf) Gauss linear; snGradCorr(deltaf) Gauss linear; snGradCorr(pp) Gauss linear; snGradCorr(pu) Gauss linear;