Merge branch 'feature-weber-number' into 'develop' (14e561d2) · Commits · Development / openfoam

Commit 14e561d2 authored 4 years ago by

Andrew Heather

Merge branch 'feature-weber-number' into 'develop'

New Weber number cloud function object

See merge request !369

parents 5c3059d2 ee947205

Branches

Tags

1 merge request!369New Weber number cloud function object

Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C 17 additions, 11 deletions

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

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.H
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C 6 additions, 2 deletions

...n/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H 2 additions, 1 deletion

...n/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H 13 additions, 1 deletion

...mediate/parcels/Templates/ReactingParcel/ReactingParcel.H
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H 24 additions, 0 deletions

...ediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C 2 additions, 1 deletion

...iphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C 2 additions, 1 deletion

...ed/basicReactingParcel/makeBasicReactingParcelSubmodels.C
src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H 65 additions, 0 deletions

.../parcels/include/makeReactingParcelCloudFunctionObjects.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C 12 additions, 12 deletions

...FunctionObjects/CloudFunctionObject/CloudFunctionObject.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H 15 additions, 6 deletions

...FunctionObjects/CloudFunctionObject/CloudFunctionObject.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C 14 additions, 14 deletions

...Objects/CloudFunctionObjectList/CloudFunctionObjectList.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H 19 additions, 6 deletions

...Objects/CloudFunctionObjectList/CloudFunctionObjectList.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C 0 additions, 7 deletions

...udFunctionObjects/FacePostProcessing/FacePostProcessing.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H 1 addition, 6 deletions

...udFunctionObjects/FacePostProcessing/FacePostProcessing.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C 0 additions, 7 deletions

...loudFunctionObjects/ParticleCollector/ParticleCollector.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H 1 addition, 6 deletions

...loudFunctionObjects/ParticleCollector/ParticleCollector.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C 38 additions, 28 deletions

...ls/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H 8 additions, 1 deletion

...ls/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C 5 additions, 9 deletions

...dels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C

with 247 additions and 122 deletions

Please register or to comment

Admin message

Merge branch 'feature-weber-number' into 'develop'