henry
|
bfbab34491
|
Corrected merge conflicts from header changes.
|
2010-06-23 17:03:41 +01:00 |
|
henry
|
6574570ba0
|
Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
Conflicts:
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties
tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
|
2010-06-23 16:56:45 +01:00 |
|
henry
|
ccfb6e32a6
|
Corrected headers.
|
2010-06-23 16:54:54 +01:00 |
|
mattijs
|
8b46d0cc68
|
BUG: chtMultiRegionFoam : adapt for basicSolidThermo
|
2010-06-11 16:55:32 +01:00 |
|
Mark Olesen
|
895a077cb1
|
STYLE: fixup some dictionary headers
|
2010-05-18 11:38:07 +02:00 |
|
henry
|
d036af2921
|
Corrected multiRegionHeater tutorial.
|
2010-04-29 14:21:11 +01:00 |
|
henry
|
a6d35185ad
|
multiRegionHeater: chtMultiRegionSimpleFoam tutorial
|
2010-04-29 14:15:01 +01:00 |
|
mattijs
|
68c7b16d5a
|
ENH: Steady-state version of multiRegionHeater
|
2010-04-27 14:56:00 +01:00 |
|