Merge remote branch 'OpenCFD/master' into olesenm (abde400d) · Commits · Development / openfoam

Commit abde400d authored 14 years ago by

Mark Olesen

Merge remote branch 'OpenCFD/master' into olesenm

Conflicts:
	bin/foamCleanPath

parents f8cae3f4 79939b9e

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

ReleaseNotes-dev 73 additions, 62 deletions

ReleaseNotes-dev
applications/solvers/heatTransfer/buoyantSimpleFoam_old/Make/files 0 additions, 3 deletions

...ons/solvers/heatTransfer/buoyantSimpleFoam_old/Make/files
applications/solvers/heatTransfer/buoyantSimpleFoam_old/Make/options 0 additions, 13 deletions

...s/solvers/heatTransfer/buoyantSimpleFoam_old/Make/options
applications/solvers/heatTransfer/buoyantSimpleFoam_old/UEqn.H 0 additions, 24 deletions

...cations/solvers/heatTransfer/buoyantSimpleFoam_old/UEqn.H
applications/solvers/heatTransfer/buoyantSimpleFoam_old/createFields.H 0 additions, 69 deletions

...solvers/heatTransfer/buoyantSimpleFoam_old/createFields.H
applications/solvers/heatTransfer/buoyantSimpleFoam_old/hEqn.H 0 additions, 17 deletions

...cations/solvers/heatTransfer/buoyantSimpleFoam_old/hEqn.H
applications/solvers/heatTransfer/buoyantSimpleFoam_old/pEqn.H 0 additions, 59 deletions

...cations/solvers/heatTransfer/buoyantSimpleFoam_old/pEqn.H
applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean 1 addition, 0 deletions

...cations/solvers/heatTransfer/chtMultiRegionFoam/Allwclean
applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake 1 addition, 0 deletions

...ications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files 0 additions, 2 deletions

...ations/solvers/heatTransfer/chtMultiRegionFoam/Make/files
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options 5 additions, 2 deletions

...ions/solvers/heatTransfer/chtMultiRegionFoam/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C 2 additions, 1 deletion

...vers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options 4 additions, 3 deletions

.../chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C 2 additions, 1 deletion

...nFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H 7 additions, 0 deletions

...onFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H 3 additions, 0 deletions

.../chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H 2 additions, 0 deletions

...oam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/files 4 additions, 0 deletions

...chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/files
applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/options 12 additions, 0 deletions

...tMultiRegionFoam/coupledDerivedFvPatchFields/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C 271 additions, 0 deletions

...ature/externalWallHeatFluxTemperatureFvPatchScalarField.C

with 387 additions and 256 deletions

Please register or to comment

Admin message

Admin message

Merge remote branch 'OpenCFD/master' into olesenm