Merge branch 'mr_extended_mesapd_shape_functionality' into 'master' (27e2bc06) · Commits · Markus Holzer / waLBerla · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

waLBerla
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- 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.

Markus Holzer
waLBerla
Commits
27e2bc06

Commit 27e2bc06 authored 3 years ago by

Christoph Schwarzmeier

Downloads
- Plain Diff

Merge branch 'mr_extended_mesapd_shape_functionality' into 'master'

Added several new shape functionality for mesapd

See merge request !526

parents 28f1e398 46b491d1

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

python/mesa_pd/templates/common/ParticleFunctions.templ.h 27 additions, 4 deletions

python/mesa_pd/templates/common/ParticleFunctions.templ.h
src/mesa_pd/common/Contains.h 58 additions, 6 deletions

src/mesa_pd/common/Contains.h
src/mesa_pd/common/ParticleFunctions.h 27 additions, 4 deletions

src/mesa_pd/common/ParticleFunctions.h
src/mesa_pd/common/RayParticleIntersection.h 57 additions, 18 deletions

src/mesa_pd/common/RayParticleIntersection.h
tests/mesa_pd/CMakeLists.txt 3 additions, 0 deletions

tests/mesa_pd/CMakeLists.txt
tests/mesa_pd/common/ContainsPoint.cpp 230 additions, 0 deletions

tests/mesa_pd/common/ContainsPoint.cpp
tests/mesa_pd/common/IntersectionRatio.cpp 72 additions, 49 deletions

tests/mesa_pd/common/IntersectionRatio.cpp

with 474 additions and 81 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