Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev (3be86aa7) · Commits · Development / openfoam

Commit 3be86aa7 authored 13 years ago by

mattijs

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/lagrangian/dieselSpray/spray/findInjectorCell.H

parents ca4b8c34 8968d1d0

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C 0 additions, 79 deletions

...elSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H 0 additions, 91 deletions

...elSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C 0 additions, 146 deletions

...y/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H 0 additions, 103 deletions

...y/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C 0 additions, 229 deletions

...elSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H 0 additions, 107 deletions

...elSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C 0 additions, 126 deletions

...ySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H 0 additions, 100 deletions

...ySubModels/collisionModel/ORourke/ORourkeCollisionModel.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/sameCell.H 0 additions, 160 deletions

...selSpray/spraySubModels/collisionModel/ORourke/sameCell.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C 0 additions, 60 deletions

...ySubModels/collisionModel/collisionModel/collisionModel.C
src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H 0 additions, 124 deletions

...ySubModels/collisionModel/collisionModel/collisionModel.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C 0 additions, 66 deletions

...bModels/collisionModel/collisionModel/collisionModelNew.C
src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C 0 additions, 73 deletions

...y/spraySubModels/collisionModel/noCollision/noCollision.C
src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H 0 additions, 86 deletions

...y/spraySubModels/collisionModel/noCollision/noCollision.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H 0 additions, 205 deletions

...aySubModels/collisionModel/trajectoryModel/trajectoryCM.H
src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C 0 additions, 120 deletions

...ubModels/collisionModel/trajectoryModel/trajectoryModel.C
src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H 0 additions, 103 deletions

...ubModels/collisionModel/trajectoryModel/trajectoryModel.H
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C 0 additions, 60 deletions

...s/dispersionModel/dispersionLESModel/dispersionLESModel.C
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H 0 additions, 91 deletions

...s/dispersionModel/dispersionLESModel/dispersionLESModel.H
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C 0 additions, 58 deletions

...bModels/dispersionModel/dispersionModel/dispersionModel.C

with 0 additions and 2187 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev