mo8it/ReCo.jl
1
0
Fork 0
mirror of https://gitlab.rlp.net/mobitar/ReCo.jl.git synced 2024-09-19 19:01:17 +00:00
Code Issues Releases Activity

Removed multi-threading

Browse source
This commit is contained in:
MoBit 2021-11-11 01:25:06 +01:00
parent bfd3cf783c
commit 8440c25a65
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Particle.jl
View file

@ -10,11 +10,6 @@ mutable struct Particle
end end
end end
get_c(p::Particle) = p.c
get_c_x(p::Particle) = p.c[1]
get_c_y(p::Particle) = p.c[2]
get_φ(p::Particle) = p.φ
function restrict_coordinate(value::Float64; l::Float64) function restrict_coordinate(value::Float64; l::Float64)
if value < -l if value < -l
value += 2 * l value += 2 * l

2
src/run.jl
View file

@ -47,7 +47,7 @@ function run(;
particles = generate_particles(grid_n, grid_box_width, l), particles = generate_particles(grid_n, grid_box_width, l),
skin_r = skin_r, skin_r = skin_r,
skin_r² = skin_r^2, skin_r² = skin_r^2,
verlet_list = [PreVector(Int64, N - 1) for i in 1:N], verlet_list = [PreVector(Int64, N - 1) for i in 1:(N - 1)],
n_frames = floor(Int64, integration_steps / n_steps_before_save) + 1, n_frames = floor(Int64, integration_steps / n_steps_before_save) + 1,
) )

24
src/simulation.jl
View file

@ -4,7 +4,7 @@ function update_verlet_list!(args)
@simd for pv in args.verlet_list @simd for pv in args.verlet_list
reset!(pv) reset!(pv)
end end
for i in 1:(args.N - 1) for i in 1:(args.N - 1)
for j in (i + 1):args.N for j in (i + 1):args.N
p1 = args.particles[i] p1 = args.particles[i]
@ -14,29 +14,35 @@ function update_verlet_list!(args)
if overlapping if overlapping
push!(args.verlet_list[i], j) push!(args.verlet_list[i], j)
push!(args.verlet_list[j], i)
end end
end end
end end
end end
function euler!(args) function euler!(args)
Threads.@threads for p in args.particles for i in 1:(args.N - 1)
p = args.particles[i]
verlet_list = args.verlet_list[p.id] verlet_list = args.verlet_list[p.id]
for i in 1:verlet_list.last_ind for j in 1:verlet_list.last_ind
p2 = args.particles[verlet_list.v[i]] p2 = args.particles[verlet_list.v[j]]
overlapping, r⃗₁₂, distance² = are_overlapping(p, p2, args.interaction_r², args.l) overlapping, r⃗₁₂, distance² = are_overlapping(p, p2, args.interaction_r², args.l)
if overlapping if overlapping
c = args.c₁ / (distance²^4) * (args.c₂ / (distance²^3) - 1) c = args.c₁ / (distance²^4) * (args.c₂ / (distance²^3) - 1)
@simd for j in 1:2
p.tmp_c[j] -= c * r⃗₁₂[j] @simd for k in 1:2
dck = c * r⃗₁₂[k]
p.tmp_c[k] -= dck
p2.tmp_c[k] += dck
end end
end end
end end
end
@simd for p in args.particles
e = SVector(cos(p.φ), sin(p.φ)) e = SVector(cos(p.φ), sin(p.φ))
@simd for i in 1:2 @simd for i in 1:2
@ -46,10 +52,8 @@ function euler!(args)
p.φ += args.c₄ * rand_normal01() p.φ += args.c₄ * rand_normal01()
restrict_coordinates!(p; l=args.l) restrict_coordinates!(p; l=args.l)
end
@simd for particle in args.particles update!(p)
update!(particle)
end end
return nothing return nothing