Skip to content
Snippets Groups Projects
Commit bfbab344 authored by henry's avatar henry
Browse files

Corrected merge conflicts from header changes.

parent 6574570b
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 54 deletions
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
+ 0
− 4
View file @ bfbab344
......@@ -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
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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 | |
\*---------------------------------------------------------------------------*/
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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 | |
\*---------------------------------------------------------------------------*/
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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
......
tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
+ 0
− 5
View file @ bfbab344
/*--------------------------------*- 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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment