From 611a107bfdeb50758fdc1525d0a28914bad20aee Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 7 Oct 2010 17:17:48 +0100 Subject: [PATCH] ENH: Multiple tutorial updates --- .../angledDuctExplicit/Allrun | 1 + .../angledDuctExplicit/system/controlDict | 20 + .../angledDuctExplicit/system/fvSchemes | 1 - .../angledDuctImplicit/Allrun | 10 + .../angledDuctImplicit/constant/porousZones | 8 +- .../angledDuctImplicit/system/controlDict | 20 + .../angledDuctImplicit/system/fvSchemes | 1 - .../angledDuctImplicit/system/fvSolution | 2 +- .../buoyantBoussinesqPimpleFoam/hotRoom/0/T | 443 ------------------ .../buoyantBoussinesqSimpleFoam/hotRoom/0/T | 39 -- .../hotBoxes/constant/surfaceFilmProperties | 24 +- 11 files changed, 59 insertions(+), 510 deletions(-) create mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun create mode 100755 tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun new file mode 120000 index 0000000000..09efeaf930 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun @@ -0,0 +1 @@ +../angledDuctImplicit/Allrun \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict index 83de517420..4b8c2697ad 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict @@ -47,5 +47,25 @@ graphFormat raw; runTimeModifiable true; +functions +{ + residualControl1 + { + type residualControl; + functionObjectLibs ( "libjobControl.so" ); + outputControl timeStep; + outputInterval 1; + + maxResiduals + { + p 1e-2; + U 1e-4; + T 1e-3; + + // possibly check turbulence fields + "(k|epsilon|omega)" 1e-3; + } + } +} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes index a1376603cf..4d843cfccb 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes @@ -34,7 +34,6 @@ divSchemes div(phi,h) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; - div(phid,p) Gauss linear; } laplacianSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun new file mode 100755 index 0000000000..ad77d33e3d --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun @@ -0,0 +1,10 @@ +cd ${0%/*} || exit 1 # run from this directory + +m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +runApplication blockMesh +runApplication rhoPorousSimpleFoam + diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones index 4a14bc6eee..e4d251bf9e 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones @@ -31,11 +31,11 @@ FoamFile f f [0 -1 0 0 0 0 0] (0 0 0); } - thermalModel - { - type fixedTemperature; + thermalModel none; // fixedTemperature; - T T [0 0 0 1 0] 350; + fixedTemperatureCoeffs + { + T 350; } } ) diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict index 3b3db3d164..fd58f436b9 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict @@ -47,5 +47,25 @@ graphFormat raw; runTimeModifiable true; +functions +{ + residualControl1 + { + type residualControl; + functionObjectLibs ( "libjobControl.so" ); + outputControl timeStep; + outputInterval 1; + + maxResiduals + { + p 1e-3; + U 1e-4; + T 1e-3; + + // possibly check turbulence fields + "(k|epsilon|omega)" 1e-3; + } + } +} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes index c03ccb3612..a432624360 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -34,7 +34,6 @@ divSchemes div(phi,h) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; - div(phid,p) Gauss linear; } laplacianSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 19a717dfb3..e126f210c5 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -51,7 +51,7 @@ SIMPLE { nUCorrectors 2; nNonOrthogonalCorrectors 0; - pMin pMin [ 1 -1 -2 0 0 0 0 ] 100; + pMin pMin [ 1 -1 -2 0 0 ] 100; } relaxationFactors diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T deleted file mode 100644 index 98cc191af7..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T +++ /dev/null @@ -1,443 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - floor - { - type fixedValue; - value nonuniform List -400 -( -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -600 -600 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -600 -600 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -300 -) -; - } - ceiling - { - type fixedValue; - value uniform 300; - } - fixedWalls - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T deleted file mode 100644 index 77b58a1a00..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - floor - { - type fixedValue; - value uniform 300; - } - ceiling - { - type fixedValue; - value uniform 300; - } - fixedWalls - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 1045475fae..4099a1fff3 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -15,38 +15,18 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//surfaceFilmModel kinematicSingleLayer; surfaceFilmModel thermoSingleLayer; filmRegionName wallFilmRegion; active true; -kinematicSingleLayerCoeffs -{ - thermoModel constant; - 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; - - deltaStable deltaStable [0 1 0 0 0] 0.0005; - Cf 0.005; - - injectionModel removeInjection; // none; // cloudInjection; -} - thermoSingleLayerCoeffs { thermoModel singleComponent; // constant liquid H2O; -// thermoModel constant; -// 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; -// cp0 cp0 [0 2 -2 -1 0] 4187; - deltaStable deltaStable [0 1 0 0 0] 0; Cf 0.005; upperSurfaceModels @@ -75,7 +55,9 @@ thermoSingleLayerCoeffs { cloudName reactingCloud1; - particlesPerParcel 100.0; + deltaStable 0.0; + + particlesPerParcel 100.0; parcelPDF {