Merge branch 'bubbleLibrary' (93dd23af) · Commits · Development / openfoam

"...git@develop.openfoam.com:Development/openfoam.git" did not exist on "d69c26311f23a91e28f74b9188fd7aff0de4864e"

Commit 93dd23af authored 11 years ago by

william

Browse files

Merge branch 'bubbleLibrary'

parents 489475d1 2843ceff

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H 31 additions, 22 deletions

applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H 1 addition, 1 deletion

...tions/solvers/multiphase/twoPhaseEulerFoam/createFields.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files 39 additions, 6 deletions

...multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options 4 additions, 1 deletion

...ltiphase/twoPhaseEulerFoam/interfacialModels/Make/options
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C 80 additions, 0 deletions

...s/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H 100 additions, 0 deletions

...s/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C 56 additions, 0 deletions

...els/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H 121 additions, 0 deletions

...els/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C 60 additions, 0 deletions

.../aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C 91 additions, 0 deletions

...pectRatioModels/constantAspectRatio/constantAspectRatio.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H 97 additions, 0 deletions

...pectRatioModels/constantAspectRatio/constantAspectRatio.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C 19 additions, 22 deletions

...PhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H 9 additions, 8 deletions

...PhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C 14 additions, 21 deletions

...ulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H 16 additions, 7 deletions

...ulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C 29 additions, 38 deletions

...Models/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H 24 additions, 6 deletions

...Models/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C 15 additions, 22 deletions

...gModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H 16 additions, 7 deletions

...gModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C 12 additions, 24 deletions

...facialModels/dragModels/SchillerNaumann/SchillerNaumann.C

with 834 additions and 185 deletions

Please register or to comment

Admin message

Merge branch 'bubbleLibrary'