tChange contact healing scheme and default value - Granular.jl - Julia package for granular dynamics simulation
 (HTM) git clone git://src.adamsgaard.dk/Granular.jl
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 1c692cbdb7170b49b5049d6ba44893193752d484
 (DIR) parent c6482c2d3564de1ffd604cb369ff4d696734d30c
 (HTM) Author: Anders Damsgaard <andersd@riseup.net>
       Date:   Tue, 20 Feb 2018 19:46:14 -0500
       
       Change contact healing scheme and default value
       
       Diffstat:
         M src/grain.jl                        |       2 +-
         M src/interaction.jl                  |       7 +++----
       
       2 files changed, 4 insertions(+), 5 deletions(-)
       ---
 (DIR) diff --git a/src/grain.jl b/src/grain.jl
       t@@ -151,7 +151,7 @@ function addGrainCylindrical!(simulation::Simulation,
                                        youngs_modulus::Float64 = 2e7,
                                        poissons_ratio::Float64 = 0.185,  # Hopkins 2004
                                        tensile_strength::Float64 = 0.,
       -                                tensile_heal_rate::Float64 = 0.,
       +                                tensile_heal_rate::Float64 = Inf,
                                        fracture_toughness::Float64 = 0.,  
                                        ocean_drag_coeff_vert::Float64 = 0.85, # H&C 2011
                                        ocean_drag_coeff_horiz::Float64 = 5e-4, # H&C 2011
 (DIR) diff --git a/src/interaction.jl b/src/interaction.jl
       t@@ -222,10 +222,9 @@ function interactGrains!(simulation::Simulation, i::Int, j::Int, ic::Int)
                # tensile stress exceeds tensile strength
        
                # linearly increase tensile strength with time until max. value
       -        tensile_strength = min(simulation.grains[i].contact_age[ic]/
       -                               max(simulation.grains[i].tensile_heal_rate,
       -                                   1e-12), 1.)*
       -                               simulation.grains[i].tensile_strength
       +        tensile_strength = min(simulation.grains[i].contact_age[ic]*
       +                               simulation.grains[i].tensile_heal_rate,
       +                               simulation.grains[i].tensile_strength)
                
        
                # break bond