Merge branch 'feature-recycle-particles' into 'develop' (14e86437) · Commits · Development / openfoam

Commit 14e86437 authored 4 years ago by

Andrew Heather

Merge branch 'feature-recycle-particles' into 'develop'

Feature recycle particles

See merge request !396

parents 7d897ee7 74ada2aa

Branches

Tags

1 merge request!396Feature recycle particles

Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C 2 additions, 0 deletions

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.C
src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H 6 additions, 3 deletions

...ediate/parcels/include/makeParcelPatchInteractionModels.H
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C 46 additions, 11 deletions

...ematic/InjectionModel/PatchInjection/patchInjectionBase.C
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H 16 additions, 0 deletions

...ematic/InjectionModel/PatchInjection/patchInjectionBase.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C 21 additions, 0 deletions

...PatchInteractionModel/MultiInteraction/MultiInteraction.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H 6 additions, 0 deletions

...PatchInteractionModel/MultiInteraction/MultiInteraction.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C 5 additions, 0 deletions

...actionModel/PatchInteractionModel/PatchInteractionModel.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H 3 additions, 1 deletion

...actionModel/PatchInteractionModel/PatchInteractionModel.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C 515 additions, 0 deletions

...hInteractionModel/RecycleInteraction/RecycleInteraction.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.H 226 additions, 0 deletions

...hInteractionModel/RecycleInteraction/RecycleInteraction.H
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O 48 additions, 0 deletions

...lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T 48 additions, 0 deletions

...s/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U 55 additions, 0 deletions

...s/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/air 48 additions, 0 deletions

...lagrangian/reactingParcelFoam/recycleParticles/0.orig/air
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/alphat 48 additions, 0 deletions

...rangian/reactingParcelFoam/recycleParticles/0.orig/alphat
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/epsilon 49 additions, 0 deletions

...angian/reactingParcelFoam/recycleParticles/0.orig/epsilon
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k 49 additions, 0 deletions

...s/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut 48 additions, 0 deletions

...lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p 48 additions, 0 deletions

...s/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p
tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh 48 additions, 0 deletions

...grangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh

with 1335 additions and 15 deletions

Please register or to comment

Admin message

Merge branch 'feature-recycle-particles' into 'develop'