Merge branch 'master' into feature/cvMesh (c644cb68) · Commits · exaFOAM / wp3-refactoring

Commit c644cb68 authored 11 years ago by

laurence

Merge branch 'master' into feature/cvMesh

Conflicts:
	applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

parents ae7a7bc1 cc8a2327

Branches

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C 32 additions, 29 deletions

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

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C 14 additions, 5 deletions

...tions/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C 1 addition, 1 deletion

.../GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C 9 additions, 25 deletions

src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C 48 additions, 27 deletions

...hes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H 36 additions, 27 deletions

...hes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H
src/dynamicMesh/motionSmoother/motionSmootherCheck.C 33 additions, 29 deletions

src/dynamicMesh/motionSmoother/motionSmootherCheck.C
src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C 62 additions, 77 deletions

...icMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H 2 additions, 11 deletions

...icMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H
src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C 2 additions, 2 deletions

...general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C 2 additions, 2 deletions

...me/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C 1 addition, 1 deletion

...Volume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C 24 additions, 0 deletions

...atchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H 24 additions, 18 deletions

...atchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C 41 additions, 1 deletion

...teVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H 23 additions, 4 deletions

...teVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C 2 additions, 2 deletions

...limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H 3 additions, 26 deletions

.../surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H 3 additions, 28 deletions

...surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H

with 382 additions and 326 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' into feature/cvMesh