Merge branch 'feature-lagrangian' into 'develop' (c29d3f1b) · Commits · Development / openfoam

Commit c29d3f1b authored 9 years ago by

Mattijs Janssens

Merge branch 'feature-lagrangian' into 'develop'

ENH: Updated lagrangian libraries from internal development line



See merge request !22

parents 740f6896 9fddd7e0

Branches

Tags

Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/coalCombustion/Make/options 2 additions, 0 deletions

src/lagrangian/coalCombustion/Make/options
src/lagrangian/intermediate/Make/files 2 additions, 0 deletions

src/lagrangian/intermediate/Make/files
src/lagrangian/intermediate/Make/options 2 additions, 0 deletions

src/lagrangian/intermediate/Make/options
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C 42 additions, 14 deletions

...ds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H 13 additions, 1 deletion

...ds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H 7 additions, 1 deletion

...s/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C 18 additions, 18 deletions

...ian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C 2 additions, 5 deletions

...n/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C 3 additions, 1 deletion

...diate/parcels/Templates/CollidingParcel/CollidingParcel.C
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C 11 additions, 11 deletions

...diate/parcels/Templates/KinematicParcel/KinematicParcel.C
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C 7 additions, 1 deletion

...lates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C 3 additions, 0 deletions

...ntermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H 3 additions, 1 deletion

...rmediate/parcels/include/makeParcelCloudFunctionObjects.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C 164 additions, 0 deletions

...te/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H 138 additions, 0 deletions

...te/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C 287 additions, 0 deletions

...iate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.H 126 additions, 0 deletions

...iate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkToolsTemplates.C 44 additions, 0 deletions

...odels/CloudFunctionObjects/CloudToVTK/vtkToolsTemplates.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C 9 additions, 1 deletion

...loudFunctionObjects/ParticleCollector/ParticleCollector.C
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H 5 additions, 5 deletions

...irModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H

with 888 additions and 59 deletions

Please register or to comment

Admin message

Merge branch 'feature-lagrangian' into 'develop'