Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev (2db6f121) · Commits · Development / openfoam

Commit 2db6f121 authored 14 years ago by

Andrew Heather

Browse files

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

parents e338bd79 ff72ba14

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 3 additions, 2 deletions

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
bin/mpirunDebug 3 additions, 3 deletions

bin/mpirunDebug
bin/tools/foamConfigurePaths 6 additions, 7 deletions

bin/tools/foamConfigurePaths
src/meshTools/PointEdgeWave/PointEdgeWave.C 10 additions, 7 deletions

src/meshTools/PointEdgeWave/PointEdgeWave.C
src/meshTools/PointEdgeWave/PointEdgeWave.H 4 additions, 1 deletion

src/meshTools/PointEdgeWave/PointEdgeWave.H
tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict 1 addition, 1 deletion

...stion/fireFoam/les/smallPoolFire2D/system/createPatchDict
tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict 1 addition, 1 deletion

...stion/fireFoam/les/smallPoolFire3D/system/createPatchDict
tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict 1 addition, 1 deletion

.../buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict 1 addition, 1 deletion

.../buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict 1 addition, 1 deletion

...inesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict 1 addition, 1 deletion

...atTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict 1 addition, 1 deletion

...atTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties 1 addition, 1 deletion

...egionHeater/constant/heater/solidThermophysicalProperties
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution 2 additions, 2 deletions

...ultiRegionFoam/multiRegionHeater/system/heater/fvSolution
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution 2 additions, 2 deletions

...iRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution 2 additions, 2 deletions

...RegionFoam/multiRegionHeater/system/rightSolid/fvSolution
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties 1 addition, 1 deletion

...iquidHeater/constant/heater/solidThermophysicalProperties
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution 2 additions, 7 deletions

...gionFoam/multiRegionLiquidHeater/system/heater/fvSolution
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution 2 additions, 7 deletions

...nFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution 2 additions, 7 deletions

...Foam/multiRegionLiquidHeater/system/rightSolid/fvSolution

with 47 additions and 56 deletions

Please register or to comment

Admin message

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev