From 3295abef5c9cfff0ba314ad1c47a78c07c05add1 Mon Sep 17 00:00:00 2001 From: sergio Date: Thu, 28 Jan 2010 12:48:52 +0000 Subject: [PATCH 1/7] Correction of version in tutorial chtMultiRegionFoam --- tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K | 2 +- tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T | 2 +- tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U | 2 +- .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp | 2 +- .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon | 2 +- tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k | 2 +- tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p | 2 +- .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho | 2 +- .../multiRegionHeater/constant/bottomAir/RASProperties | 2 +- .../chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g | 2 +- .../constant/bottomAir/thermophysicalProperties | 2 +- .../multiRegionHeater/constant/bottomAir/turbulenceProperties | 2 +- .../multiRegionHeater/constant/polyMesh/blockMeshDict | 2 +- .../multiRegionHeater/constant/regionProperties | 2 +- .../multiRegionHeater/system/bottomAir/changeDictionaryDict | 2 +- .../multiRegionHeater/system/bottomAir/fvSchemes | 2 +- .../multiRegionHeater/system/bottomAir/fvSolution | 2 +- .../chtMultiRegionFoam/multiRegionHeater/system/controlDict | 2 +- .../chtMultiRegionFoam/multiRegionHeater/system/fvSchemes | 2 +- .../chtMultiRegionFoam/multiRegionHeater/system/fvSolution | 2 +- .../multiRegionHeater/system/heater/changeDictionaryDict | 2 +- .../multiRegionHeater/system/heater/fvSchemes | 2 +- .../multiRegionHeater/system/heater/fvSolution | 2 +- .../multiRegionHeater/system/leftSolid/changeDictionaryDict | 2 +- .../multiRegionHeater/system/leftSolid/fvSchemes | 2 +- .../multiRegionHeater/system/leftSolid/fvSolution | 2 +- .../multiRegionHeater/system/rightSolid/changeDictionaryDict | 2 +- .../multiRegionHeater/system/rightSolid/fvSchemes | 2 +- .../multiRegionHeater/system/rightSolid/fvSolution | 2 +- .../multiRegionHeater/system/topAir/changeDictionaryDict | 2 +- .../multiRegionHeater/system/topAir/fvSchemes | 2 +- .../multiRegionHeater/system/topAir/fvSolution | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K index ea49df4585..4068676987 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T index 8788a0bc78..c6ae16042a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U index 1b349bf9ac..42ab6a0a09 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp index 848efdc53d..84aab72ae1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon index 6d6c661d93..f5dfd4cc55 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k index b657a9bf05..f8bfda5d8e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p index 31a16ae78c..0233591ba3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho index 901d2457a5..e8c31261f1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties index 29aa27e237..0d135f28e9 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g index 6f32e33835..af6459f97c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index af8ff6f5eb..c2d48ee2b0 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties index e009ce86da..9edb2bbd94 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict index bd6aac3b71..06d8984cac 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties index 67629a878b..2ba326a49b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index db3cf3761e..b9a8773586 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes index 33f61814eb..cedcc3c611 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution index 742f7015a5..16947842af 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict index 60ea53c784..3e22a4695d 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes index 83b10f8ae8..7662a20c90 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution index 568b5d9529..fd0e7cced2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict index dba9b78979..b2b1284ef3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes index 8dc070f0eb..74053b0ab3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution index 0396116914..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index 6b4ffab625..05d3011024 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes index 8dc070f0eb..74053b0ab3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution index 0396116914..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index fa811e5fe2..7e1adc24b3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes index 8dc070f0eb..74053b0ab3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution index 0396116914..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict index 46dada5c63..6e9192301d 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes index 33f61814eb..cedcc3c611 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution index 5133861105..27f5cfb1dd 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ From 4561d95209595446b152ca370a8a2ff3d7e3cc13 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:01:56 +0000 Subject: [PATCH 2/7] pTraits: Added non-const access function to the value. --- src/OpenFOAM/primitives/Scalar/Scalar.H | 10 ++++-- src/OpenFOAM/primitives/bools/bool/bool.H | 13 ++++++-- src/OpenFOAM/primitives/ints/label/label.H | 13 ++++++-- src/OpenFOAM/primitives/ints/uLabel/uLabel.H | 12 +++++-- src/OpenFOAM/primitives/pTraits/pTraits.H | 33 ++++++++++++++------ 5 files changed, 64 insertions(+), 17 deletions(-) diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H index 4c818be7c4..f6904dce98 100644 --- a/src/OpenFOAM/primitives/Scalar/Scalar.H +++ b/src/OpenFOAM/primitives/Scalar/Scalar.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,11 +72,17 @@ public: // Member Functions - //- Conversion to a Scalar + //- Access to the Scalar value operator Scalar() const { return p_; } + + //- Access to the Scalar value + operator Scalar&() + { + return p_; + } }; diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H index 78d8f58f93..999355f679 100644 --- a/src/OpenFOAM/primitives/bools/bool/bool.H +++ b/src/OpenFOAM/primitives/bools/bool/bool.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,6 +81,7 @@ public: nComponents = 1 //!< Number of components in bool is 1 }; + // Static data members static const char* const typeName; @@ -88,18 +89,26 @@ public: static const bool zero; static const bool one; + // Constructors //- Construct from Istream pTraits(Istream&); + // Member Functions - //- Conversion to a bool + //- Access to the bool value operator bool() const { return p_; } + + //- Access to the bool value + operator bool&() + { + return p_; + } }; diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H index c81d823241..81bf55e4b1 100644 --- a/src/OpenFOAM/primitives/ints/label/label.H +++ b/src/OpenFOAM/primitives/ints/label/label.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -153,6 +153,7 @@ public: nComponents = 1 //!< Number of components in label is 1 }; + // Static data members static const char* const typeName; @@ -162,18 +163,26 @@ public: static const label min; static const label max; + // Constructors //- Construct from Istream pTraits(Istream&); + // Member Functions - //- Conversion to a label + //- Access to the label value operator label() const { return p_; } + + //- Access to the label value + operator label&() + { + return p_; + } }; diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H index 23115fe99f..2ab4b5b7c9 100644 --- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H +++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,6 +137,7 @@ public: nComponents = 1 //!< Number of components in uLabel is 1 }; + // Static data members static const char* const typeName; @@ -146,6 +147,7 @@ public: static const uLabel max; static const uLabel min; + // Constructors //- Construct from Istream @@ -154,11 +156,17 @@ public: // Member Functions - //- Conversion to a uLabel + //- Access to the uLabel value operator uLabel() const { return p_; } + + //- Access to the uLabel value + operator uLabel&() + { + return p_; + } }; diff --git a/src/OpenFOAM/primitives/pTraits/pTraits.H b/src/OpenFOAM/primitives/pTraits/pTraits.H index 98a3df7ec9..1712f2746d 100644 --- a/src/OpenFOAM/primitives/pTraits/pTraits.H +++ b/src/OpenFOAM/primitives/pTraits/pTraits.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,15 +54,30 @@ class pTraits public: - pTraits(const PrimitiveType& p) - : - PrimitiveType(p) - {} + // Constructors - pTraits(Istream& is) - : - PrimitiveType(is) - {} + pTraits(const PrimitiveType& p) + : + PrimitiveType(p) + {} + + pTraits(Istream& is) + : + PrimitiveType(is) + {} + + + // Member operators + + operator PrimitiveType() const + { + return *this; + } + + operator PrimitiveType&() + { + return *this; + } }; From b1b7fbec655f1cfc8d2ebdebebabe75a884e928a Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:04:36 +0000 Subject: [PATCH 3/7] buoyantPressureFvPatchScalarField: added support for pmh (pressure - hydrostatic) which is the new name for pd. --- .../buoyantPressure/buoyantPressureFvPatchScalarField.C | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C index a6ae6f1ee6..82604d781d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C @@ -117,10 +117,14 @@ void buoyantPressureFvPatchScalarField::updateCoeffs() const fvPatchField& rho = patch().lookupPatchField(rhoName_); - // If the variable name is "pd" assume it is p - rho*g.h + // If the variable name is "pmh" or "pd" assume it is p - rho*g.h // and set the gradient appropriately. // Otherwise assume the variable is the static pressure. - if (dimensionedInternalField().name() == "pd") + if + ( + dimensionedInternalField().name() == "pmh" + || dimensionedInternalField().name() == "pd" + ) { gradient() = -rho.snGrad()*(g.value() & patch().Cf()); } From 3b038c37029b1e51ef18f7b4b67dfb2c1e92890e Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:06:08 +0000 Subject: [PATCH 4/7] settlingFoam: Changed to solving for pmh (static pressure minus hydrostatic pressure). While p and pmh (pd in OpenFOAM-1.5.?) are equivalent on orthogonal meshes they are not on non-orthogonal meshes and the difference is very important for buoyancy-dominated flows such as settling. settlingFoam is now written in terms of pmh (static pressure minus hydrostatic pressure) which used to be called pd but that confused too may people. --- .../solvers/multiphase/settlingFoam/UEqn.H | 3 +- .../multiphase/settlingFoam/createFields.H | 56 ++++++++++++++++--- .../solvers/multiphase/settlingFoam/pmhEqn.H | 52 +++++++++++++++++ .../multiphase/settlingFoam/settlingFoam.C | 30 +++++----- .../settlingFoam/ras/dahl/0/{p => pmh} | 2 +- .../ras/dahl/constant/polyMesh/boundary | 2 +- .../settlingFoam/ras/dahl/system/fvSchemes | 4 +- .../settlingFoam/ras/dahl/system/fvSolution | 2 +- .../multiphase/settlingFoam/ras/tank3D/0/U | 3 +- .../settlingFoam/ras/tank3D/0/{p => pmh} | 17 ++++-- .../settlingFoam/ras/tank3D/Allclean | 2 +- .../ras/tank3D/system/controlDict | 2 +- .../settlingFoam/ras/tank3D/system/fvSchemes | 4 +- .../settlingFoam/ras/tank3D/system/fvSolution | 12 +++- 14 files changed, 149 insertions(+), 42 deletions(-) create mode 100644 applications/solvers/multiphase/settlingFoam/pmhEqn.H rename tutorials/multiphase/settlingFoam/ras/dahl/0/{p => pmh} (98%) rename tutorials/multiphase/settlingFoam/ras/tank3D/0/{p => pmh} (86%) diff --git a/applications/solvers/multiphase/settlingFoam/UEqn.H b/applications/solvers/multiphase/settlingFoam/UEqn.H index 04e9194363..390eeb0502 100644 --- a/applications/solvers/multiphase/settlingFoam/UEqn.H +++ b/applications/solvers/multiphase/settlingFoam/UEqn.H @@ -22,8 +22,7 @@ == fvc::reconstruct ( - fvc::interpolate(rho)*(g & mesh.Sf()) - - fvc::snGrad(p)*mesh.magSf() + (- ghf*fvc::snGrad(rho) - fvc::snGrad(pmh))*mesh.magSf() ) ); } diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H index a085aebb37..6833c90ec9 100644 --- a/applications/solvers/multiphase/settlingFoam/createFields.H +++ b/applications/solvers/multiphase/settlingFoam/createFields.H @@ -1,9 +1,9 @@ - Info<< "Reading field p\n" << endl; - volScalarField p + Info<< "Reading field pmh\n" << endl; + volScalarField pmh ( IOobject ( - "p", + "pmh", runTime.timeName(), mesh, IOobject::MUST_READ, @@ -119,11 +119,6 @@ #include "compressibleCreatePhi.H" - label pRefCell = 0; - scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue); - - Info<< "Calculating field mul\n" << endl; volScalarField mul ( @@ -346,3 +341,48 @@ ), mut + mul ); + + + Info<< "Calculating field (g.h)f\n" << endl; + volScalarField gh("gh", g & mesh.C()); + surfaceScalarField ghf = surfaceScalarField("gh", g & mesh.Cf()); + + volScalarField p + ( + IOobject + ( + "p", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + pmh + rho*gh + ); + + label pmhRefCell = 0; + scalar pmhRefValue = 0.0; + setRefCell + ( + pmh, + mesh.solutionDict().subDict("PISO"), + pmhRefCell, + pmhRefValue + ); + + scalar pRefValue = 0.0; + + if (pmh.needReference()) + { + pRefValue = readScalar + ( + mesh.solutionDict().subDict("PISO").lookup("pRefValue") + ); + + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pmhRefCell) + ); + } diff --git a/applications/solvers/multiphase/settlingFoam/pmhEqn.H b/applications/solvers/multiphase/settlingFoam/pmhEqn.H new file mode 100644 index 0000000000..5a9b01a6f2 --- /dev/null +++ b/applications/solvers/multiphase/settlingFoam/pmhEqn.H @@ -0,0 +1,52 @@ +volScalarField rUA = 1.0/UEqn.A(); + +surfaceScalarField rUAf +( + "(rho*(1|A(U)))", + fvc::interpolate(rho)*fvc::interpolate(rUA) +); + +U = rUA*UEqn.H(); +phi = + fvc::interpolate(rho) + *( + (fvc::interpolate(U) & mesh.Sf()) + + fvc::ddtPhiCorr(rUA, rho, U, phi) + ); + +surfaceScalarField phiU("phiU", phi); +phi -= ghf*fvc::snGrad(rho)*rUAf*mesh.magSf(); + +for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) +{ + fvScalarMatrix pmhEqn + ( + fvm::laplacian(rUAf, pmh) == fvc::ddt(rho) + fvc::div(phi) + ); + + pmhEqn.setReference(pmhRefCell, pmhRefValue); + pmhEqn.solve(); + + if (nonOrth == nNonOrthCorr) + { + phi -= pmhEqn.flux(); + } +} + +p == pmh + rho*gh; + +if (pmh.needReference()) +{ + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pmhRefCell) + ); +} + +#include "rhoEqn.H" +#include "compressibleContinuityErrs.H" + +U += rUA*fvc::reconstruct((phi - phiU)/rUAf); +U.correctBoundaryConditions(); diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C index 942ed729be..006870828a 100644 --- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C +++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C @@ -64,22 +64,24 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" - #include "calcVdj.H" - - #include "UEqn.H" - - #include "alphaEqn.H" - - #include "correctViscosity.H" - - - // --- PISO loop - for (int corr=0; corr/dev/null +rm log.* diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict index cd4042ef63..b6d0e5c258 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict @@ -17,7 +17,7 @@ FoamFile application settlingFoam; -startFrom startTime; +startFrom latestTime; startTime 0; diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes index 3802ef8dca..e076870135 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes @@ -39,7 +39,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian((rho*(1|A(U))),pmh) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(mut,Alpha) Gauss linear corrected; @@ -58,7 +58,7 @@ snGradSchemes fluxRequired { default no; - p ; + pmh ; } diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution index 148cdcddc5..ac27adffb4 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + pmh { solver PCG; preconditioner DIC; @@ -68,9 +68,17 @@ solvers PISO { - nCorrectors 2; + momentumPredictor yes; + nOuterCorrectors 1; + nCorrectors 2; nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + U 1; + k 1; + epsilon 1; +} // ************************************************************************* // From 5579f7afe423f97d002002152bac3af0b122907e Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:06:30 +0000 Subject: [PATCH 5/7] AverageIOField: Changed the average value to be member data. --- .../AverageIOField.C | 40 ++++++++++--------- .../AverageIOField.H | 24 ++++++----- .../AverageIOFields.C | 2 + 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C index 1450290f74..2f079100a5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,42 +26,37 @@ License #include "AverageIOField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -AverageIOField::AverageIOField +Foam::AverageIOField::AverageIOField ( const IOobject& io ) : - regIOobject(io), - pTraits(readStream(typeName)), - Field(readStream(typeName)) + regIOobject(io) { + readStream(typeName) >> average_; + readStream(typeName) >> static_cast&>(*this); close(); } template -AverageIOField::AverageIOField +Foam::AverageIOField::AverageIOField ( const IOobject& io, const label size ) : regIOobject(io), - pTraits(pTraits::zero), - Field(size) + Field(size), + average_(0) {} template -AverageIOField::AverageIOField +Foam::AverageIOField::AverageIOField ( const IOobject& io, const Type& average, @@ -69,21 +64,28 @@ AverageIOField::AverageIOField ) : regIOobject(io), - pTraits(average), - Field(f) + Field(f), + average_(average) { if (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk()) { readStream(typeName) - >> static_cast(*this) + >> average_ >> static_cast&>(*this); close(); } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +template +bool Foam::AverageIOField::writeData(Ostream& os) const +{ + os << average_ + << token::NL + << static_cast&>(*this); + + return os.good(); +} -} // End namespace Foam // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H index 4217dcbd1a..25634ab109 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,16 +45,20 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class AverageIOField Declaration + Class AverageIOField Declaration \*---------------------------------------------------------------------------*/ template class AverageIOField : public regIOobject, - public pTraits, public Field { + // Private data + + //- The average of the field + Type average_; + public: @@ -87,19 +91,17 @@ public: // Member functions - const pTraits& average() const + const Type& average() const { - return static_cast&>(*this); + return average_; } - bool writeData(Ostream& os) const + Type& average() { - os << static_cast(*this) - << token::NL - << static_cast&>(*this); - - return os.good(); + return average_; } + + bool writeData(Ostream& os) const; }; diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOFields.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOFields.C index e39cd28d90..066b741abe 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOFields.C @@ -22,6 +22,8 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Description + \*---------------------------------------------------------------------------*/ #include "AverageIOField.H" From d36bb781b7553d68dddba584ac72b5e3776a1589 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:07:18 +0000 Subject: [PATCH 6/7] timeVaryingMappedFixedValueFvPatchField: Added the option to specify the name of the field data table. Defaults to the name of the field the BC is being applied to but may be set using the keyword fieldTableName, e.g. fieldTableName totalPressure; --- .../timeVaryingMappedFixedValueFvPatchField.C | 31 ++++++++++++++----- .../timeVaryingMappedFixedValueFvPatchField.H | 3 ++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index b1afef7b88..9ce0597ff2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C @@ -49,6 +49,7 @@ timeVaryingMappedFixedValueFvPatchField ) : fixedValueFvPatchField(p, iF), + fieldTableName_(iF.name()), setAverage_(false), referenceCS_(NULL), nearestVertex_(0), @@ -80,6 +81,7 @@ timeVaryingMappedFixedValueFvPatchField ) : fixedValueFvPatchField(ptf, p, iF, mapper), + fieldTableName_(ptf.fieldTableName_), setAverage_(ptf.setAverage_), referenceCS_(NULL), nearestVertex_(0), @@ -110,6 +112,7 @@ timeVaryingMappedFixedValueFvPatchField ) : fixedValueFvPatchField(p, iF), + fieldTableName_(iF.name()), setAverage_(readBool(dict.lookup("setAverage"))), referenceCS_(NULL), nearestVertex_(0), @@ -128,6 +131,11 @@ timeVaryingMappedFixedValueFvPatchField << endl; } + if (dict.found("fieldTableName")) + { + dict.lookup("fieldTableName") >> fieldTableName_; + } + if (dict.found("value")) { fvPatchField::operator==(Field("value", dict, p.size())); @@ -147,6 +155,7 @@ timeVaryingMappedFixedValueFvPatchField ) : fixedValueFvPatchField(ptf), + fieldTableName_(ptf.fieldTableName_), setAverage_(ptf.setAverage_), referenceCS_(ptf.referenceCS_), nearestVertex_(ptf.nearestVertex_), @@ -177,6 +186,7 @@ timeVaryingMappedFixedValueFvPatchField ) : fixedValueFvPatchField(ptf, iF), + fieldTableName_(ptf.fieldTableName_), setAverage_(ptf.setAverage_), referenceCS_(ptf.referenceCS_), nearestVertex_(ptf.nearestVertex_), @@ -271,8 +281,8 @@ void timeVaryingMappedFixedValueFvPatchField::readSamplePoints() << "Need at least three non-colinear samplePoints" << " to be able to interpolate." << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of points " << samplePoints.name() + << " in file " << samplePoints.objectPath() << exit(FatalError); } @@ -332,8 +342,8 @@ void timeVaryingMappedFixedValueFvPatchField::readSamplePoints() ) << "Cannot find points that make valid normal." << nl << "Need at least three sample points which are not in a line." << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of points " << samplePoints.name() + << " in file " << samplePoints.objectPath() << exit(FatalError); } @@ -474,8 +484,7 @@ void timeVaryingMappedFixedValueFvPatchField::findTime << "In directory " << this->db().time().constant()/"boundaryData"/this->patch().name() << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << fieldTableName_ << exit(FatalError); } @@ -563,7 +572,7 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() ( IOobject ( - this->dimensionedInternalField().name(), + fieldTableName_, this->db().time().constant(), "boundaryData" /this->patch().name() @@ -608,7 +617,7 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() ( IOobject ( - this->dimensionedInternalField().name(), + fieldTableName_, this->db().time().constant(), "boundaryData" /this->patch().name() @@ -771,6 +780,12 @@ void timeVaryingMappedFixedValueFvPatchField::write(Ostream& os) const { fvPatchField::write(os); os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl; + + if (fieldTableName_ != this->dimensionedInternalField().name()) + { + os.writeKeyword("fieldTableName") << fieldTableName_ << token::END_STATEMENT << nl; + } + this->writeEntry("value", os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H index 31b88ae03a..a310c8f4dc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H @@ -57,6 +57,9 @@ class timeVaryingMappedFixedValueFvPatchField { // Private data + //- Name of the field data table, defaults to the name of the field + word fieldTableName_; + //- If true adjust the mapped field to maintain average value bool setAverage_; From 200b5d4f29579d02752b53cef309cbf4c96dcd5d Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 28 Jan 2010 16:08:11 +0000 Subject: [PATCH 7/7] GeometricField: Reformatted slightly. --- .../GeometricFields/GeometricField/GeometricField.H | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H index 4e38804cc9..f9ac079b0f 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H @@ -345,12 +345,12 @@ public: ); //- Construct as copy of tmp deleting argument -# ifdef ConstructFromTmp + #ifdef ConstructFromTmp GeometricField ( const tmp >& ); -# endif + #endif //- Construct as copy resetting IO parameters GeometricField @@ -367,13 +367,13 @@ public: ); //- Construct as copy resetting name -# ifdef ConstructFromTmp + #ifdef ConstructFromTmp GeometricField ( const word& newName, const tmp >& ); -# endif + #endif //- Construct as copy resetting IO parameters and patch type GeometricField @@ -392,9 +392,8 @@ public: ); - // Destructor - - virtual ~GeometricField(); + //- Destructor + virtual ~GeometricField(); // Member Functions