tinclude rotational kinematics in debug output - slidergrid - grid of elastic sliders on a frictional surface
(HTM) git clone git://src.adamsgaard.dk/slidergrid
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit c0247d0e47f5d802895fb09e6e89e66b1c69d08c
(DIR) parent 1fd2ff5c433e192a246da1919a7346ec6ec3dafc
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 14 Apr 2016 13:04:10 -0700
include rotational kinematics in debug output
Diffstat:
M slidergrid/main.c | 9 +++++++--
M slidergrid/slider.c | 9 ++-------
M tests/elasticity/shear.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/slidergrid/main.c b/slidergrid/main.c
t@@ -206,8 +206,13 @@ int main(int argc, char** argv)
#ifdef DEBUG_SLIDER_KINEMATICS
for (i=0; i<sim.N; i++) {
- printf("main.c: Slider %d: pos = %f %f %f, vel = %f %f %f, "
- "acc = %f %f %f\n",
+ printf("main.c: Slider %d:\n"
+ "\tpos = %f %f %f\n"
+ "\tvel = %f %f %f\n"
+ "\tacc = %f %f %f\n"
+ "\tangpos = %f %f %f\n"
+ "\tangvel = %f %f %f\n"
+ "\tangacc = %f %f %f\n",
i,
sim.sliders[i].pos.x,
sim.sliders[i].pos.y,
(DIR) diff --git a/slidergrid/slider.c b/slidergrid/slider.c
t@@ -357,6 +357,7 @@ void bond_shear_kelvin_voigt(slider* s1, const slider s2,
// add bond-shear Kelvin-Voigt force to sum of forces on slider
s1->force = add_float3(s1->force, f_t);
+ // determine torque on slider from shear on this bond
const Float3 torque = multiply_scalar_float3( -1.0,
cross_float3(
multiply_float3_scalar(
t@@ -364,13 +365,7 @@ void bond_shear_kelvin_voigt(slider* s1, const slider s2,
f_t));
// add bond-shear Kelvin-Voigt force to sum of torques on slider
- //s1->torque = add_float3(s1->torque, f_t);
- /*s1->torque = add_float3(s1->torque,
- multiply_scalar_float3( -1.0,
- cross_float3(
- multiply_float3_scalar(s1->neighbor_distance[idx_neighbor], 0.5)
- , // midpoint distance between sliders
- f_t)));*/
+ s1->torque = add_float3(s1->torque, torque);
#ifdef DEBUG_SLIDER_FORCE_COMPONENTS
printf(" slider_interaction KV-shear:\n\tf_t = %f %f %f\n"
(DIR) diff --git a/tests/elasticity/shear.c b/tests/elasticity/shear.c
t@@ -30,7 +30,7 @@ simulation setup_simulation()
// set custom values for certain parameters
sim.sliders[i].mass = 1.0;
- sim.sliders[i].moment_of_inertia = 1.0e3;
+ sim.sliders[i].moment_of_inertia = 1.0;
sim.sliders[i].bond_parallel_kv_stiffness = 1.0e5;
//sim.sliders[i].bond_parallel_kv_viscosity = 1.0e2;
sim.sliders[i].bond_shear_kv_stiffness = 1.0e5;