GIT: Resolved conflict

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

View File

@ -29,8 +29,8 @@ porosity1
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (2e8 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
d (2e8 -1000 -1000);
f (0 0 0);
coordinateSystem
{

View File

@ -1,62 +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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
front
{
type wall;
inGroups 1(wall);
nFaces 700;
startFace 63400;
}
back
{
type wall;
inGroups 1(wall);
nFaces 700;
startFace 64100;
}
walls
{
type wall;
inGroups 1(wall);
nFaces 1400;
startFace 64800;
}
porosityWall
{
type wall;
inGroups 1(wall);
nFaces 1600;
startFace 66200;
}
inlet
{
type patch;
nFaces 400;
startFace 67800;
}
outlet
{
type patch;
nFaces 400;
startFace 68200;
}
)
// ************************************************************************* //

View File

@ -1,56 +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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
leftWall
{
type wall;
inGroups 1(wall);
nFaces 50;
startFace 4432;
}
rightWall
{
type wall;
inGroups 1(wall);
nFaces 50;
startFace 4482;
}
lowerWall
{
type wall;
inGroups 1(wall);
nFaces 62;
startFace 4532;
}
atmosphere
{
type patch;
nFaces 46;
startFace 4594;
}
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 4536;
startFace 4640;
}
)
// ************************************************************************* //

View File

@ -1,88 +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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
7
(
leftWall
{
type wall;
inGroups 1(wall);
nFaces 50;
startFace 4419;
}
rightWall
{
type wall;
inGroups 1(wall);
nFaces 50;
startFace 4469;
}
lowerWall
{
type wall;
inGroups 1(wall);
nFaces 62;
startFace 4519;
}
atmosphere
{
type patch;
nFaces 46;
startFace 4581;
}
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 4536;
startFace 4627;
}
porous_half0
{
type cyclic;
inGroups
2
(
cyclic
cyclicFaces
)
;
nFaces 13;
startFace 9163;
matchTolerance 0.0001;
transform unknown;
neighbourPatch porous_half1;
}
porous_half1
{
type cyclic;
inGroups
2
(
cyclic
cyclicFaces
)
;
nFaces 13;
startFace 9176;
matchTolerance 0.0001;
transform unknown;
neighbourPatch porous_half0;
}
)
// ************************************************************************* //

View File

@ -1,53 +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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
inlet
{
type patch;
nFaces 44;
startFace 9981;
}
outlet
{
type patch;
nFaces 64;
startFace 10025;
}
lowerWall
{
type wall;
nFaces 155;
startFace 10089;
}
atmosphere
{
type patch;
nFaces 95;
startFace 10244;
}
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 10160;
startFace 10339;
}
)
// ************************************************************************* //