tset default values for remaining slider parameters - slidergrid - grid of elas… | |
git clone git://src.adamsgaard.dk/slidergrid | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 14e8686be58c808ac6a040a280c5f117ff13516f | |
parent 5956528c9e7451c2d932ce45de64d94da384150b | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 22 Mar 2016 12:32:22 -0700 | |
set default values for remaining slider parameters | |
Diffstat: | |
M slidergrid/slider.c | 30 ++++++++++++++++++++++++++---- | |
1 file changed, 26 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/slidergrid/slider.c b/slidergrid/slider.c | |
t@@ -20,6 +20,10 @@ void initialize_slider_values(slider* s) | |
{ | |
s->force = zeroes_float3(); | |
s->torque = zeroes_float3(); | |
+ s->mass = 0.0; | |
+ s->moment_of_inertia = 0.0; | |
+ s->bond_parallel_stiffness = 0.0; | |
+ s->bond_parallel_viscosity = 0.0; | |
// define all entries in neighbor list as empty | |
int i; | |
t@@ -170,11 +174,22 @@ void slider_interaction(slider* s1, const slider s2, con… | |
// bond-parallel viscosity | |
const Float3 f_n_viscous = | |
multiply_scalar_float3(bond_parallel_viscosity, | |
- s1->neighbor_relative_distance_displacement[idx_neighbor]); | |
+ s1->neighbor_relative_distance_velocity[idx_neighbor]); | |
// bond-parallel force, counteracts tension and compression | |
const Float3 f_n = multiply_float3(f_n_elastic, f_n_viscous); | |
+ printf("f_n = %f %f %f, f_n_elastic = %f %f %f, f_n_viscous = %f %f %f\n", | |
+ f_n.x, | |
+ f_n.y, | |
+ f_n.z, | |
+ f_n_elastic.x, | |
+ f_n_elastic.y, | |
+ f_n_elastic.z, | |
+ f_n_viscous.x, | |
+ f_n_viscous.y, | |
+ f_n_viscous.z); | |
+ | |
// add bond-parallel force to sum of forces on slider | |
s1->force = add_float3(s1->force, f_n); | |
} | |
t@@ -190,8 +205,9 @@ void slider_neighbor_interaction( | |
int idx_neighbor; | |
for (idx_neighbor=0; idx_neighbor<MAX_NEIGHBORS; idx_neighbor++) { | |
- // reset sum of forces on slider | |
+ // reset sum of forces and torques on slider | |
s->force = make_float3(0., 0., 0.); | |
+ s->torque = make_float3(0., 0., 0.); | |
if (s->neighbors[idx_neighbor] != -1) { | |
t@@ -201,8 +217,14 @@ void slider_neighbor_interaction( | |
slider_interaction( | |
s, sliders[s->neighbors[idx_neighbor]], idx_neighbor); | |
- | |
- | |
+ printf("%d, %d: F = %f %f %f, T = %f %f %f\n", | |
+ s, sliders[s->neighbors[idx_neighbor]], | |
+ s->force.x, | |
+ s->force.y, | |
+ s->force.z, | |
+ s->torque.x, | |
+ s->torque.y, | |
+ s->torque.z); | |
} | |
} | |
} |