Merge remote-tracking branch 'origin/master' into develop (84784c50) · Commits · Development / openfoam · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openfoam
- Activity
- Members
- Labels
- Releases
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Admin message

Site will likely be offline for maintenance 14/15 April - more details soon

Development
openfoam
Commits
84784c50

Commit 84784c50 authored 6 years ago by

Mark OLESEN

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into develop

parents 71ab8a47 f09d9852

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/localDensityAbsorptionEmission/localDensityAbsorptionEmission.C 3 additions, 3 deletions

...ensityAbsorptionEmission/localDensityAbsorptionEmission.C
src/functionObjects/lagrangian/vtkCloud/vtkCloud.C 3 additions, 1 deletion

src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
src/functionObjects/lagrangian/vtkCloud/vtkCloud.H 4 additions, 0 deletions

src/functionObjects/lagrangian/vtkCloud/vtkCloud.H
src/lagrangian/basic/particle/particle.C 7 additions, 3 deletions

src/lagrangian/basic/particle/particle.C
src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C 86 additions, 28 deletions

...ls/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
tutorials/lagrangian/reactingParcelFoam/filter/Allrun-parallel 19 additions, 0 deletions

...ials/lagrangian/reactingParcelFoam/filter/Allrun-parallel
tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict 4 additions, 0 deletions

...s/lagrangian/reactingParcelFoam/filter/system/controlDict
tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict 1 addition, 4 deletions

...rangian/reactingParcelFoam/filter/system/decomposeParDict
tutorials/lagrangian/reactingParcelFoam/filter/system/vtkCloud 31 additions, 0 deletions

...ials/lagrangian/reactingParcelFoam/filter/system/vtkCloud

with 158 additions and 39 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment