GIT: conflict resolution (f8edaaec) · Commits · Development / openfoam

Commit f8edaaec authored 14 years ago by

andy

Browse files

GIT: conflict resolution

parents 77daf8bb 903e2257

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
ReleaseNotes-dev 104 additions, 36 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 13 additions, 7 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 12 additions, 5 deletions

...rs/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H 7 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

with 347 additions and 201 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

GIT: conflict resolution

Some changes are not shown.