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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ Static = "0.8, 1"
StaticArrayInterface = "1.5.1"
StaticArrays = "1"
StrideArrays = "0.1.28"
Trixi = "0.13"
Trixi = "0.14"
julia = "1.10"
8 changes: 4 additions & 4 deletions src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function Trixi.rhs!(du, u, t,
dg::DG, cache) where {Source}

# Reset du
Trixi.@trixi_timeit Trixi.timer() "reset ∂u/∂t" Trixi.reset_du!(du, dg, cache)
Trixi.@trixi_timeit Trixi.timer() "reset ∂u/∂t" Trixi.set_zero!(du, dg, cache)

# Calculate volume integral
Trixi.@trixi_timeit Trixi.timer() "volume integral" begin
Expand Down Expand Up @@ -84,7 +84,7 @@ end
dg::DGSEM, cache, alpha = true)
# true * [some floating point value] == [exactly the same floating point value]
# This can (hopefully) be optimized away due to constant propagation.
@unpack derivative_dhat = dg.basis
@unpack derivative_hat = dg.basis
@unpack contravariant_vectors = cache.elements

for j in eachnode(dg), i in eachnode(dg)
Expand All @@ -101,7 +101,7 @@ end
element)
contravariant_flux1 = Ja11 * flux1 + Ja12 * flux2 + Ja13 * flux3
for ii in eachnode(dg)
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_dhat[ii, i],
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_hat[ii, i],
contravariant_flux1, equations, dg, ii, j,
element)
end
Expand All @@ -113,7 +113,7 @@ end
element)
contravariant_flux2 = Ja21 * flux1 + Ja22 * flux2 + Ja23 * flux3
for jj in eachnode(dg)
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_dhat[jj, j],
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_hat[jj, j],
contravariant_flux2, equations, dg, i, jj,
element)
end
Expand Down
8 changes: 4 additions & 4 deletions src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_covariant.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Trixi.rhs!(du, u, t,
boundary_conditions, source_terms::Source,
dg::DG, cache) where {Source}
# Reset du
Trixi.@trixi_timeit Trixi.timer() "reset ∂u/∂t" Trixi.reset_du!(du, dg, cache)
Trixi.@trixi_timeit Trixi.timer() "reset ∂u/∂t" Trixi.set_zero!(du, dg, cache)

# Calculate volume integral
Trixi.@trixi_timeit Trixi.timer() "volume integral" begin
Expand Down Expand Up @@ -96,7 +96,7 @@ end
nonconservative_terms::False,
equations::AbstractCovariantEquations{2},
dg::DGSEM, cache, alpha = true)
(; derivative_dhat) = dg.basis
(; derivative_hat) = dg.basis
(; aux_node_vars) = cache.auxiliary_variables

for j in eachnode(dg), i in eachnode(dg)
Expand All @@ -110,13 +110,13 @@ end

# Apply weak form derivative with respect to ξ¹
for ii in eachnode(dg)
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_dhat[ii, i],
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_hat[ii, i],
flux1, equations, dg, ii, j, element)
end

# Apply weak form derivative with respect to ξ²
for jj in eachnode(dg)
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_dhat[jj, j],
Trixi.multiply_add_to_node_vars!(du, alpha * derivative_hat[jj, j],
flux2, equations, dg, i, jj, element)
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ NLsolve = "4.5.1"
OrdinaryDiffEqLowStorageRK = "1.2"
OrdinaryDiffEqSSPRK = "1.2"
Test = "1"
Trixi = "0.13"
Trixi = "0.14"
TrixiTest = "0.1.3, 0.2"
Loading