From c2c0c66fd2a4ab17af8ee7c110735a07a0c72369 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Feb 2009 11:15:47 +0000 Subject: [PATCH 01/18] typo --- src/thermophysicalModels/liquids/liquid/liquid.H | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H index 39b9517621..27bbff55bf 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.H +++ b/src/thermophysicalModels/liquids/liquid/liquid.H @@ -41,7 +41,6 @@ SourceFiles #include "typeInfo.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -//#include "eos.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,8 +51,6 @@ namespace Foam Class liquid Declaration \*---------------------------------------------------------------------------*/ - //class eos; - class liquid { // Private data @@ -75,23 +72,22 @@ class liquid //- Triple point temperature [K] scalar Tt_; - + //- Triple point pressure [Pa] scalar Pt_; //- Normal boiling temperature [K] scalar Tb_; - + //- Dipole moment [] scalar dipm_; - //- Pitzer's acentric factor [] + //- Pitzer's accentric factor [] scalar omega_; //- Solubility parameter [(J/m^3)^0.5] scalar delta_; - //eos state_; public: @@ -174,7 +170,7 @@ public: // Member Functions - // Phisical constants which define the specie + // Physical constants which define the specie //- Molecular weight [kg/kmol] scalar W() const From dee5fee4dbf91cfcbc609ccf392a6ef40c758c67 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Feb 2009 12:29:22 +0000 Subject: [PATCH 02/18] tutorial updates --- .../XiFoam/ras/moriyoshiHomogeneous/0/epsilon | 18 ++--- .../XiFoam/ras/moriyoshiHomogeneous/0/k | 18 ++--- .../XiFoam/ras/moriyoshiHomogeneous/0/mut | 51 ++++++++++++++ .../compressible/rhoPisoFoam/ras/cavity/0/R | 22 +++--- .../rhoPisoFoam/ras/cavity/0/epsilon | 20 +++--- .../compressible/rhoPisoFoam/ras/cavity/0/k | 8 ++- .../compressible/rhoPisoFoam/ras/cavity/0/mut | 4 +- .../rhoPisoFoam/ras/cavity/0/omega | 8 ++- .../angledDuctImplicit/0/epsilon | 35 ++++++---- .../angledDuctImplicit/0/k | 35 ++++++---- .../angledDuctImplicit/0/mut | 62 +++++++++++++++++ .../buoyantPisoFoam/hotRoom/0/epsilon | 23 ++++--- .../heatTransfer/buoyantPisoFoam/hotRoom/0/k | 23 ++++--- .../buoyantPisoFoam/hotRoom/0/mut | 44 ++++++++++++ .../hotRadiationRoom/0/epsilon | 26 ++++--- .../hotRadiationRoom/0/k | 26 ++++--- .../hotRadiationRoom/0/mut | 50 ++++++++++++++ .../multiRegionHeater/0/alphat | 67 +++++++++++++++++++ .../multiRegionHeater/0/epsilon | 37 ++++++---- .../chtMultiRegionFoam/multiRegionHeater/0/k | 37 ++++++---- .../multiRegionHeater/0/mut | 67 +++++++++++++++++++ .../multiRegionHeater/Allrun | 3 +- .../constant/topAir/turbulenceProperties | 1 + .../multiRegionHeater/system/README | 3 + .../multiRegionHeater/system/fvSchemes} | 25 +------ .../multiRegionHeater/system/fvSolution} | 26 +------ .../MRFSimpleFoam/mixerVessel2D/0/epsilon | 14 ++-- .../MRFSimpleFoam/mixerVessel2D/0/k | 14 ++-- .../MRFSimpleFoam/mixerVessel2D/0/nut | 48 +++++++++++++ .../pimpleFoam/t-junction/0/epsilon | 12 ++-- .../incompressible/pimpleFoam/t-junction/0/k | 13 ++-- .../pimpleFoam/t-junction/0/nut | 50 ++++++++++++++ .../incompressible/pisoFoam/ras/cavity/0/R | 10 +-- .../incompressible/simpleFoam/pitzDaily/0/R | 14 ++-- .../simpleFoam/pitzDailyExptInlet/0/R | 14 ++-- .../multiphase/interFoam/ras/damBreak/0/R | 33 +++++---- .../interFoam/ras/damBreak/0/epsilon | 27 +++++--- .../multiphase/interFoam/ras/damBreak/0/k | 27 +++++--- .../multiphase/interFoam/ras/damBreak/0/mut | 55 +++++++++++++++ 39 files changed, 817 insertions(+), 253 deletions(-) create mode 100644 tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut create mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/alphat create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/mut create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/README rename tutorials/heatTransfer/{buoyantSimpleFoam/hotRoom/0/k.old => chtMultiRegionFoam/multiRegionHeater/system/fvSchemes} (69%) rename tutorials/heatTransfer/{buoyantSimpleFoam/hotRoom/0/epsilon.old => chtMultiRegionFoam/multiRegionHeater/system/fvSolution} (68%) create mode 100644 tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut create mode 100644 tutorials/incompressible/pimpleFoam/t-junction/0/nut create mode 100644 tutorials/multiphase/interFoam/ras/damBreak/0/mut diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon index c7751ffc11..57a9ae5372 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,40 +10,42 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 375; boundaryField { - left + left { type symmetryPlane; } - right + right { type symmetryPlane; } - top + top { type symmetryPlane; } - bottom + bottom { type symmetryPlane; } - frontAndBack + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k index a8d80dda8a..603093e6e3 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,40 +10,42 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1.5; boundaryField { - left + left { type symmetryPlane; } - right + right { type symmetryPlane; } - top + top { type symmetryPlane; } - bottom + bottom { type symmetryPlane; } - frontAndBack + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut new file mode 100644 index 0000000000..a9920120d0 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R index f229e06765..6d7f9a3db1 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R @@ -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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,34 @@ FoamFile version 2.0; format ascii; class volSymmTensorField; + location "0"; object R; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; -internalField uniform (0 0 0 0 0 0); +internalField uniform ( 0 0 0 0 0 0 ); boundaryField { - movingWall + movingWall { - type zeroGradient; + type kQRWallFunction; + value uniform ( 0 0 0 0 0 0 ); } - fixedWalls + fixedWalls { - type zeroGradient; + type kQRWallFunction; + value uniform ( 0 0 0 0 0 0 ); } - frontAndBack + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon index b24ccfb380..1b7c6c0d70 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,34 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 0.000765; boundaryField { - movingWall + movingWall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - fixedWalls + fixedWalls { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - frontAndBack + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k index 5242962b3b..64ea0ca8fb 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0.00325; @@ -24,13 +24,15 @@ boundaryField movingWall { type kQRWallFunction; - value uniform 0.00325; + value uniform 0; } + fixedWalls { type kQRWallFunction; - value uniform 0.00325; + value uniform 0; } + frontAndBack { type empty; diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut index a0f4c47310..3aaa8e77f8 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -1 0 0 0 0]; +dimensions [ 1 -1 -1 0 0 0 0 ]; internalField uniform 0; @@ -26,11 +26,13 @@ boundaryField type mutWallFunction; value uniform 0; } + fixedWalls { type mutWallFunction; value uniform 0; } + frontAndBack { type empty; diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega index b825b4913a..fa4f022f01 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 -1 0 0 0 0]; +dimensions [ 0 0 -1 0 0 0 0 ]; internalField uniform 2.6; @@ -24,13 +24,15 @@ boundaryField movingWall { type omegaWallFunction; - value uniform 2.6; + value uniform 0; } + fixedWalls { type omegaWallFunction; - value uniform 2.6; + value uniform 0; } + frontAndBack { type empty; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon index ca6ec2ff0d..13cfc84a0e 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon @@ -1,55 +1,64 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; + +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 200; boundaryField { - front { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } + back { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } + wall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } + porosityWall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } inlet { type turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; - value $internalField; + value uniform 200; } outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 200; + value uniform 200; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k index c1cf0e833d..16c1e28fb8 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k @@ -1,55 +1,64 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; + +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1; boundaryField { - front { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } + back { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } + wall { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } + porosityWall { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } inlet { type turbulentIntensityKineticEnergyInlet; intensity 0.05; - value $internalField; + value uniform 1; } outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 1; + value uniform 1; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut new file mode 100644 index 0000000000..264b3b4003 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut @@ -0,0 +1,62 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + front + { + type mutWallFunction; + value uniform 0; + } + + back + { + type mutWallFunction; + value uniform 0; + } + + wall + { + type mutWallFunction; + value uniform 0; + } + + porosityWall + { + type mutWallFunction; + value uniform 0; + } + + inlet + { + type calculated; + value uniform 0; + } + + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon index 46a465314b..471f122da8 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon +++ b/tutorials/heatTransfer/buoyantPisoFoam/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,35 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 0.01; boundaryField { - floor + floor { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - ceiling + ceiling { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - fixedWalls + fixedWalls { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k index 5485bd3e57..e0c92b9c4f 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantPisoFoam/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,35 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0.1; boundaryField { - floor + floor { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - ceiling + ceiling { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - fixedWalls + fixedWalls { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut new file mode 100644 index 0000000000..f78d7659f9 --- /dev/null +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut @@ -0,0 +1,44 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + floor + { + type mutWallFunction; + value uniform 0; + } + + ceiling + { + type mutWallFunction; + value uniform 0; + } + + fixedWalls + { + type mutWallFunction; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon index 5f8de5792e..d9e8b1dc34 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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,41 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 0.01; boundaryField { - floor + floor { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - ceiling + ceiling { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - fixedWalls + fixedWalls { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } box { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k index a7d2d3f4f0..0eb1a25c30 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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,41 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0.1; boundaryField { - floor + floor { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - ceiling + ceiling { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - fixedWalls + fixedWalls { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } box { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut new file mode 100644 index 0000000000..c609cbf3d2 --- /dev/null +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut @@ -0,0 +1,50 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + box + { + type mutWallFunction; + value uniform 0; + } + + floor + { + type mutWallFunction; + value uniform 0; + } + + ceiling + { + type mutWallFunction; + value uniform 0; + } + + fixedWalls + { + type mutWallFunction; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/alphat new file mode 100644 index 0000000000..3a5286b6db --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/alphat @@ -0,0 +1,67 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0.001"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + maxY + { + type alphatWallFunction; + value uniform 0; + } + minX + { + type calculated; + value uniform 0; + } + maxX + { + type calculated; + value uniform 0; + } + minZ + { + type alphatWallFunction; + value uniform 0; + } + maxZ + { + type alphatWallFunction; + value uniform 0; + } + topAir_to_leftSolid + { + type calculated; + value uniform 0; + } + topAir_to_heater + { + type calculated; + value uniform 0; + } + topAir_to_rightSolid + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon index 4f3ffc986e..bb298dd95d 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.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0.001"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,6 +21,11 @@ internalField uniform 0.01; boundaryField { + maxY + { + type epsilonWallFunction; + value uniform 0.01; + } minX { type fixedValue; @@ -29,24 +35,29 @@ boundaryField { type zeroGradient; } - - minY - { - type zeroGradient; - } - maxY - { - type zeroGradient; - } - minZ { - type zeroGradient; + type epsilonWallFunction; + value uniform 0.01; } maxZ + { + type epsilonWallFunction; + value uniform 0.01; + } + topAir_to_leftSolid + { + type zeroGradient; + } + topAir_to_heater + { + type zeroGradient; + } + topAir_to_rightSolid { type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k index 7ac77f7e69..e4db2c837d 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.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0.001"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,6 +21,11 @@ internalField uniform 0.1; boundaryField { + maxY + { + type kQRWallFunction; + value uniform 0.1; + } minX { type fixedValue; @@ -29,24 +35,29 @@ boundaryField { type zeroGradient; } - - minY - { - type zeroGradient; - } - maxY - { - type zeroGradient; - } - minZ { - type zeroGradient; + type kQRWallFunction; + value uniform 0.1; } maxZ + { + type kQRWallFunction; + value uniform 0.1; + } + topAir_to_leftSolid + { + type zeroGradient; + } + topAir_to_heater + { + type zeroGradient; + } + topAir_to_rightSolid { type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/mut b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/mut new file mode 100644 index 0000000000..ece854fd06 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/mut @@ -0,0 +1,67 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0.001"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + maxY + { + type mutWallFunction; + value uniform 0; + } + minX + { + type calculated; + value uniform 0; + } + maxX + { + type calculated; + value uniform 0; + } + minZ + { + type mutWallFunction; + value uniform 0; + } + maxZ + { + type mutWallFunction; + value uniform 0; + } + topAir_to_leftSolid + { + type calculated; + value uniform 0; + } + topAir_to_heater + { + type calculated; + value uniform 0; + } + topAir_to_rightSolid + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index e698fc906a..f4374b6a93 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -1,4 +1,5 @@ #!/bin/sh + # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions @@ -20,7 +21,7 @@ done # remove fluid fields from solid regions (important for post-processing) for i in heater leftSolid rightSolid do - rm -f 0*/$i/{epsilon,k,p,pd,U} + rm -f 0*/$i/{mut,alphat,epsilon,k,p,pd,U} done # remove solid fields from fluid regions (important for post-processing) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties new file mode 120000 index 0000000000..435bf46f77 --- /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/README b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/README new file mode 100644 index 0000000000..fd464e464c --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/README @@ -0,0 +1,3 @@ +fvSchemes and fvSolution are not used here +- added so that pre-processing activities can proceed + diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes similarity index 69% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes index 1130003c3b..e8078b2b20 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes @@ -9,31 +9,10 @@ FoamFile { version 2.0; format ascii; - class volScalarField; - location "0"; - object k.old; + class dictionary; + object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.1; - -boundaryField -{ - floor - { - type zeroGradient; - } - ceiling - { - type zeroGradient; - } - fixedWalls - { - type zeroGradient; - } -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution similarity index 68% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution index d7f6131697..78262ec2df 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution @@ -9,31 +9,9 @@ FoamFile { version 2.0; format ascii; - class volScalarField; - location "0"; - object epsilon.old; + class dictionary; + object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 0.01; - -boundaryField -{ - floor - { - type zeroGradient; - } - ceiling - { - type zeroGradient; - } - fixedWalls - { - type zeroGradient; - } -} - - // ************************************************************************* // diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/epsilon b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/epsilon index 54a2ee8baa..ddb0f60d60 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/epsilon +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 20; @@ -22,12 +23,14 @@ boundaryField { rotor { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } stator { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } front @@ -41,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k index 3a979f12e4..e78fcca795 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1; @@ -22,12 +23,14 @@ boundaryField { rotor { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } stator { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } front @@ -41,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut new file mode 100644 index 0000000000..6a0f01dc75 --- /dev/null +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object nut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + rotor + { + type nutWallFunction; + value uniform 0; + } + + stator + { + type nutWallFunction; + value uniform 0; + } + + front + { + type empty; + } + + back + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon index 8e5b3e553d..2c4cfab1c0 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon +++ b/tutorials/incompressible/pimpleFoam/t-junction/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 1; @@ -23,7 +24,7 @@ boundaryField inlet { type turbulentMixingLengthDissipationRateInlet; - mixingLength 0.01; // 1cm - half channel height + mixingLength 0.01; value uniform 1; } @@ -41,7 +42,8 @@ boundaryField defaultFaces { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } } diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/t-junction/0/k index 35b2bd3ff9..51c0ab7cd3 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/0/k +++ b/tutorials/incompressible/pimpleFoam/t-junction/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1; @@ -23,7 +24,7 @@ boundaryField inlet { type turbulentIntensityKineticEnergyInlet; - intensity 0.05; // 5% turbulence + intensity 0.05; value uniform 1; } @@ -41,8 +42,10 @@ boundaryField defaultFaces { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/t-junction/0/nut new file mode 100644 index 0000000000..8a3ff85900 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nut @@ -0,0 +1,50 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object nut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + + outlet1 + { + type calculated; + value uniform 0; + } + + outlet2 + { + type calculated; + value uniform 0; + } + + defaultFaces + { + type nutWallFunction; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/R b/tutorials/incompressible/pisoFoam/ras/cavity/0/R index f229e06765..fec1a87fa5 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/0/R +++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/R @@ -20,17 +20,17 @@ internalField uniform (0 0 0 0 0 0); boundaryField { - movingWall + movingWall { - type zeroGradient; + type kQRWallFunction; } - fixedWalls + fixedWalls { - type zeroGradient; + type kQRWallFunction; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/R b/tutorials/incompressible/simpleFoam/pitzDaily/0/R index 6e399c9a75..f5e0a97820 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/0/R +++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/R @@ -20,28 +20,28 @@ internalField uniform (0 0 0 0 0 0); boundaryField { - inlet + inlet { type fixedValue; value uniform (0 0 0 0 0 0); } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { - type zeroGradient; + type kQRWallFunction; } - lowerWall + lowerWall { - type zeroGradient; + type kQRWallFunction; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R index 6e399c9a75..f5e0a97820 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R @@ -20,28 +20,28 @@ internalField uniform (0 0 0 0 0 0); boundaryField { - inlet + inlet { type fixedValue; value uniform (0 0 0 0 0 0); } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { - type zeroGradient; + type kQRWallFunction; } - lowerWall + lowerWall { - type zeroGradient; + type kQRWallFunction; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/R b/tutorials/multiphase/interFoam/ras/damBreak/0/R index 2342009c4f..e62afda35f 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/R +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/R @@ -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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,42 +10,47 @@ FoamFile version 2.0; format ascii; class volSymmTensorField; + location "0"; object R; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; -internalField uniform (0 0 0 0 0 0); +internalField uniform ( 0 0 0 0 0 0 ); boundaryField { - leftWall + leftWall { - type zeroGradient; + type kQRWallFunction; + value uniform ( 0 0 0 0 0 0 ); } - rightWall + rightWall { - type zeroGradient; + type kQRWallFunction; + value uniform ( 0 0 0 0 0 0 ); } - lowerWall + lowerWall { - type zeroGradient; + type kQRWallFunction; + value uniform ( 0 0 0 0 0 0 ); } - atmosphere + atmosphere { type inletOutlet; - inletValue uniform (0 0 0 0 0 0); - value uniform (0 0 0 0 0 0); + inletValue uniform ( 0 0 0 0 0 0 ); + value uniform ( 0 0 0 0 0 0 ); } - defaultFaces + defaultFaces { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon index 1db00208e9..92ed8a7d75 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon +++ b/tutorials/multiphase/interFoam/ras/damBreak/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,42 +10,47 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 0.1; boundaryField { - leftWall + leftWall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - rightWall + rightWall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - lowerWall + lowerWall { - type zeroGradient; + type epsilonWallFunction; + value uniform 0; } - atmosphere + atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces + defaultFaces { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k index 9e576a0270..c8071de03b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/k +++ b/tutorials/multiphase/interFoam/ras/damBreak/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 | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,42 +10,47 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0.1; boundaryField { - leftWall + leftWall { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - rightWall + rightWall { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - lowerWall + lowerWall { - type zeroGradient; + type kQRWallFunction; + value uniform 0; } - atmosphere + atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces + defaultFaces { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/mut b/tutorials/multiphase/interFoam/ras/damBreak/0/mut new file mode 100644 index 0000000000..6bdb1297a4 --- /dev/null +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/mut @@ -0,0 +1,55 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type mutWallFunction; + value uniform 0; + } + + rightWall + { + type mutWallFunction; + value uniform 0; + } + + lowerWall + { + type mutWallFunction; + value uniform 0; + } + + atmosphere + { + type calculated; + value uniform 0; + } + + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // From 0781a2f387a144607e63e85068bc7a92329fade3 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Feb 2009 16:13:32 +0000 Subject: [PATCH 03/18] correcting use of totalPressure BC - still not consistent for pd as does not include buoyancy effects --- .../interDyMFoam/damBreakWithObstacle/0-orig/pd | 8 ++++---- .../interDyMFoam/damBreakWithObstacle/0/pd | 8 ++++---- tutorials/multiphase/interFoam/laminar/damBreak/0/pd | 12 ++++++------ tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd | 12 ++++++------ tutorials/multiphase/interFoam/ras/damBreak/0/pd | 12 ++++++------ .../multiphaseInterFoam/damBreak4phase/0/pd | 12 ++++++------ .../multiphaseInterFoam/damBreak4phaseFine/0/pd | 12 ++++++------ 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd index f5801776cf..0136109909 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd @@ -20,23 +20,23 @@ internalField uniform 0; boundaryField { - walls + walls { type zeroGradient; } - obstacle + obstacle { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd index f5801776cf..0136109909 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd @@ -20,23 +20,23 @@ internalField uniform 0; boundaryField { - walls + walls { type zeroGradient; } - obstacle + obstacle { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd b/tutorials/multiphase/interFoam/laminar/damBreak/0/pd index b6af7556cf..520a3e9b0b 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/pd @@ -20,34 +20,34 @@ internalField uniform 0; boundaryField { - leftWall + leftWall { type zeroGradient; } - rightWall + rightWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; } - defaultFaces + defaultFaces { type empty; } diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd index 58eb97f261..b533fbc016 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd @@ -25,34 +25,34 @@ boundaryField type empty; } - inlet + inlet { type zeroGradient; } - wall + wall { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; } - front + front { type wedge; } - back + back { type wedge; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/pd b/tutorials/multiphase/interFoam/ras/damBreak/0/pd index b6af7556cf..520a3e9b0b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/pd @@ -20,34 +20,34 @@ internalField uniform 0; boundaryField { - leftWall + leftWall { type zeroGradient; } - rightWall + rightWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; } - defaultFaces + defaultFaces { type empty; } diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd index b6af7556cf..520a3e9b0b 100644 --- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd @@ -20,34 +20,34 @@ internalField uniform 0; boundaryField { - leftWall + leftWall { type zeroGradient; } - rightWall + rightWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; } - defaultFaces + defaultFaces { type empty; } diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd index b6af7556cf..520a3e9b0b 100644 --- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd @@ -20,34 +20,34 @@ internalField uniform 0; boundaryField { - leftWall + leftWall { type zeroGradient; } - rightWall + rightWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - atmosphere + atmosphere { type totalPressure; p0 uniform 0; U U; phi phi; - rho none; + rho rho; psi none; gamma 1; value uniform 0; } - defaultFaces + defaultFaces { type empty; } From 0e2f77b1705dc01b1f5695be06140f7fb17ff200 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 18 Feb 2009 17:05:56 +0000 Subject: [PATCH 04/18] iso surface on coupled bc --- .../sampledSurface/isoSurface/isoSurface.C | 110 ++++++++++++++---- .../isoSurface/isoSurfaceTemplates.C | 56 ++++----- 2 files changed, 114 insertions(+), 52 deletions(-) diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C index b092f62605..c69a51f407 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C @@ -29,6 +29,7 @@ License #include "mergePoints.H" #include "syncTools.H" #include "addToRunTimeSelectionTable.H" +#include "slicedVolFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -347,24 +348,36 @@ void Foam::isoSurface::getNeighbour { label nbr = (own[faceI] == cellI ? nei[faceI] : own[faceI]); nbrValue = cVals[nbr]; - nbrPoint = mesh_.C()[nbr]; + nbrPoint = mesh_.cellCentres()[nbr]; } else { label bFaceI = faceI-mesh_.nInternalFaces(); label patchI = boundaryRegion[bFaceI]; - label patchFaceI = faceI-mesh_.boundaryMesh()[patchI].start(); + const polyPatch& pp = mesh_.boundaryMesh()[patchI]; + label patchFaceI = faceI-pp.start(); - if (isA(mesh_.boundaryMesh()[patchI])) + if (isA(pp)) { // Assume zero gradient nbrValue = cVals[own[faceI]]; + nbrPoint = mesh_.faceCentres()[faceI]; + } + else if + ( + pp.coupled() + && !refCast(pp).separated() + ) + { + // other side value + nbrValue = cVals.boundaryField()[patchI][patchFaceI]; + // other side cell centre nbrPoint = mesh_.C().boundaryField()[patchI][patchFaceI]; } else { nbrValue = cVals.boundaryField()[patchI][patchFaceI]; - nbrPoint = mesh_.C().boundaryField()[patchI][patchFaceI]; + nbrPoint = mesh_.faceCentres()[faceI]; } } } @@ -383,6 +396,7 @@ void Foam::isoSurface::calcSnappedCc ) const { const pointField& pts = mesh_.points(); + const pointField& cc = mesh_.cellCentres(); snappedCc.setSize(mesh_.nCells()); snappedCc = -1; @@ -427,7 +441,7 @@ void Foam::isoSurface::calcSnappedCc // From cc to neighbour cc. s[2] = isoFraction(cVal, nbrValue); - pt[2] = (1.0-s[2])*mesh_.C()[cellI] + s[2]*nbrPoint; + pt[2] = (1.0-s[2])*cc[cellI] + s[2]*nbrPoint; const face& f = mesh_.faces()[cFaces[cFaceI]]; @@ -436,12 +450,12 @@ void Foam::isoSurface::calcSnappedCc // From cc to fp label p0 = f[fp]; s[0] = isoFraction(cVal, pVals[p0]); - pt[0] = (1.0-s[0])*mesh_.C()[cellI] + s[0]*pts[p0]; + pt[0] = (1.0-s[0])*cc[cellI] + s[0]*pts[p0]; // From cc to fp+1 label p1 = f[f.fcIndex(fp)]; s[1] = isoFraction(cVal, pVals[p1]); - pt[1] = (1.0-s[1])*mesh_.C()[cellI] + s[1]*pts[p1]; + pt[1] = (1.0-s[1])*cc[cellI] + s[1]*pts[p1]; if ( @@ -548,6 +562,7 @@ void Foam::isoSurface::calcSnappedPoint ) const { const pointField& pts = mesh_.points(); + const pointField& cc = mesh_.cellCentres(); const point greatPoint(VGREAT, VGREAT, VGREAT); @@ -616,7 +631,7 @@ void Foam::isoSurface::calcSnappedPoint label fp = findIndex(f, pointI); s[0] = isoFraction(pVals[pointI], cVals[own]); - pt[0] = (1.0-s[0])*pts[pointI] + s[0]*mesh_.C()[own]; + pt[0] = (1.0-s[0])*pts[pointI] + s[0]*cc[own]; s[1] = isoFraction(pVals[pointI], nbrValue); pt[1] = (1.0-s[1])*pts[pointI] + s[1]*nbrPoint; @@ -815,13 +830,6 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints tris.transfer(dynTris); } - if (debug) - { - Pout<< "isoSurface : merged from " << nTris - << " down to " << tris.size() << " triangles." << endl; - } - - // Determine 'flat hole' situation (see RMT paper). // Two unconnected triangles get connected because (some of) the edges @@ -862,6 +870,12 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints triMap.transfer(newToOldTri); tris.setSize(triMap.size()); + + if (debug) + { + Pout<< "isoSurface : merged from " << nTris + << " down to " << tris.size() << " unique triangles." << endl; + } } return triSurface(tris, geometricSurfacePatchList(0), newPoints, true); @@ -1504,17 +1518,21 @@ Foam::isoSurface::isoSurface { const polyPatch& pp = patches[patchI]; - if (pp.coupled()) - { - label faceI = pp.start(); + label faceI = pp.start(); - forAll(pp, i) - { - boundaryRegion[faceI-mesh_.nInternalFaces()] = patchI; - faceI++; - } + forAll(pp, i) + { + boundaryRegion[faceI-mesh_.nInternalFaces()] = patchI; + faceI++; } - else + + // Mark all points that are not physically coupled (so anything + // but collocated coupled patches) + if + ( + !pp.coupled() + || refCast(pp).separated() + ) { label faceI = pp.start(); @@ -1594,6 +1612,48 @@ Foam::isoSurface::isoSurface } + // Generate field to interpolate. This is identical to the mesh.C() + // except on separated coupled patches. + slicedVolVectorField meshC + ( + IOobject + ( + "C", + mesh_.pointsInstance(), + mesh_.meshSubDir, + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE, + false + ), + mesh_, + dimLength, + mesh_.cellCentres(), + mesh_.faceCentres() + ); + { + const polyBoundaryMesh& patches = mesh_.boundaryMesh(); + forAll(patches, patchI) + { + if + ( + patches[patchI].coupled() + && refCast(patches[patchI]).separated() + ) + { + fvPatchVectorField& pfld = const_cast + ( + meshC.boundaryField()[patchI] + ); + pfld.operator== + ( + patches[patchI].patchSlice(mesh_.faceCentres()) + ); + } + } + } + + DynamicList triPoints(nCutCells_); DynamicList