Fix friction force typo

Caltech-OCTO · Jul 10, 2023 · 9df96ab · 9df96ab
1 parent e20986e
commit 9df96ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/examples/simple_strait.jl b/examples/simple_strait.jl
@@ -45,7 +45,7 @@ coupling_settings = CouplingSettings(
 # Floe creation
 floe_arr = initialize_floe_field(
  FT,
- 10,
+ 50,
  [0.7],
  domain,
  hmean,
@@ -81,7 +81,7 @@ simulation = Simulation(
  model = model,
  consts = consts,
  Δt = Δt,
- nΔt = 1000,
+ nΔt = 3000,
  verbose = false,
  coupling_settings = coupling_settings,
  fracture_settings = fracture_settings,

diff --git a/src/physical_processes/collisions.jl b/src/physical_processes/collisions.jl
@@ -206,9 +206,8 @@ function calc_friction_forces(
  for i in axes(vdiff, 1)
  v = vdiff[i, :]
  n = normal[i, :]
- vnorm = norm(v)
- force_dir = maximum(abs.(v)) == 0 ? zeros(FT, 2) : v/vnorm
- friction = G * Δl[i] * Δt * vnorm * -dot(force_dir, v) * force_dir
+ force_dir = maximum(abs.(v)) == 0 ? zeros(FT, 2) : v/norm(v)
+ friction = G * Δl[i] * Δt * norm(n) * -dot(force_dir, v) * force_dir
  if norm(friction) > consts.μ*norm(n)
  friction = -consts.μ*norm(n)*force_dir
  end