Merge branch 'master' into splitCyclic

Conflicts:
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
	applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
	src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
	src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
	src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
	src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
	src/edgeMesh/edgeFormats/vtk/VTKedgeFormat.H
	src/mesh/blockMesh/curvedEdges/spline.H
	src/meshTools/PointEdgeWave/PointEdgeWave.C
	src/meshTools/sets/topoSets/faceSet.C
This commit is contained in:
mattijs
2010-01-26 17:11:18 +00:00
1391 changed files with 507189 additions and 62865 deletions

View File

@ -53,7 +53,7 @@ void Foam::PointEdgeWave<Type>::offset(const label val, labelList& elems)
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Gets point-point correspondence. Is
// Gets point-point correspondence. Is
// - list of halfA points (in cyclic patch points)
// - list of halfB points (can overlap with A!)
// - for every patchPoint its corresponding point
@ -111,7 +111,7 @@ void Foam::PointEdgeWave<Type>::leaveDomain
) const
{
const labelList& meshPoints = patch.meshPoints();
forAll(patchPointLabels, i)
{
label patchPointI = patchPointLabels[i];
@ -134,7 +134,7 @@ void Foam::PointEdgeWave<Type>::enterDomain
) const
{
const labelList& meshPoints = patch.meshPoints();
forAll(patchPointLabels, i)
{
label patchPointI = patchPointLabels[i];
@ -453,7 +453,7 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
{
OPstream toNeighbour
(
(
Pstream::blocking,
procPatch.neighbProcNo()
);
@ -488,7 +488,7 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
);
fromNeighbour >> owner >> ownerIndex >> patchInfo;
}
}
if (debug)
{
@ -625,7 +625,7 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
if (debug)
{
Pout<< "Cyclic patch " << patchI << ' ' << patch.name()
Pout<< "Cyclic patch " << patchI << ' ' << patch.name()
<< " Changed on first half : " << halfAInfo.size()
<< " Changed on second half : " << halfBInfo.size()
<< endl;
@ -662,7 +662,7 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Iterate, propagating changedPointsInfo across mesh, until no change (or
// Iterate, propagating changedPointsInfo across mesh, until no change (or
// maxIter reached). Initial point values specified.
template <class Type>
Foam::PointEdgeWave<Type>::PointEdgeWave
@ -977,7 +977,7 @@ Foam::label Foam::PointEdgeWave<Type>::iterate(const label maxIter)
label iter = 0;
while(iter < maxIter)
while (iter < maxIter)
{
if (debug)
{