From d749e8148b4ee8b127b5dd5deb099603f6bacba3 Mon Sep 17 00:00:00 2001 From: patrickersing Date: Fri, 3 May 2024 19:06:18 +0200 Subject: [PATCH] fix some comments --- .../elixir_shallowwater_multilayer_dam_break_dry.jl | 2 +- .../elixir_shallowwater_multilayer_dam_break_dry.jl | 2 +- .../elixir_shallowwater_multilayer_well_balanced_wet_dry.jl | 2 +- src/equations/numerical_fluxes.jl | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl b/examples/tree_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl index 0a7ba42..5cc5b6f 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl @@ -29,7 +29,7 @@ function initial_condition_dam_break(x, t, equations::ShallowWaterMultiLayerEqua # stays positive. The system would not be stable for h set to a hard 0 due to division by h in # the computation of velocity, e.g., (h v) / h. Therefore, a small dry state threshold # with a default value of 5*eps() ≈ 1e-15 in double precision, is set in the constructor above - # for the ShallowWaterMultiLayerEquations1D and added to the initial condition if h = 0. + # for the ShallowWaterMultiLayerEquations2D and added to the initial condition if h = 0. # This default value can be changed within the constructor call depending on the simulation setup. for i in reverse(eachlayer(equations)) if i == nlayers(equations) diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl index a6dccde..99e7dc7 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_dam_break_dry.jl @@ -124,7 +124,7 @@ function initial_condition_discontinuous_dam_break(x, t, element_id, # stays positive. The system would not be stable for h set to a hard 0 due to division by h in # the computation of velocity, e.g., (h v) / h. Therefore, a small dry state threshold # with a default value of 5*eps() ≈ 1e-15 in double precision, is set in the constructor above - # for the ShallowWaterMultiLayerEquations1D and added to the initial condition if h = 0. + # for the ShallowWaterMultiLayerEquations2D and added to the initial condition if h = 0. # This default value can be changed within the constructor call depending on the simulation setup. for i in reverse(eachlayer(equations)) if i == nlayers(equations) diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_well_balanced_wet_dry.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_well_balanced_wet_dry.jl index 6f3216c..b65f16a 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_well_balanced_wet_dry.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_multilayer_well_balanced_wet_dry.jl @@ -30,7 +30,7 @@ function initial_condition_well_balancedness(x, t, # stays positive. The system would not be stable for h set to a hard 0 due to division by h in # the computation of velocity, e.g., (h v) / h. Therefore, a small dry state threshold # with a default value of 5*eps() ≈ 1e-15 in double precision, is set in the constructor above - # for the ShallowWaterMultiLayerEquations1D and added to the initial condition if h = 0. + # for the ShallowWaterMultiLayerEquations2D and added to the initial condition if h = 0. # This default value can be changed within the constructor call depending on the simulation setup. for i in reverse(eachlayer(equations)) if i == nlayers(equations) diff --git a/src/equations/numerical_fluxes.jl b/src/equations/numerical_fluxes.jl index 57fdc21..442ded5 100644 --- a/src/equations/numerical_fluxes.jl +++ b/src/equations/numerical_fluxes.jl @@ -36,13 +36,13 @@ const flux_hll_chen_noelle = FluxHLL(min_max_speed_chen_noelle) normal_direction_ll, normal_direction_average, equations::Trixi.AbstractEquations) - @unpack numerical_flux, hydrostatic_reconstruction = numflux + @unpack nonconservative_flux, hydrostatic_reconstruction = numflux # Create the reconstructed left/right solution states in conservative form u_ll_star, u_rr_star = hydrostatic_reconstruction(u_ll, u_rr, equations) - # Use the reconstructed states to compute the numerical surface flux - return numerical_flux(u_ll_star, u_rr_star, normal_direction_ll, + # Use the reconstructed states to compute the nonconservative surface flux + return nonconservative_flux(u_ll_star, u_rr_star, normal_direction_ll, normal_direction_average, equations) end