Merge branch 'dem' into 'master' (69585aa5) · Commits · Dominik Mehlich / waLBerla

Snippets Groups Projects

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.

Commit 69585aa5 authored 7 years ago by

Sebastian Eibl

Browse files

Merge branch 'dem' into 'master'

Switchable integrator and contact resolution for DEM

See merge request !32

parents ee5d54e6 2150f2b7

Hide whitespace changes

Inline Side-by-side

Showing with 476 additions and 18 deletions

Please register or to comment

Admin message

Merge branch 'dem' into 'master'