Hotfix for #1065 (#1070)

* Hotfix for #1065

* Add missing Project.toml

Author: efaulhaber

Project.toml

@@ -4,6 +4,7 @@ version = "0.4.4-dev"
 authors = ["erik.faulhaber <44124897+efaulhaber@users.noreply.github.com>"]
 
 [deps]
+Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -41,6 +42,7 @@ OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
 TrixiParticlesOrdinaryDiffEqExt = ["OrdinaryDiffEq", "OrdinaryDiffEqCore"]
 
 [compat]
+Accessors = "0.1.43"
 Adapt = "4"
 CSV = "0.10"
 DataFrames = "1.6"

src/TrixiParticles.jl

@@ -2,6 +2,7 @@ module TrixiParticles
 
 using Reexport: @reexport
 
+using Accessors: @set
 using Adapt: Adapt
 using Base: @propagate_inbounds
 using CSV: CSV

src/general/semidiscretization.jl

@@ -272,11 +272,7 @@ function semidiscretize(semi, tspan; reset_threads=true)
         # Therefore, we have to re-link them, which yields yet another `Semidiscretization`.
         # Note that this re-creates systems containing links, so it only works as long
         # as systems don't link to other systems containing links.
-        semi_new = Semidiscretization(set_system_links.(semi_.systems, Ref(semi_)),
-                                      semi_.ranges_u, semi_.ranges_v,
-                                      semi_.neighborhood_searches,
-                                      semi_.parallelization_backend,
-                                      semi_.update_callback_used, semi_.integrate_tlsph)
+        semi_new = @set semi_.systems = set_system_links.(semi_.systems, Ref(semi_))
 
         @info "To move data to the GPU, `semidiscretize` creates a deep copy of the passed " *
               "`Semidiscretization`. Use `semi = ode.p` to access simulation data."
@@ -822,26 +818,10 @@ end
 # After `adapt`, the system type information may change.
 # This means that systems linking to other systems still point to old systems.
 # Therefore, we have to re-link them based on the stored system index.
-set_system_links(system, semi) = system
-
 function set_system_links(system::OpenBoundarySystem, semi)
     fluid_system = semi.systems[system.fluid_system_index[]]
 
-    return OpenBoundarySystem(system.boundary_model,
-                              system.initial_condition,
-                              fluid_system, # link to fluid system
-                              system.fluid_system_index,
-                              system.smoothing_kernel,
-                              system.smoothing_length,
-                              system.mass,
-                              system.volume,
-                              system.boundary_candidates,
-                              system.fluid_candidates,
-                              system.boundary_zone_indices,
-                              system.boundary_zones,
-                              system.buffer,
-                              system.pressure_acceleration_formulation,
-                              system.shifting_technique,
-                              system.calculate_flow_rate,
-                              system.cache)
+    return @set system.fluid_system = fluid_system
 end
+
+set_system_links(system, semi) = system

src/io/write_vtk.jl

@@ -158,8 +158,17 @@ function trixi2vtk(system_, dvdu_ode_, vu_ode_, semi_, t, periodic_box;
     vtk_save(pvd)
 end
 
+function transfer2cpu(semi::Semidiscretization)
+    # First move all data to the CPU
+    semi = Adapt.adapt(Array, semi)
+
+    # Now, set the parallelization backend to `PolyesterBackend` to make sure that
+    # `@threaded` loops still work as expected with this semidiscretization.
+    return @set semi.parallelization_backend = PolyesterBackend()
+end
+
 function transfer2cpu(v_::AbstractGPUArray, u_, semi_)
-    semi = Adapt.adapt(Array, semi_)
+    semi = transfer2cpu(semi_)
     v, u = transfer2cpu(v_, u_)
 
     return v, u, semi