Skip to content
  • mattijs's avatar
    cff25803
    Merge branch 'master' into splitCyclic · cff25803
    mattijs authored
    Conflicts:
    	applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
    	applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
    	src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
    	src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
    	src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
    	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
    	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
    	src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
    	src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
    	src/meshTools/sets/topoSets/faceSet.C
    	src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
    cff25803
    Merge branch 'master' into splitCyclic
    mattijs authored
    Conflicts:
    	applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
    	applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
    	src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
    	src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
    	src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
    	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
    	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
    	src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
    	src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
    	src/meshTools/sets/topoSets/faceSet.C
    	src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
Loading