Merge branch 'main' into dev

Author: LasNikas

Project.toml

@@ -27,7 +27,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-StrideArrays = "d1fa6d79-ef01-42a6-86c9-f7c551f8593b"
+StrideArraysCore = "7792a7ef-975c-4747-a70f-980b88e8d1da"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284"
 WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
@@ -61,7 +61,7 @@ RecipesBase = "1"
 Reexport = "1"
 SciMLBase = "2"
 StaticArrays = "1"
-StrideArrays = "0.1"
+StrideArraysCore = "0.5.7"
 TimerOutputs = "0.5.25"
 TrixiBase = "0.1.5"
 WriteVTK = "1.21.2"

src/TrixiParticles.jl

@@ -27,7 +27,7 @@ using SciMLBase: CallbackSet, DiscreteCallback, DynamicalODEProblem, u_modified!
                  get_du
 @reexport using StaticArrays: SVector
 using StaticArrays: @SMatrix, SMatrix, setindex
-using StrideArrays: PtrArray, StaticInt
+using StrideArraysCore: PtrArray, StaticInt
 using TimerOutputs: TimerOutput, TimerOutputs, print_timer, reset_timer!, @notimeit
 using TrixiBase: @trixi_timeit, timer, timeit_debug_enabled,
                  disable_debug_timings, enable_debug_timings, TrixiBase

src/schemes/boundary/open_boundary/system.jl

@@ -241,6 +241,20 @@ end
     return system.pressure
 end
 
+@inline function set_particle_pressure!(v, system::OpenBoundarySPHSystem, particle,
+                                        pressure)
+    system.pressure[particle] = pressure
+
+    return v
+end
+
+@inline function set_particle_density!(v, system::OpenBoundarySPHSystem, particle,
+                                       density)
+    system.density[particle] = density
+
+    return v
+end
+
 function update_boundary_interpolation!(system::OpenBoundarySPHSystem, v, u, v_ode, u_ode,
                                         semi, t)
     update_boundary_model!(system, system.boundary_model, v, u, v_ode, u_ode, semi, t)

src/schemes/fluid/entropically_damped_sph/system.jl

@@ -257,18 +257,6 @@ end
 
 @inline system_state_equation(system::EntropicallyDampedSPHSystem) = nothing
 
-# WARNING!
-# These functions are intended to be used internally to set the pressure
-# of newly activated particles in a callback.
-# DO NOT use outside a callback. OrdinaryDiffEq does not allow changing `v` and `u`
-# outside of callbacks.
-@inline function set_particle_pressure!(v, system::EntropicallyDampedSPHSystem, particle,
-                                        pressure)
-    v[end, particle] = pressure
-
-    return v
-end
-
 @inline system_sound_speed(system::EntropicallyDampedSPHSystem) = system.sound_speed
 
 @inline shifting_technique(system::EntropicallyDampedSPHSystem) = system.shifting_technique

src/schemes/fluid/fluid.jl

@@ -1,16 +1,21 @@
+# WARNING!
+# These functions are intended to be used internally to set the density
+# of newly activated particles in a callback.
+# DO NOT use outside a callback. OrdinaryDiffEq does not allow changing `v` and `u`
+# outside of callbacks.
 @inline function set_particle_density!(v, system::FluidSystem, particle, density)
-    set_particle_density!(v, system, system.density_calculator, particle, density)
+    current_density(v, system)[particle] = density
+
+    return v
 end
 
 # WARNING!
-# These functions are intended to be used internally to set the density
+# These functions are intended to be used internally to set the pressure
 # of newly activated particles in a callback.
 # DO NOT use outside a callback. OrdinaryDiffEq does not allow changing `v` and `u`
 # outside of callbacks.
-@inline set_particle_density!(v, system, ::SummationDensity, particle, density) = v
-
-@inline function set_particle_density!(v, system, ::ContinuityDensity, particle, density)
-    v[end, particle] = density
+@inline function set_particle_pressure!(v, system::FluidSystem, particle, pressure)
+    current_pressure(v, system)[particle] = pressure
 
     return v
 end