-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
34 changed files
with
1,829 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,4 +10,4 @@ jobs: | |
| - name: Checkout Actions Repository | ||
| uses: actions/checkout@v4 | ||
| - name: Check spelling | ||
| uses: crate-ci/[email protected].23 | ||
| uses: crate-ci/[email protected].26 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| name = "Trixi" | ||
| uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" | ||
| authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"] | ||
| version = "0.6.6-pre" | ||
| version = "0.6.7-pre" | ||
|
|
||
| [deps] | ||
| CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" | ||
| ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9" | ||
| DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" | ||
| DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" | ||
| DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" | ||
| EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" | ||
| FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" | ||
|
|
@@ -54,6 +55,7 @@ TrixiMakieExt = "Makie" | |
| CodeTracking = "1.0.5" | ||
| ConstructionBase = "1.3" | ||
| DataStructures = "0.18.15" | ||
| DiffEqBase = "6 - 6.143" | ||
| DiffEqCallbacks = "2.25" | ||
| EllipsisNotation = "1.0" | ||
| FillArrays = "0.13.2, 1" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using OrdinaryDiffEq | ||
| using Trixi | ||
|
|
||
| ############################################################################### | ||
| # Semidiscretization of the quasi 1d compressible Euler equations | ||
| # See Chan et al. https://doi.org/10.48550/arXiv.2307.12089 for details | ||
|
|
||
| equations = CompressibleEulerEquationsQuasi1D(1.4) | ||
|
|
||
| initial_condition = initial_condition_convergence_test | ||
|
|
||
| surface_flux = (flux_chan_etal, flux_nonconservative_chan_etal) | ||
| volume_flux = surface_flux | ||
| dg = DGMulti(polydeg = 4, element_type = Line(), approximation_type = SBP(), | ||
| surface_integral = SurfaceIntegralWeakForm(surface_flux), | ||
| volume_integral = VolumeIntegralFluxDifferencing(volume_flux)) | ||
|
|
||
| cells_per_dimension = (8,) | ||
| mesh = DGMultiMesh(dg, cells_per_dimension, | ||
| coordinates_min = (-1.0,), coordinates_max = (1.0,), periodicity = true) | ||
| semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, dg; | ||
| source_terms = source_terms_convergence_test) | ||
|
|
||
| ############################################################################### | ||
| # ODE solvers, callbacks etc. | ||
|
|
||
| tspan = (0.0, 2.0) | ||
| ode = semidiscretize(semi, tspan) | ||
|
|
||
| summary_callback = SummaryCallback() | ||
|
|
||
| analysis_interval = 100 | ||
| analysis_callback = AnalysisCallback(semi, interval = analysis_interval, uEltype = real(dg)) | ||
|
|
||
| alive_callback = AliveCallback(analysis_interval = analysis_interval) | ||
| stepsize_callback = StepsizeCallback(cfl = 0.8) | ||
|
|
||
| callbacks = CallbackSet(summary_callback, | ||
| analysis_callback, | ||
| alive_callback, | ||
| stepsize_callback) | ||
|
|
||
| ############################################################################### | ||
| # run the simulation | ||
|
|
||
| sol = solve(ode, CarpenterKennedy2N54(williamson_condition = false), | ||
| dt = 1.0, # solve needs some value here but it will be overwritten by the stepsize_callback | ||
| save_everystep = false, callback = callbacks); | ||
| summary_callback() # print the timer summary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using OrdinaryDiffEq | ||
| using Trixi | ||
|
|
||
| ############################################################################### | ||
| # Semidiscretization of the quasi 1d shallow water equations | ||
| # See Chan et al. https://doi.org/10.48550/arXiv.2307.12089 for details | ||
|
|
||
| equations = ShallowWaterEquationsQuasi1D(gravity_constant = 9.81) | ||
|
|
||
| initial_condition = initial_condition_convergence_test | ||
|
|
||
| volume_flux = (flux_chan_etal, flux_nonconservative_chan_etal) | ||
| surface_flux = (FluxPlusDissipation(flux_chan_etal, DissipationLocalLaxFriedrichs()), | ||
| flux_nonconservative_chan_etal) | ||
|
|
||
| dg = DGMulti(polydeg = 4, element_type = Line(), approximation_type = SBP(), | ||
| surface_integral = SurfaceIntegralWeakForm(surface_flux), | ||
| volume_integral = VolumeIntegralFluxDifferencing(volume_flux)) | ||
|
|
||
| cells_per_dimension = (8,) | ||
| mesh = DGMultiMesh(dg, cells_per_dimension, | ||
| coordinates_min = (0.0,), coordinates_max = (sqrt(2),), | ||
| periodicity = true) | ||
| semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, dg; | ||
| source_terms = source_terms_convergence_test) | ||
|
|
||
| ############################################################################### | ||
| # ODE solvers, callbacks etc. | ||
|
|
||
| tspan = (0.0, 1.0) | ||
| ode = semidiscretize(semi, tspan) | ||
|
|
||
| summary_callback = SummaryCallback() | ||
|
|
||
| analysis_interval = 100 | ||
| analysis_callback = AnalysisCallback(semi, interval = analysis_interval, uEltype = real(dg)) | ||
|
|
||
| alive_callback = AliveCallback(analysis_interval = analysis_interval) | ||
|
|
||
| callbacks = CallbackSet(summary_callback, | ||
| analysis_callback, | ||
| alive_callback) | ||
|
|
||
| ############################################################################### | ||
| # run the simulation | ||
|
|
||
| sol = solve(ode, RDPK3SpFSAL49(); abstol = 1.0e-8, reltol = 1.0e-8, | ||
| ode_default_options()..., callback = callbacks) | ||
| summary_callback() # print the timer summary |
113 changes: 113 additions & 0 deletions
113
examples/p4est_3d_dgsem/elixir_navierstokes_blast_wave_amr.jl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
|
|
||
| using OrdinaryDiffEq | ||
| using Trixi | ||
|
|
||
| ############################################################################### | ||
| # semidiscretization of the compressible Navier-Stokes equations | ||
|
|
||
| # TODO: parabolic; unify names of these accessor functions | ||
| prandtl_number() = 0.72 | ||
| mu() = 6.25e-4 # equivalent to Re = 1600 | ||
|
|
||
| equations = CompressibleEulerEquations3D(1.4) | ||
| equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu(), | ||
| Prandtl = prandtl_number()) | ||
|
|
||
| function initial_condition_3d_blast_wave(x, t, equations::CompressibleEulerEquations3D) | ||
| rho_c = 1.0 | ||
| p_c = 1.0 | ||
| u_c = 0.0 | ||
|
|
||
| rho_o = 0.125 | ||
| p_o = 0.1 | ||
| u_o = 0.0 | ||
|
|
||
| rc = 0.5 | ||
| r = sqrt(x[1]^2 + x[2]^2 + x[3]^2) | ||
| if r < rc | ||
| rho = rho_c | ||
| v1 = u_c | ||
| v2 = u_c | ||
| v3 = u_c | ||
| p = p_c | ||
| else | ||
| rho = rho_o | ||
| v1 = u_o | ||
| v2 = u_o | ||
| v3 = u_o | ||
| p = p_o | ||
| end | ||
|
|
||
| return prim2cons(SVector(rho, v1, v2, v3, p), equations) | ||
| end | ||
| initial_condition = initial_condition_3d_blast_wave | ||
|
|
||
| surface_flux = flux_lax_friedrichs | ||
| volume_flux = flux_ranocha | ||
| polydeg = 3 | ||
| basis = LobattoLegendreBasis(polydeg) | ||
| indicator_sc = IndicatorHennemannGassner(equations, basis, | ||
| alpha_max = 1.0, | ||
| alpha_min = 0.001, | ||
| alpha_smooth = true, | ||
| variable = density_pressure) | ||
| volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; | ||
| volume_flux_dg = volume_flux, | ||
| volume_flux_fv = surface_flux) | ||
|
|
||
| solver = DGSEM(polydeg = polydeg, surface_flux = surface_flux, | ||
| volume_integral = volume_integral) | ||
|
|
||
| coordinates_min = (-1.0, -1.0, -1.0) .* pi | ||
| coordinates_max = (1.0, 1.0, 1.0) .* pi | ||
|
|
||
| trees_per_dimension = (4, 4, 4) | ||
|
|
||
| mesh = P4estMesh(trees_per_dimension, polydeg = 3, | ||
| coordinates_min = coordinates_min, coordinates_max = coordinates_max, | ||
| periodicity = (true, true, true), initial_refinement_level = 1) | ||
|
|
||
| semi = SemidiscretizationHyperbolicParabolic(mesh, (equations, equations_parabolic), | ||
| initial_condition, solver) | ||
|
|
||
| ############################################################################### | ||
| # ODE solvers, callbacks etc. | ||
|
|
||
| tspan = (0.0, 0.8) | ||
| ode = semidiscretize(semi, tspan) | ||
|
|
||
| summary_callback = SummaryCallback() | ||
|
|
||
| analysis_interval = 100 | ||
| analysis_callback = AnalysisCallback(semi, interval = analysis_interval) | ||
| save_solution = SaveSolutionCallback(interval = analysis_interval, | ||
| save_initial_solution = true, | ||
| save_final_solution = true, | ||
| solution_variables = cons2prim) | ||
|
|
||
| amr_indicator = IndicatorLöhner(semi, variable = Trixi.density) | ||
|
|
||
| amr_controller = ControllerThreeLevel(semi, amr_indicator, | ||
| base_level = 0, | ||
| med_level = 1, med_threshold = 0.05, | ||
| max_level = 3, max_threshold = 0.1) | ||
| amr_callback = AMRCallback(semi, amr_controller, | ||
| interval = 10, | ||
| adapt_initial_condition = true, | ||
| adapt_initial_condition_only_refine = true) | ||
|
|
||
| alive_callback = AliveCallback(analysis_interval = analysis_interval) | ||
|
|
||
| callbacks = CallbackSet(summary_callback, | ||
| analysis_callback, | ||
| alive_callback, | ||
| amr_callback, | ||
| save_solution) | ||
|
|
||
| ############################################################################### | ||
| # run the simulation | ||
|
|
||
| time_int_tol = 1e-8 | ||
| sol = solve(ode, RDPK3SpFSAL49(); abstol = time_int_tol, reltol = time_int_tol, | ||
| ode_default_options()..., callback = callbacks) | ||
| summary_callback() # print the timer summary |
Oops, something went wrong.