Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename MCL parameters #119

Merged
merged 4 commits into from
Nov 14, 2023
Merged

Rename MCL parameters #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33d82ec
Rename MCL parameters
bennibolm Nov 6, 2023
d45bcbf
Merge branch 'subcell-limiting' into subcell-limiting-renaming-MCL
bennibolm Nov 6, 2023
e470849
Merge branch 'subcell-limiting' into subcell-limiting-renaming-MCL
bennibolm Nov 14, 2023
71e15ea
Merge branch 'subcell-limiting' into subcell-limiting-renaming-MCL
bennibolm Nov 14, 2023
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
14 changes: 7 additions & 7 deletions examples/structured_2d_dgsem/elixir_euler_convergence_wavingflag_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ volume_flux = flux_ranocha
polydeg = 3
basis = LobattoLegendreBasis(polydeg)
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = false,
DensityAlphaForAll = false,
SequentialLimiter = false,
ConservativeLimiter = false,
DensityPositivityLimiter = true,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = true,
density_limiter = false,
density_coefficient_for_all = false,
sequential_limiter = false,
conservative_limiter = false,
positivity_limiter_density = true,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = true,
Plotting = true)

volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
Expand Down
14 changes: 7 additions & 7 deletions examples/structured_2d_dgsem/elixir_euler_double_mach_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ polydeg = 4
basis = LobattoLegendreBasis(polydeg)

limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = true,
DensityAlphaForAll = false,
SequentialLimiter = true,
ConservativeLimiter = false,
DensityPositivityLimiter = false,
PressurePositivityLimiterKuzmin = false,
SemiDiscEntropyLimiter = false,
density_limiter = true,
density_coefficient_for_all = false,
sequential_limiter = true,
conservative_limiter = false,
positivity_limiter_density = false,
positivity_limiter_pressure = false,
entropy_limiter_semidiscrete = false,
Plotting = true)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
volume_flux_dg = volume_flux,
Expand Down
16 changes: 8 additions & 8 deletions examples/structured_2d_dgsem/elixir_euler_free_stream_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ volume_flux = flux_ranocha
polydeg = 3
basis = LobattoLegendreBasis(polydeg)
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = false,
DensityAlphaForAll = false,
SequentialLimiter = false,
ConservativeLimiter = false,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = true,
DensityPositivityLimiter = true,
SemiDiscEntropyLimiter = false,
density_limiter = false,
density_coefficient_for_all = false,
sequential_limiter = false,
conservative_limiter = false,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = true,
positivity_limiter_density = true,
entropy_limiter_semidiscrete = false,
smoothness_indicator = false,
Plotting = true)

Expand Down
16 changes: 8 additions & 8 deletions examples/structured_2d_dgsem/elixir_euler_shock_upstream_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ polydeg = 5
basis = LobattoLegendreBasis(polydeg)

limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = true,
DensityAlphaForAll = false,
SequentialLimiter = true,
ConservativeLimiter = false,
PressurePositivityLimiterKuzmin = false,
PressurePositivityLimiterKuzminExact = false,
DensityPositivityLimiter = false,
SemiDiscEntropyLimiter = false,
density_limiter = true,
density_coefficient_for_all = false,
sequential_limiter = true,
conservative_limiter = false,
positivity_limiter_pressure = false,
positivity_limiter_pressure_exact = false,
positivity_limiter_density = false,
entropy_limiter_semidiscrete = false,
Plotting = true)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
volume_flux_dg = volume_flux,
Expand Down
12 changes: 6 additions & 6 deletions examples/tree_2d_dgsem/elixir_euler_astro_jet_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ basis = LobattoLegendreBasis(polydeg)

# shock capturing necessary for this tough example
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = true,
DensityAlphaForAll = true,
SequentialLimiter = true,
PressurePositivityLimiterKuzmin = true,
DensityPositivityLimiter = false,
SemiDiscEntropyLimiter = false,
density_limiter = true,
density_coefficient_for_all = true,
sequential_limiter = true,
positivity_limiter_pressure = true,
positivity_limiter_density = false,
entropy_limiter_semidiscrete = false,
Plotting = true)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
volume_flux_dg = volume_flux,
Expand Down
16 changes: 8 additions & 8 deletions examples/tree_2d_dgsem/elixir_euler_blast_wave_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ surface_flux = flux_lax_friedrichs
volume_flux = flux_ranocha
basis = LobattoLegendreBasis(3)
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = true,
DensityAlphaForAll = true,
SequentialLimiter = false,
ConservativeLimiter = true,
DensityPositivityLimiter = true,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = false,
SemiDiscEntropyLimiter = true,
density_limiter = true,
density_coefficient_for_all = true,
sequential_limiter = false,
conservative_limiter = true,
positivity_limiter_density = true,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = false,
entropy_limiter_semidiscrete = true,
smoothness_indicator = true,
Plotting = false)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
Expand Down
14 changes: 7 additions & 7 deletions examples/tree_2d_dgsem/elixir_euler_convergence_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ volume_flux = flux_ranocha
polydeg = 3
basis = LobattoLegendreBasis(polydeg)
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = false,
DensityAlphaForAll = false,
SequentialLimiter = false,
ConservativeLimiter = false,
DensityPositivityLimiter = true,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = true,
density_limiter = false,
density_coefficient_for_all = false,
sequential_limiter = false,
conservative_limiter = false,
positivity_limiter_density = true,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = true,
Plotting = true)

volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
Expand Down
16 changes: 8 additions & 8 deletions examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ polydeg = 3
basis = LobattoLegendreBasis(polydeg)

limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = false,
DensityAlphaForAll = false,
SequentialLimiter = false,
ConservativeLimiter = false,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = true,
DensityPositivityLimiter = true,
SemiDiscEntropyLimiter = false,
density_limiter = false,
density_coefficient_for_all = false,
sequential_limiter = false,
conservative_limiter = false,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = true,
positivity_limiter_density = true,
entropy_limiter_semidiscrete = false,
Plotting = true)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
volume_flux_dg = volume_flux,
Expand Down
16 changes: 8 additions & 8 deletions examples/tree_2d_dgsem/elixir_euler_sedov_blast_wave_MCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ surface_flux = flux_lax_friedrichs
volume_flux = flux_chandrashekar
basis = LobattoLegendreBasis(3)
limiter_mcl = SubcellLimiterMCL(equations, basis;
DensityLimiter = true,
DensityAlphaForAll = false,
SequentialLimiter = true,
ConservativeLimiter = false,
DensityPositivityLimiter = false,
PressurePositivityLimiterKuzmin = true,
PressurePositivityLimiterKuzminExact = true,
SemiDiscEntropyLimiter = true,
density_limiter = true,
density_coefficient_for_all = false,
sequential_limiter = true,
conservative_limiter = false,
positivity_limiter_density = false,
positivity_limiter_pressure = true,
positivity_limiter_pressure_exact = true,
entropy_limiter_semidiscrete = true,
smoothness_indicator = false,
Plotting = true)
volume_integral = VolumeIntegralSubcellLimiting(limiter_mcl;
Expand Down
6 changes: 3 additions & 3 deletions src/callbacks_stage/subcell_bounds_check.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function init_callback(callback::BoundsCheckCallback, semi, limiter::SubcellLimi
open("$output_directory/deviations.txt", "a") do f
print(f, "# iter, simu_time",
join(", $(v)_min, $(v)_max" for v in varnames(cons2cons, semi.equations)))
if limiter.PressurePositivityLimiterKuzmin
if limiter.positivity_limiter_pressure
print(f, ", pressure_min")
end
# TODO: Bounds check for entropy limiting
Expand Down Expand Up @@ -200,11 +200,11 @@ end
println(variables[v], ":\n- lower bound: ", mcl_bounds_delta[2, 1, v],
"\n- upper bound: ", mcl_bounds_delta[2, 2, v])
end
if limiter.PressurePositivityLimiterKuzmin
if limiter.positivity_limiter_pressure
println("pressure:\n- positivity: ",
mcl_bounds_delta[2, 1, nvariables(semi.equations) + 1])
end
if limiter.SemiDiscEntropyLimiter
if limiter.entropy_limiter_semidiscrete
# TODO: Bounds check for entropy limiting
println("\nWARNING: No bounds check for the entropy limiter.")
end
Expand Down
Loading
Loading