Merge branch 'AMR_Parabolic_2D3D_Tree' of github.com:DanielDoehring/T…

…rixi.jl into AMR_Parabolic_2D3D_Tree

Project.toml

@@ -1,7 +1,7 @@
 name = "Trixi"
 uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"]
-version = "0.5.46-pre"
+version = "0.5.47-pre"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"

examples/p4est_2d_dgsem/elixir_euler_double_mach_amr.jl

@@ -27,15 +27,15 @@ See Section IV c on the paper below for details.
     phi = pi / 6
     sin_phi, cos_phi = sincos(phi)
 
-    rho =  8
+    rho =  8.0
     v1  =  8.25 * cos_phi
     v2  = -8.25 * sin_phi
     p   =  116.5
   else
     rho = 1.4
-    v1  = 0
-    v2  = 0
-    p   = 1
+    v1  = 0.0
+    v2  = 0.0
+    p   = 1.0
   end
 
   prim = SVector(rho, v1, v2, p)

src/callbacks_step/save_solution.jl

@@ -211,11 +211,11 @@ end
         get_element_variables!(element_variables, u_ode, semi)
         callbacks = integrator.opts.callback
         if callbacks isa CallbackSet
-            for cb in callbacks.continuous_callbacks
+            foreach(callbacks.continuous_callbacks) do cb
                 get_element_variables!(element_variables, u_ode, semi, cb;
                                        t = integrator.t, iter = iter)
             end
-            for cb in callbacks.discrete_callbacks
+            foreach(callbacks.discrete_callbacks) do cb
                 get_element_variables!(element_variables, u_ode, semi, cb;
                                        t = integrator.t, iter = iter)
             end

src/callbacks_step/summary.jl

@@ -168,16 +168,17 @@ function initialize_summary_callback(cb::DiscreteCallback, u, t, integrator;
 
     callbacks = integrator.opts.callback
     if callbacks isa CallbackSet
-        for cb in callbacks.continuous_callbacks
+        foreach(callbacks.continuous_callbacks) do cb
             show(io_context, MIME"text/plain"(), cb)
             println(io, "\n")
         end
-        for cb in callbacks.discrete_callbacks
+        foreach(callbacks.discrete_callbacks) do cb
             # Do not show ourselves
-            cb.affect! === summary_callback && continue
+            cb.affect! === summary_callback && return nothing
 
             show(io_context, MIME"text/plain"(), cb)
             println(io, "\n")
+            return nothing
         end
     else
         show(io_context, MIME"text/plain"(), callbacks)

src/time_integration/methods_2N.jl

@@ -119,10 +119,10 @@ function solve(ode::ODEProblem, alg::T;
 
     # initialize callbacks
     if callback isa CallbackSet
-        for cb in callback.continuous_callbacks
+        foreach(callback.continuous_callbacks) do cb
             error("unsupported")
         end
-        for cb in callback.discrete_callbacks
+        foreach(callback.discrete_callbacks) do cb
             cb.initialize(cb, integrator.u, integrator.t, integrator)
         end
     elseif !isnothing(callback)
@@ -172,10 +172,11 @@ function solve!(integrator::SimpleIntegrator2N)
 
         # handle callbacks
         if callbacks isa CallbackSet
-            for cb in callbacks.discrete_callbacks
+            foreach(callbacks.discrete_callbacks) do cb
                 if cb.condition(integrator.u, integrator.t, integrator)
                     cb.affect!(integrator)
                 end
+                return nothing
             end
         end
 

src/time_integration/methods_3Sstar.jl

@@ -189,10 +189,10 @@ function solve(ode::ODEProblem, alg::T;
 
     # initialize callbacks
     if callback isa CallbackSet
-        for cb in callback.continuous_callbacks
+        foreach(callback.continuous_callbacks) do cb
             error("unsupported")
         end
-        for cb in callback.discrete_callbacks
+        foreach(callback.discrete_callbacks) do cb
             cb.initialize(cb, integrator.u, integrator.t, integrator)
         end
     elseif !isnothing(callback)
@@ -248,10 +248,11 @@ function solve!(integrator::SimpleIntegrator3Sstar)
 
         # handle callbacks
         if callbacks isa CallbackSet
-            for cb in callbacks.discrete_callbacks
+            foreach(callbacks.discrete_callbacks) do cb
                 if cb.condition(integrator.u, integrator.t, integrator)
                     cb.affect!(integrator)
                 end
+                return nothing
             end
         end
 

src/time_integration/methods_SSP.jl

@@ -124,10 +124,10 @@ function solve(ode::ODEProblem, alg = SimpleSSPRK33()::SimpleAlgorithmSSP;
 
     # initialize callbacks
     if callback isa CallbackSet
-        for cb in callback.continuous_callbacks
+        foreach(callback.continuous_callbacks) do cb
             error("unsupported")
         end
-        for cb in callback.discrete_callbacks
+        foreach(callback.discrete_callbacks) do cb
             cb.initialize(cb, integrator.u, integrator.t, integrator)
         end
     elseif !isnothing(callback)
@@ -148,7 +148,7 @@ function solve!(integrator::SimpleIntegratorSSP)
     callbacks = integrator.opts.callback
 
     integrator.finalstep = false
-    while !integrator.finalstep
+    @trixi_timeit timer() "main loop" while !integrator.finalstep
         if isnan(integrator.dt)
             error("time step size `dt` is NaN")
         end
@@ -184,7 +184,7 @@ function solve!(integrator::SimpleIntegratorSSP)
 
         # handle callbacks
         if callbacks isa CallbackSet
-            for cb in callbacks.discrete_callbacks
+            foreach(callbacks.discrete_callbacks) do cb
                 if cb.condition(integrator.u, integrator.t, integrator)
                     cb.affect!(integrator)
                 end

test/test_tree_2d_euler.jl

@@ -137,7 +137,7 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem")
         t = sol.t[end] 
         u_ode = sol.u[end] 
         du_ode = similar(u_ode) 
-        @test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 1000 
+        @test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 15000 
       end
   end
 

test/test_tree_2d_eulermulti.jl

@@ -44,7 +44,7 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem")
         t = sol.t[end] 
         u_ode = sol.u[end] 
         du_ode = similar(u_ode) 
-        @test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 1000 
+        @test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 15000 
       end
   end