merge with master + fix conflict (24fa65eb) · Commits · Development / openfoam

Commit 24fa65eb authored 15 years ago by

Andrew Heather

Browse files

merge with master + fix conflict

parents a0101214 d8304417

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 4 additions, 1 deletion

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
applications/utilities/mesh/manipulation/createPatch/createPatch.C 3 additions, 22 deletions

...ons/utilities/mesh/manipulation/createPatch/createPatch.C
applications/utilities/mesh/manipulation/createPatch/createPatchDict 2 additions, 2 deletions

...s/utilities/mesh/manipulation/createPatch/createPatchDict
applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt 1 addition, 1 deletion

...ssing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt
applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt 1 addition, 1 deletion

...cessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt
applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C 2 additions, 3 deletions

...s/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
bin/tools/CleanFunctions 3 additions, 0 deletions

bin/tools/CleanFunctions
src/OSspecific/POSIX/signals/sigFpe.C 1 addition, 1 deletion

src/OSspecific/POSIX/signals/sigFpe.C
src/OpenFOAM/primitives/Scalar/scalar/scalar.H 3 additions, 3 deletions

src/OpenFOAM/primitives/Scalar/scalar/scalar.H
src/Pstream/mpi/Pstream.C 2 additions, 2 deletions

src/Pstream/mpi/Pstream.C
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 1 addition, 1 deletion

...glomerationMethods/MGridGenGamgAgglomeration/Make/options
tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary 3 additions, 2 deletions

...als/basic/laplacianFoam/flange/constant/polyMesh/boundary
tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary 3 additions, 2 deletions

...s/basic/potentialFoam/cylinder/constant/polyMesh/boundary
tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary 33 additions, 36 deletions

.../basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary 33 additions, 36 deletions

.../scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary 33 additions, 36 deletions

...ombustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary 1 addition, 1 deletion

...mbustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary 21 additions, 22 deletions

...combustion/engineFoam/kivaTest/constant/polyMesh/boundary
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T 0 additions, 0 deletions

...Transfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U 0 additions, 0 deletions

...Transfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U

with 150 additions and 172 deletions

Please register or to comment

Admin message

Admin message

merge with master + fix conflict