Resolved unexpected merge problem.

This commit is contained in:
henry
2010-05-25 18:49:10 +01:00
96 changed files with 2936 additions and 452 deletions

View File

@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
3
6
(
periodicX
periodicX_half0
{
type cyclic;
nFaces 288;
nFaces 144;
startFace 4752;
featureCos 0.9;
neighbourPatch periodicX_half1;
}
periodicY
periodicX_half1
{
type cyclic;
nFaces 288;
nFaces 144;
startFace 4896;
neighbourPatch periodicX_half0;
}
periodicY_half0
{
type cyclic;
nFaces 144;
startFace 5040;
featureCos 0.9;
neighbourPatch periodicY_half1;
}
periodicZ
periodicY_half1
{
type cyclic;
nFaces 288;
nFaces 144;
startFace 5184;
neighbourPatch periodicY_half0;
}
periodicZ_half0
{
type cyclic;
nFaces 144;
startFace 5328;
featureCos 0.9;
neighbourPatch periodicZ_half1;
}
periodicZ_half1
{
type cyclic;
nFaces 144;
startFace 5472;
neighbourPatch periodicZ_half0;
}
)

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
3
6
(
periodicX
periodicX_half0
{
type cyclic;
nFaces 264;
nFaces 132;
startFace 4344;
featureCos 0.9;
neighbourPatch periodicX_half1;
}
periodicY
periodicX_half1
{
type cyclic;
nFaces 264;
nFaces 132;
startFace 4476;
neighbourPatch periodicX_half0;
}
periodicY_half0
{
type cyclic;
nFaces 132;
startFace 4608;
featureCos 0.9;
neighbourPatch periodicY_half1;
}
periodicZ
periodicY_half1
{
type cyclic;
nFaces 288;
nFaces 132;
startFace 4740;
neighbourPatch periodicY_half0;
}
periodicZ_half0
{
type cyclic;
nFaces 144;
startFace 4872;
featureCos 0.9;
neighbourPatch periodicZ_half1;
}
periodicZ_half1
{
type cyclic;
nFaces 144;
startFace 5016;
neighbourPatch periodicZ_half0;
}
)