diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C index 91dbaba9ebd4e4037cad2731763c901ca77d3661..adb3bf8a88dc7f4d0a60f33841c1fce424b0d981 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 abe9b7c5d0c878dd0102962dc6eda3e77f16e2fa..083849c7ab9b76b6cd31ccbfd50c997b1005faac 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::scalarField> Foam::constSolidThermo::K const label patchI ) const { - return tmp<scalarField> - ( - 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 cc9bc06422159316983ac94b9945125bd3784a93..0f86edd2fd26cf2d528fa4860a47e2b615ec6ded 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 af43965719ae353a52bc14b3c2cb67eb2fcaa1a7..d7b2c3f4e38267cd4802f7d1d330a0f10753ff63 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 c0b1c57ad9bdb629fb091cc842723200b9c701d6..5095d44209f6a69c6d97ba677092b5ed4fea6d30 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 e70bf3dec049007f0f422f82e0a9cab1950acdec..f122ced6002a3f2c01d98cc81f056c8ee12b4d78 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 7d8327178dc1bfdc8f0907c3e57a5029f34f92ad..7c1b49bba666dc76387b241b83c5b4a307236377 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 79d4bcf728fb94be8cf8005f066b6a3aacc56d98..50b7892cba5379ceff6ae9fc6bc3956d58f51345 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 ed7509d9f40faa7f5eef93792515b71bbb45693f..ca4e6c968438d7412be3a0471866811a97721957 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 57a6d5ab272a04c8f6a2a4580a11c4eb6c95e840..242f45c9433d5e0c38dbd781351fee02196f2582 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 1dc73a2624da5f2db2ec882c171488c552a93802..d24a5478e180909c4c274b78b140437fb0b7b837 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 0ca8b79198e1a8158856259d4186a0c49dc9d2ab..8782fc3987226248544dff0e07fd18506d70013f 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 89387dba538f465d418f3af193599f71c20b07c4..5eb48934bcb8327370debeee135904e714ce6e13 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 d94861f4ba916fc33c2b8a78dee31abd824aa735..6acd2d628247fec2eee63a3eb5f7cd36e9be3ebf 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 f403fa62a9c2c7d7a8a9116b34e99510fe68ef47..a50c9aeafc138c8fc40327eba8eded955c84778f 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 38b3c31d20bb09da42ba8cd68c635642a74d03f3..d79dbb6d849d4b1375037d837bc9f76ce3f6c367 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 958b0085f84e889ca697756025737bcee2631339..1367081449fbc77880917955a96d9d3c2140db72 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 b4b0eee712c41e456c748a42ef7cffd25ec834b0..e387970281a9821705966649484bbf24343832d7 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 ba1c9a7919689042ba64937dc459a6f2fde5b568..41bb9021966aaa079f9aa6d4c3c303ebd19fbcee 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 81cfdb427d7354a8fbe85b140488d725b1ebcbbf..e57f4b203c85e8964e92952424b4d0cc0ee72317 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 97cfc596c045e3b78b6ae9c1c23a2410df34c89f..cfdaa34ad7a1ebfb183fb55a65160c3d93679fd2 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 ce19474d30478c00148f61901742e7785f83e452..98aa306ca2827138a96e836569ff0eeb65838f10 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 a247de0973a7cee1e6d2988eeb8b4a5875311e44..0c81370dc65ec0225fa661cbab8c81887ec3e187 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 94380a9e7662d4c5d8b3b0e32f93fb31551b1a26..e78b6f6cf4cd848917a37653d50cc1ccc312b7a7 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 99eed3629ec964960a56948d38baad5247a82735..224cd1d79ced0a0153483690df104f94498c740f 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 72c26cef38ea125f7534bbf1405b2529dd0c5e5a..a8ba113bdf80770dbc85e338887f2fe780921d45 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