Merge branch 'main' into oriented-bbox

Author: svchb

Project.toml

@@ -50,7 +50,7 @@ FastPow = "0.1"
 FileIO = "1"
 ForwardDiff = "1"
 GPUArraysCore = "0.2"
-JSON = "0.21"
+JSON = "1"
 KernelAbstractions = "0.9"
 MuladdMacro = "0.2"
 OrdinaryDiffEq = "6.91"

test/Project.toml

@@ -17,11 +17,11 @@ TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26"
 
 [compat]
 CSV = "0.10"
-CairoMakie = "0.13, 0.15"
+CairoMakie = "0.15"
 DataFrames = "1.6"
 GLM = "1.9"
 Glob = "1.3"
-JSON = "0.21"
+JSON = "1"
 OrdinaryDiffEq = "6.49"
 Plots = "1"
 Polyester = "0.7"

test/systems/iisph_system.jl

@@ -253,7 +253,7 @@
                                                  time_step=0.001)
 
         u0 = zeros(TrixiParticles.u_nvariables(system),
-                   TrixiParticles.n_moving_particles(system))
+                   TrixiParticles.n_integrated_particles(system))
         TrixiParticles.write_u0!(u0, system)
 
         @test u0 == coordinates
@@ -279,7 +279,7 @@
                                                  time_step=0.001)
 
         v0 = zeros(TrixiParticles.v_nvariables(system),
-                   TrixiParticles.n_moving_particles(system))
+                   TrixiParticles.n_integrated_particles(system))
         TrixiParticles.write_v0!(v0, system)
 
         @test v0 == velocity

test/systems/systems.jl

@@ -5,3 +5,4 @@ include("boundary_system.jl")
 include("open_boundary_system.jl")
 include("dem_system.jl")
 include("packing_system.jl")
+include("iisph_system.jl")