Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev (876aa9cd) · Commits · Development / openfoam

Commit 876aa9cd authored 14 years ago by

mattijs

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C

parents 472bb821 1a009548

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/conversion/sammToFoam/readPoints.C 1 addition, 1 deletion

...cations/utilities/mesh/conversion/sammToFoam/readPoints.C
applications/utilities/mesh/conversion/star3ToFoam/readPoints.C 4 additions, 5 deletions

...ations/utilities/mesh/conversion/star3ToFoam/readPoints.C
applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C 1 addition, 0 deletions

...ons/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
applications/utilities/mesh/manipulation/refineMesh/refineMesh.C 1 addition, 0 deletions

...tions/utilities/mesh/manipulation/refineMesh/refineMesh.C
applications/utilities/miscellaneous/foamDebugSwitches/Make/options 0 additions, 1 deletion

...ns/utilities/miscellaneous/foamDebugSwitches/Make/options
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C 1 addition, 9 deletions

...V3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
src/OpenFOAM/include/checkTimeOptions.H 4 additions, 4 deletions

src/OpenFOAM/include/checkTimeOptions.H
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C 2 additions, 0 deletions

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
src/engine/ignition/ignitionSite.C 1 addition, 3 deletions

src/engine/ignition/ignitionSite.C
src/lagrangian/basic/InteractionLists/InteractionLists.C 0 additions, 2 deletions

src/lagrangian/basic/InteractionLists/InteractionLists.C
src/lagrangian/dieselSpray/parcel/parcel.C 0 additions, 2 deletions

src/lagrangian/dieselSpray/parcel/parcel.C
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C 1 addition, 2 deletions

...n/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C 0 additions, 3 deletions

...rangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C 1 addition, 8 deletions

...aySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
src/mesh/blockMesh/blockMesh/blockMeshMerge.C 1 addition, 10 deletions

src/mesh/blockMesh/blockMesh/blockMeshMerge.C
src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C 1 addition, 2 deletions

src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C 3 additions, 8 deletions

...raint/linearAxialAngularSpring/linearAxialAngularSpring.C
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C 3 additions, 5 deletions

...tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict 1 addition, 1 deletion

...mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict
tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict 0 additions, 15 deletions

tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict

with 26 additions and 81 deletions

Please register or to comment

Admin message

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev