fix tests

Author: LasNikas

examples/postprocessing/interpolation_plane.jl

@@ -107,7 +107,7 @@ combined_plot = Plots.plot(plot1, plot2, plot3, plot_3d, layout=(2, 2),
 # Note that the arguments `system, v_ode, u_ode, semi, t` are more powerful than the
 # documented arguments `system, data, t`, allowing us to use interpolation (which requires
 # a semidiscretization).
-function save_interpolated_plane(system, v_ode, u_ode, semi, t)
+function save_interpolated_plane(system, dv_ode, du_ode, v_ode, u_ode, semi, t)
     # Size of the patch to be interpolated
     interpolation_start = [0.0, 0.0]
     interpolation_end = [tank_size[1], tank_size[2]]

examples/postprocessing/postprocessing.jl

@@ -15,7 +15,7 @@ using JSON
 
 # Any custom function with the arguments `v, u, t, system` can be passed to the callback
 # to be called every 10th timestep. See example below:
-function hello(system, v_ode, u_ode, semi, t)
+function hello(system, dv_ode, du_ode, v_ode, u_ode, semi, t)
     # Will write "hello" and the current simulation time
     println("hello at ", t)
 

src/io/write_vtk.jl

@@ -139,12 +139,16 @@ function trixi2vtk(system_, dvdu_ode_, vu_ode_, semi_, t, periodic_box;
         end
 
         # Extract custom quantities for this system
-        # TODO: Check if any custom quantities and then adapt from gpu
-        dv_ode, du_ode = dvdu_ode_.x
-        for (key, quantity) in custom_quantities
-            value = custom_quantity(quantity, system, dv_ode, du_ode, v_ode, u_ode, semi, t)
-            if value !== nothing
-                vtk[string(key)] = value
+        if !isempty(custom_quantities)
+            dv_ode, du_ode = dvdu_ode_.x
+            dv_ode, du_ode = transfer2cpu(dv_ode, du_ode)
+
+            for (key, quantity) in custom_quantities
+                value = custom_quantity(quantity, system, dv_ode, du_ode, v_ode, u_ode,
+                                        semi, t)
+                if value !== nothing
+                    vtk[string(key)] = value
+                end
             end
         end
 
@@ -155,19 +159,30 @@ function trixi2vtk(system_, dvdu_ode_, vu_ode_, semi_, t, periodic_box;
 end
 
 function transfer2cpu(v_::AbstractGPUArray, u_, system_, semi_)
-    v = Adapt.adapt(Array, v_)
-    u = Adapt.adapt(Array, u_)
     semi = Adapt.adapt(Array, semi_)
     system_index = system_indices(system_, semi_)
     system = semi.systems[system_index]
 
+    v, u = transfer2cpu(v_, u_)
+
     return v, u, system, semi
 end
 
 function transfer2cpu(v_, u_, system_, semi_)
     return v_, u_, system_, semi_
 end
 
+function transfer2cpu(v_::AbstractGPUArray, u_)
+    v = Adapt.adapt(Array, v_)
+    u = Adapt.adapt(Array, u_)
+
+    return v, u
+end
+
+function transfer2cpu(v_, u_)
+    return v_, u_
+end
+
 function custom_quantity(quantity::AbstractArray, system, dv_ode, du_ode, v_ode, u_ode,
                          semi, t)
     return quantity

test/callbacks/solution_saving.jl

@@ -69,18 +69,21 @@
     @testset verbose=true "custom quantities" begin
         # Test that `custom_quantity` correctly chooses the correct method
         quantity1(system, data, t) = data
-        quantity2(system, v_ode, u_ode, semi, t) = 2
+        quantity2(system, dv_ode, du_ode, v_ode, u_ode, semi, t) = 2
         quantity3() = 3
 
         system = Val(:mock_system)
         TrixiParticles.system_data(::Val{:mock_system}, dv_ode, du_ode, v_ode, u_ode,
                                    semi) = 1
 
-        data = v_ode = u_ode = semi = t = nothing
+        data = v_ode = u_ode = dv_ode = du_ode = semi = t = nothing
 
-        @test TrixiParticles.custom_quantity(quantity1, system, v_ode, u_ode, semi, t) == 1
-        @test TrixiParticles.custom_quantity(quantity2, system, v_ode, u_ode, semi, t) == 2
-        @test_throws MethodError TrixiParticles.custom_quantity(quantity3, system, v_ode,
-                                                                u_ode, semi, t)
+        @test TrixiParticles.custom_quantity(quantity1, system, dv_ode, du_ode, v_ode,
+                                             u_ode, semi, t) == 1
+        @test TrixiParticles.custom_quantity(quantity2, system, dv_ode, du_ode, v_ode,
+                                             u_ode, semi, t) == 2
+        @test_throws MethodError TrixiParticles.custom_quantity(quantity3, system, dv_ode,
+                                                                du_ode, v_ode, u_ode,
+                                                                semi, t)
     end
 end

test/io/read_vtk.jl

@@ -1,7 +1,7 @@
 @testset verbose=true "`vtk2trixi`" begin
     mktempdir() do tmp_dir
-        coordinates=fill(1.0, 2, 12)
-        velocity=fill(2.0, 2, 12)
+        coordinates = fill(1.0, 2, 12)
+        velocity = fill(2.0, 2, 12)
 
         expected_ic = InitialCondition(; coordinates=coordinates, velocity=velocity,
                                        density=1000.0, pressure=900.0, mass=50.0)
@@ -29,15 +29,17 @@
             semi = Semidiscretization(fluid_system)
 
             # Create random ODE solutions
+            dvdu_ode = nothing
             v = fill(2.0, ndims(fluid_system), nparticles(fluid_system))
             pressure = fill(3.0, nparticles(fluid_system))
             v_ode = vec([v; pressure'])
-
             u = fill(1.0, ndims(fluid_system), nparticles(fluid_system))
             u_ode = vec(u)
+            x = (; v_ode, u_ode)
+            vu_ode = (; x)
 
             # Write out `FluidSystem` Simulation-File
-            trixi2vtk(fluid_system, v_ode, u_ode, semi, 0.0,
+            trixi2vtk(fluid_system, dvdu_ode, vu_ode, semi, 0.0,
                       nothing; system_name="tmp_file_fluid", output_directory=tmp_dir,
                       iter=1)
 
@@ -65,11 +67,14 @@
             semi = Semidiscretization(boundary_system)
 
             # Create dummy ODE solutions
+            dvdu_ode = nothing
             v_ode = zeros(ndims(boundary_system) * nparticles(boundary_system))
             u_ode = zeros(ndims(boundary_system) * nparticles(boundary_system))
+            x = (; v_ode, u_ode)
+            vu_ode = (; x)
 
             # Write out `BoundarySystem` Simulation-File
-            trixi2vtk(boundary_system, v_ode, u_ode, semi, 0.0,
+            trixi2vtk(boundary_system, dvdu_ode, vu_ode, semi, 0.0,
                       nothing; system_name="tmp_file_boundary", output_directory=tmp_dir,
                       iter=1)