diff --git a/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h b/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h index 2e86c1c1d150ea53a4dc5344c3823a2e6a905aa0..2613d241462169d9e72b076cbe0d4ed16c5966b0 100644 --- a/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h +++ b/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h @@ -93,7 +93,7 @@ public: const size_t type2, const real_t coefficientOfRestitution, const real_t collisionTime, - const real_t poissonsRatio, + const real_t kappa, const real_t effectiveMass); {% for param in parameters %} @@ -282,10 +282,9 @@ inline void LinearSpringDashpot::setStiffnessAndDamping(const size_t type1, const size_t type2, const real_t coefficientOfRestitution, const real_t collisionTime, - const real_t poissonsRatio, + const real_t kappa, const real_t effectiveMass) { - const real_t kappa = real_t(2) * ( real_t(1) - poissonsRatio ) / ( real_t(2) - poissonsRatio ) ; const real_t lnDryResCoeff = std::log(coefficientOfRestitution); setStiffnessN(type1, type2, effectiveMass * ( math::pi * math::pi + lnDryResCoeff * lnDryResCoeff ) / (collisionTime * collisionTime) ); diff --git a/src/mesa_pd/kernel/LinearSpringDashpot.h b/src/mesa_pd/kernel/LinearSpringDashpot.h index 46db0270b614fed6e80c45f802400fff39370b5c..acf15d8448af6b0212cc0e0422f2ceaf8848ecb1 100644 --- a/src/mesa_pd/kernel/LinearSpringDashpot.h +++ b/src/mesa_pd/kernel/LinearSpringDashpot.h @@ -98,7 +98,7 @@ public: const size_t type2, const real_t coefficientOfRestitution, const real_t collisionTime, - const real_t poissonsRatio, + const real_t kappa, const real_t effectiveMass); @@ -386,10 +386,9 @@ inline void LinearSpringDashpot::setStiffnessAndDamping(const size_t type1, const size_t type2, const real_t coefficientOfRestitution, const real_t collisionTime, - const real_t poissonsRatio, + const real_t kappa, const real_t effectiveMass) { - const real_t kappa = real_t(2) * ( real_t(1) - poissonsRatio ) / ( real_t(2) - poissonsRatio ) ; const real_t lnDryResCoeff = std::log(coefficientOfRestitution); setStiffnessN(type1, type2, effectiveMass * ( math::pi * math::pi + lnDryResCoeff * lnDryResCoeff ) / (collisionTime * collisionTime) );