From 5fb2dcbbc7e8ebecf86d10be5f4a05e124c6e18a Mon Sep 17 00:00:00 2001
From: Christoph Rettinger <christoph.rettinger@fau.de>
Date: Wed, 12 Feb 2020 15:28:15 +0100
Subject: [PATCH] Fixes in arguments
---
python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h | 5 ++---
src/mesa_pd/kernel/LinearSpringDashpot.h | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h b/python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h
index 2e86c1c1d..2613d2414 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 46db0270b..acf15d844 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) );
--
GitLab