From 641a431bbf2434f65969b65de6f65aad93e27f36 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Mon, 25 Feb 2019 15:46:33 -0600
Subject: [PATCH] Fixed unit conversion in RB integrator for Langevin dynamics
---
src/RigidBody.cu | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/RigidBody.cu b/src/RigidBody.cu
index e1067d6..88df47e 100644
--- a/src/RigidBody.cu
+++ b/src/RigidBody.cu
@@ -208,13 +208,13 @@ void RigidBody::applyGridParticleForces(Vector3* forcestorques, const std::vecto
void RigidBody::addLangevin(Vector3 w1, Vector3 w2)
{
Vector3 transForceCoeff = Vector3::element_sqrt( 2. * Temp * t->mass*t->transDamping / timestep );
- Vector3 rotTorqueCoeff = Vector3::element_sqrt( 2. * Temp * Vector3::element_mult(t->inertia,t->rotDamping) / timestep );
+ Vector3 rotTorqueCoeff = Vector3::element_sqrt( 2. * Temp * Vector3::element_mult( t->inertia,t->rotDamping) / timestep );
- Force f = Vector3::element_mult(transForceCoeff,w1) * 2.046167337 -
- Vector3::element_mult(t->transDamping, orientation.transpose()*momentum) * 41867.999435;
+ Force f = Vector3::element_mult(transForceCoeff,w1) -
+ Vector3::element_mult(t->transDamping, orientation.transpose()*momentum) * 10000;
- Force torq = Vector3::element_mult(rotTorqueCoeff,w2) * 2.046167337 -
- Vector3::element_mult(t->rotDamping, angularMomentum) * 41867.999435;
+ Force torq = Vector3::element_mult(rotTorqueCoeff,w2) -
+ Vector3::element_mult(t->rotDamping, angularMomentum) * 10000;
f = orientation * f;
torq = orientation * torq;
--
GitLab