Skip to content

Commit e50d19c

Browse files
authored
Merge branch 'main' into fix-smoothing-length-factor
2 parents b1acf76 + f8e3631 commit e50d19c

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

src/schemes/fluid/entropically_damped_sph/system.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@ system_correction(system::EntropicallyDampedSPHSystem) = system.correction
239239
return v[end, particle]
240240
end
241241

242+
@inline function current_velocity(v, system::EntropicallyDampedSPHSystem)
243+
return view(v, 1:ndims(system), :)
244+
end
245+
242246
@inline system_state_equation(system::EntropicallyDampedSPHSystem) = nothing
243247

244248
# WARNING!

test/systems/edac_system.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@
193193
TrixiParticles.n_moving_particles(system))
194194
TrixiParticles.write_v0!(v0, system)
195195

196+
system.cache.density .= density
197+
196198
@test v0 == vcat(velocity, pressure')
199+
@test TrixiParticles.current_velocity(v0, system) == velocity
200+
@test TrixiParticles.current_density(v0, system) == system.cache.density
201+
@test TrixiParticles.current_pressure(v0, system) == pressure
197202

198203
initial_condition = InitialCondition(; coordinates, velocity, mass, density,
199204
pressure=pressure_function)

test/systems/wcsph_system.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,13 @@
266266
TrixiParticles.n_moving_particles(system))
267267
TrixiParticles.write_v0!(v0, system)
268268

269+
system.cache.density .= density
270+
system.pressure .= zero(density)
271+
269272
@test v0 == velocity
273+
@test TrixiParticles.current_velocity(v0, system) == velocity
274+
@test TrixiParticles.current_density(v0, system) == system.cache.density
275+
@test TrixiParticles.current_pressure(v0, system) == system.pressure
270276

271277
# ContinuityDensity
272278
system = WeaklyCompressibleSPHSystem(initial_condition,

0 commit comments

Comments
 (0)