GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
2311 changed files with 44971 additions and 26546 deletions

View File

@ -1,50 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
frontAndBack
{
type wall;
inGroups 1(wall);
nFaces 1050;
startFace 228225;
}
topAndBottom
{
type wall;
inGroups 1(wall);
nFaces 10500;
startFace 229275;
}
hot
{
type wall;
inGroups 1(wall);
nFaces 2250;
startFace 239775;
}
cold
{
type wall;
inGroups 1(wall);
nFaces 2250;
startFace 242025;
}
)
// ************************************************************************* //

View File

@ -1,50 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
box
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 303675;
}
floor
{
type wall;
inGroups 1(wall);
nFaces 5125;
startFace 303975;
}
ceiling
{
type wall;
inGroups 1(wall);
nFaces 5225;
startFace 309100;
}
fixedWalls
{
type wall;
inGroups 1(wall);
nFaces 6000;
startFace 314325;
}
)
// ************************************************************************* //

View File

@ -1,50 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
box
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 303675;
}
floor
{
type wall;
inGroups 1(wall);
nFaces 5125;
startFace 303975;
}
ceiling
{
type wall;
inGroups 1(wall);
nFaces 5225;
startFace 309100;
}
fixedWalls
{
type wall;
inGroups 1(wall);
nFaces 6000;
startFace 314325;
}
)
// ************************************************************************* //