From bfbab344916e83902831e9c6afaaacf9f5abc958 Mon Sep 17 00:00:00 2001 From: henry <Henry Weller h.weller@opencfd.co.uk> Date: Wed, 23 Jun 2010 17:03:41 +0100 Subject: [PATCH] Corrected merge conflicts from header changes. --- .../multiRegionHeater/constant/polyMesh/boundary | 4 ---- .../snappyMultiRegionHeater/constant/polyMesh/boundary | 4 ---- .../snappyMultiRegionHeater/constant/topAir/RASProperties | 4 ---- .../constant/topAir/thermophysicalProperties | 4 ---- .../constant/topAir/turbulenceProperties | 4 ---- .../multiRegionHeater/constant/polyMesh/boundary | 4 ---- .../simpleFoam/windTurbineTerrain/0/include/fixedInlet | 5 ----- .../windTurbineTerrain/0/include/sideAndTopPatches | 5 ----- tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut | 5 ----- tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p | 5 ----- .../simpleFoam/windTurbineTerrain/constant/RASProperties | 5 ----- .../simpleFoam/windTurbineTerrain/system/decomposeParDict | 5 ----- 12 files changed, 54 deletions(-) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary index f580ba31065..39c75e0d212 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary index ff6f22bad94..4c44b92b595 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties index ecbca25509f..1597ab89059 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index 28dfd330415..64a74514b8b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties index 5da159ec0cc..e01c7d0bdb7 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary index f580ba31065..39c75e0d212 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet index 6aa487df946..491f5d824cf 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches index f83fee59b6f..c383ea3a819 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut index ba9af115582..dbff87ae2a1 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p index 4c626134081..1449474a5ee 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties index a33d9a3df2d..492ab236e15 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict index 4e736474935..ede2ec0462c 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile -- GitLab