Skip to content

Commit aa192cc

Browse files
DanielDoehringDanielDoehring
authored
Make line breaks in get_contravariant_vector semantic & consistent (#2542)
* Make line breaks in 2D and 3D stepsize semantic & consistent * cont
1 parent 1d1daf9 commit aa192cc

8 files changed

Lines changed: 68 additions & 67 deletions

File tree

‎src/callbacks_step/analysis_dg2d.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ function analyze(::Val{:linf_divb}, du, u, t,
377377
for j in eachnode(dg), i in eachnode(dg)
378378
divb = zero(eltype(u))
379379
# Get the contravariant vectors Ja^1 and Ja^2
380-
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors, i, j,
381-
element)
382-
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors, i, j,
383-
element)
380+
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors,
381+
i, j, element)
382+
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors,
383+
i, j, element)
384384
# Compute the transformed divergence
385385
for k in eachnode(dg)
386386
u_kj = get_node_vars(u, equations, dg, k, j, element)

‎src/callbacks_step/analysis_dg3d.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,12 @@ function analyze(::Val{:l2_divb}, du, u, t,
343343
dg, cache, derivative_matrix
344344
divb = zero(eltype(u))
345345
# Get the contravariant vectors Ja^1, Ja^2, and Ja^3
346-
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors, i, j, k,
347-
element)
348-
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors, i, j, k,
349-
element)
350-
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors, i, j, k,
351-
element)
346+
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors,
347+
i, j, k, element)
348+
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors,
349+
i, j, k, element)
350+
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors,
351+
i, j, k, element)
352352
# Compute the transformed divergence
353353
for l in eachnode(dg)
354354
u_ljk = get_node_vars(u, equations, dg, l, j, k, element)
@@ -420,12 +420,12 @@ function analyze(::Val{:linf_divb}, du, u, t,
420420
for k in eachnode(dg), j in eachnode(dg), i in eachnode(dg)
421421
divb = zero(eltype(u))
422422
# Get the contravariant vectors Ja^1, Ja^2, and Ja^3
423-
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors, i, j,
424-
k, element)
425-
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors, i, j,
426-
k, element)
427-
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors, i, j,
428-
k, element)
423+
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors,
424+
i, j, k, element)
425+
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors,
426+
i, j, k, element)
427+
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors,
428+
i, j, k, element)
429429
# Compute the transformed divergence
430430
for l in eachnode(dg)
431431
u_ljk = get_node_vars(u, equations, dg, l, j, k, element)

‎src/callbacks_step/stepsize_dg2d.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ function max_dt(u, t,
9595
lambda1, lambda2 = max_abs_speeds(u_node, equations)
9696

9797
# Local speeds transformed to the reference element
98-
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors, i, j,
99-
element)
98+
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors,
99+
i, j, element)
100100
lambda1_transformed = abs(Ja11 * lambda1 + Ja12 * lambda2)
101-
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors, i, j,
102-
element)
101+
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors,
102+
i, j, element)
103103
lambda2_transformed = abs(Ja21 * lambda1 + Ja22 * lambda2)
104104

105105
inv_jacobian = abs(inverse_jacobian[i, j, element])
@@ -129,11 +129,11 @@ function max_dt(u, t,
129129
@batch reduction=(max, max_scaled_speed) for element in eachelement(dg, cache)
130130
for j in eachnode(dg), i in eachnode(dg)
131131
# Local speeds transformed to the reference element
132-
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors, i, j,
133-
element)
132+
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors,
133+
i, j, element)
134134
lambda1_transformed = abs(Ja11 * max_lambda1 + Ja12 * max_lambda2)
135-
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors, i, j,
136-
element)
135+
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors,
136+
i, j, element)
137137
lambda2_transformed = abs(Ja21 * max_lambda1 + Ja22 * max_lambda2)
138138

139139
inv_jacobian = abs(inverse_jacobian[i, j, element])

‎src/callbacks_step/stepsize_dg3d.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ function max_dt(u, t, mesh::Union{StructuredMesh{3}, P4estMesh{3}, T8codeMesh{3}
5959
u_node = get_node_vars(u, equations, dg, i, j, k, element)
6060
lambda1, lambda2, lambda3 = max_abs_speeds(u_node, equations)
6161

62-
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors, i, j,
63-
k, element)
62+
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors,
63+
i, j, k, element)
6464
lambda1_transformed = abs(Ja11 * lambda1 + Ja12 * lambda2 + Ja13 * lambda3)
65-
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors, i, j,
66-
k, element)
65+
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors,
66+
i, j, k, element)
6767
lambda2_transformed = abs(Ja21 * lambda1 + Ja22 * lambda2 + Ja23 * lambda3)
68-
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors, i, j,
69-
k, element)
68+
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors,
69+
i, j, k, element)
7070
lambda3_transformed = abs(Ja31 * lambda1 + Ja32 * lambda2 + Ja33 * lambda3)
7171

7272
inv_jacobian = abs(cache.elements.inverse_jacobian[i, j, k, element])
@@ -95,16 +95,16 @@ function max_dt(u, t, mesh::Union{StructuredMesh{3}, P4estMesh{3}, T8codeMesh{3}
9595

9696
@batch reduction=(max, max_scaled_speed) for element in eachelement(dg, cache)
9797
for k in eachnode(dg), j in eachnode(dg), i in eachnode(dg)
98-
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors, i, j,
99-
k, element)
98+
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors,
99+
i, j, k, element)
100100
lambda1_transformed = abs(Ja11 * max_lambda1 + Ja12 * max_lambda2 +
101101
Ja13 * max_lambda3)
102-
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors, i, j,
103-
k, element)
102+
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors,
103+
i, j, k, element)
104104
lambda2_transformed = abs(Ja21 * max_lambda1 + Ja22 * max_lambda2 +
105105
Ja23 * max_lambda3)
106-
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors, i, j,
107-
k, element)
106+
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors,
107+
i, j, k, element)
108108
lambda3_transformed = abs(Ja31 * max_lambda1 + Ja32 * max_lambda2 +
109109
Ja33 * max_lambda3)
110110

‎src/solvers/dgsem_p4est/dg_2d_parabolic.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ function calc_gradient!(gradients, u_transformed, t,
190190
# now that the reference coordinate gradients are computed, transform them node-by-node to physical gradients
191191
# using the contravariant vectors
192192
for j in eachnode(dg), i in eachnode(dg)
193-
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors, i, j,
194-
element)
195-
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors, i, j,
196-
element)
193+
Ja11, Ja12 = get_contravariant_vector(1, contravariant_vectors,
194+
i, j, element)
195+
Ja21, Ja22 = get_contravariant_vector(2, contravariant_vectors,
196+
i, j, element)
197197

198198
gradients_reference_1 = get_node_vars(gradients_x, equations_parabolic,
199199
dg, i, j, element)

‎src/solvers/dgsem_p4est/dg_3d_parabolic.jl‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,8 @@ function calc_volume_integral!(du, flux_viscous,
402402

403403
# Compute the contravariant flux by taking the scalar product of the
404404
# first contravariant vector Ja^1 and the flux vector
405-
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors, i, j,
406-
k,
407-
element)
405+
Ja11, Ja12, Ja13 = get_contravariant_vector(1, contravariant_vectors,
406+
i, j, k, element)
408407
contravariant_flux1 = Ja11 * flux1 + Ja12 * flux2 + Ja13 * flux3
409408
for ii in eachnode(dg)
410409
multiply_add_to_node_vars!(du, derivative_dhat[ii, i],
@@ -414,9 +413,8 @@ function calc_volume_integral!(du, flux_viscous,
414413

415414
# Compute the contravariant flux by taking the scalar product of the
416415
# second contravariant vector Ja^2 and the flux vector
417-
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors, i, j,
418-
k,
419-
element)
416+
Ja21, Ja22, Ja23 = get_contravariant_vector(2, contravariant_vectors,
417+
i, j, k, element)
420418
contravariant_flux2 = Ja21 * flux1 + Ja22 * flux2 + Ja23 * flux3
421419
for jj in eachnode(dg)
422420
multiply_add_to_node_vars!(du, derivative_dhat[jj, j],
@@ -426,9 +424,8 @@ function calc_volume_integral!(du, flux_viscous,
426424

427425
# Compute the contravariant flux by taking the scalar product of the
428426
# second contravariant vector Ja^2 and the flux vector
429-
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors, i, j,
430-
k,
431-
element)
427+
Ja31, Ja32, Ja33 = get_contravariant_vector(3, contravariant_vectors,
428+
i, j, k, element)
432429
contravariant_flux3 = Ja31 * flux1 + Ja32 * flux2 + Ja33 * flux3
433430
for kk in eachnode(dg)
434431
multiply_add_to_node_vars!(du, derivative_dhat[kk, k],

‎src/solvers/dgsem_structured/dg_2d.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ end
142142
for jj in (j + 1):nnodes(dg)
143143
u_node_jj = get_node_vars(u, equations, dg, i, jj, element)
144144
# pull the contravariant vectors and compute the average
145-
Ja2_node_jj = get_contravariant_vector(2, contravariant_vectors, i, jj,
146-
element)
145+
Ja2_node_jj = get_contravariant_vector(2, contravariant_vectors,
146+
i, jj, element)
147147
Ja2_avg = 0.5f0 * (Ja2_node + Ja2_node_jj)
148148
# compute the contravariant sharp flux in the direction of the
149149
# averaged contravariant vector
@@ -248,8 +248,8 @@ end
248248
fstar1_R[:, nnodes(dg) + 1, :] .= zero(eltype(fstar1_R))
249249

250250
for j in eachnode(dg)
251-
normal_direction = get_contravariant_vector(1, contravariant_vectors, 1, j,
252-
element)
251+
normal_direction = get_contravariant_vector(1, contravariant_vectors,
252+
1, j, element)
253253

254254
for i in 2:nnodes(dg)
255255
u_ll = get_node_vars(u, equations, dg, i - 1, j, element)
@@ -275,8 +275,8 @@ end
275275
fstar2_R[:, :, nnodes(dg) + 1] .= zero(eltype(fstar2_R))
276276

277277
for i in eachnode(dg)
278-
normal_direction = get_contravariant_vector(2, contravariant_vectors, i, 1,
279-
element)
278+
normal_direction = get_contravariant_vector(2, contravariant_vectors,
279+
i, 1, element)
280280

281281
for j in 2:nnodes(dg)
282282
u_ll = get_node_vars(u, equations, dg, i, j - 1, element)

‎src/solvers/dgsem_structured/subcell_limiters_2d.jl‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ function calc_bounds_twosided_interface!(var_min, var_max, variable,
5757
for cell_y in axes(mesh, 2)
5858
element = linear_indices[begin, cell_y]
5959
for j in eachnode(dg)
60-
Ja1 = get_contravariant_vector(1, contravariant_vectors, 1, j, element)
60+
Ja1 = get_contravariant_vector(1, contravariant_vectors,
61+
1, j, element)
6162
u_inner = get_node_vars(u, equations, dg, 1, j, element)
6263
u_outer = get_boundary_outer_state(u_inner, t,
6364
boundary_conditions[1], Ja1, 1,
@@ -73,8 +74,8 @@ function calc_bounds_twosided_interface!(var_min, var_max, variable,
7374
for cell_y in axes(mesh, 2)
7475
element = linear_indices[end, cell_y]
7576
for j in eachnode(dg)
76-
Ja1 = get_contravariant_vector(1, contravariant_vectors, nnodes(dg), j,
77-
element)
77+
Ja1 = get_contravariant_vector(1, contravariant_vectors,
78+
nnodes(dg), j, element)
7879
u_inner = get_node_vars(u, equations, dg, nnodes(dg), j, element)
7980
u_outer = get_boundary_outer_state(u_inner, t,
8081
boundary_conditions[2], Ja1, 2,
@@ -94,7 +95,8 @@ function calc_bounds_twosided_interface!(var_min, var_max, variable,
9495
for cell_x in axes(mesh, 1)
9596
element = linear_indices[cell_x, begin]
9697
for i in eachnode(dg)
97-
Ja2 = get_contravariant_vector(2, contravariant_vectors, i, 1, element)
98+
Ja2 = get_contravariant_vector(2, contravariant_vectors,
99+
i, 1, element)
98100
u_inner = get_node_vars(u, equations, dg, i, 1, element)
99101
u_outer = get_boundary_outer_state(u_inner, t,
100102
boundary_conditions[3], Ja2, 3,
@@ -110,8 +112,8 @@ function calc_bounds_twosided_interface!(var_min, var_max, variable,
110112
for cell_x in axes(mesh, 1)
111113
element = linear_indices[cell_x, end]
112114
for i in eachnode(dg)
113-
Ja2 = get_contravariant_vector(2, contravariant_vectors, i, nnodes(dg),
114-
element)
115+
Ja2 = get_contravariant_vector(2, contravariant_vectors,
116+
i, nnodes(dg), element)
115117
u_inner = get_node_vars(u, equations, dg, i, nnodes(dg), element)
116118
u_outer = get_boundary_outer_state(u_inner, t,
117119
boundary_conditions[4], Ja2, 4,
@@ -179,7 +181,8 @@ function calc_bounds_onesided_interface!(var_minmax, minmax, variable, u, t, sem
179181
for cell_y in axes(mesh, 2)
180182
element = linear_indices[begin, cell_y]
181183
for j in eachnode(dg)
182-
Ja1 = get_contravariant_vector(1, contravariant_vectors, 1, j, element)
184+
Ja1 = get_contravariant_vector(1, contravariant_vectors,
185+
1, j, element)
183186
u_inner = get_node_vars(u, equations, dg, 1, j, element)
184187
u_outer = get_boundary_outer_state(u_inner, t,
185188
boundary_conditions[1], Ja1, 1,
@@ -194,8 +197,8 @@ function calc_bounds_onesided_interface!(var_minmax, minmax, variable, u, t, sem
194197
for cell_y in axes(mesh, 2)
195198
element = linear_indices[end, cell_y]
196199
for j in eachnode(dg)
197-
Ja1 = get_contravariant_vector(1, contravariant_vectors, nnodes(dg), j,
198-
element)
200+
Ja1 = get_contravariant_vector(1, contravariant_vectors,
201+
nnodes(dg), j, element)
199202
u_inner = get_node_vars(u, equations, dg, nnodes(dg), j, element)
200203
u_outer = get_boundary_outer_state(u_inner, t,
201204
boundary_conditions[2], Ja1, 2,
@@ -214,7 +217,8 @@ function calc_bounds_onesided_interface!(var_minmax, minmax, variable, u, t, sem
214217
for cell_x in axes(mesh, 1)
215218
element = linear_indices[cell_x, begin]
216219
for i in eachnode(dg)
217-
Ja2 = get_contravariant_vector(2, contravariant_vectors, i, 1, element)
220+
Ja2 = get_contravariant_vector(2, contravariant_vectors,
221+
i, 1, element)
218222
u_inner = get_node_vars(u, equations, dg, i, 1, element)
219223
u_outer = get_boundary_outer_state(u_inner, t,
220224
boundary_conditions[3], Ja2, 3,
@@ -229,8 +233,8 @@ function calc_bounds_onesided_interface!(var_minmax, minmax, variable, u, t, sem
229233
for cell_x in axes(mesh, 1)
230234
element = linear_indices[cell_x, end]
231235
for i in eachnode(dg)
232-
Ja2 = get_contravariant_vector(2, contravariant_vectors, i, nnodes(dg),
233-
element)
236+
Ja2 = get_contravariant_vector(2, contravariant_vectors,
237+
i, nnodes(dg), element)
234238
u_inner = get_node_vars(u, equations, dg, i, nnodes(dg), element)
235239
u_outer = get_boundary_outer_state(u_inner, t,
236240
boundary_conditions[4], Ja2, 4,

0 commit comments

Comments
 (0)