From 49f5df64a62cda2aa6ec9f350debe59358106a8b Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Mon, 1 Nov 2010 16:51:19 +0100 Subject: [PATCH] Fix Tutorials: All heatTransfer tutorials now work fine. * icoLagrangianFoam tutorials work * Format of fixed tutorials updated to reflect current version standards. Current status: 10 failing tests in a total of 139 tests --- bin/foamUpdateCaseFileHeader | 2 +- .../buoyantSimpleFoam/hotRoom/0/epsilon | 34 ++++-- .../buoyantSimpleFoam/hotRoom/0/k | 25 ++-- .../buoyantSimpleFoam/hotRoom/0/p | 8 +- .../hotRoom/constant/polyMesh/boundary | 7 +- .../hotRoom/constant/thermophysicalProperties | 2 +- .../hotRoom/system/fvSchemes | 4 +- .../hotRoom/system/fvSolution | 24 ++-- .../hotRadiationRoom/0/epsilon | 53 ++++++--- .../hotRadiationRoom/0/k | 41 ++++--- .../hotRadiationRoom/0/p | 8 +- .../hotRadiationRoom/0/pd | 48 -------- .../constant/polyMesh/boundary | 7 +- .../constant/radiationProperties | 2 + .../constant/thermophysicalProperties | 2 +- .../hotRadiationRoom/system/fvSchemes | 4 +- .../hotRadiationRoom/system/fvSolution | 8 +- .../chtMultiRegionFoam/multiRegionHeater/0/K | 12 +- .../chtMultiRegionFoam/multiRegionHeater/0/T | 12 +- .../chtMultiRegionFoam/multiRegionHeater/0/U | 26 ++-- .../chtMultiRegionFoam/multiRegionHeater/0/cp | 12 +- .../multiRegionHeater/0/epsilon | 12 +- .../chtMultiRegionFoam/multiRegionHeater/0/k | 12 +- .../chtMultiRegionFoam/multiRegionHeater/0/p | 25 ++-- .../chtMultiRegionFoam/multiRegionHeater/0/pd | 58 --------- .../multiRegionHeater/0/rho | 12 +- .../multiRegionHeater/Allclean | 3 +- .../constant/bottomAir/RASProperties | 23 ++-- .../bottomAir/{environmentalProperties => g} | 26 ++-- .../bottomAir/thermophysicalProperties | 25 ++-- .../constant/bottomAir/turbulenceProperties} | 33 +----- .../constant/polyMesh/blockMeshDict | 24 ++-- .../constant/polyMesh/boundary | 6 +- .../constant/regionProperties | 23 ++-- .../constant/topAir/RASProperties | 23 ++-- .../constant/topAir/environmentalProperties | 1 - .../multiRegionHeater/constant/topAir/g | 1 + .../constant/topAir/turbulenceProperties | 1 + .../system/bottomAir/changeDictionaryDict | 112 +++++------------- .../system/bottomAir/fvSchemes | 26 ++-- .../system/bottomAir/fvSolution | 84 ++++++------- .../multiRegionHeater/system/controlDict | 25 ++-- .../multiRegionHeater/system/fvSchemes | 25 ++-- .../multiRegionHeater/system/fvSolution | 77 +++++------- .../system/heater/changeDictionaryDict | 25 ++-- .../multiRegionHeater/system/heater/fvSchemes | 23 ++-- .../system/heater/fvSolution | 28 ++--- .../system/leftSolid/changeDictionaryDict | 25 ++-- .../system/rightSolid/changeDictionaryDict | 25 ++-- .../system/topAir/changeDictionaryDict | 110 +++++------------ .../icoLagrangianFoam/channelParticles/0/U | 26 ++-- .../icoLagrangianFoam/channelParticles/0/p | 26 ++-- .../channelParticles/system/fvSolution | 17 ++- 53 files changed, 471 insertions(+), 832 deletions(-) delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd rename tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/{environmentalProperties => g} (53%) rename tutorials/heatTransfer/{buoyantSimpleFoam/hotRoom/0/pd => chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties} (52%) delete mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader index 7b3c97789..f5d937bd0 100755 --- a/bin/foamUpdateCaseFileHeader +++ b/bin/foamUpdateCaseFileHeader @@ -59,7 +59,7 @@ printHeader() { | ========= | | | \\\\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\\\ / O peration | Version: ${foamVersion} | -| \\\\ / A nd | Web: www.OpenFOAM.org | +| \\\\ / A nd | Web: www.extend-project.de | | \\\\/ M anipulation | | \\*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon index 46a465314..de37f7316 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,20 +21,31 @@ internalField uniform 0.01; boundaryField { - floor + floor { - type zeroGradient; + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; } - - ceiling + ceiling { - type zeroGradient; + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; } - - fixedWalls + fixedWalls { - type zeroGradient; + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k index 5485bd3e5..cb718f556 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,20 +21,22 @@ internalField uniform 0.1; boundaryField { - floor + floor { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 0.1; } - - ceiling + ceiling { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 0.1; } - - fixedWalls + fixedWalls { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 0.1; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p index 1c3d0d9e4..d23b961aa 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p @@ -16,25 +16,25 @@ FoamFile dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 0; +internalField uniform 1e+05; boundaryField { floor { - type calculated; + type buoyantPressure; value uniform 100000; } ceiling { - type calculated; + type buoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type buoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary index 713344455..4dc47a628 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties index 845c425d4..38ff610a4 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType hPsiThermo>>>>; mixture air 1 28.9 1000 0 1.8e-05 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes index 3430f8f76..6d15e5129 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes @@ -40,7 +40,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -60,7 +60,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; } // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution index fecb215fc..045075582 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution @@ -16,38 +16,44 @@ FoamFile solvers { - pd PCG + p { + solver PCG; preconditioner DIC; tolerance 1e-08; relTol 0; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; }; - h PBiCG + h { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; }; - k PBiCG + k { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; }; - epsilon PBiCG + epsilon { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; }; - R PBiCG + R { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; @@ -57,14 +63,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1.0; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon index 5f8de5792..8b8f5e15d 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,25 +21,39 @@ internalField uniform 0.01; boundaryField { - floor - { - type zeroGradient; - } - - ceiling - { - type zeroGradient; - } - - fixedWalls - { - type zeroGradient; - } - box { - type zeroGradient; + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; + } + floor + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; + } + ceiling + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; + } + fixedWalls + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.01; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k index a7d2d3f4f..1b4ea689c 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,25 +21,27 @@ internalField uniform 0.1; boundaryField { - floor - { - type zeroGradient; - } - - ceiling - { - type zeroGradient; - } - - fixedWalls - { - type zeroGradient; - } - box { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 0.1; + } + floor + { + type compressible::kqRWallFunction; + value uniform 0.1; + } + ceiling + { + type compressible::kqRWallFunction; + value uniform 0.1; + } + fixedWalls + { + type compressible::kqRWallFunction; + value uniform 0.1; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p index f200e3eeb..f36884c5b 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p @@ -22,25 +22,25 @@ boundaryField { floor { - type calculated; + type buoyantPressure; value uniform 100000; } ceiling { - type calculated; + type buoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type buoyantPressure; value uniform 100000; } box { - type calculated; + type buoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd deleted file mode 100644 index 1841d7882..000000000 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object pd; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - box - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary index add6399d3..a51f754e1 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties index 4ff28e364..2139370aa 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties @@ -18,6 +18,8 @@ radiation on; radiationModel P1; +solverFreq 5; + noRadiation { } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties index 845c425d4..38ff610a4 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType hPsiThermo>>>>; mixture air 1 28.9 1000 0 1.8e-05 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes index 248f87def..d24fa5705 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes @@ -40,7 +40,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -61,7 +61,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; } // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution index 7bc226e13..01950610c 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution @@ -16,7 +16,7 @@ FoamFile solvers { - pd PCG + p PCG { preconditioner DIC; tolerance 1e-06; @@ -57,14 +57,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1.0; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K index d216becb7..15f6073aa 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object K; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 1 -3 -1 0 0 0]; +dimensions [ 1 1 -3 -1 0 0 0 ]; internalField uniform 80; @@ -29,7 +29,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -38,7 +37,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T index 29e55ac27..93a9247f7 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [ 0 0 0 1 0 0 0 ]; internalField uniform 300; @@ -30,7 +30,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -39,7 +38,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U index 528c16391..7a091e53b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,48 +10,46 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 1 -1 0 0 0 0]; +dimensions [ 0 1 -1 0 0 0 0 ]; -internalField uniform (0.01 0 0); +internalField uniform ( 0.01 0 0 ); boundaryField { minX { type fixedValue; - value uniform (0.01 0 0); + value uniform ( 0.01 0 0 ); } maxX { type inletOutlet; - inletValue uniform (0 0 0); + inletValue uniform ( 0 0 0 ); } - minY { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } maxY { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } - minZ { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } maxZ { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp index bc53e05c8..276073996 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object cp; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 -1 0 0 0]; +dimensions [ 0 2 -2 -1 0 0 0 ]; internalField uniform 450; @@ -29,7 +29,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -38,7 +37,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon index c79030383..be74fd43d 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 0.01; @@ -30,7 +30,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -39,7 +38,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k index c491981bf..62cbd442e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0.1; @@ -30,7 +30,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -39,7 +38,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p index 9605bb7ff..6b4e8183d 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,45 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; +dimensions [ 1 -1 -2 0 0 0 0 ]; -internalField uniform 0; +internalField uniform 1e+05; boundaryField { minX { - type calculated; + type zeroGradient; value uniform 0; } maxX { - type calculated; + type fixedValue; value uniform 0; } - minY { - type calculated; + type zeroGradient; value uniform 0; } maxY { - type calculated; + type zeroGradient; value uniform 0; } minZ { - type calculated; + type zeroGradient; value uniform 0; } maxZ { - type calculated; + type zeroGradient; value uniform 0; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd deleted file mode 100644 index 1d0ac0a6a..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; - location "0.003"; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - minX - { - type zeroGradient; - value uniform 0; - } - maxX - { - type fixedValue; - value uniform 0; - } - - minY - { - type zeroGradient; - value uniform 0; - } - maxY - { - type zeroGradient; - value uniform 0; - } - minZ - { - type zeroGradient; - value uniform 0; - } - maxZ - { - type zeroGradient; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho index 24f6f2d0c..00342d876 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object rho; - location "0.003"; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -3 0 0 0 0 0]; +dimensions [ 1 -3 0 0 0 0 0 ]; internalField uniform 8000; @@ -29,7 +29,6 @@ boundaryField { type zeroGradient; } - minY { type zeroGradient; @@ -38,7 +37,6 @@ boundaryField { type zeroGradient; } - minZ { type zeroGradient; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean index 2bcf76424..ed0c73a35 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean @@ -5,9 +5,10 @@ cleanCase +rm 0/cellToRegion + if [ -d "VTK" ] then rm -r VTK fi - diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties index 66160205b..77810c86c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object RASProperties; + version 2.0; + format ascii; + class dictionary; + object RASProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASModel kEpsilon; @@ -101,5 +93,4 @@ wallFunctionCoeffs E 9; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g similarity index 53% rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g index e9aee6c9b..c400e43d5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g @@ -1,28 +1,20 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object environmentalProperties; + version 2.0; + format ascii; + class uniformDimensionedVectorField; + object g; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); - +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index ca90242d7..7cefc4260 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -1,30 +1,21 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object thermophysicalProperties; + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType hPsiThermo>>>>; mixture air 1 28.9 1000 0 1.8e-05 0.7; - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/pd b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties similarity index 52% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/pd rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties index 3a679ba63..d07cb5135 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/pd +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties @@ -1,42 +1,19 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; format ascii; - class volScalarField; - object pd; + class dictionary; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} +simulationType laminar; // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict index a0733096f..0a065aacb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict @@ -1,28 +1,19 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - convertToMeters 1; vertices @@ -78,5 +69,4 @@ mergePatchPairs ( ); - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary index ee565b35b..516b9f312 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties index 6bff0e8cf..bb5f40698 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object regionProperties; + version 2.0; + format ascii; + class dictionary; + object regionProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // fluidRegionNames @@ -28,7 +20,6 @@ fluidRegionNames topAir ); - solidRegionNames ( heater diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties index a0307ea43..8977496e5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object RASProperties; + version 2.0; + format ascii; + class dictionary; + object RASProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASModel kEpsilon; @@ -102,5 +94,4 @@ wallFunctionCoeffs E 9; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties deleted file mode 120000 index 9cb87f239..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties +++ /dev/null @@ -1 +0,0 @@ -../bottomAir/environmentalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g new file mode 120000 index 000000000..fe0384ff0 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g @@ -0,0 +1 @@ +../bottomAir/g \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties new file mode 120000 index 000000000..435bf46f7 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties @@ -0,0 +1 @@ +../bottomAir/turbulenceProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index 7258aec7b..6d680a89a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changePatchTypeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { U @@ -33,7 +32,6 @@ dictionaryReplacement value uniform (0 0 0); } - bottomAir_to_leftSolid { type fixedValue; @@ -53,8 +51,6 @@ dictionaryReplacement } } - - T { boundaryField @@ -94,7 +90,6 @@ dictionaryReplacement } } - epsilon { // Set the value on all bc to non-zero. Not used in simulation @@ -154,7 +149,6 @@ dictionaryReplacement } } - k { internalField uniform 0.1; @@ -211,103 +205,53 @@ dictionaryReplacement } } - - pd - { - boundaryField - { - minX - { - type fixedFluxBuoyantPressure; - value 0; - } - maxX - { - type fixedFluxBuoyantPressure; - value 0; - } - minY - { - type fixedFluxBuoyantPressure; - value 0; - } - minZ - { - type fixedFluxBuoyantPressure; - value 0; - } - maxZ - { - type fixedFluxBuoyantPressure; - value 0; - } - bottomAir_to_leftSolid - { - type fixedFluxBuoyantPressure; - value 0; - } - bottomAir_to_heater - { - type fixedFluxBuoyantPressure; - value 0; - } - bottomAir_to_rightSolid - { - type fixedFluxBuoyantPressure; - value 0; - } - } - } - - p { - internalField uniform 100000; boundaryField { minX { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } maxX { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } minY { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } minZ { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } maxZ { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } - bottomAir_to_leftSolid { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } bottomAir_to_heater { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } bottomAir_to_rightSolid { - type calculated; - value uniform 100000; + type buoyantPressure; + value uniform 1e+05; } } } + } // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes index 73309294b..e500ead63 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; + version 2.0; + format ascii; + class dictionary; + object fvSchemes; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes @@ -52,6 +44,7 @@ laplacianSchemes default none; laplacian(muEff,U) Gauss linear limited 0.333; laplacian((rho*(1|A(U))),pd) Gauss linear limited 0.333; + laplacian((rho*(1|A(U))),p) Gauss linear limited 0.333; laplacian(alphaEff,h) Gauss linear limited 0.333; laplacian(DkEff,k) Gauss linear limited 0.333; laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; @@ -71,8 +64,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution index e82c183b1..05a07f910 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution @@ -1,49 +1,31 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; + version 2.0; + format ascii; + class dictionary; + object fvSolution; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { + solver PCG; preconditioner DIC; tolerance 1e-6; relTol 0; }; -// pd PCG -// { -// preconditioner DIC; -// tolerance 1e-6; -// relTol 0.1; -// }; -// pdFinal PCG -// { -// preconditioner DIC; -// tolerance 1e-08; -// relTol 0; -// }; - pd GAMG + p { + solver GAMG; tolerance 1e-6; relTol 0.1; @@ -54,8 +36,9 @@ solvers agglomerator faceAreaPair; mergeLevels 1; }; - pdFinal GAMG + pFinal { + solver GAMG; tolerance 1e-6; relTol 0; @@ -66,53 +49,58 @@ solvers agglomerator faceAreaPair; mergeLevels 1; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - h PBiCG + h { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - k PBiCG + hFinal { + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + k + { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - epsilon PBiCG + epsilon { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - R PBiCG + R { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; } -PISO +PIMPLE { - momentumPredictor off; - nOuterCorrectors 1; - nCorrectors 2; + momentumPredictor off; + nOuterCorrectors 1; + nCorrectors 2; nNonOrthogonalCorrectors 1; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } -//relaxationFactors -//{ -//// h 0.9; -// U 0.9; -//} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict index cab5c5b14..21efffab4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; + version 2.0; + format ascii; + class dictionary; + object controlDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application chtFoam; @@ -36,8 +28,6 @@ deltaT 0.001; writeControl adjustableRunTime; writeInterval 5; -//writeControl timeStep; -//writeInterval 20; purgeWrite 0; @@ -57,5 +47,4 @@ maxCo 0.3; adjustTimeStep yes; - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes index 73309294b..683d12e26 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; + version 2.0; + format ascii; + class dictionary; + object fvSchemes; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes @@ -71,8 +63,7 @@ snGradSchemes fluxRequired { default no; - pd; + p; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution index e82c183b1..6a31a89f2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution @@ -1,49 +1,31 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; + version 2.0; + format ascii; + class dictionary; + object fvSolution; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { + solver PCG; preconditioner DIC; tolerance 1e-6; relTol 0; }; -// pd PCG -// { -// preconditioner DIC; -// tolerance 1e-6; -// relTol 0.1; -// }; -// pdFinal PCG -// { -// preconditioner DIC; -// tolerance 1e-08; -// relTol 0; -// }; - pd GAMG + p { + solver GAMG; tolerance 1e-6; relTol 0.1; @@ -54,8 +36,9 @@ solvers agglomerator faceAreaPair; mergeLevels 1; }; - pdFinal GAMG + pFinal { + solver GAMG; tolerance 1e-6; relTol 0; @@ -66,53 +49,51 @@ solvers agglomerator faceAreaPair; mergeLevels 1; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; }; - h PBiCG + h { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - k PBiCG + k { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - epsilon PBiCG + epsilon { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; - R PBiCG + R { + solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; }; } -PISO +PIMPLE { - momentumPredictor off; - nOuterCorrectors 1; - nCorrectors 2; + momentumPredictor off; + nOuterCorrectors 1; + nCorrectors 2; nNonOrthogonalCorrectors 1; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } -//relaxationFactors -//{ -//// h 0.9; -// U 0.9; -//} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict index 816a562c4..8ef513f70 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changePatchTypeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -115,7 +114,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -153,7 +151,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes index e1c5ba8e1..600439aa1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; + version 2.0; + format ascii; + class dictionary; + object fvSchemes; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes @@ -58,5 +50,4 @@ fluxRequired default no; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution index 648c2282b..e1914b555 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution @@ -1,41 +1,33 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; + version 2.0; + format ascii; + class dictionary; + object fvSolution; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - T PCG + T { + solver PCG; preconditioner DIC; tolerance 1E-06; relTol 0; }; } -PISO +PIMPLE { nNonOrthogonalCorrectors 1; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index 6fd741f20..cab30e465 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changePatchTypeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -99,7 +98,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -133,7 +131,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index f25015174..ad2509f8e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changePatchTypeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { T @@ -98,7 +97,6 @@ dictionaryReplacement } } - K { internalField uniform 80; @@ -132,7 +130,6 @@ dictionaryReplacement } } - cp { internalField uniform 450; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict index 75b747f23..4158df4cb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -1,20 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; - case "damBreak"; - instance "system"; - local ""; - - class dictionary; - object changePatchTypeDict; + version 2.0; + format ascii; + class dictionary; + object changePatchTypeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dictionaryReplacement { U @@ -33,7 +32,6 @@ dictionaryReplacement inletValue uniform (0 0 0); } - topAir_to_leftSolid { type fixedValue; @@ -53,8 +51,6 @@ dictionaryReplacement } } - - T { boundaryField @@ -95,7 +91,6 @@ dictionaryReplacement } } - epsilon { // Set the value on all bc to non-zero. Not used in simulation @@ -152,7 +147,6 @@ dictionaryReplacement } } - k { internalField uniform 0.1; @@ -210,15 +204,14 @@ dictionaryReplacement } } - - pd + p { boundaryField { minX { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } maxX { @@ -233,93 +226,44 @@ dictionaryReplacement lInf 0.40; // double length of domain inletOutlet off; correctSupercritical off; - value uniform 0; + value uniform 1e+05; } minY { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } minZ { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } maxZ { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } topAir_to_leftSolid { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } topAir_to_heater { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } topAir_to_rightSolid { - type fixedFluxBuoyantPressure; - value 0; + type buoyantPressure; + value uniform 1e+05; } } } - p - { - internalField uniform 100000; - - boundaryField - { - minX - { - type calculated; - value uniform 100000; - } - maxX - { - type calculated; - value uniform 100000; - } - maxY - { - type calculated; - value uniform 100000; - } - minZ - { - type calculated; - value uniform 100000; - } - maxZ - { - type calculated; - value uniform 100000; - } - - topAir_to_leftSolid - { - type calculated; - value uniform 100000; - } - topAir_to_heater - { - type calculated; - value uniform 100000; - } - topAir_to_rightSolid - { - type calculated; - value uniform 100000; - } - } - } } // ************************************************************************* // diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U index 22213bf8c..a0296f1e9 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U @@ -1,30 +1,19 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - -// Field Dictionary - FoamFile { - version 2.0; - format ascii; - - root "/home/coyote/hjasak/OpenFOAM/hjasak-1.2/run/test"; - case "cavity"; - instance "0"; - local ""; - - class volVectorField; - object U; + version 2.0; + format ascii; + class volVectorField; + object U; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); @@ -54,5 +43,4 @@ boundaryField } } - // ************************************************************************* // diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p index b6fb5966f..30378e387 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p @@ -1,30 +1,19 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - -// Field Dictionary - FoamFile { - version 2.0; - format ascii; - - root "/home/coyote/hjasak/OpenFOAM/hjasak-1.2/run/test"; - case "cavity"; - instance "0"; - local ""; - - class volScalarField; - object p; + version 2.0; + format ascii; + class volScalarField; + object p; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 2 -2 0 0 0 0]; internalField uniform 0; @@ -53,5 +42,4 @@ boundaryField } } - // ************************************************************************* // diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution index 2b64b257a..5ed0cc2d5 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution @@ -26,8 +26,21 @@ FoamFile solvers { - p ICCG 1e-06 0; - U BICCG 1e-05 0; + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO