Merge branch 'mr_mesapd_fixes' into 'master' (bf7aa341) · Commits · Arash Partow / waLBerla · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

waLBerla
- Activity
- Members
- Labels
- Releases
- Package Registry
- Terraform modules
- Service Desk

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.

Arash Partow
waLBerla
Commits
bf7aa341

Commit bf7aa341 authored 4 years ago by

Christoph Rettinger

Downloads
- Plain Diff

Merge branch 'mr_mesapd_fixes' into 'master'

Changes in mesa_pd functionality for halfspaces

See merge request walberla/walberla!350

parents f210886a 09a842c1

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/mesa_pd/common/Contains.h 3 additions, 3 deletions

src/mesa_pd/common/Contains.h
src/mesa_pd/common/RayParticleIntersection.h 6 additions, 8 deletions

src/mesa_pd/common/RayParticleIntersection.h
src/mesa_pd/data/shape/HalfSpace.h 5 additions, 5 deletions

src/mesa_pd/data/shape/HalfSpace.h
tests/lbm_mesapd_coupling/mapping/ParticleMapping.cpp 1 addition, 38 deletions

tests/lbm_mesapd_coupling/mapping/ParticleMapping.cpp
tests/mesa_pd/common/IntersectionRatio.cpp 2 additions, 29 deletions

tests/mesa_pd/common/IntersectionRatio.cpp

with 17 additions and 83 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