Merge branch 'mr_mesapd_functionality' into 'master' (ff1a3a46) · 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
ff1a3a46

Commit ff1a3a46 authored 5 years ago by

Sebastian Eibl

Downloads
- Plain Diff

Merge branch 'mr_mesapd_functionality' into 'master'

Added utility function to mesa pd and used it in coupling apps

See merge request walberla/walberla!245

parents 45492644 5fb2dcbb

Branches

Tags

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/benchmarks/FluidParticleCoupling/ObliqueDryCollision.cpp 2 additions, 18 deletions

.../benchmarks/FluidParticleCoupling/ObliqueDryCollision.cpp
apps/benchmarks/FluidParticleCoupling/ObliqueWetCollision.cpp 1 addition, 16 deletions

.../benchmarks/FluidParticleCoupling/ObliqueWetCollision.cpp
apps/benchmarks/FluidParticleCoupling/SphereWallCollision.cpp 3 additions, 18 deletions

.../benchmarks/FluidParticleCoupling/SphereWallCollision.cpp
python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h 48 additions, 2 deletions

python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h
src/mesa_pd/kernel/LinearSpringDashpot.h 48 additions, 2 deletions

src/mesa_pd/kernel/LinearSpringDashpot.h

with 102 additions and 56 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