Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev/ (25908d7f) · Commits · Development / openfoam

Commit 25908d7f authored 17 years ago by

Henry Weller

Browse files

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

parents 00dc73fa 9acc7a8b

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/intermediate/Make/files 4 additions, 0 deletions

src/lagrangian/intermediate/Make/files
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C 17 additions, 22 deletions

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.C
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H 3 additions, 0 deletions

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.H
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H 8 additions, 0 deletions

...mediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C 12 additions, 20 deletions

...termediate/clouds/Templates/ReactingCloud/ReactingCloud.C
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H 34 additions, 14 deletions

...diate/parcels/Templates/KinematicParcel/KinematicParcel.H
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H 31 additions, 9 deletions

...mediate/parcels/Templates/ReactingParcel/ReactingParcel.H
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H 19 additions, 3 deletions

...ntermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C 9 additions, 2 deletions

...KinematicParcel/makeBasicKinematicParcelInjectionModels.C
src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C 9 additions, 2 deletions

...icReactingParcel/makeBasicReactingParcelInjectionModels.C
src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C 3 additions, 0 deletions

.../basicThermoParcel/makeBasicThermoParcelInjectionModels.C
src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C 90 additions, 0 deletions

...n/intermediate/submodels/IO/DataEntry/Constant/Constant.C
src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H 129 additions, 0 deletions

...n/intermediate/submodels/IO/DataEntry/Constant/Constant.H
src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C 60 additions, 0 deletions

...intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H 170 additions, 0 deletions

...intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C 62 additions, 0 deletions

...ermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C 151 additions, 0 deletions

...rangian/intermediate/submodels/IO/DataEntry/Table/Table.C
src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H 130 additions, 0 deletions

...rangian/intermediate/submodels/IO/DataEntry/Table/Table.H
src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C 51 additions, 0 deletions

...ian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H 1 addition, 12 deletions

...c/DispersionModel/DispersionRASModel/DispersionRASModel.H

with 993 additions and 84 deletions

Please register or to comment

Admin message

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