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

Commit 923e17b1 authored 14 years ago by

Mark Olesen

Merge remote branch 'OpenCFD/master' into olesenm

Also with trailing space cleanups!!

parents 4d418ecc 205d16c6

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

ReleaseNotes-dev 7 additions, 0 deletions

ReleaseNotes-dev
applications/solvers/combustion/PDRFoam/Make/files 1 addition, 1 deletion

applications/solvers/combustion/PDRFoam/Make/files
applications/solvers/combustion/PDRFoam/Make/options 3 additions, 2 deletions

applications/solvers/combustion/PDRFoam/Make/options
applications/solvers/combustion/PDRFoam/PDRFoam.C 3 additions, 4 deletions

applications/solvers/combustion/PDRFoam/PDRFoam.C
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C 25 additions, 26 deletions

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C 64 additions, 52 deletions

...Foam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H 1 addition, 10 deletions

...Foam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C 29 additions, 4 deletions

...ion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H 1 addition, 1 deletion

...ion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C 2 additions, 2 deletions

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H 6 additions, 1 deletion

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C 23 additions, 35 deletions

...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H 5 additions, 3 deletions

...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C 43 additions, 6 deletions

...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H 14 additions, 8 deletions

...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
applications/solvers/combustion/PDRFoam/StCourantNo.H 2 additions, 2 deletions

applications/solvers/combustion/PDRFoam/StCourantNo.H
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C 82 additions, 7 deletions

...rs/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H 10 additions, 3 deletions

...rs/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H 2 additions, 1 deletion

...RFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C 14 additions, 13 deletions

...bustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C

with 337 additions and 181 deletions

Please register or to comment

Admin message

Merge remote branch 'OpenCFD/master' into olesenm