Fix current_velocity for EDAC

src/schemes/fluid/entropically_damped_sph/system.jl

@@ -239,6 +239,10 @@ system_correction(system::EntropicallyDampedSPHSystem) = system.correction
     return v[end, particle]
 end
 
+@inline function current_velocity(v, system::EntropicallyDampedSPHSystem)
+    return view(v, 1:ndims(system), each_moving_particle(system))
+end
+
 @inline system_state_equation(system::EntropicallyDampedSPHSystem) = nothing
 
 # WARNING!
@@ -283,8 +287,8 @@ end
     return view(v, size(v, 1) - 1, :)
 end
 
-@inline function current_pressure(v, ::EntropicallyDampedSPHSystem)
-    return view(v, size(v, 1), :)
+@inline function current_pressure(v, system::EntropicallyDampedSPHSystem)
+    return view(v, size(v, 1), each_moving_particle(system))
 end
 
 function update_quantities!(system::EntropicallyDampedSPHSystem, v, u,

src/schemes/fluid/weakly_compressible_sph/system.jl

@@ -261,7 +261,7 @@ end
                                   system::WeaklyCompressibleSPHSystem)
     # When using `ContinuityDensity`, the velocity is stored
     # in the first `ndims(system)` rows of `v`.
-    return view(v, 1:ndims(system), :)
+    return view(v, 1:ndims(system), each_moving_particle(system))
 end
 
 @inline function current_density(v, system::WeaklyCompressibleSPHSystem)
@@ -271,17 +271,17 @@ end
 @inline function current_density(v, ::SummationDensity,
                                  system::WeaklyCompressibleSPHSystem)
     # When using `SummationDensity`, the density is stored in the cache
-    return system.cache.density
+    return view(system.cache.density, each_moving_particle(system))
 end
 
 @inline function current_density(v, ::ContinuityDensity,
                                  system::WeaklyCompressibleSPHSystem)
     # When using `ContinuityDensity`, the density is stored in the last row of `v`
-    return view(v, size(v, 1), :)
+    return view(v, size(v, 1), each_moving_particle(system))
 end
 
 @inline function current_pressure(v, system::WeaklyCompressibleSPHSystem)
-    return system.pressure
+    return view(system.pressure, each_moving_particle(system))
 end
 
 @inline system_sound_speed(system::WeaklyCompressibleSPHSystem) = system.state_equation.sound_speed

test/systems/edac_system.jl

@@ -193,7 +193,12 @@
                    TrixiParticles.n_moving_particles(system))
         TrixiParticles.write_v0!(v0, system)
 
+        system.cache.density .= density
+
         @test v0 == vcat(velocity, pressure')
+        @test TrixiParticles.current_velocity(v0, system) == velocity
+        @test TrixiParticles.current_density(v0, system) == system.cache.density
+        @test TrixiParticles.current_pressure(v0, system) == pressure
 
         initial_condition = InitialCondition(; coordinates, velocity, mass, density,
                                              pressure=pressure_function)

test/systems/wcsph_system.jl

@@ -266,7 +266,13 @@
                    TrixiParticles.n_moving_particles(system))
         TrixiParticles.write_v0!(v0, system)
 
+        system.cache.density .= density
+        system.pressure .= zero(density)
+
         @test v0 == velocity
+        @test TrixiParticles.current_velocity(v0, system) == velocity
+        @test TrixiParticles.current_density(v0, system) == system.cache.density
+        @test TrixiParticles.current_pressure(v0, system) == system.pressure
 
         # ContinuityDensity
         system = WeaklyCompressibleSPHSystem(initial_condition,