Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts: src/lagrangian/dieselSpray/spray/findInjectorCell.H
Showing
- src/lagrangian/dieselSpray/injector/injectorType/injectorType.C 0 additions, 176 deletions...grangian/dieselSpray/injector/injectorType/injectorType.C
- src/lagrangian/dieselSpray/injector/injectorType/injectorType.H 0 additions, 235 deletions...grangian/dieselSpray/injector/injectorType/injectorType.H
- src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C 0 additions, 452 deletions...ieselSpray/injector/multiHoleInjector/multiHoleInjector.C
- src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H 0 additions, 245 deletions...ieselSpray/injector/multiHoleInjector/multiHoleInjector.H
- src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C 0 additions, 447 deletions...angian/dieselSpray/injector/swirlInjector/swirlInjector.C
- src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H 0 additions, 254 deletions...angian/dieselSpray/injector/swirlInjector/swirlInjector.H
- src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C 0 additions, 390 deletions...grangian/dieselSpray/injector/unitInjector/unitInjector.C
- src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H 0 additions, 234 deletions...grangian/dieselSpray/injector/unitInjector/unitInjector.H
- src/lagrangian/dieselSpray/parcel/boundaryTreatment.H 0 additions, 54 deletionssrc/lagrangian/dieselSpray/parcel/boundaryTreatment.H
- src/lagrangian/dieselSpray/parcel/parcel.C 0 additions, 685 deletionssrc/lagrangian/dieselSpray/parcel/parcel.C
- src/lagrangian/dieselSpray/parcel/parcel.H 0 additions, 432 deletionssrc/lagrangian/dieselSpray/parcel/parcel.H
- src/lagrangian/dieselSpray/parcel/parcelFunctions.C 0 additions, 115 deletionssrc/lagrangian/dieselSpray/parcel/parcelFunctions.C
- src/lagrangian/dieselSpray/parcel/parcelI.H 0 additions, 232 deletionssrc/lagrangian/dieselSpray/parcel/parcelI.H
- src/lagrangian/dieselSpray/parcel/parcelIO.C 0 additions, 337 deletionssrc/lagrangian/dieselSpray/parcel/parcelIO.C
- src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C 0 additions, 306 deletionssrc/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
- src/lagrangian/dieselSpray/spray/findInjectorCell.H 0 additions, 67 deletionssrc/lagrangian/dieselSpray/spray/findInjectorCell.H
- src/lagrangian/dieselSpray/spray/spray.C 0 additions, 364 deletionssrc/lagrangian/dieselSpray/spray/spray.C
- src/lagrangian/dieselSpray/spray/spray.H 0 additions, 356 deletionssrc/lagrangian/dieselSpray/spray/spray.H
- src/lagrangian/dieselSpray/spray/sprayFunctions.C 0 additions, 398 deletionssrc/lagrangian/dieselSpray/spray/sprayFunctions.C
- src/lagrangian/dieselSpray/spray/sprayI.H 0 additions, 382 deletionssrc/lagrangian/dieselSpray/spray/sprayI.H
Please register or sign in to comment