Granular.jl

commit 20d07138a2455897c927ac08be2bb8a90bc497b2
parent 386bc4ddefe8ed8700984bc6802f5490935edbe5
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Fri, 26 May 2017 18:05:44 -0400

determine contact compressibility during vtk write

Diffstat:
M
src/io.jl
 | 
10
+++++++---

1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/io.jl b/src/io.jl
@@ -157,9 +157,13 @@ function writeIceFloeBondVTK(simulation::Simulation,
                 if simulation.ice_floes[i].youngs_modulus > 0. &&
                     simulation.ice_floes[j].youngs_modulus > 0.
                     R_ij = harmonicMean(r_i, r_j)
-                    A_ij = R_ij*min(simulation.ice_floes[i].thickness, 
-                                    simulation.ice_floes[j].thickness)
-                    k_n = E*A_ij/R_ij
+                    E_ij = harmonicMean(simulation.ice_floes[i].
+                                        youngs_modulus,
+                                        simulation.ice_floes[j].
+                                        youngs_modulus)
+                    R_ij*min(simulation.ice_floes[i].thickness, 
+                             simulation.ice_floes[j].thickness)
+                    k_n = E_ij*A_ij/R_ij
                 else
                     k_n = harmonicMean(simulation.ice_floes[i].
                                        contact_stiffness_normal,