commit ff34b28e15248e7fc441713dccec15de1152fffa
parent 82f70d2c9a75a02c4a9d57bc1cfb7825ff4941f8
Author: Anders Damsgaard <andersd@riseup.net>
Date: Fri, 26 May 2017 10:07:54 -0400
add bond healing rate as ice floe parameter
Diffstat:
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/datatypes.jl b/src/datatypes.jl
@@ -47,6 +47,7 @@ type IceFloeCylindrical
youngs_modulus::float
poissons_ratio::float
tensile_strength::float
+ tensile_heal_rate::float
compressive_strength_prefactor::float
# Ocean/atmosphere interaction parameters
diff --git a/src/icefloe.jl b/src/icefloe.jl
@@ -31,7 +31,8 @@ function addIceFloeCylindrical(simulation::Simulation,
#youngs_modulus::float = 2e9, # Hopkins 2004
poissons_ratio::float = 0.185, # Hopkins 2004
#tensile_strength::float = 500e3, # Hopkins 2004
- tensile_strength::float = 0., # Hopkins 2004
+ tensile_strength::float = 0.,
+ tensile_heal_rate::float = 0.,
compressive_strength_prefactor::float = 1285e3,
# Hopkins 2004
ocean_drag_coeff_vert::float = 0.85, # H&C 2011
@@ -117,6 +118,7 @@ function addIceFloeCylindrical(simulation::Simulation,
youngs_modulus,
poissons_ratio,
tensile_strength,
+ tensile_heal_rate,
compressive_strength_prefactor,
ocean_drag_coeff_vert,
diff --git a/src/interaction.jl b/src/interaction.jl
@@ -136,7 +136,8 @@ function interactIceFloes!(simulation::Simulation, i::Int, j::Int, ic::Int)
# linearly increase tensile strength with time until max. value
tensile_strength = min(simulation.ice_floes[i].contact_age[ic]/
- (60.*60.*24.), 1.)*
+ max(simulation.ice_floes[i].tensile_heal_rate,
+ 1e-12), 1.)*
simulation.ice_floes[i].tensile_strength
# break bond
