Skip to content

Commit a255fc0

Browse files
DanielDoehringranocha
DanielDoehring
and
ranocha
authored
Remove unused surface_integral for prolong2mortar functions (trixi-framework#2188)
* Remove unused `surface_integral` for `prolong2mortar` functions * remove * remove at some more places --------- Co-authored-by: Hendrik Ranocha <[email protected]>
1 parent 751b305 commit a255fc0

12 files changed

+26
-27
lines changed

‎src/solvers/dgsem_p4est/dg_2d.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ end
384384
function prolong2mortars!(cache, u,
385385
mesh::Union{P4estMesh{2}, T8codeMesh{2}}, equations,
386386
mortar_l2::LobattoLegendreMortarL2,
387-
surface_integral, dg::DGSEM)
387+
dg::DGSEM)
388388
@unpack neighbor_ids, node_indices = cache.mortars
389389
index_range = eachnode(dg)
390390

‎src/solvers/dgsem_p4est/dg_2d_parabolic.jl

+5-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for `P4estMesh`es we call
3333
3434
```
3535
prolong2mortars_divergence!(cache, flux_viscous, mesh, equations_parabolic,
36-
dg.mortar, dg.surface_integral, dg)
36+
dg.mortar, dg)
3737
3838
calc_mortar_flux_divergence!(cache_parabolic.elements.surface_flux_values,
3939
mesh, equations_parabolic, dg.mortar,
@@ -42,11 +42,11 @@ for `P4estMesh`es we call
4242
instead of
4343
```
4444
prolong2mortars!(cache, flux_viscous, mesh, equations_parabolic,
45-
dg.mortar, dg.surface_integral, dg)
45+
dg.mortar, dg)
4646
4747
calc_mortar_flux!(cache_parabolic.elements.surface_flux_values, mesh,
4848
equations_parabolic,
49-
dg.mortar, dg.surface_integral, dg, cache)
49+
dg.mortar, dg, cache)
5050
```
5151
=#
5252
function rhs_parabolic!(du, u, t, mesh::Union{P4estMesh{2}, P4estMesh{3}},
@@ -126,7 +126,7 @@ function rhs_parabolic!(du, u, t, mesh::Union{P4estMesh{2}, P4estMesh{3}},
126126
# !!! NOTE: we reuse the hyperbolic cache here since it contains "mortars" and "u_threaded". See https://github.com/trixi-framework/Trixi.jl/issues/1674 for a discussion
127127
@trixi_timeit timer() "prolong2mortars" begin
128128
prolong2mortars_divergence!(cache, flux_viscous, mesh, equations_parabolic,
129-
dg.mortar, dg.surface_integral, dg)
129+
dg.mortar, dg)
130130
end
131131

132132
# Calculate mortar fluxes (specialized for AbstractEquationsParabolic)
@@ -253,7 +253,7 @@ function calc_gradient!(gradients, u_transformed, t,
253253
# Prolong solution to mortars. This resues the hyperbolic version of `prolong2mortars`
254254
@trixi_timeit timer() "prolong2mortars" begin
255255
prolong2mortars!(cache, u_transformed, mesh, equations_parabolic,
256-
dg.mortar, dg.surface_integral, dg)
256+
dg.mortar, dg)
257257
end
258258

259259
# Calculate mortar fluxes. This reuses the hyperbolic version of `calc_mortar_flux`,
@@ -676,7 +676,6 @@ function prolong2mortars_divergence!(cache, flux_viscous::Vector{Array{uEltype,
676676
mesh::Union{P4estMesh{2}, T8codeMesh{2}},
677677
equations,
678678
mortar_l2::LobattoLegendreMortarL2,
679-
surface_integral,
680679
dg::DGSEM) where {uEltype <: Real}
681680
@unpack neighbor_ids, node_indices = cache.mortars
682681
@unpack contravariant_vectors = cache.elements

‎src/solvers/dgsem_p4est/dg_2d_parallel.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function prolong2mpimortars!(cache, u,
137137
mesh::Union{ParallelP4estMesh{2}, ParallelT8codeMesh{2}},
138138
equations,
139139
mortar_l2::LobattoLegendreMortarL2,
140-
surface_integral, dg::DGSEM)
140+
dg::DGSEM)
141141
@unpack node_indices = cache.mpi_mortars
142142
index_range = eachnode(dg)
143143

‎src/solvers/dgsem_p4est/dg_3d.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ end
418418
function prolong2mortars!(cache, u,
419419
mesh::Union{P4estMesh{3}, T8codeMesh{3}}, equations,
420420
mortar_l2::LobattoLegendreMortarL2,
421-
surface_integral, dg::DGSEM)
421+
dg::DGSEM)
422422
@unpack fstar_tmp_threaded = cache
423423
@unpack neighbor_ids, node_indices = cache.mortars
424424
index_range = eachnode(dg)

‎src/solvers/dgsem_p4est/dg_3d_parabolic.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function calc_gradient!(gradients, u_transformed, t,
148148
# !!! should we have a separate mortars/u_threaded in cache_parabolic?
149149
@trixi_timeit timer() "prolong2mortars" begin
150150
prolong2mortars!(cache, u_transformed, mesh, equations_parabolic,
151-
dg.mortar, dg.surface_integral, dg)
151+
dg.mortar, dg)
152152
end
153153

154154
# Calculate mortar fluxes. These should reuse the hyperbolic version of `calc_mortar_flux`,
@@ -647,7 +647,7 @@ function prolong2mortars_divergence!(cache, flux_viscous,
647647
mesh::Union{P4estMesh{3}, T8codeMesh{3}},
648648
equations,
649649
mortar_l2::LobattoLegendreMortarL2,
650-
surface_integral, dg::DGSEM)
650+
dg::DGSEM)
651651
@unpack neighbor_ids, node_indices = cache.mortars
652652
@unpack fstar_tmp_threaded = cache
653653
@unpack contravariant_vectors = cache.elements

‎src/solvers/dgsem_p4est/dg_3d_parallel.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function rhs!(du, u, t,
2020
# Prolong solution to MPI mortars
2121
@trixi_timeit timer() "prolong2mpimortars" begin
2222
prolong2mpimortars!(cache, u, mesh, equations,
23-
dg.mortar, dg.surface_integral, dg)
23+
dg.mortar, dg)
2424
end
2525

2626
# Start to send MPI data
@@ -64,7 +64,7 @@ function rhs!(du, u, t,
6464
# Prolong solution to mortars
6565
@trixi_timeit timer() "prolong2mortars" begin
6666
prolong2mortars!(cache, u, mesh, equations,
67-
dg.mortar, dg.surface_integral, dg)
67+
dg.mortar, dg)
6868
end
6969

7070
# Calculate mortar fluxes
@@ -305,7 +305,7 @@ function prolong2mpimortars!(cache, u,
305305
mesh::Union{ParallelP4estMesh{3}, ParallelT8codeMesh{3}},
306306
equations,
307307
mortar_l2::LobattoLegendreMortarL2,
308-
surface_integral, dg::DGSEM)
308+
dg::DGSEM)
309309
@unpack node_indices = cache.mpi_mortars
310310
index_range = eachnode(dg)
311311

‎src/solvers/dgsem_tree/dg_2d.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function rhs!(du, u, t,
152152
# Prolong solution to mortars
153153
@trixi_timeit timer() "prolong2mortars" begin
154154
prolong2mortars!(cache, u, mesh, equations,
155-
dg.mortar, dg.surface_integral, dg)
155+
dg.mortar, dg)
156156
end
157157

158158
# Calculate mortar fluxes
@@ -798,7 +798,7 @@ end
798798

799799
function prolong2mortars!(cache, u,
800800
mesh::TreeMesh{2}, equations,
801-
mortar_l2::LobattoLegendreMortarL2, surface_integral,
801+
mortar_l2::LobattoLegendreMortarL2,
802802
dg::DGSEM)
803803
@threaded for mortar in eachmortar(dg, cache)
804804
large_element = cache.mortars.neighbor_ids[3, mortar]

‎src/solvers/dgsem_tree/dg_2d_parabolic.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function rhs_parabolic!(du, u, t, mesh::Union{TreeMesh{2}, TreeMesh{3}},
8989
# Prolong solution to mortars
9090
@trixi_timeit timer() "prolong2mortars" begin
9191
prolong2mortars!(cache, flux_viscous, mesh, equations_parabolic,
92-
dg.mortar, dg.surface_integral, dg)
92+
dg.mortar, dg)
9393
end
9494

9595
# Calculate mortar fluxes
@@ -519,7 +519,7 @@ end
519519
function prolong2mortars!(cache, flux_viscous::Vector{Array{uEltype, 4}},
520520
mesh::TreeMesh{2},
521521
equations_parabolic::AbstractEquationsParabolic,
522-
mortar_l2::LobattoLegendreMortarL2, surface_integral,
522+
mortar_l2::LobattoLegendreMortarL2,
523523
dg::DGSEM) where {uEltype <: Real}
524524
flux_viscous_x, flux_viscous_y = flux_viscous
525525
@threaded for mortar in eachmortar(dg, cache)
@@ -830,7 +830,7 @@ function calc_gradient!(gradients, u_transformed, t,
830830
# NOTE: This re-uses the implementation for hyperbolic terms in "dg_2d.jl"
831831
@trixi_timeit timer() "prolong2mortars" begin
832832
prolong2mortars!(cache, u_transformed, mesh, equations_parabolic,
833-
dg.mortar, dg.surface_integral, dg)
833+
dg.mortar, dg)
834834
end
835835

836836
# Calculate mortar fluxes

‎src/solvers/dgsem_tree/dg_2d_parallel.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ function rhs!(du, u, t,
463463
# Prolong solution to MPI mortars
464464
@trixi_timeit timer() "prolong2mpimortars" begin
465465
prolong2mpimortars!(cache, u, mesh, equations,
466-
dg.mortar, dg.surface_integral, dg)
466+
dg.mortar, dg)
467467
end
468468

469469
# Start to send MPI data
@@ -510,7 +510,7 @@ function rhs!(du, u, t,
510510
# Prolong solution to mortars
511511
@trixi_timeit timer() "prolong2mortars" begin
512512
prolong2mortars!(cache, u, mesh, equations,
513-
dg.mortar, dg.surface_integral, dg)
513+
dg.mortar, dg)
514514
end
515515

516516
# Calculate mortar fluxes
@@ -597,7 +597,7 @@ end
597597

598598
function prolong2mpimortars!(cache, u,
599599
mesh::ParallelTreeMesh{2}, equations,
600-
mortar_l2::LobattoLegendreMortarL2, surface_integral,
600+
mortar_l2::LobattoLegendreMortarL2,
601601
dg::DGSEM)
602602
@unpack mpi_mortars = cache
603603

‎src/solvers/dgsem_tree/dg_3d.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function rhs!(du, u, t,
200200
# Prolong solution to mortars
201201
@trixi_timeit timer() "prolong2mortars" begin
202202
prolong2mortars!(cache, u, mesh, equations,
203-
dg.mortar, dg.surface_integral, dg)
203+
dg.mortar, dg)
204204
end
205205

206206
# Calculate mortar fluxes
@@ -864,7 +864,7 @@ end
864864
function prolong2mortars!(cache, u,
865865
mesh::TreeMesh{3}, equations,
866866
mortar_l2::LobattoLegendreMortarL2,
867-
surface_integral, dg::DGSEM)
867+
dg::DGSEM)
868868
# temporary buffer for projections
869869
@unpack fstar_tmp1_threaded = cache
870870

‎src/solvers/dgsem_tree/dg_3d_parabolic.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ function prolong2mortars!(cache,
496496
mesh::TreeMesh{3},
497497
equations_parabolic::AbstractEquationsParabolic,
498498
mortar_l2::LobattoLegendreMortarL2,
499-
surface_integral, dg::DGSEM) where {uEltype <: Real}
499+
dg::DGSEM) where {uEltype <: Real}
500500
# temporary buffer for projections
501501
@unpack fstar_tmp1_threaded = cache
502502

@@ -966,7 +966,7 @@ function calc_gradient!(gradients, u_transformed, t,
966966
# NOTE: This re-uses the implementation for hyperbolic terms in "dg_3d.jl"
967967
@trixi_timeit timer() "prolong2mortars" begin
968968
prolong2mortars!(cache, u_transformed, mesh, equations_parabolic,
969-
dg.mortar, dg.surface_integral, dg)
969+
dg.mortar, dg)
970970
end
971971

972972
# Calculate mortar fluxes

‎src/solvers/fdsbp_tree/fdsbp.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ create_cache(mesh, equations, mortar::Nothing, uEltype) = NamedTuple()
5151
nmortars(mortar::Nothing) = 0
5252

5353
function prolong2mortars!(cache, u, mesh, equations, mortar::Nothing,
54-
surface_integral, dg::DG)
54+
dg::DG)
5555
@assert isempty(eachmortar(dg, cache))
5656
end
5757

0 commit comments

Comments
 (0)