diff --git a/src/data.jl b/src/data.jl index 9295b4b..7e2e284 100644 --- a/src/data.jl +++ b/src/data.jl @@ -3,7 +3,7 @@ struct SimConsts v₀::Float64 δt::Float64 packing_ratio::Float64 - μ::Float64 + μₜ::Float64 Dₜ::Float64 particle_radius::Float64 Dᵣ::Float64 diff --git a/src/run.jl b/src/run.jl index 9c8cd0d..683f1ca 100644 --- a/src/run.jl +++ b/src/run.jl @@ -84,12 +84,12 @@ function run_sim( skin_r=sim_consts.skin_r, skin_r²=sim_consts.skin_r^2, n_snapshots=n_snapshots, - c₁=4 * sim_consts.ϵ * 6 * sim_consts.σ^6 * sim_consts.δt * sim_consts.μ, + c₁=4 * sim_consts.ϵ * 6 * sim_consts.σ^6 * sim_consts.δt * sim_consts.μₜ, c₂=2 * sim_consts.σ^6, c₃=sqrt(2 * sim_consts.Dₜ * sim_consts.δt), c₄=sqrt(2 * sim_consts.Dᵣ * sim_consts.δt), v₀δt=sim_consts.v₀ * sim_consts.δt, - μ=sim_consts.μ, + μₜ=sim_consts.μₜ, interaction_r=sim_consts.interaction_r, interaction_r²=sim_consts.interaction_r^2, n_particles=sim_consts.n_particles, diff --git a/src/setup.jl b/src/setup.jl index ba3761c..42048cf 100644 --- a/src/setup.jl +++ b/src/setup.jl @@ -6,7 +6,7 @@ const DEFAULT_PARENT_DIR = "" const DEFAULT_COMMENT = "" const DEFAULT_PARTICLE_RADIUS = 0.5 const DEFAULT_Dₜ = 1.0 -const DEFAULT_μ = 1.0 +const DEFAULT_μₜ = 1.0 const DEFAULT_ϵ = 100.0 function initial_particle_grid_pos( @@ -59,7 +59,7 @@ function gen_sim_consts( @assert δt in 1e-7:1e-7:1e-4 @assert packing_ratio > 0 - μ = DEFAULT_μ + μₜ = DEFAULT_μₜ Dₜ = DEFAULT_Dₜ particle_radius = DEFAULT_PARTICLE_RADIUS Dᵣ = 3 * Dₜ / ((2 * particle_radius)^2) @@ -101,7 +101,7 @@ function gen_sim_consts( δt, packing_ratio, # Internal - μ, + μₜ, Dₜ, particle_radius, Dᵣ,