Commit 777b1399 authored 9 years ago by mattijs

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into develop

Conflicts:
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C

parents ff6b5502 2fcc523f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/incompressible/boundaryFoam/boundaryFoam.C 2 additions, 0 deletions

...ations/solvers/incompressible/boundaryFoam/boundaryFoam.C
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log 0 additions, 6 deletions

...tiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C 1 addition, 1 deletion

...oam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/write.H 0 additions, 17 deletions

...phase/reactingEulerFoam/reactingTwoPhaseEulerFoam/write.H
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C 20 additions, 6 deletions

...ilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C 171 additions, 14 deletions

...s/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 136 additions, 20 deletions

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C 6 additions, 3 deletions

...ons/utilities/mesh/manipulation/checkMesh/checkGeometry.C
applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C 5 additions, 1 deletion

...ities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C 8 additions, 1 deletion

...ies/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
applications/utilities/parallelProcessing/decomposePar/Make/options 2 additions, 0 deletions

...ns/utilities/parallelProcessing/decomposePar/Make/options
applications/utilities/parallelProcessing/decomposePar/decomposePar.C 52 additions, 38 deletions

.../utilities/parallelProcessing/decomposePar/decomposePar.C
applications/utilities/parallelProcessing/decomposePar/decomposeParDict 53 additions, 2 deletions

...tilities/parallelProcessing/decomposePar/decomposeParDict
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C 50 additions, 119 deletions

...ies/parallelProcessing/decomposePar/domainDecomposition.C
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H 10 additions, 5 deletions

...ies/parallelProcessing/decomposePar/domainDecomposition.H
applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C 9 additions, 6 deletions

...elProcessing/decomposePar/domainDecompositionDistribute.C
applications/utilities/parallelProcessing/decomposePar/readFields.C 46 additions, 11 deletions

...ns/utilities/parallelProcessing/decomposePar/readFields.C
applications/utilities/parallelProcessing/decomposePar/readFields.H 11 additions, 1 deletion

...ns/utilities/parallelProcessing/decomposePar/readFields.H
applications/utilities/parallelProcessing/reconstructPar/Make/options 2 additions, 0 deletions

.../utilities/parallelProcessing/reconstructPar/Make/options
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C 76 additions, 2 deletions

...lities/parallelProcessing/reconstructPar/reconstructPar.C

with 660 additions and 253 deletions

Please register or to comment