mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Conflicts: src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C src/parallel/decompose/scotchDecomp/scotchDecomp.C src/parallel/parMetisDecomp/parMetisDecomp.C src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C