Merge branch 'master' into particleInteractions (20835912) · Commits · Development / openfoam

Commit 20835912 authored 15 years ago by

graham

Merge branch 'master' into particleInteractions

Conflicts:
	src/parallel/decompositionMethods/Make/options

parents 6b0daf36 67f6d982

Hide whitespace changes

Inline Side-by-side

Showing

applications/Allwmake 1 addition, 1 deletion

applications/Allwmake
applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H 1 addition, 1 deletion

...vers/incompressible/boundaryFoam/interrogateWallPatches.H
applications/test/fileName/fileNameTest.C 2 additions, 2 deletions

applications/test/fileName/fileNameTest.C
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L 7 additions, 10 deletions

...tions/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
applications/utilities/mesh/conversion/foamToStarMesh/Make/options 2 additions, 1 deletion

...ons/utilities/mesh/conversion/foamToStarMesh/Make/options
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L 10 additions, 20 deletions

...ons/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C 16 additions, 3 deletions

.../utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C 1 addition, 1 deletion

...ilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
applications/utilities/mesh/conversion/star4ToFoam/Make/options 2 additions, 1 deletion

...ations/utilities/mesh/conversion/star4ToFoam/Make/options
applications/utilities/mesh/manipulation/setSet/Allwmake 6 additions, 4 deletions

applications/utilities/mesh/manipulation/setSet/Allwmake
applications/utilities/mesh/manipulation/setSet/Make/options 3 additions, 1 deletion

applications/utilities/mesh/manipulation/setSet/Make/options
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C 3 additions, 3 deletions

...arallelProcessing/reconstructParMesh/reconstructParMesh.C
applications/utilities/parallelProcessing/redistributeMeshPar/Make/options 1 addition, 2 deletions

...ities/parallelProcessing/redistributeMeshPar/Make/options
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml 13 additions, 0 deletions

...3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx 1 addition, 1 deletion

...ders/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h 1 addition, 1 deletion

...eaders/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx 2 additions, 1 deletion

...3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h 7 additions, 1 deletion

...PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H 1 addition, 1 deletion

...s/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMTupleRemap.H 72 additions, 0 deletions

...3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMTupleRemap.H

with 152 additions and 55 deletions

Please register or to comment

Admin message

Merge branch 'master' into particleInteractions