Skip to content

Commit

Permalink
Merge branch 'compressible_euler_quasi_1d' of https://github.com/Kris…
Browse files Browse the repository at this point in the history
…shChawla/Trixi.jl into compressible_euler_quasi_1d
  • Loading branch information
KrisshChawla committed Nov 25, 2023
2 parents bd2a155 + b13eb72 commit 72eb0e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ equations = CompressibleEulerEquationsQuasi1D(1.4)
"""
initial_condition_discontinuity(x, t, equations::CompressibleEulerEquations1D)
An entropy conservation verification initial condition taken from
A discontinuous initial condition taken from
- Jesse Chan, Khemraj Shukla, Xinhui Wu, Ruofeng Liu, Prani Nalluri (2023)
High order entropy stable schemes for the quasi-one-dimensional
shallow water and compressible Euler equations
Expand Down
11 changes: 7 additions & 4 deletions src/equations/compressible_euler_quasi_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -232,19 +232,22 @@ Further details are available in the paper:
_, _, p_ll, a_ll = cons2prim(u_ll, equations)
_, _, p_rr, _ = cons2prim(u_rr, equations)

p_avg = 0.5 * (p_ll + p_rr)
# For flux differencing using non-conservative terms, we return the
# non-conservative flux scaled by 2. This cancels with a factor of 0.5
# in the arithmetic average of {p}.
p_avg = p_ll + p_rr

z = zero(eltype(u_ll))

return SVector(z, 2 * a_ll * p_avg, z, z)
return SVector(z, a_ll * p_avg, z, z)
end

"""
@inline function flux_chan_etal(u_ll, u_rr, orientation::Integer,
equations::CompressibleEulerEquationsQuasi1D)
Total energy conservative (mathematical entropy for quasi 1D compressible Euler equations) split form.
Conservative (symmetric) part of the entropy conservative flux for quasi 1D compressible Euler equations split form.
This flux is a generalization of [`flux_ranocha`](@ref) for [`CompressibleEulerEquations1D`](@ref).
Further details are available in the paper:
- Jesse Chan, Khemraj Shukla, Xinhui Wu, Ruofeng Liu, Prani Nalluri (2023)
High order entropy stable schemes for the quasi-one-dimensional
Expand Down

0 comments on commit 72eb0e0

Please sign in to comment.