diff --git a/Project.toml b/Project.toml index 77aeed96..7cde46ad 100644 --- a/Project.toml +++ b/Project.toml @@ -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" diff --git a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl index b1e5860d..e08f0032 100644 --- a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl +++ b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_cartesian.jl @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_covariant.jl b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_covariant.jl index d7ac9d07..189b9b3c 100644 --- a/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_covariant.jl +++ b/src/solvers/dgsem_p4est/dg_2d_manifold_in_3d_covariant.jl @@ -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 @@ -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) @@ -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 diff --git a/test/Project.toml b/test/Project.toml index 670a9fae..cbb4d255 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -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"