Skip to content

Commit 9c0d0be

Browse files
committed
fix deleteat!
1 parent 4162c29 commit 9c0d0be

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
struct ParticleRefinement
22
n_particles_before_resize :: Ref{Int}
33
n_new_particles :: Ref{Int}
4+
delete_candidates :: Vector{Bool} # length(delete_candidates) == nparticles
45
end
56

67
function ParticleRefinement()
7-
return ParticleRefinement(Ref(0), Ref(0))
8+
return ParticleRefinement(Ref(0), Ref(0), Bool[])
89
end

src/multi_resolution/resize.jl

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function Base.resize!(semi::Semidiscretization, v_ode, u_ode, _v_ode, _u_ode)
99
return semi
1010
end
1111

12-
function deleteat!(semi::Semidiscretization, v_ode, u_ode, _v_ode, _u_ode)
12+
function Base.deleteat!(semi::Semidiscretization, v_ode, u_ode, _v_ode, _u_ode)
1313
# Delete at specific indices
1414
foreach_system(semi) do system
1515
v = wrap_v(v_ode, system, semi)
@@ -116,15 +116,15 @@ function resize_cache!(system::EntropicallyDampedSPHSystem, n)
116116
return system
117117
end
118118

119-
deleteat!(system, v, u) = system
119+
Base.deleteat!(system::System, v, u) = system
120120

121-
function deleteat!(system::FluidSystem, v, u)
121+
function Base.deleteat!(system::FluidSystem, v, u)
122122
return deleteat!(system, system.particle_refinement, v, u)
123123
end
124124

125-
deleteat!(system, ::Nothing, v, u) = system
125+
Base.deleteat!(system::FluidSystem, ::Nothing, v, u) = system
126126

127-
function deleteat!(system::FluidSystem, refinement, v, u)
127+
function Base.deleteat!(system::FluidSystem, refinement, v, u)
128128
(; delete_candidates) = refinement
129129

130130
delete_counter = 0
@@ -138,12 +138,13 @@ function deleteat!(system::FluidSystem, refinement, v, u)
138138
pos_keep = current_coords(u, system, dump_id)
139139

140140
mass_keep = hydrodynamic_mass(system, dump_id)
141-
density_keep = particle_density(system, v, dump_id)
142-
pressure_keep = particle_pressure(system, v, dump_id)
143-
smoothing_length_keep = smoothing_length(system, dump_id)
141+
density_keep = particle_density(v, system, dump_id)
142+
pressure_keep = particle_pressure(v, system,dump_id)
143+
#TODO
144+
# smoothing_length_keep = smoothing_length(system, dump_id)
145+
# system.cache.smoothing_length[particle] = smoothing_length_keep
144146

145147
system.mass[particle] = mass_keep
146-
system.cache.smoothing_length[particle] = smoothing_length_keep
147148

148149
set_particle_pressure!(v, system, particle, pressure_keep)
149150

0 commit comments

Comments
 (0)