Skip to content

Commit 52799fe

Browse files
committed
small fixes
1 parent 225f39d commit 52799fe

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

src/simulators.jl

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ Custom simulators should implement this function.
7575
using_constraints = length(sys.constraints) > 0
7676
println(sim.log_stream, "Step 0 - potential energy ", E, " - max force N/A - N/A")
7777
hn = sim.step_size
78-
coords_copy = similar(sys.coords)
79-
F_nounits = ustrip_vec.(similar(sys.coords))
78+
coords_copy = zero(sys.coords)
79+
F_nounits = ustrip_vec.(zero(sys.coords))
8080
F = F_nounits .* sys.force_units
8181
forces_buffer = init_forces_buffer!(sys, F_nounits, n_threads)
8282

@@ -150,18 +150,18 @@ end
150150
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
151151
forces_nounits_t = ustrip_vec.(zero(sys.coords))
152152
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
153-
forces_nounits_t = forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, 0;
154-
n_threads=n_threads)
153+
forces_nounits_t .= forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, 0;
154+
n_threads=n_threads)
155155
forces_t = forces_nounits_t .* sys.force_units
156156
accels_t = forces_t ./ masses(sys)
157-
forces_nounits_t_dt = ustrip_vec.(similar(sys.coords))
157+
forces_nounits_t_dt = ustrip_vec.(zero(sys.coords))
158158
forces_t_dt = forces_nounits_t_dt .* sys.force_units
159159
accels_t_dt = zero(accels_t)
160160
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads, current_forces=forces_t)
161161
using_constraints = length(sys.constraints) > 0
162162
if using_constraints
163-
cons_coord_storage = similar(sys.coords)
164-
cons_vel_storage = similar(sys.velocities)
163+
cons_coord_storage = zero(sys.coords)
164+
cons_vel_storage = zero(sys.velocities)
165165
end
166166

167167
for step_n in 1:n_steps
@@ -240,13 +240,13 @@ end
240240
!iszero(sim.remove_CM_motion) && remove_CM_motion!(sys)
241241
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
242242
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads)
243-
forces_nounits_t = ustrip_vec.(similar(sys.coords))
243+
forces_nounits_t = ustrip_vec.(zero(sys.coords))
244244
forces_t = forces_nounits_t .* sys.force_units
245245
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
246246
accels_t = forces_t ./ masses(sys)
247247
using_constraints = length(sys.constraints) > 0
248248
if using_constraints
249-
cons_coord_storage = similar(sys.coords)
249+
cons_coord_storage = zero(sys.coords)
250250
end
251251

252252
for step_n in 1:n_steps
@@ -315,8 +315,8 @@ StormerVerlet(; dt, coupling=NoCoupling()) = StormerVerlet(dt, coupling)
315315
sys.coords .= wrap_coords.(sys.coords, (sys.boundary,))
316316
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
317317
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads)
318-
coords_last, coords_copy = similar(sys.coords), similar(sys.coords)
319-
forces_nounits_t = ustrip_vec.(similar(sys.coords))
318+
coords_last, coords_copy = zero(sys.coords), zero(sys.coords)
319+
forces_nounits_t = ustrip_vec.(zero(sys.coords))
320320
forces_t = forces_nounits_t .* sys.force_units
321321
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
322322
accels_t = forces_t ./ masses(sys)
@@ -400,15 +400,15 @@ end
400400
!iszero(sim.remove_CM_motion) && remove_CM_motion!(sys)
401401
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
402402
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads)
403-
forces_nounits_t = ustrip_vec.(similar(sys.coords))
403+
forces_nounits_t = ustrip_vec.(zero(sys.coords))
404404
forces_t = forces_nounits_t .* sys.force_units
405405
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
406406
accels_t = forces_t ./ masses(sys)
407-
noise = similar(sys.velocities)
407+
noise = zero(sys.velocities)
408408
using_constraints = length(sys.constraints) > 0
409409
if using_constraints
410-
cons_coord_storage = similar(sys.coords)
411-
cons_vel_storage = similar(sys.velocities)
410+
cons_coord_storage = zero(sys.coords)
411+
cons_vel_storage = zero(sys.velocities)
412412
end
413413

414414
for step_n in 1:n_steps
@@ -508,11 +508,13 @@ end
508508
!iszero(sim.remove_CM_motion) && remove_CM_motion!(sys)
509509
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
510510
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads)
511-
forces_nounits_t = ustrip_vec.(similar(sys.coords))
512-
forces_t = forces_nounits_t .* sys.force_units
511+
forces_nounits_t = ustrip_vec.(zero(sys.coords))
513512
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
513+
forces_nounits_t .= forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, 0;
514+
n_threads=n_threads)
515+
forces_t = forces_nounits_t .* sys.force_units
514516
accels_t = forces_t ./ masses(sys)
515-
noise = similar(sys.velocities)
517+
noise = zero(sys.velocities)
516518

517519
effective_dts = [sim.dt / count(c, sim.splitting) for c in sim.splitting]
518520

@@ -628,11 +630,11 @@ end
628630
!iszero(sim.remove_CM_motion) && remove_CM_motion!(sys)
629631
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
630632
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads)
631-
forces_nounits_t = ustrip_vec.(similar(sys.coords))
633+
forces_nounits_t = ustrip_vec.(zero(sys.coords))
632634
forces_t = forces_nounits_t .* sys.force_units
633635
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
634636
accels_t = forces_t ./ masses(sys)
635-
noise = similar(sys.velocities)
637+
noise = zero(sys.velocities)
636638

637639
for step_n in 1:n_steps
638640
forces_nounits_t .= forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, step_n;
@@ -704,11 +706,11 @@ end
704706
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
705707
forces_nounits_t = ustrip_vec.(zero(sys.coords))
706708
forces_buffer = init_forces_buffer!(sys, forces_nounits_t, n_threads)
707-
forces_nounits_t = forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, 0;
708-
n_threads=n_threads)
709+
forces_nounits_t .= forces_nounits!(forces_nounits_t, sys, neighbors, forces_buffer, 0;
710+
n_threads=n_threads)
709711
forces_t = forces_nounits_t .* sys.force_units
710712
accels_t = forces_t ./ masses(sys)
711-
forces_nounits_t_dt = ustrip_vec.(similar(sys.coords))
713+
forces_nounits_t_dt = ustrip_vec.(zero(sys.coords))
712714
forces_t_dt = forces_nounits_t_dt .* sys.force_units
713715
accels_t_dt = zero(accels_t)
714716
apply_loggers!(sys, neighbors, 0, run_loggers; n_threads=n_threads, current_forces=forces_t)
@@ -1062,7 +1064,7 @@ end
10621064
rng=Random.default_rng())
10631065
neighbors = find_neighbors(sys, sys.neighbor_finder; n_threads=n_threads)
10641066
E_old = potential_energy(sys, neighbors; n_threads=n_threads)
1065-
coords_old = similar(sys.coords)
1067+
coords_old = zero(sys.coords)
10661068

10671069
for step_n in 1:n_steps
10681070
coords_old .= sys.coords

0 commit comments

Comments
 (0)