Merge commit 'bundle/home' into olesenm (5e852915) · Commits · Development / openfoam

Commit 5e852915 authored 15 years ago by

Mark Olesen

Merge commit 'bundle/home' into olesenm

Conflicts:
	src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
	src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
	src/mesh/blockMesh/blockMesh/blockMeshMerge.C
	src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H

parents c45ea2c4 33156d98

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/generation/blockMesh/Make/files 0 additions, 28 deletions

applications/utilities/mesh/generation/blockMesh/Make/files
applications/utilities/mesh/generation/blockMesh/Make/options 2 additions, 1 deletion

...ications/utilities/mesh/generation/blockMesh/Make/options
applications/utilities/mesh/generation/blockMesh/blockBoundary.C 0 additions, 209 deletions

...tions/utilities/mesh/generation/blockMesh/blockBoundary.C
applications/utilities/mesh/generation/blockMesh/blockCells.C 0 additions, 65 deletions

...ications/utilities/mesh/generation/blockMesh/blockCells.C
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C 39 additions, 5 deletions

...ations/utilities/mesh/generation/blockMesh/blockMeshApp.C
applications/utilities/mesh/generation/blockMesh/createCells.C 0 additions, 74 deletions

...cations/utilities/mesh/generation/blockMesh/createCells.C
applications/utilities/mesh/generation/blockMesh/createPoints.C 0 additions, 71 deletions

...ations/utilities/mesh/generation/blockMesh/createPoints.C
applications/utilities/miscellaneous/foamDebugSwitches/Make/options 2 additions, 1 deletion

...ns/utilities/miscellaneous/foamDebugSwitches/Make/options
applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml 1 addition, 1 deletion

...graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx 5 additions, 31 deletions

...graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h 2 additions, 5 deletions

...g/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/files 1 addition, 1 deletion

...stProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/files
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H 5 additions, 5 deletions

...ing/graphics/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C 147 additions, 163 deletions

...Processing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H 4 additions, 13 deletions

...Processing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C 2 additions, 2 deletions

...phics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C 2 additions, 2 deletions

...g/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C 3 additions, 3 deletions

...ing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C 3 additions, 3 deletions

.../graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C 3 additions, 3 deletions

...ng/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C

with 221 additions and 686 deletions

Please register or to comment

Admin message

Admin message

Merge commit 'bundle/home' into olesenm