Merge branch 'upstream' into master
commitf5edc2606cd83e730264450c8010578da09b005d
authorMichael Wild <themiwi@users.sourceforge.net>
Sun, 22 Mar 2009 11:07:09 +0000 (22 12:07 +0100)
committerMichael Wild <themiwi@users.sourceforge.net>
Sun, 22 Mar 2009 11:09:33 +0000 (22 12:09 +0100)
tree676a7063ca9ec72a95e3b11883de91812b7bb0db
parent100b241bb343f41da9bb668854ee75395ac6482b
parentbee68c45fc8bd25e75ed2fc300633051b972bee2
Merge branch 'upstream' into master

Conflicts:
applications/utilities/mesh/generation/blockMesh/blockPoints.C
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
etc/bashrc
etc/cshrc
etc/settings.csh
etc/settings.sh
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H

Merged by removing scripts from etc/bashrc and fixing #include
statements.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
29 files changed:
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
applications/utilities/mesh/generation/blockMesh/blockPoints.C
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
src/finiteVolume/cfdTools/general/MRF/MRFZone.H
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H
src/postProcessing/forces/forces/IOforces.H
src/postProcessing/forces/forces/forces.C
src/postProcessing/forces/forces/forces.H
src/postProcessing/forces/forces/forcesFunctionObject.C
src/postProcessing/forces/forces/forcesFunctionObject.H
tutorials/MRFSimpleFoam/mixerVessel2D/constant/MRFZones