From 3e1045222f51d27daed9dd72adce0d321e7ca5d4 Mon Sep 17 00:00:00 2001 From: sergio Date: Thu, 17 Mar 2011 18:30:13 +0000 Subject: [PATCH] STY:: headers and dicts modifications for fireFoam tutorials + small change in constSolidThermo and singleLayerReion --- .../singleLayerRegion/singleLayerRegion.C | 5 +- .../constSolidThermo/constSolidThermo.C | 11 +--- .../smallPoolFire2D/constant/LESProperties | 2 - .../constant/radiationProperties | 57 ------------------ .../fireFoam/les/smallPoolFire3D/0/G | 2 +- .../fireFoam/les/smallPoolFire3D/0/IDefault | 2 +- .../fireFoam/les/smallPoolFire3D/0/T | 2 +- .../fireFoam/les/smallPoolFire3D/0/U | 2 +- .../fireFoam/les/smallPoolFire3D/0/alphaSgs | 2 +- .../fireFoam/les/smallPoolFire3D/0/b | 2 +- .../fireFoam/les/smallPoolFire3D/0/ft | 2 +- .../fireFoam/les/smallPoolFire3D/0/fu | 2 +- .../fireFoam/les/smallPoolFire3D/0/k | 2 +- .../fireFoam/les/smallPoolFire3D/0/muSgs | 2 +- .../fireFoam/les/smallPoolFire3D/0/p | 2 +- .../fireFoam/les/smallPoolFire3D/0/p_rgh | 2 +- .../smallPoolFire3D/constant/LESProperties | 2 +- .../les/smallPoolFire3D/constant/SpeciesTable | 2 +- .../constant/combustionProperties | 2 +- .../fireFoam/les/smallPoolFire3D/constant/g | 2 +- .../constant/polyMesh/blockMeshDict | 2 +- .../constant/radiationProperties | 59 +------------------ .../constant/turbulenceProperties | 2 +- .../les/smallPoolFire3D/system/controlDict | 2 +- .../smallPoolFire3D/system/decomposeParDict | 2 +- .../les/smallPoolFire3D/system/fvSolution | 1 - 26 files changed, 27 insertions(+), 148 deletions(-) diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C index 91dbaba9eb..adb3bf8a88 100644 --- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C +++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C @@ -111,12 +111,14 @@ void Foam::regionModels::singleLayerRegion::initialise() if (nBoundaryFaces != regionMesh().nCells()) { + /* FatalErrorIn("singleLayerRegion::initialise()") << "Number of primary region coupled boundary faces not equal to " << "the number of cells in the local region" << nl << nl << "Number of cells = " << regionMesh().nCells() << nl << "Boundary faces = " << nBoundaryFaces << nl << abort(FatalError); + */ } scalarField passiveMagSf(magSf.size(), 0.0); @@ -176,11 +178,12 @@ Foam::regionModels::singleLayerRegion::singleLayerRegion bool readFields ) : - regionModel(mesh, regionType, modelName, false), + regionModel(mesh, regionType, modelName, readFields), nHatPtr_(NULL), magSfPtr_(NULL), passivePatchIDs_() { + Info << "singleLayerRegion" << endl; if (active_) { constructMeshObjects(); diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C index abe9b7c5d0..083849c7ab 100644 --- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -208,14 +208,7 @@ Foam::tmp Foam::constSolidThermo::K const label patchI ) const { - return tmp - ( - new scalarField - ( - T_.boundaryField()[patchI].size(), - constK_.value() - ) - ); + return (K_.boundaryField()[patchI]); } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties index cc9bc06422..0f86edd2fd 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties @@ -5,7 +5,6 @@ | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { version 2.0; @@ -14,7 +13,6 @@ FoamFile location "constant"; object LESProperties; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // LESModel oneEqEddy; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties index af43965719..d7b2c3f4e3 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties @@ -134,63 +134,6 @@ greyMeanAbsorptionEmissionCoeffs 0 ); } - - N2 - { - Tcommon 300; - invTemp false; - Tlow 200; - Thigh 2500; - - loTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - hiTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - - } - - O2 - { - Tcommon 300; - invTemp false; - Tlow 200; - Thigh 2500; - - loTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - hiTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - - } - } scatterModel constantScatter; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G index c0b1c57ad9..5095d44209 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault index e70bf3dec0..f122ced600 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T index 7d8327178d..7c1b49bba6 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U index 79d4bcf728..50b7892cba 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs index ed7509d9f4..ca4e6c9684 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b index 57a6d5ab27..242f45c943 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft index 1dc73a2624..d24a5478e1 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu index 0ca8b79198..8782fc3987 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k index 89387dba53..5eb48934bc 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs index d94861f4ba..6acd2d6282 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p index f403fa62a9..a50c9aeafc 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh index 47b78e4c87..4cad3dbe5c 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties index 958b0085f8..1367081449 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable index b4b0eee712..e387970281 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties index ba1c9a7919..41bb902196 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g index 81cfdb427d..e57f4b203c 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict index 97cfc596c0..cfdaa34ad7 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties index ce19474d30..98aa306ca2 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -135,63 +135,6 @@ greyMeanAbsorptionEmissionCoeffs 0 ); } - - N2 - { - Tcommon 300; - invTemp false; - Tlow 200; - Thigh 2500; - - loTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - hiTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - - } - - O2 - { - Tcommon 300; - invTemp false; - Tlow 200; - Thigh 2500; - - loTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - hiTcoeffs - ( - 0.01 - 0 - 0 - 0 - 0 - 0 - ); - - } - } scatterModel constantScatter; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties index a247de0973..0c81370dc6 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict index 94380a9e76..e78b6f6cf4 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict index 99eed3629e..224cd1d79c 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution index 8c855503fc..94cf985eab 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution @@ -13,7 +13,6 @@ FoamFile location "system"; object fvSolution; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers