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;
}
)
// ************************************************************************* //

View File

@ -1,62 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev-OpenCFD.feature-externalCoupled |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
maxY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8300;
}
minX
{
type patch;
nFaces 100;
startFace 8600;
}
maxX
{
type patch;
nFaces 100;
startFace 8700;
}
minY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8800;
}
minZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9100;
}
maxZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9400;
}
)
// ************************************************************************* //

View File

@ -53,10 +53,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p_rgh;
}
// ************************************************************************* //

View File

@ -38,9 +38,5 @@ snGradSchemes
{
}
fluxRequired
{
}
// ************************************************************************* //

View File

@ -45,9 +45,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
}
// ************************************************************************* //

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
(
maxY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8300;
}
minX
{
type patch;
nFaces 100;
startFace 8600;
}
maxX
{
type patch;
nFaces 100;
startFace 8700;
}
minY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8800;
}
minZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9100;
}
maxZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9400;
}
)
// ************************************************************************* //

View File

@ -1,54 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev-OpenCFD |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
inlet
{
type patch;
nFaces 70;
startFace 648417;
}
outlet
{
type patch;
nFaces 2250;
startFace 648487;
}
exterior
{
type patch;
nFaces 2250;
startFace 650737;
}
symmetry
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 4365;
startFace 652987;
}
walls
{
type wall;
inGroups 1(wall);
nFaces 15071;
startFace 657352;
}
)
// ************************************************************************* //

View File

@ -60,12 +60,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p_rgh ;
}
wallDist
{
method meshWave;

View File

@ -39,9 +39,5 @@ snGradSchemes
{
}
fluxRequired
{
}
// ************************************************************************* //

View File

@ -45,9 +45,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
}
// ************************************************************************* //

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 2.3.x |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 2.3.x |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -46,8 +46,8 @@ porosityBlockage
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0] (-1000 -1000 1e4);
f f [0 -1 0 0 0] (0 0 0);
d (-1000 -1000 1e4);
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
(
maxY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8300;
}
minX
{
type patch;
nFaces 100;
startFace 8600;
}
maxX
{
type patch;
nFaces 100;
startFace 8700;
}
minY
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 8800;
}
minZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9100;
}
maxZ
{
type wall;
inGroups 1(wall);
nFaces 300;
startFace 9400;
}
)
// ************************************************************************* //