Merge commit 'OpenCFD/master' into olesenm
Conflicts: src/Allwmake src/OpenFOAM/global/global.C wmake/rules/General/version Retained solution with global.Cver
Showing
- src/lagrangian/dieselSpray/Make/files 1 addition, 0 deletionssrc/lagrangian/dieselSpray/Make/files
- src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C 23 additions, 3 deletions...selSpray/injector/commonRailInjector/commonRailInjector.C
- src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H 13 additions, 2 deletions...selSpray/injector/commonRailInjector/commonRailInjector.H
- src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C 22 additions, 2 deletions...an/dieselSpray/injector/definedInjector/definedInjector.C
- src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H 13 additions, 2 deletions...an/dieselSpray/injector/definedInjector/definedInjector.H
- src/lagrangian/dieselSpray/injector/injectorType/injectorType.H 17 additions, 3 deletions...grangian/dieselSpray/injector/injectorType/injectorType.H
- src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C 420 additions, 0 deletions...ieselSpray/injector/multiHoleInjector/multiHoleInjector.C
- src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H 248 additions, 0 deletions...ieselSpray/injector/multiHoleInjector/multiHoleInjector.H
- src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C 22 additions, 2 deletions...angian/dieselSpray/injector/swirlInjector/swirlInjector.C
- src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H 13 additions, 2 deletions...angian/dieselSpray/injector/swirlInjector/swirlInjector.H
- src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C 47 additions, 10 deletions...grangian/dieselSpray/injector/unitInjector/unitInjector.C
- src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H 13 additions, 3 deletions...grangian/dieselSpray/injector/unitInjector/unitInjector.H
- src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C 18 additions, 3 deletionssrc/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
- src/lagrangian/dieselSpray/spray/findInjectorCell.H 1 addition, 1 deletionsrc/lagrangian/dieselSpray/spray/findInjectorCell.H
- src/lagrangian/dieselSpray/spray/spray.C 3 additions, 1 deletionsrc/lagrangian/dieselSpray/spray/spray.C
- src/lagrangian/dieselSpray/spray/spray.H 3 additions, 0 deletionssrc/lagrangian/dieselSpray/spray/spray.H
- src/lagrangian/dieselSpray/spray/sprayFunctions.C 17 additions, 1 deletionsrc/lagrangian/dieselSpray/spray/sprayFunctions.C
- src/lagrangian/dieselSpray/spray/sprayInject.C 92 additions, 80 deletionssrc/lagrangian/dieselSpray/spray/sprayInject.C
- src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C 9 additions, 3 deletions...n/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
- src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C 16 additions, 1 deletion...zationModel/blobsSheetAtomization/blobsSheetAtomization.C
Please register or sign in to comment