Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/callbacks_step/stepsize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,12 @@ end
semi = integrator.p
@unpack cfl_hyperbolic, cfl_parabolic = stepsize_callback

backend = trixi_backend(u_ode)
# Dispatch based on semidiscretization
dt = @trixi_timeit timer() "calculate dt" calculate_dt(u_ode, t, cfl_hyperbolic,
cfl_parabolic, semi)
dt = @trixi_timeit_ext backend timer() "calculate dt" calculate_dt(u_ode, t,
cfl_hyperbolic,
cfl_parabolic,
semi)

set_proposed_dt!(integrator, dt)
integrator.opts.dtmax = dt
Expand Down
6 changes: 4 additions & 2 deletions src/semidiscretization/semidiscretization_hyperbolic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,13 @@ function rhs!(du_ode, u_ode, semi::SemidiscretizationHyperbolic, t)

u = wrap_array(u_ode, mesh, equations, solver, cache)
du = wrap_array(du_ode, mesh, equations, solver, cache)
backend = trixi_backend(u)

# TODO: Taal decide, do we need to pass the mesh?
time_start = time_ns()
@trixi_timeit timer() "rhs!" rhs!(du, u, t, mesh, equations,
boundary_conditions, source_terms, solver, cache)
@trixi_timeit_ext backend timer() "rhs!" rhs!(du, u, t, mesh, equations,
boundary_conditions, source_terms,
solver, cache)
runtime = time_ns() - time_start
put!(semi.performance_counter, runtime)

Expand Down
21 changes: 13 additions & 8 deletions src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,13 @@ function rhs!(du_ode, u_ode, semi::SemidiscretizationHyperbolicParabolic, t)

u = wrap_array(u_ode, mesh, equations, solver, cache)
du = wrap_array(du_ode, mesh, equations, solver, cache)
backend = trixi_backend(u)

# TODO: Taal decide, do we need to pass the mesh?
time_start = time_ns()
@trixi_timeit timer() "rhs!" rhs!(du, u, t, mesh, equations,
boundary_conditions, source_terms, solver, cache)
@trixi_timeit_ext backend timer() "rhs!" rhs!(du, u, t, mesh, equations,
boundary_conditions, source_terms,
solver, cache)
runtime = time_ns() - time_start
put!(semi.performance_counter.counters[1], runtime)

Expand All @@ -385,15 +387,18 @@ function rhs_parabolic!(du_ode, u_ode, semi::SemidiscretizationHyperbolicParabol

u = wrap_array(u_ode, mesh, equations_parabolic, solver, cache)
du = wrap_array(du_ode, mesh, equations_parabolic, solver, cache)
backend = trixi_backend(u)

# TODO: Taal decide, do we need to pass the mesh?
time_start = time_ns()
@trixi_timeit timer() "parabolic rhs!" rhs_parabolic!(du, u, t, mesh,
equations_parabolic,
boundary_conditions_parabolic,
source_terms_parabolic,
solver, solver_parabolic,
cache, cache_parabolic)
@trixi_timeit_ext backend timer() "parabolic rhs!" rhs_parabolic!(du, u, t, mesh,
equations_parabolic,
boundary_conditions_parabolic,
source_terms_parabolic,
solver,
solver_parabolic,
cache,
cache_parabolic)
runtime = time_ns() - time_start
put!(semi.performance_counter.counters[2], runtime)

Expand Down
Loading