mattijs
|
49fb39e8f3
|
Merge commit 'origin/master' into splitCyclic
Conflicts:
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
|
2010-03-09 21:28:53 +00:00 |
|