tcalculate mean radius before conditional - Granular.jl - Julia package for gra… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 9bab04cfb39c08c4b92304968959fca205ec46e8 | |
parent 9d563785c775f08b03bc3000107f44b6e4038fc8 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 23 Jun 2017 09:09:52 -0400 | |
calculate mean radius before conditional | |
Diffstat: | |
M src/io.jl | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
--- | |
diff --git a/src/io.jl b/src/io.jl | |
t@@ -384,10 +384,10 @@ function writeIceFloeInteractionVTK(simulation::Simulati… | |
r_i = simulation.ice_floes[i].contact_radius | |
r_j = simulation.ice_floes[j].contact_radius | |
δ_n = dist - (r_i + r_j) | |
+ R_ij = harmonicMean(r_i, r_j) | |
if simulation.ice_floes[i].youngs_modulus > 0. && | |
simulation.ice_floes[j].youngs_modulus > 0. | |
- R_ij = harmonicMean(r_i, r_j) | |
E_ij = harmonicMean(simulation.ice_floes[i]. | |
youngs_modulus, | |
simulation.ice_floes[j]. |