Merge branch 'mr_fixed_force_averaging' into 'master' (571b86e7) · 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
571b86e7

Commit 571b86e7 authored 5 years ago by

Christoph Rettinger

Downloads
- Plain Diff

Merge branch 'mr_fixed_force_averaging' into 'master'

Added initialization kernel for hydrodynamic force for averaging

See merge request walberla/walberla!250

parents c5901b0f d41eac2f

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/benchmarks/FluidParticleCoupling/ForcesOnSphereNearPlane.cpp 6 additions, 0 deletions

...chmarks/FluidParticleCoupling/ForcesOnSphereNearPlane.cpp
apps/benchmarks/FluidParticleCoupling/ObliqueWetCollision.cpp 7 additions, 2 deletions

.../benchmarks/FluidParticleCoupling/ObliqueWetCollision.cpp
apps/benchmarks/FluidParticleCoupling/SettlingSphereInBox.cpp 9 additions, 3 deletions

.../benchmarks/FluidParticleCoupling/SettlingSphereInBox.cpp
apps/benchmarks/FluidParticleCoupling/SphereMovingWithPrescribedVelocity.cpp 9 additions, 3 deletions

...idParticleCoupling/SphereMovingWithPrescribedVelocity.cpp
apps/benchmarks/FluidParticleCoupling/SphereWallCollision.cpp 7 additions, 2 deletions

.../benchmarks/FluidParticleCoupling/SphereWallCollision.cpp
src/lbm_mesapd_coupling/utility/InitializeHydrodynamicForceTorqueForAveragingKernel.h 54 additions, 0 deletions

...ity/InitializeHydrodynamicForceTorqueForAveragingKernel.h
tests/lbm_mesapd_coupling/momentum_exchange_method/SettlingSphere.cpp 9 additions, 3 deletions

...sapd_coupling/momentum_exchange_method/SettlingSphere.cpp

with 101 additions and 13 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