From 06645e13a4adffecae89e1ad8b5a2f67ff3075df Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Thu, 15 Oct 2026 17:29:33 +0800 Subject: [PATCH 01/28] Update dependencies and migrate Trixi and CUDA APIs --- .buildkite/pipeline.yml | 23 +++++- .github/workflows/DependencyCheck.yml | 29 +++++++ .github/workflows/FormatCheck.yml | 2 +- Project.toml | 13 +-- README.md | 2 +- benchmark/advection_basic_1d.jl | 10 ++- benchmark/advection_basic_2d.jl | 10 ++- benchmark/advection_basic_3d.jl | 10 ++- benchmark/advection_mortar_2d.jl | 10 ++- benchmark/advection_mortar_3d.jl | 10 ++- benchmark/euler_ec_1d.jl | 10 ++- benchmark/euler_ec_2d.jl | 6 +- benchmark/euler_ec_3d.jl | 10 ++- benchmark/euler_shock_1d.jl | 10 ++- benchmark/euler_shock_2d.jl | 10 ++- benchmark/euler_shock_3d.jl | 10 ++- benchmark/hypdiff_nonperiodic_1d.jl | 6 +- benchmark/hypdiff_nonperiodic_2d.jl | 6 +- benchmark/hypdiff_nonperiodic_3d.jl | 6 +- benchmark/mhd_alfven_wave_1d.jl | 10 ++- benchmark/mhd_alfven_wave_2d.jl | 12 +-- benchmark/mhd_alfven_wave_3d.jl | 12 +-- benchmark/mhd_alfven_wave_mortar_2d.jl | 14 ++-- benchmark/mhd_alfven_wave_mortar_3d.jl | 14 ++-- benchmark/mhd_ec_1d.jl | 10 ++- benchmark/mhd_ec_2d.jl | 12 +-- benchmark/mhd_ec_3d.jl | 12 +-- benchmark/shallowwater_ec_1d.jl | 12 +-- benchmark/shallowwater_ec_2d.jl | 12 +-- benchmark/shallowwater_source_terms_1d.jl | 9 +- benchmark/shallowwater_source_terms_2d.jl | 9 +- docs/Project.toml | 10 ++- examples/advection_basic_1d.jl | 2 +- examples/advection_basic_2d.jl | 2 +- examples/advection_basic_3d.jl | 2 +- examples/advection_mortar_2d.jl | 2 +- examples/advection_mortar_3d.jl | 2 +- examples/euler_ec_1d.jl | 2 +- examples/euler_ec_2d.jl | 2 +- examples/euler_ec_3d.jl | 2 +- examples/euler_shockcapturing_1d.jl | 2 +- examples/euler_shockcapturing_2d.jl | 2 +- examples/euler_shockcapturing_3d.jl | 2 +- examples/euler_source_terms_1d.jl | 2 +- examples/euler_source_terms_2d.jl | 2 +- examples/euler_source_terms_3d.jl | 2 +- examples/eulermulti_ec_1d.jl | 2 +- examples/eulermulti_ec_2d.jl | 2 +- examples/hypdiff_nonperiodic_1d.jl | 2 +- examples/hypdiff_nonperiodic_2d.jl | 2 +- examples/hypdiff_nonperiodic_3d.jl | 2 +- examples/shallowwater_dirichlet_1d.jl | 2 +- examples/shallowwater_dirichlet_2d.jl | 2 +- examples/shallowwater_ec_1d.jl | 2 +- examples/shallowwater_ec_2d.jl | 2 +- examples/shallowwater_source_terms_1d.jl | 2 +- examples/shallowwater_source_terms_2d.jl | 2 +- profile/profiling.jl | 2 +- profile/profiling_kernel.jl | 3 +- profile/profiling_kernel2.jl | 3 +- profile/profiling_kernel3.jl | 3 +- src/TrixiCUDA.jl | 25 ++++-- .../semidiscretization_hyperbolic.jl | 6 +- src/solvers/basis_lobatto_legendre.jl | 53 ++++-------- src/solvers/cache.jl | 27 +++--- src/solvers/containers_1d.jl | 6 +- src/solvers/containers_2d.jl | 8 +- src/solvers/containers_3d.jl | 8 +- src/solvers/dg_1d.jl | 20 ++--- src/solvers/dg_1d_kernel.jl | 10 +-- src/solvers/dg_2d.jl | 20 ++--- src/solvers/dg_2d_kernel.jl | 12 +-- src/solvers/dg_3d.jl | 20 ++--- src/solvers/dg_3d_kernel.jl | 14 ++-- src/solvers/dgsem_gpu.jl | 26 ++++-- src/solvers/indicators.jl | 2 +- src/solvers/indicators_1d.jl | 17 +--- src/solvers/indicators_2d.jl | 18 +--- src/solvers/indicators_3d.jl | 21 +---- test/dependency_compatibility.jl | 82 +++++++++++++++++++ test/runtests.jl | 2 + test/tree_dgsem_1d/advection_basic.jl | 19 +++-- test/tree_dgsem_1d/advection_extended.jl | 16 ++-- test/tree_dgsem_1d/burgers_basic.jl | 19 +++-- test/tree_dgsem_1d/burgers_rarefraction.jl | 16 ++-- test/tree_dgsem_1d/burgers_shock.jl | 16 ++-- test/tree_dgsem_1d/euler_blast_wave.jl | 19 +++-- test/tree_dgsem_1d/euler_ec.jl | 19 +++-- test/tree_dgsem_1d/euler_shock.jl | 19 +++-- test/tree_dgsem_1d/euler_source_terms.jl | 19 +++-- .../euler_source_terms_nonperiodic.jl | 16 ++-- test/tree_dgsem_1d/eulermulti_ec.jl | 19 +++-- test/tree_dgsem_1d/eulermulti_es.jl | 19 +++-- test/tree_dgsem_1d/eulerquasi_ec.jl | 19 +++-- test/tree_dgsem_1d/eulerquasi_source_terms.jl | 19 +++-- .../hypdiff_harmonic_nonperiodic.jl | 16 ++-- test/tree_dgsem_1d/hypdiff_nonperiodic.jl | 16 ++-- test/tree_dgsem_1d/mhd_alfven_wave.jl | 19 +++-- test/tree_dgsem_1d/mhd_ec.jl | 19 +++-- test/tree_dgsem_1d/shallowwater_shock.jl | 16 ++-- test/tree_dgsem_2d/advection_basic.jl | 23 +++--- test/tree_dgsem_2d/advection_mortar.jl | 23 +++--- test/tree_dgsem_2d/euler_blob_mortar.jl | 23 +++--- test/tree_dgsem_2d/euler_ec.jl | 20 ++--- test/tree_dgsem_2d/euler_shock.jl | 23 +++--- test/tree_dgsem_2d/euler_source_terms.jl | 23 +++--- .../euler_source_terms_nonperiodic.jl | 20 ++--- test/tree_dgsem_2d/eulermulti_ec.jl | 23 +++--- test/tree_dgsem_2d/eulermulti_es.jl | 23 +++--- test/tree_dgsem_2d/hypdiff_nonperiodic.jl | 20 ++--- test/tree_dgsem_2d/mhd_alfven_wave.jl | 25 +++--- test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl | 25 +++--- test/tree_dgsem_2d/mhd_ec.jl | 25 +++--- test/tree_dgsem_2d/mhd_shock.jl | 25 +++--- test/tree_dgsem_2d/shallowwater_ec.jl | 23 +++--- .../shallowwater_source_terms.jl | 23 +++--- .../shawllowwater_source_terms_nonperiodic.jl | 20 ++--- test/tree_dgsem_3d/advection_basic.jl | 23 +++--- test/tree_dgsem_3d/advection_mortar.jl | 23 +++--- test/tree_dgsem_3d/euler_convergence.jl | 23 +++--- test/tree_dgsem_3d/euler_ec.jl | 23 +++--- test/tree_dgsem_3d/euler_mortar.jl | 23 +++--- test/tree_dgsem_3d/euler_shock.jl | 23 +++--- test/tree_dgsem_3d/euler_source_terms.jl | 23 +++--- test/tree_dgsem_3d/hypdiff_nonperiodic.jl | 20 ++--- test/tree_dgsem_3d/mhd_alfven_wave.jl | 25 +++--- test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl | 25 +++--- test/tree_dgsem_3d/mhd_ec.jl | 25 +++--- test/tree_dgsem_3d/mhd_shock.jl | 25 +++--- 129 files changed, 995 insertions(+), 812 deletions(-) create mode 100644 .github/workflows/DependencyCheck.yml create mode 100644 test/dependency_compatibility.jl diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 037599ee..117f091d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -8,6 +8,27 @@ steps: println("--- :julia: Instantiating environment") Pkg.develop(path=".") + Pkg.update() + Pkg.status() + + println("+++ :julia: Running tests") + Pkg.test("TrixiCUDA")' + agents: + queue: "cuda" + if: build.message !~ /\[skip tests\]/ + timeout_in_minutes: 60 + + - label: "CUDA Test - latest stable Julia" + plugins: + - JuliaCI/julia#v1: + version: "1" + command: | + julia -e 'using Pkg + + println("--- :julia: Instantiating environment") + Pkg.develop(path=".") + Pkg.update() + Pkg.status() println("+++ :julia: Running tests") Pkg.test("TrixiCUDA")' @@ -35,4 +56,4 @@ steps: agents: queue: "cuda" if: build.message !~ /\[skip docs\]/ - timeout_in_minutes: 10 \ No newline at end of file + timeout_in_minutes: 10 diff --git a/.github/workflows/DependencyCheck.yml b/.github/workflows/DependencyCheck.yml new file mode 100644 index 00000000..7c2c8dbb --- /dev/null +++ b/.github/workflows/DependencyCheck.yml @@ -0,0 +1,29 @@ +name: Dependency Check + +on: + push: + branches: + - main + pull_request: + workflow_dispatch: + +jobs: + dependencies: + name: Resolve and load dependencies - Julia ${{ matrix.julia-version }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + julia-version: ['1.10', '1'] + env: + JULIA_PKG_PRECOMPILE_AUTO: '0' + steps: + - uses: actions/checkout@v5 + - uses: julia-actions/setup-julia@v2 + with: + version: ${{ matrix.julia-version }} + - uses: julia-actions/cache@v2 + - name: Resolve latest compatible runtime dependencies + run: julia --project=. -e 'using Pkg; Pkg.update(); Pkg.status(; outdated=true); include("test/dependency_compatibility.jl")' + - name: Resolve latest compatible documentation dependencies + run: julia --project=docs -e 'using Pkg; Pkg.develop(path=pwd()); Pkg.update(); Pkg.status(; outdated=true); using Documenter, TrixiCUDA' diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml index 3f97d0c2..eade52cf 100644 --- a/.github/workflows/FormatCheck.yml +++ b/.github/workflows/FormatCheck.yml @@ -18,4 +18,4 @@ jobs: - name: Run Julia Format Check uses: julia-actions/julia-format@v4 with: - version: '1.0.56' + version: '2.14.0' diff --git a/Project.toml b/Project.toml index f0e7e4ef..57340087 100644 --- a/Project.toml +++ b/Project.toml @@ -5,18 +5,21 @@ version = "1.0.0-DEV" [deps] CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" +GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" [compat] -Aqua = "0.8" -CUDA = "5" -SciMLBase = "2" -StaticArrays = "1" +Aqua = "0.8.18" +CUDA = "6.4.2" +GPUArraysCore = "0.2.1" +Printf = "1" +SciMLBase = "3.58" +StaticArrays = "1.9.23" Test = "1.10" -Trixi = "0.11 - 0.13.5" +Trixi = "0.17.15" julia = "1.10" [extras] diff --git a/README.md b/README.md index bdf0b476..0f68d4bd 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver) diff --git a/benchmark/advection_basic_1d.jl b/benchmark/advection_basic_1d.jl index adca1266..8f404682 100644 --- a/benchmark/advection_basic_1d.jl +++ b/benchmark/advection_basic_1d.jl @@ -17,11 +17,13 @@ coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, - initial_condition_convergence_test, solver) + initial_condition_convergence_test, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,7 +53,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -60,7 +62,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/advection_basic_2d.jl b/benchmark/advection_basic_2d.jl index ebc0b219..1b8d0a10 100644 --- a/benchmark/advection_basic_2d.jl +++ b/benchmark/advection_basic_2d.jl @@ -17,11 +17,13 @@ coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, - initial_condition_convergence_test, solver) + initial_condition_convergence_test, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,7 +53,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -60,7 +62,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/advection_basic_3d.jl b/benchmark/advection_basic_3d.jl index 03b310c6..ef96d5eb 100644 --- a/benchmark/advection_basic_3d.jl +++ b/benchmark/advection_basic_3d.jl @@ -17,11 +17,13 @@ coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, - initial_condition_convergence_test, solver) + initial_condition_convergence_test, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,7 +53,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -60,7 +62,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/advection_mortar_2d.jl b/benchmark/advection_mortar_2d.jl index 9371ed4a..9be96c44 100644 --- a/benchmark/advection_mortar_2d.jl +++ b/benchmark/advection_mortar_2d.jl @@ -20,10 +20,12 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -52,7 +54,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -61,7 +63,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/advection_mortar_3d.jl b/benchmark/advection_mortar_3d.jl index 1499f382..2e96fd55 100644 --- a/benchmark/advection_mortar_3d.jl +++ b/benchmark/advection_mortar_3d.jl @@ -22,10 +22,12 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0, -1.0f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 5.0f0) @@ -54,7 +56,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -63,7 +65,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_ec_1d.jl b/benchmark/euler_ec_1d.jl index 59285132..649bde98 100644 --- a/benchmark/euler_ec_1d.jl +++ b/benchmark/euler_ec_1d.jl @@ -22,10 +22,12 @@ coordinates_min = (-2.0f0,) coordinates_max = (2.0f0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -54,7 +56,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -63,7 +65,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_ec_2d.jl b/benchmark/euler_ec_2d.jl index 4657f615..2e2d03af 100644 --- a/benchmark/euler_ec_2d.jl +++ b/benchmark/euler_ec_2d.jl @@ -22,7 +22,7 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # Cache initialization @@ -57,7 +57,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -66,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_ec_3d.jl b/benchmark/euler_ec_3d.jl index 882b9d37..e7ce5ea0 100644 --- a/benchmark/euler_ec_3d.jl +++ b/benchmark/euler_ec_3d.jl @@ -22,10 +22,12 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -54,7 +56,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -63,7 +65,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_shock_1d.jl b/benchmark/euler_shock_1d.jl index e90c8a7c..c3ff0a4a 100644 --- a/benchmark/euler_shock_1d.jl +++ b/benchmark/euler_shock_1d.jl @@ -35,10 +35,12 @@ coordinates_min = -2.0f0 coordinates_max = 2.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -67,7 +69,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -76,7 +78,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_shock_2d.jl b/benchmark/euler_shock_2d.jl index f7daa4e7..344626a0 100644 --- a/benchmark/euler_shock_2d.jl +++ b/benchmark/euler_shock_2d.jl @@ -35,10 +35,12 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -67,7 +69,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -76,7 +78,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/euler_shock_3d.jl b/benchmark/euler_shock_3d.jl index 2c337f67..744707b4 100644 --- a/benchmark/euler_shock_3d.jl +++ b/benchmark/euler_shock_3d.jl @@ -35,11 +35,13 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -69,7 +71,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -78,7 +80,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/hypdiff_nonperiodic_1d.jl b/benchmark/hypdiff_nonperiodic_1d.jl index ce129279..523d4a99 100644 --- a/benchmark/hypdiff_nonperiodic_1d.jl +++ b/benchmark/hypdiff_nonperiodic_1d.jl @@ -21,7 +21,7 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = false, RealT = RealT) @@ -59,7 +59,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -68,7 +68,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/hypdiff_nonperiodic_2d.jl b/benchmark/hypdiff_nonperiodic_2d.jl index 732b8e20..7a6f0f3b 100644 --- a/benchmark/hypdiff_nonperiodic_2d.jl +++ b/benchmark/hypdiff_nonperiodic_2d.jl @@ -24,7 +24,7 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = (false, true), RealT = RealT) @@ -62,7 +62,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -71,7 +71,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/hypdiff_nonperiodic_3d.jl b/benchmark/hypdiff_nonperiodic_3d.jl index 9a42ea9d..e8722187 100644 --- a/benchmark/hypdiff_nonperiodic_3d.jl +++ b/benchmark/hypdiff_nonperiodic_3d.jl @@ -26,7 +26,7 @@ coordinates_min = (0.0f0, 0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = (false, true, true), RealT = RealT) @@ -64,7 +64,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -73,7 +73,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_alfven_wave_1d.jl b/benchmark/mhd_alfven_wave_1d.jl index 89f1fa0e..60dbc7ab 100644 --- a/benchmark/mhd_alfven_wave_1d.jl +++ b/benchmark/mhd_alfven_wave_1d.jl @@ -21,10 +21,12 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -53,7 +55,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -62,7 +64,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_alfven_wave_2d.jl b/benchmark/mhd_alfven_wave_2d.jl index 81eb26b8..5c61a2fd 100644 --- a/benchmark/mhd_alfven_wave_2d.jl +++ b/benchmark/mhd_alfven_wave_2d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations2D(gamma) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -23,10 +23,12 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -55,7 +57,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -64,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_alfven_wave_3d.jl b/benchmark/mhd_alfven_wave_3d.jl index efbbd854..1dc0b997 100644 --- a/benchmark/mhd_alfven_wave_3d.jl +++ b/benchmark/mhd_alfven_wave_3d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations3D(gamma) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -23,10 +23,12 @@ coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -55,7 +57,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -64,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_alfven_wave_mortar_2d.jl b/benchmark/mhd_alfven_wave_mortar_2d.jl index a9e3ad7e..4ff04741 100644 --- a/benchmark/mhd_alfven_wave_mortar_2d.jl +++ b/benchmark/mhd_alfven_wave_mortar_2d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations2D(gamma) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -30,11 +30,13 @@ refinement_patches = ((type = "box", coordinates_min = 0.25f0 .* coordinates_max mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000, - RealT = RealT) + + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -63,7 +65,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -72,7 +74,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_alfven_wave_mortar_3d.jl b/benchmark/mhd_alfven_wave_mortar_3d.jl index 8e8c0dd3..294cbd5b 100644 --- a/benchmark/mhd_alfven_wave_mortar_3d.jl +++ b/benchmark/mhd_alfven_wave_mortar_3d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations3D(gamma) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -30,11 +30,13 @@ refinement_patches = ((type = "box", coordinates_min = (-0.5f0, -0.5f0, -0.5f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000, - RealT = RealT) + + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -63,7 +65,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -72,7 +74,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_ec_1d.jl b/benchmark/mhd_ec_1d.jl index 2099bb93..f0adafe6 100644 --- a/benchmark/mhd_ec_1d.jl +++ b/benchmark/mhd_ec_1d.jl @@ -23,10 +23,12 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -55,7 +57,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -64,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_ec_2d.jl b/benchmark/mhd_ec_2d.jl index 7802c633..f3df3180 100644 --- a/benchmark/mhd_ec_2d.jl +++ b/benchmark/mhd_ec_2d.jl @@ -6,7 +6,7 @@ using BenchmarkTools RealT = Float32 # Set up the problem -equations = IdealGlmMhdEquations2D(1.4f0) +equations = IdealGlmMhdEquations2D(1.4f0; initial_c_h = 1.0f0) initial_condition = initial_condition_weak_blast_wave @@ -24,10 +24,12 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -56,7 +58,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -65,7 +67,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/mhd_ec_3d.jl b/benchmark/mhd_ec_3d.jl index 0a339156..7423f8a4 100644 --- a/benchmark/mhd_ec_3d.jl +++ b/benchmark/mhd_ec_3d.jl @@ -6,7 +6,7 @@ using BenchmarkTools RealT = Float32 # Set up the problem -equations = IdealGlmMhdEquations3D(1.4f0) +equations = IdealGlmMhdEquations3D(1.4f0; initial_c_h = 1.0f0) initial_condition = initial_condition_weak_blast_wave @@ -24,10 +24,12 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -56,7 +58,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -65,7 +67,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/shallowwater_ec_1d.jl b/benchmark/shallowwater_ec_1d.jl index a22cea39..5f34bf0d 100644 --- a/benchmark/shallowwater_ec_1d.jl +++ b/benchmark/shallowwater_ec_1d.jl @@ -45,11 +45,13 @@ coordinates_min = -1.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, - RealT = RealT) + + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -78,7 +80,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -87,7 +89,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/shallowwater_ec_2d.jl b/benchmark/shallowwater_ec_2d.jl index 0957b794..c41bda6b 100644 --- a/benchmark/shallowwater_ec_2d.jl +++ b/benchmark/shallowwater_ec_2d.jl @@ -56,11 +56,13 @@ coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, - RealT = RealT) + + RealT = RealT, + periodicity = true) # Cache initialization -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -111,7 +113,7 @@ CUDA.allowscalar(false) # enable check for scalar operations on GPU du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -120,7 +122,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/shallowwater_source_terms_1d.jl b/benchmark/shallowwater_source_terms_1d.jl index 18b9b9ba..399bb4ff 100644 --- a/benchmark/shallowwater_source_terms_1d.jl +++ b/benchmark/shallowwater_source_terms_1d.jl @@ -24,13 +24,14 @@ coordinates_min = 0.0f0 coordinates_max = sqrt(2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -60,7 +61,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -69,7 +70,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/benchmark/shallowwater_source_terms_2d.jl b/benchmark/shallowwater_source_terms_2d.jl index 2399e316..4d925f5a 100644 --- a/benchmark/shallowwater_source_terms_2d.jl +++ b/benchmark/shallowwater_source_terms_2d.jl @@ -24,13 +24,14 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -60,7 +61,7 @@ u_gpu = TrixiCUDA.wrap_array(u_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_ du_gpu = TrixiCUDA.wrap_array(du_gpu_, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) # Warm up -Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) +Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, boundary_conditions_gpu, source_terms_gpu, solver_gpu, cache_gpu, cache_cpu) @@ -69,7 +70,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" -cpu_trial = @benchmark Trixi.rhs!(du, u, t, mesh, equations, boundary_conditions, source_terms, +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, solver, cache) @info "Benchmarking rhs! on GPU" diff --git a/docs/Project.toml b/docs/Project.toml index 6b178765..7fbc25f7 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,8 +1,10 @@ [deps] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +TrixiCUDA = "5056661c-942a-472c-b3bc-01507f717a60" -[compat] -Documenter = "1" +[sources] +TrixiCUDA = {path = "/workspace/scratch/6354733ba1f5/TrixiCUDA.jl"} -[extras] -Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" +[compat] +Documenter = "1.19" +TrixiCUDA = "1" diff --git a/examples/advection_basic_1d.jl b/examples/advection_basic_1d.jl index 05215703..f536dcd6 100644 --- a/examples/advection_basic_1d.jl +++ b/examples/advection_basic_1d.jl @@ -18,7 +18,7 @@ coordinates_max = 1.0 # maximum coordinate # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000) # set maximum capacity of tree data structure + periodicity = true) # set maximum capacity of tree data structure # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/examples/advection_basic_2d.jl b/examples/advection_basic_2d.jl index 3b7395e5..cf71de2f 100644 --- a/examples/advection_basic_2d.jl +++ b/examples/advection_basic_2d.jl @@ -18,7 +18,7 @@ coordinates_max = (1.0, 1.0) # maximum coordinates (max(x), max(y)) # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000) # set maximum capacity of tree data structure + periodicity = true) # set maximum capacity of tree data structure # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/examples/advection_basic_3d.jl b/examples/advection_basic_3d.jl index f455241e..07b52b58 100644 --- a/examples/advection_basic_3d.jl +++ b/examples/advection_basic_3d.jl @@ -18,7 +18,7 @@ coordinates_max = (1.0, 1.0, 1.0) # maximum coordinates (max(x), max(y), max(z)) # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000) # set maximum capacity of tree data structure + periodicity = true) # set maximum capacity of tree data structure # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/examples/advection_mortar_2d.jl b/examples/advection_mortar_2d.jl index 63d34ac6..615d9f1a 100644 --- a/examples/advection_mortar_2d.jl +++ b/examples/advection_mortar_2d.jl @@ -22,7 +22,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/advection_mortar_3d.jl b/examples/advection_mortar_3d.jl index e8b49b16..c832f2cf 100644 --- a/examples/advection_mortar_3d.jl +++ b/examples/advection_mortar_3d.jl @@ -25,7 +25,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0, -1.0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_ec_1d.jl b/examples/euler_ec_1d.jl index 5207d656..c47de28b 100644 --- a/examples/euler_ec_1d.jl +++ b/examples/euler_ec_1d.jl @@ -17,7 +17,7 @@ coordinates_min = (-2.0,) coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_ec_2d.jl b/examples/euler_ec_2d.jl index d7ffaf02..0bffe2cd 100644 --- a/examples/euler_ec_2d.jl +++ b/examples/euler_ec_2d.jl @@ -17,7 +17,7 @@ coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000, + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/euler_ec_3d.jl b/examples/euler_ec_3d.jl index 9e15c01c..d4728385 100644 --- a/examples/euler_ec_3d.jl +++ b/examples/euler_ec_3d.jl @@ -18,7 +18,7 @@ coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_shockcapturing_1d.jl b/examples/euler_shockcapturing_1d.jl index 45b74502..0be01896 100644 --- a/examples/euler_shockcapturing_1d.jl +++ b/examples/euler_shockcapturing_1d.jl @@ -32,7 +32,7 @@ coordinates_min = -2.0 coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_shockcapturing_2d.jl b/examples/euler_shockcapturing_2d.jl index 79b34d8e..19a62cb1 100644 --- a/examples/euler_shockcapturing_2d.jl +++ b/examples/euler_shockcapturing_2d.jl @@ -32,7 +32,7 @@ coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_shockcapturing_3d.jl b/examples/euler_shockcapturing_3d.jl index 4ff6d5af..c41a076a 100644 --- a/examples/euler_shockcapturing_3d.jl +++ b/examples/euler_shockcapturing_3d.jl @@ -33,7 +33,7 @@ coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/euler_source_terms_1d.jl b/examples/euler_source_terms_1d.jl index 8f747222..c0ccd1ea 100644 --- a/examples/euler_source_terms_1d.jl +++ b/examples/euler_source_terms_1d.jl @@ -18,7 +18,7 @@ coordinates_min = 0.0 coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test) diff --git a/examples/euler_source_terms_2d.jl b/examples/euler_source_terms_2d.jl index ada0bc84..20be977c 100644 --- a/examples/euler_source_terms_2d.jl +++ b/examples/euler_source_terms_2d.jl @@ -15,7 +15,7 @@ coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test) diff --git a/examples/euler_source_terms_3d.jl b/examples/euler_source_terms_3d.jl index b5be2a2c..8027f437 100644 --- a/examples/euler_source_terms_3d.jl +++ b/examples/euler_source_terms_3d.jl @@ -17,7 +17,7 @@ coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test) diff --git a/examples/eulermulti_ec_1d.jl b/examples/eulermulti_ec_1d.jl index 3c42e9dc..c96de152 100644 --- a/examples/eulermulti_ec_1d.jl +++ b/examples/eulermulti_ec_1d.jl @@ -23,7 +23,7 @@ coordinates_min = (-2.0,) coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/eulermulti_ec_2d.jl b/examples/eulermulti_ec_2d.jl index 5c6d3c62..0fb93323 100644 --- a/examples/eulermulti_ec_2d.jl +++ b/examples/eulermulti_ec_2d.jl @@ -18,7 +18,7 @@ coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/hypdiff_nonperiodic_1d.jl b/examples/hypdiff_nonperiodic_1d.jl index 28f34b87..73904455 100644 --- a/examples/hypdiff_nonperiodic_1d.jl +++ b/examples/hypdiff_nonperiodic_1d.jl @@ -21,7 +21,7 @@ coordinates_min = 0.0 coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = false) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/hypdiff_nonperiodic_2d.jl b/examples/hypdiff_nonperiodic_2d.jl index b9005c64..1a3ff231 100644 --- a/examples/hypdiff_nonperiodic_2d.jl +++ b/examples/hypdiff_nonperiodic_2d.jl @@ -24,7 +24,7 @@ coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = (false, true)) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/hypdiff_nonperiodic_3d.jl b/examples/hypdiff_nonperiodic_3d.jl index c8e12860..6ad2d260 100644 --- a/examples/hypdiff_nonperiodic_3d.jl +++ b/examples/hypdiff_nonperiodic_3d.jl @@ -25,7 +25,7 @@ coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 30_000, + periodicity = (false, true, true)) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/shallowwater_dirichlet_1d.jl b/examples/shallowwater_dirichlet_1d.jl index aa37866d..f519cba3 100644 --- a/examples/shallowwater_dirichlet_1d.jl +++ b/examples/shallowwater_dirichlet_1d.jl @@ -27,7 +27,7 @@ coordinates_min = 0.0 coordinates_max = sqrt(2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = false) # create the semi discretization object diff --git a/examples/shallowwater_dirichlet_2d.jl b/examples/shallowwater_dirichlet_2d.jl index 5d1ee770..a6b94b89 100644 --- a/examples/shallowwater_dirichlet_2d.jl +++ b/examples/shallowwater_dirichlet_2d.jl @@ -27,7 +27,7 @@ coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = false) # create the semi discretization object diff --git a/examples/shallowwater_ec_1d.jl b/examples/shallowwater_ec_1d.jl index 67a84e60..8d8fa7c7 100644 --- a/examples/shallowwater_ec_1d.jl +++ b/examples/shallowwater_ec_1d.jl @@ -53,7 +53,7 @@ coordinates_min = -1.0 coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) # Create the semi discretization object semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/shallowwater_ec_2d.jl b/examples/shallowwater_ec_2d.jl index 227d26d1..0afb0719 100644 --- a/examples/shallowwater_ec_2d.jl +++ b/examples/shallowwater_ec_2d.jl @@ -28,7 +28,7 @@ coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) # Create the semi discretization object semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver) diff --git a/examples/shallowwater_source_terms_1d.jl b/examples/shallowwater_source_terms_1d.jl index 12232d35..a613767d 100644 --- a/examples/shallowwater_source_terms_1d.jl +++ b/examples/shallowwater_source_terms_1d.jl @@ -25,7 +25,7 @@ coordinates_min = 0.0 coordinates_max = sqrt(2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = true) # create the semi discretization object diff --git a/examples/shallowwater_source_terms_2d.jl b/examples/shallowwater_source_terms_2d.jl index ccd65097..18700f9c 100644 --- a/examples/shallowwater_source_terms_2d.jl +++ b/examples/shallowwater_source_terms_2d.jl @@ -25,7 +25,7 @@ coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = true) # create the semi discretization object diff --git a/profile/profiling.jl b/profile/profiling.jl index c3ace34e..985c3751 100644 --- a/profile/profiling.jl +++ b/profile/profiling.jl @@ -12,7 +12,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.5, 0.5, 0.5), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test) diff --git a/profile/profiling_kernel.jl b/profile/profiling_kernel.jl index 2ca59905..604095cd 100644 --- a/profile/profiling_kernel.jl +++ b/profile/profiling_kernel.jl @@ -29,7 +29,8 @@ coordinates_min = -2.0f0 coordinates_max = 2.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel2.jl b/profile/profiling_kernel2.jl index 3f849e34..cddd2b92 100644 --- a/profile/profiling_kernel2.jl +++ b/profile/profiling_kernel2.jl @@ -29,7 +29,8 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000, RealT = RealT) + RealT = RealT, + periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel3.jl b/profile/profiling_kernel3.jl index 38da11ca..a528fa2a 100644 --- a/profile/profiling_kernel3.jl +++ b/profile/profiling_kernel3.jl @@ -29,7 +29,8 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000, RealT = RealT) + RealT = RealT, + periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 7c4c24e7..4212bd0e 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -2,23 +2,24 @@ module TrixiCUDA # Include other packages that are used in TrixiCUDA.jl using CUDA -using CUDA: @cuda, CuArray, AbstractGPUArray, HostKernel, +using CUDA: @cuda, CuArray, HostKernel, threadIdx, blockIdx, blockDim, reshape, similar, launch_configuration +using GPUArraysCore: AbstractGPUArray + using Printf: @printf, @sprintf using SciMLBase: ODEProblem, FullSpecialize using StaticArrays: SVector # Trixi.jl methods using Trixi: allocate_coefficients, compute_coefficients, create_cache, - flux, ntuple, nvariables, ndofs, + flux, flux_central, ntuple, nvariables, ndofs, local_leaf_cells, init_elements, init_interfaces, init_boundaries, init_mortars, have_nonconservative_terms, boundary_condition_periodic, digest_boundary_conditions, check_periodicity_mesh_boundary_conditions, gauss_lobatto_nodes_weights, vandermonde_legendre, polynomial_interpolation_matrix, volume_jacobian, total_volume, - calc_dsplit, calc_dhat, calc_lhat, calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower, polynomial_derivative_matrix, analyze, cons2cons, max_abs_speeds, pretty_form_utf, @@ -30,15 +31,16 @@ using Trixi: allocate_coefficients, compute_coefficients, create_cache, using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, AbstractSurfaceIntegral, AbstractBasisSBP, PerformanceCounter, True, False, TreeMesh, StructuredMesh, - DG, FDSBP, SemidiscretizationHyperbolic, + DG, DGSEM, FDSBP, SemidiscretizationHyperbolic, LobattoLegendreBasis, LobattoLegendreMortarL2, - ElementContainer1D, ElementContainer2D, ElementContainer3D, - InterfaceContainer1D, InterfaceContainer2D, InterfaceContainer3D, - BoundaryContainer1D, BoundaryContainer2D, BoundaryContainer3D, - L2MortarContainer2D, L2MortarContainer3D, + TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D, + TreeInterfaceContainer1D, TreeInterfaceContainer2D, TreeInterfaceContainer3D, + TreeBoundaryContainer1D, TreeBoundaryContainer2D, TreeBoundaryContainer3D, + TreeL2MortarContainer2D, TreeL2MortarContainer3D, SurfaceIntegralWeakForm, VolumeIntegralWeakForm, BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, - VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHG, + VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType, + VolumeIntegralPureLGLFiniteVolume, LobattoLegendreAnalyzer # Trixi.jl indicators (since it is temporarily used to make tests pass, @@ -64,6 +66,11 @@ set_log_type!("log_Base") set_sqrt_type!("sqrt_Base") set_loop_vectorization!(false) +# The existing GPU kernels implement the classic first-order HG blend. +const SupportedShockCapturingHG = VolumeIntegralShockCapturingHGType{ + <:Any, <:VolumeIntegralFluxDifferencing, <:VolumeIntegralFluxDifferencing, + <:VolumeIntegralPureLGLFiniteVolume} + # Include other source files include("auxiliary/auxiliary.jl") include("semidiscretization/semidiscretization.jl") diff --git a/src/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index 38c4a2da..a3a44e88 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -68,7 +68,11 @@ function SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, sol cache_gpu = (; create_cache_gpu(mesh, equations, solver, RealT, uEltype)..., initial_cache_gpu...) - cache_cpu = (; create_cache(mesh, equations, solver, RealT, uEltype)..., + cache_cpu = (; create_cache(mesh, equations, + DGSEM(RealT = real(solver), polydeg = polydeg(solver), + surface_integral = solver.surface_integral, + volume_integral = solver.volume_integral), + RealT, uEltype)..., initial_cache_cpu...) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, diff --git a/src/solvers/basis_lobatto_legendre.jl b/src/solvers/basis_lobatto_legendre.jl index a596a0cc..52cd89f7 100644 --- a/src/solvers/basis_lobatto_legendre.jl +++ b/src/solvers/basis_lobatto_legendre.jl @@ -1,26 +1,5 @@ # Everything related to Lobatto-Legendre basis adapted for initialization on the GPU. -# CPU version of LobattoLegendreBasis from Trixi.jl (for reference) -# struct LobattoLegendreBasis{RealT <: Real, NNODES, -# VectorT <: AbstractVector{RealT}, -# InverseVandermondeLegendre <: AbstractMatrix{RealT}, -# BoundaryMatrix <: AbstractMatrix{RealT}, -# DerivativeMatrix <: AbstractMatrix{RealT}} <: -# AbstractBasisSBP{RealT} -# nodes::VectorT -# weights::VectorT -# inverse_weights::VectorT - -# inverse_vandermonde_legendre::InverseVandermondeLegendre -# boundary_interpolation::BoundaryMatrix # lhat - -# derivative_matrix::DerivativeMatrix # strong form derivative matrix -# derivative_split::DerivativeMatrix # strong form derivative matrix minus boundary terms -# derivative_split_transpose::DerivativeMatrix # transpose of `derivative_split` -# derivative_dhat::DerivativeMatrix # weak form matrix "dhat", -# # negative adjoint wrt the SBP dot product -# end - # Similar to `LobattoLegendreBasis` in Trixi.jl struct LobattoLegendreBasisGPU{RealT <: Real, NNODES, VectorT <: CuArray{RealT, 1}, @@ -43,7 +22,7 @@ struct LobattoLegendreBasisGPU{RealT <: Real, NNODES, derivative_matrix::DerivativeMatrix derivative_split::DerivativeMatrix derivative_split_transpose::DerivativeMatrix - derivative_dhat::DerivativeMatrix + derivative_hat::DerivativeMatrix end """ @@ -58,21 +37,21 @@ Galerkin spectral element method (DGSEM). ongoing performance optimizations. """ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) - nnodes_ = polydeg + 1 - - # TODO: Use GPU kernels to complete the computation (compare with CPU) - nodes_, weights_ = gauss_lobatto_nodes_weights(nnodes_, RealT) - inverse_weights_ = inv.(weights_) - - _, inverse_vandermonde_legendre_ = vandermonde_legendre(nodes_, RealT) - + basis_cpu = LobattoLegendreBasis(RealT, polydeg) + nnodes_ = nnodes(basis_cpu) + nodes_, weights_ = get_nodes(basis_cpu), basis_cpu.weights + inverse_weights_ = basis_cpu.inverse_weights + inverse_vandermonde_legendre_ = basis_cpu.inverse_vandermonde_legendre + + # Lobatto nodes coincide with the endpoints. The GPU surface kernels retain + # the weighted endpoint-interpolation matrix used by this package. boundary_interpolation_ = zeros(RealT, nnodes_, 2) - boundary_interpolation_[:, 1] = calc_lhat(-one(RealT), nodes_, weights_) - boundary_interpolation_[:, 2] = calc_lhat(one(RealT), nodes_, weights_) + boundary_interpolation_[1, 1] = first(inverse_weights_) + boundary_interpolation_[end, 2] = last(inverse_weights_) - derivative_matrix_ = polynomial_derivative_matrix(nodes_) - derivative_split_ = calc_dsplit(nodes_, weights_) - derivative_dhat_ = calc_dhat(nodes_, weights_) + derivative_matrix_ = basis_cpu.derivative_matrix + derivative_split_ = basis_cpu.derivative_split + derivative_hat_ = basis_cpu.derivative_hat # Convert to GPU arrays inverse_weights = CuArray{RealT}(inverse_weights_) @@ -80,7 +59,7 @@ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) derivative_matrix = CuArray{RealT}(derivative_matrix_) derivative_split = CuArray{RealT}(derivative_split_) derivative_split_transpose = CuArray{RealT}(derivative_split_') - derivative_dhat = CuArray{RealT}(derivative_dhat_) + derivative_hat = CuArray{RealT}(derivative_hat_) # Avoid scalar indexing # inverse_vandermonde_legendre = CuArray{RealT}(inverse_vandermonde_legendre_) @@ -96,7 +75,7 @@ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) derivative_matrix, derivative_split, derivative_split_transpose, - derivative_dhat) + derivative_hat) end LobattoLegendreBasisGPU(polydeg::Integer) = LobattoLegendreBasisGPU(Float64, polydeg) # Float32 ? diff --git a/src/solvers/cache.jl b/src/solvers/cache.jl index 36f981f6..fdbfd5de 100644 --- a/src/solvers/cache.jl +++ b/src/solvers/cache.jl @@ -16,11 +16,12 @@ function create_cache_gpu(mesh::TreeMesh{1}, equations, dg::DG, RealT, uEltype) # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) - elements = init_elements(leaf_cell_ids, mesh, equations, dg.basis, RealT, uEltype) + basis_cpu = LobattoLegendreBasis(real(dg), polydeg(dg)) + elements = init_elements(leaf_cell_ids, mesh, equations, basis_cpu, RealT, uEltype) interfaces = init_interfaces(leaf_cell_ids, mesh, elements) - boundaries = init_boundaries(leaf_cell_ids, mesh, elements) + boundaries = init_boundaries(leaf_cell_ids, mesh, elements, basis_cpu) # Copy cache components from CPU to GPU elements = copy_elements(elements) @@ -44,13 +45,13 @@ function create_cache_gpu(mesh::TreeMesh{1}, equations, end function create_cache_gpu(mesh::TreeMesh{1}, equations, - volume_integral::VolumeIntegralShockCapturingHG, dg::DG, + volume_integral::SupportedShockCapturingHG, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) fstar1_R = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) cache = create_cache_gpu(mesh, equations, - VolumeIntegralFluxDifferencing(volume_integral.volume_flux_dg), + volume_integral.volume_integral_blend_high_order, dg, uEltype, cache) return (; cache..., fstar1_L, fstar1_R) @@ -62,11 +63,12 @@ function create_cache_gpu(mesh::TreeMesh{2}, equations, # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) - elements = init_elements(leaf_cell_ids, mesh, equations, dg.basis, RealT, uEltype) + basis_cpu = LobattoLegendreBasis(real(dg), polydeg(dg)) + elements = init_elements(leaf_cell_ids, mesh, equations, basis_cpu, RealT, uEltype) interfaces = init_interfaces(leaf_cell_ids, mesh, elements) - boundaries = init_boundaries(leaf_cell_ids, mesh, elements) + boundaries = init_boundaries(leaf_cell_ids, mesh, elements, basis_cpu) mortars = init_mortars(leaf_cell_ids, mesh, elements, dg.mortar) @@ -94,7 +96,7 @@ function create_cache_gpu(mesh::TreeMesh{2}, equations, end function create_cache_gpu(mesh::TreeMesh{2}, equations, - volume_integral::VolumeIntegralShockCapturingHG, dg::DG, + volume_integral::SupportedShockCapturingHG, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nelements(cache.elements)) @@ -106,7 +108,7 @@ function create_cache_gpu(mesh::TreeMesh{2}, equations, nelements(cache.elements)) cache = create_cache_gpu(mesh, equations, - VolumeIntegralFluxDifferencing(volume_integral.volume_flux_dg), + volume_integral.volume_integral_blend_high_order, dg, uEltype, cache) return (; cache..., fstar1_L, fstar1_R, fstar2_L, fstar2_R) @@ -132,11 +134,12 @@ function create_cache_gpu(mesh::TreeMesh{3}, equations, # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) - elements = init_elements(leaf_cell_ids, mesh, equations, dg.basis, RealT, uEltype) + basis_cpu = LobattoLegendreBasis(real(dg), polydeg(dg)) + elements = init_elements(leaf_cell_ids, mesh, equations, basis_cpu, RealT, uEltype) interfaces = init_interfaces(leaf_cell_ids, mesh, elements) - boundaries = init_boundaries(leaf_cell_ids, mesh, elements) + boundaries = init_boundaries(leaf_cell_ids, mesh, elements, basis_cpu) mortars = init_mortars(leaf_cell_ids, mesh, elements, dg.mortar) @@ -164,7 +167,7 @@ function create_cache_gpu(mesh::TreeMesh{3}, equations, end function create_cache_gpu(mesh::TreeMesh{3}, equations, - volume_integral::VolumeIntegralShockCapturingHG, dg::DG, + volume_integral::SupportedShockCapturingHG, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nnodes(dg), nelements(cache.elements)) @@ -180,7 +183,7 @@ function create_cache_gpu(mesh::TreeMesh{3}, equations, nnodes(dg) + 1, nelements(cache.elements)) cache = create_cache_gpu(mesh, equations, - VolumeIntegralFluxDifferencing(volume_integral.volume_flux_dg), + volume_integral.volume_integral_blend_high_order, dg, uEltype, cache) return (; cache..., fstar1_L, fstar1_R, fstar2_L, fstar2_R, fstar3_L, fstar3_R) diff --git a/src/solvers/containers_1d.jl b/src/solvers/containers_1d.jl index b302ea8d..68e07359 100644 --- a/src/solvers/containers_1d.jl +++ b/src/solvers/containers_1d.jl @@ -31,7 +31,7 @@ Base.eltype(elements::ElementContainerGPU1D) = eltype(elements.surface_flux_valu @inline nelements(elements::ElementContainerGPU1D) = length(elements.cell_ids) # Copy arrays from DG elements to GPU -function copy_elements(elements::ElementContainer1D) +function copy_elements(elements::TreeElementContainer1D) dims_inverse_jacobian = size(elements.inverse_jacobian) dims_node_coordinates = size(elements.node_coordinates) dims_surface_flux_values = size(elements.surface_flux_values) @@ -75,7 +75,7 @@ end @inline ninterfaces(interfaces::InterfaceContainerGPU1D) = length(interfaces.orientations) # Copy arrays from DG interfaces to GPU -function copy_interfaces(interfaces::InterfaceContainer1D) +function copy_interfaces(interfaces::TreeInterfaceContainer1D) dims_u = size(interfaces.u) dims_neighbor_ids = size(interfaces.neighbor_ids) dims_orientations = size(interfaces.orientations) @@ -125,7 +125,7 @@ mutable struct BoundaryContainerGPU1D{RealT <: Real, uEltype <: Real} <: Abstrac end # Copy arrays from DG boundaries to GPU -function copy_boundaries(boundaries::BoundaryContainer1D) +function copy_boundaries(boundaries::TreeBoundaryContainer1D) dims_u = size(boundaries.u) dims_neighbor_ids = size(boundaries.neighbor_ids) dims_orientations = size(boundaries.orientations) diff --git a/src/solvers/containers_2d.jl b/src/solvers/containers_2d.jl index 219e861b..827a0100 100644 --- a/src/solvers/containers_2d.jl +++ b/src/solvers/containers_2d.jl @@ -31,7 +31,7 @@ Base.eltype(elements::ElementContainerGPU2D) = eltype(elements.surface_flux_valu @inline nelements(elements::ElementContainerGPU2D) = length(elements.cell_ids) # Copy arrays from DG elements to GPU -function copy_elements(elements::ElementContainer2D) +function copy_elements(elements::TreeElementContainer2D) dims_inverse_jacobian = size(elements.inverse_jacobian) dims_node_coordinates = size(elements.node_coordinates) dims_surface_flux_values = size(elements.surface_flux_values) @@ -77,7 +77,7 @@ end @inline ninterfaces(interfaces::InterfaceContainerGPU2D) = length(interfaces.orientations) # Copy arrays from DG interfaces to GPU -function copy_interfaces(interfaces::InterfaceContainer2D) +function copy_interfaces(interfaces::TreeInterfaceContainer2D) dims_u = size(interfaces.u) dims_neighbor_ids = size(interfaces.neighbor_ids) dims_orientations = size(interfaces.orientations) @@ -128,7 +128,7 @@ mutable struct BoundaryContainerGPU2D{RealT <: Real, uEltype <: Real} <: Abstrac end # Copy arrays from DG boundaries to GPU -function copy_boundaries(boundaries::BoundaryContainer2D) +function copy_boundaries(boundaries::TreeBoundaryContainer2D) dims_u = size(boundaries.u) dims_neighbor_ids = size(boundaries.neighbor_ids) dims_orientations = size(boundaries.orientations) @@ -184,7 +184,7 @@ end @inline nmortars(l2mortars::L2MortarContainerGPU2D) = length(l2mortars.orientations) # Copy arrays from DG mortars to GPU -function copy_mortars(mortars::L2MortarContainer2D) +function copy_mortars(mortars::TreeL2MortarContainer2D) dims_u_upper = size(mortars.u_upper) dims_u_lower = size(mortars.u_lower) dims_neighbor_ids = size(mortars.neighbor_ids) diff --git a/src/solvers/containers_3d.jl b/src/solvers/containers_3d.jl index 4120a5ec..8a048fb1 100644 --- a/src/solvers/containers_3d.jl +++ b/src/solvers/containers_3d.jl @@ -31,7 +31,7 @@ Base.eltype(elements::ElementContainerGPU3D) = eltype(elements.surface_flux_valu @inline nelements(elements::ElementContainerGPU3D) = length(elements.cell_ids) # Copy arrays from DG elements to GPU -function copy_elements(elements::ElementContainer3D) +function copy_elements(elements::TreeElementContainer3D) dims_inverse_jacobian = size(elements.inverse_jacobian) dims_node_coordinates = size(elements.node_coordinates) dims_surface_flux_values = size(elements.surface_flux_values) @@ -77,7 +77,7 @@ end @inline ninterfaces(interfaces::InterfaceContainerGPU3D) = length(interfaces.orientations) # Copy arrays from DG interfaces to GPU -function copy_interfaces(interfaces::InterfaceContainer3D) +function copy_interfaces(interfaces::TreeInterfaceContainer3D) dims_u = size(interfaces.u) dims_neighbor_ids = size(interfaces.neighbor_ids) dims_orientations = size(interfaces.orientations) @@ -128,7 +128,7 @@ mutable struct BoundaryContainerGPU3D{RealT <: Real, uEltype <: Real} <: Abstrac end # Copy arrays from DG boundaries to GPU -function copy_boundaries(boundaries::BoundaryContainer3D) +function copy_boundaries(boundaries::TreeBoundaryContainer3D) dims_u = size(boundaries.u) dims_neighbor_ids = size(boundaries.neighbor_ids) dims_orientations = size(boundaries.orientations) @@ -193,7 +193,7 @@ end @inline nmortars(l2mortars::L2MortarContainerGPU3D) = length(l2mortars.orientations) # Copy arrays from DG mortars to GPU -function copy_mortars(mortars::L2MortarContainer3D) +function copy_mortars(mortars::TreeL2MortarContainer3D) dims_u_upper_left = size(mortars.u_upper_left) dims_u_upper_right = size(mortars.u_upper_right) dims_u_lower_left = size(mortars.u_lower_left) diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index fd8073ad..97cc111a 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -20,7 +20,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - derivative_dhat = dg.basis.derivative_dhat + derivative_hat = dg.basis.derivative_hat thread_per_block = size(du, 1) * size(du, 2) shmem_per_block = (size(du, 2)^2 + size(du, 1) * size(du, 2)) * sizeof(RealT) @@ -29,7 +29,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms, threads = (size(du, 1), size(du, 2), 1) blocks = (1, 1, size(du, 3)) @cuda threads=threads blocks=blocks shmem=shmem_per_block flux_weak_form_kernel!(du, u, - derivative_dhat, + derivative_hat, equations, flux) else @@ -40,8 +40,8 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms, flux_kernel(flux_arr, u, equations, flux; kernel_configurator_2d(flux_kernel, size(u, 2), size(u, 3))...) - weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_dhat, flux_arr) - weak_form_kernel(du, derivative_dhat, flux_arr; + weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_hat, flux_arr) + weak_form_kernel(du, derivative_hat, flux_arr; kernel_configurator_3d(weak_form_kernel, size(du)...)...) end @@ -138,12 +138,12 @@ end # Compute the DG volume term on the GPU for 1D problems using the hybrid DG # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::False, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, volume_flux_fv = dg.volume_integral.volume_flux_dg, - dg.volume_integral.volume_flux_fv + volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -200,12 +200,12 @@ end # Compute the DG volume term on the GPU for 1D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::True, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, noncons_flux_dg = dg.volume_integral.volume_flux_dg - volume_flux_fv, noncons_flux_fv = dg.volume_integral.volume_flux_fv + volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights diff --git a/src/solvers/dg_1d_kernel.jl b/src/solvers/dg_1d_kernel.jl index 9ae49c78..c2a19653 100644 --- a/src/solvers/dg_1d_kernel.jl +++ b/src/solvers/dg_1d_kernel.jl @@ -22,7 +22,7 @@ function flux_kernel!(flux_arr, u, equations::AbstractEquations{1}, flux::Any) end # Kernel for calculating weak form -function weak_form_kernel!(du, derivative_dhat, flux_arr) +function weak_form_kernel!(du, derivative_hat, flux_arr) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y k = (blockIdx().z - 1) * blockDim().z + threadIdx().z @@ -30,7 +30,7 @@ function weak_form_kernel!(du, derivative_dhat, flux_arr) if (i <= size(du, 1) && j <= size(du, 2) && k <= size(du, 3)) @inbounds du[i, j, k] = zero(eltype(du)) # initialize `du` with zeros for ii in axes(du, 2) - @inbounds du[i, j, k] += derivative_dhat[j, ii] * flux_arr[i, ii, k] + @inbounds du[i, j, k] += derivative_hat[j, ii] * flux_arr[i, ii, k] end end @@ -39,7 +39,7 @@ end ############################################################################## New optimization # Kernel for calculating volume integrals with weak form -function flux_weak_form_kernel!(du, u, derivative_dhat, +function flux_weak_form_kernel!(du, u, derivative_hat, equations::AbstractEquations{1}, flux::Any) # Set tile width tile_width = size(du, 2) @@ -57,10 +57,10 @@ function flux_weak_form_kernel!(du, u, derivative_dhat, # Tile the computation (restrict to one tile here) value = zero(eltype(du)) - # Load global `derivative_dhat` into shared memory + # Load global `derivative_hat` into shared memory for ty2 in axes(du, 2) # Transposed load - @inbounds shmem_dhat[ty2, ty] = derivative_dhat[ty, ty2] + @inbounds shmem_dhat[ty2, ty] = derivative_hat[ty, ty2] end # Compute flux values diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index 65ae1102..f7195356 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -20,7 +20,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - derivative_dhat = dg.basis.derivative_dhat + derivative_hat = dg.basis.derivative_hat thread_per_block = size(du, 1) * size(du, 2)^2 shmem_per_block = (size(du, 2)^2 + size(du, 1) * 2 * size(du, 2)^2) * sizeof(RealT) @@ -29,7 +29,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms, threads = (size(du, 1), size(du, 2)^2, 1) blocks = (1, 1, size(du, 4)) @cuda threads=threads blocks=blocks shmem=shmem_per_block flux_weak_form_kernel!(du, u, - derivative_dhat, + derivative_hat, equations, flux) else @@ -41,9 +41,9 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms, flux_kernel(flux_arr1, flux_arr2, u, equations, flux; kernel_configurator_2d(flux_kernel, size(u, 2)^2, size(u, 4))...) - weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_dhat, flux_arr1, + weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_hat, flux_arr1, flux_arr2) - weak_form_kernel(du, derivative_dhat, flux_arr1, flux_arr2; + weak_form_kernel(du, derivative_hat, flux_arr1, flux_arr2; kernel_configurator_3d(weak_form_kernel, size(du, 1), size(du, 2)^2, size(du, 4))...) end @@ -157,12 +157,12 @@ end # Compute the DG volume term on the GPU for 2D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::False, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, volume_flux_fv = dg.volume_integral.volume_flux_dg, - dg.volume_integral.volume_flux_fv + volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -231,12 +231,12 @@ end # Compute the DG volume term on the GPU for 2D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::True, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, noncons_flux_dg = dg.volume_integral.volume_flux_dg - volume_flux_fv, noncons_flux_fv = dg.volume_integral.volume_flux_fv + volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights diff --git a/src/solvers/dg_2d_kernel.jl b/src/solvers/dg_2d_kernel.jl index 681c71a1..3a09632a 100644 --- a/src/solvers/dg_2d_kernel.jl +++ b/src/solvers/dg_2d_kernel.jl @@ -30,7 +30,7 @@ function flux_kernel!(flux_arr1, flux_arr2, u, equations::AbstractEquations{2}, end # Kernel for calculating weak form -function weak_form_kernel!(du, derivative_dhat, flux_arr1, flux_arr2) +function weak_form_kernel!(du, derivative_hat, flux_arr1, flux_arr2) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y k = (blockIdx().z - 1) * blockDim().z + threadIdx().z @@ -42,8 +42,8 @@ function weak_form_kernel!(du, derivative_dhat, flux_arr1, flux_arr2) @inbounds du[i, j1, j2, k] = zero(eltype(du)) # initialize `du` with zeros for ii in axes(du, 2) - @inbounds du[i, j1, j2, k] += derivative_dhat[j1, ii] * flux_arr1[i, ii, j2, k] + - derivative_dhat[j2, ii] * flux_arr2[i, j1, ii, k] + @inbounds du[i, j1, j2, k] += derivative_hat[j1, ii] * flux_arr1[i, ii, j2, k] + + derivative_hat[j2, ii] * flux_arr2[i, j1, ii, k] end end @@ -52,7 +52,7 @@ end ############################################################################## New optimization # Kernel for calculating volume integrals with weak form -function flux_weak_form_kernel!(du, u, derivative_dhat, +function flux_weak_form_kernel!(du, u, derivative_hat, equations::AbstractEquations{2}, flux::Any) # Set tile width tile_width = size(du, 2) @@ -72,9 +72,9 @@ function flux_weak_form_kernel!(du, u, derivative_dhat, # Tile the computation (restrict to one tile here) value = zero(eltype(du)) - # Load global `derivative_dhat` into shared memory + # Load global `derivative_hat` into shared memory # Transposed load - @inbounds shmem_dhat[ty1, ty2] = derivative_dhat[ty2, ty1] + @inbounds shmem_dhat[ty1, ty2] = derivative_hat[ty2, ty1] # Compute flux values u_node = get_node_vars(u, equations, ty1, ty2, k) diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index 88688e9e..ea5929ee 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -20,7 +20,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - derivative_dhat = dg.basis.derivative_dhat + derivative_hat = dg.basis.derivative_hat thread_per_block = size(du, 1) * size(du, 2)^3 shmem_per_block = (size(du, 2)^2 + size(du, 1) * 3 * size(du, 2)^3) * sizeof(RealT) @@ -29,7 +29,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms, threads = (size(du, 1), size(du, 2)^3, 1) blocks = (1, 1, size(du, 5)) @cuda threads=threads blocks=blocks shmem=shmem_per_block flux_weak_form_kernel!(du, u, - derivative_dhat, + derivative_hat, equations, flux) else @@ -42,9 +42,9 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms, flux_kernel(flux_arr1, flux_arr2, flux_arr3, u, equations, flux; kernel_configurator_2d(flux_kernel, size(u, 2)^3, size(u, 5))...) - weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_dhat, flux_arr1, + weak_form_kernel = @cuda launch=false weak_form_kernel!(du, derivative_hat, flux_arr1, flux_arr2, flux_arr3) - weak_form_kernel(du, derivative_dhat, flux_arr1, flux_arr2, flux_arr3; + weak_form_kernel(du, derivative_hat, flux_arr1, flux_arr2, flux_arr3; kernel_configurator_3d(weak_form_kernel, size(du, 1), size(du, 2)^3, size(du, 5))...) end @@ -173,12 +173,12 @@ end # Compute the DG volume term on the GPU for 3D problems using the hybrid DG # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::False, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, volume_flux_fv = dg.volume_integral.volume_flux_dg, - dg.volume_integral.volume_flux_fv + volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -257,12 +257,12 @@ end # Compute the DG volume term on the GPU for 3D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::True, - equations, volume_integral::VolumeIntegralShockCapturingHG, + equations, volume_integral::SupportedShockCapturingHG, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) - volume_flux_dg, noncons_flux_dg = dg.volume_integral.volume_flux_dg - volume_flux_fv, noncons_flux_fv = dg.volume_integral.volume_flux_fv + volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights diff --git a/src/solvers/dg_3d_kernel.jl b/src/solvers/dg_3d_kernel.jl index e2438edd..16288cba 100644 --- a/src/solvers/dg_3d_kernel.jl +++ b/src/solvers/dg_3d_kernel.jl @@ -36,7 +36,7 @@ function flux_kernel!(flux_arr1, flux_arr2, flux_arr3, u, equations::AbstractEqu end # Kernel for calculating weak form -function weak_form_kernel!(du, derivative_dhat, flux_arr1, flux_arr2, flux_arr3) +function weak_form_kernel!(du, derivative_hat, flux_arr1, flux_arr2, flux_arr3) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y k = (blockIdx().z - 1) * blockDim().z + threadIdx().z @@ -51,9 +51,9 @@ function weak_form_kernel!(du, derivative_dhat, flux_arr1, flux_arr2, flux_arr3) @inbounds du[i, j1, j2, j3, k] = zero(eltype(du)) # initialize `du` with zeros for ii in axes(du, 2) - @inbounds du[i, j1, j2, j3, k] += derivative_dhat[j1, ii] * flux_arr1[i, ii, j2, j3, k] + - derivative_dhat[j2, ii] * flux_arr2[i, j1, ii, j3, k] + - derivative_dhat[j3, ii] * flux_arr3[i, j1, j2, ii, k] + @inbounds du[i, j1, j2, j3, k] += derivative_hat[j1, ii] * flux_arr1[i, ii, j2, j3, k] + + derivative_hat[j2, ii] * flux_arr2[i, j1, ii, j3, k] + + derivative_hat[j3, ii] * flux_arr3[i, j1, j2, ii, k] end end @@ -62,7 +62,7 @@ end ############################################################################## New optimization # Kernel for calculating volume integrals with weak form -function flux_weak_form_kernel!(du, u, derivative_dhat, +function flux_weak_form_kernel!(du, u, derivative_hat, equations::AbstractEquations{3}, flux::Any) # Set tile width tile_width = size(du, 2) @@ -84,9 +84,9 @@ function flux_weak_form_kernel!(du, u, derivative_dhat, # Tile the computation (restrict to one tile here) value = zero(eltype(du)) - # Load global `derivative_dhat` into shared memory + # Load global `derivative_hat` into shared memory # Transposed load - @inbounds shmem_dhat[ty1, ty2] = derivative_dhat[ty2, ty1] + @inbounds shmem_dhat[ty1, ty2] = derivative_hat[ty2, ty1] # Compute flux values u_node = get_node_vars(u, equations, ty1, ty2, ty3, k) diff --git a/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index 85def4ea..272de139 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -1,7 +1,17 @@ +function check_gpu_volume_integral(volume_integral) + if volume_integral isa VolumeIntegralShockCapturingHGType + volume_integral isa SupportedShockCapturingHG || + throw(ArgumentError("GPU shock capturing requires flux differencing and first-order subcell finite volumes")) + volume_integral.volume_integral_default == volume_integral.volume_integral_blend_high_order || + throw(ArgumentError("GPU shock capturing requires the same default and blended high-order volume integral")) + end + return nothing +end + # Rewrite `DGSEM` in Trixi.jl to add the specialized parts of the arrays required to copy the arrays # from CPU to GPU. -# Maybe the return type of `DGSEMGPU` should be change? +# Construct a DG solver using this package's GPU basis and kernels. function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_flux = flux_central, @@ -9,8 +19,8 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, mortar = MortarL2GPU(basis)) surface_integral = SurfaceIntegralWeakForm(surface_flux) - # Since we use `LobattoLegendreBasisGPU`, the type degrades to `DG` if - # we create a new `DGSEMGPU` struct. + check_gpu_volume_integral(volume_integral) + # Preserve the GPU basis and mortar types in the DG solver. return DG{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end @@ -19,9 +29,8 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_integral::AbstractSurfaceIntegral, volume_integral = VolumeIntegralWeakForm(), mortar = MortarL2GPU(basis)) - - # Since we use `LobattoLegendreBasisGPU`, the type degrades to `DG` if - # we create a new `DGSEMGPU` struct. + check_gpu_volume_integral(volume_integral) + # Preserve the GPU basis and mortar types in the DG solver. return DG{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end @@ -45,10 +54,9 @@ function DGSEMGPU(; RealT = Float64, surface_flux = flux_central, surface_integral = SurfaceIntegralWeakForm(surface_flux), volume_integral = VolumeIntegralWeakForm()) + check_gpu_volume_integral(volume_integral) basis = LobattoLegendreBasisGPU(RealT, polydeg) - - # Since we use `LobattoLegendreBasisGPU`, the type degrades to `DG` if - # we create a new `DGSEMGPU` struct. + # Preserve the GPU basis and mortar types in the DG solver. return DGSEMGPU(basis, surface_integral, volume_integral) end diff --git a/src/solvers/indicators.jl b/src/solvers/indicators.jl index ac509cb2..97db22a4 100644 --- a/src/solvers/indicators.jl +++ b/src/solvers/indicators.jl @@ -4,7 +4,7 @@ # Same as `IndicatorHennemannGassner` in Trixi.jl but with `DG` signature # How to implement this in a better way? -function (indicator_hg::IndicatorHennemannGassner)(u, mesh, equations, dg::DG, cache; +function (indicator_hg::IndicatorHennemannGassner)(u, mesh, equations, dg::DG{<:LobattoLegendreBasisGPU}, cache; kwargs...) (; alpha_smooth) = indicator_hg (; alpha, alpha_tmp) = indicator_hg.cache diff --git a/src/solvers/indicators_1d.jl b/src/solvers/indicators_1d.jl index 08f16a8d..68869ca4 100644 --- a/src/solvers/indicators_1d.jl +++ b/src/solvers/indicators_1d.jl @@ -1,17 +1,6 @@ -# Currently hold cache for indicators on CPU -# Note that this should be optimized on GPU in the future. +# Reuse Trixi's host-side indicator cache, including its thread-indexed buffers. function create_cache(::Type{IndicatorHennemannGassner}, equations::AbstractEquations{1}, basis::LobattoLegendreBasisGPU) - alpha = Vector{real(basis)}() - alpha_tmp = similar(alpha) - - A = Array{real(basis), ndims(equations)} - - # Single indicator and modal arrays (single thread) - # Note: This can be optimized by moving to GPU but need to be careful about - # its actual performance. - indicator_threaded = [A(undef, nnodes(basis))] - modal_threaded = [A(undef, nnodes(basis))] - - return (; alpha, alpha_tmp, indicator_threaded, modal_threaded) + basis_cpu = LobattoLegendreBasis(real(basis), polydeg(basis)) + return create_cache(IndicatorHennemannGassner, equations, basis_cpu) end diff --git a/src/solvers/indicators_2d.jl b/src/solvers/indicators_2d.jl index 300ab7ac..355fc7b1 100644 --- a/src/solvers/indicators_2d.jl +++ b/src/solvers/indicators_2d.jl @@ -1,18 +1,6 @@ -# Currently hold cache for indicators on CPU -# Note that this should be optimized on GPU in the future. +# Reuse Trixi's host-side indicator cache, including its thread-indexed buffers. function create_cache(::Type{IndicatorHennemannGassner}, equations::AbstractEquations{2}, basis::LobattoLegendreBasisGPU) - alpha = Vector{real(basis)}() - alpha_tmp = similar(alpha) - - A = Array{real(basis), ndims(equations)} - - # Single indicator and modal arrays (single thread) - # Note: This can be optimized by moving to GPU but need to be careful about - # its actual performance. - indicator_threaded = [A(undef, nnodes(basis), nnodes(basis))] - modal_threaded = [A(undef, nnodes(basis), nnodes(basis))] - modal_tmp1_threaded = [A(undef, nnodes(basis), nnodes(basis))] - - return (; alpha, alpha_tmp, indicator_threaded, modal_threaded, modal_tmp1_threaded) + basis_cpu = LobattoLegendreBasis(real(basis), polydeg(basis)) + return create_cache(IndicatorHennemannGassner, equations, basis_cpu) end diff --git a/src/solvers/indicators_3d.jl b/src/solvers/indicators_3d.jl index 8c416d5b..dd748389 100644 --- a/src/solvers/indicators_3d.jl +++ b/src/solvers/indicators_3d.jl @@ -1,21 +1,6 @@ - -# Currently hold cache for indicators on CPU -# Note that this should be optimized on GPU in the future. +# Reuse Trixi's host-side indicator cache, including its thread-indexed buffers. function create_cache(::Type{IndicatorHennemannGassner}, equations::AbstractEquations{3}, basis::LobattoLegendreBasisGPU) - alpha = Vector{real(basis)}() - alpha_tmp = similar(alpha) - - A = Array{real(basis), ndims(equations)} - - # Single indicator and modal arrays (single thread) - # Note: This can be optimized by moving to GPU but need to be careful about - # its actual performance. - indicator_threaded = [A(undef, nnodes(basis), nnodes(basis), nnodes(basis))] - modal_threaded = [A(undef, nnodes(basis), nnodes(basis), nnodes(basis))] - modal_tmp1_threaded = [A(undef, nnodes(basis), nnodes(basis), nnodes(basis))] - modal_tmp2_threaded = [A(undef, nnodes(basis), nnodes(basis), nnodes(basis))] - - return (; alpha, alpha_tmp, indicator_threaded, modal_threaded, modal_tmp1_threaded, - modal_tmp2_threaded) + basis_cpu = LobattoLegendreBasis(real(basis), polydeg(basis)) + return create_cache(IndicatorHennemannGassner, equations, basis_cpu) end diff --git a/test/dependency_compatibility.jl b/test/dependency_compatibility.jl new file mode 100644 index 00000000..3a1e816c --- /dev/null +++ b/test/dependency_compatibility.jl @@ -0,0 +1,82 @@ +using Test +using CUDA, Trixi, TrixiCUDA + +@testset "Dependency compatibility" begin + equations = LinearScalarAdvectionEquation1D(1.0) + basis = LobattoLegendreBasis(3) + indicator = IndicatorHennemannGassner(equations, basis; variable = (u, equations) -> first(u)) + volume_integral = VolumeIntegralShockCapturingHG(indicator) + @test TrixiCUDA.check_gpu_volume_integral(volume_integral) === nothing + @test TrixiCUDA.check_gpu_volume_integral(VolumeIntegralWeakForm()) === nothing + + generalized = VolumeIntegralShockCapturingHGType(indicator; + volume_integral_default = VolumeIntegralWeakForm(), + volume_integral_blend_high_order = VolumeIntegralFluxDifferencing(flux_central), + volume_integral_blend_low_order = VolumeIntegralPureLGLFiniteVolume(flux_lax_friedrichs)) + @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(generalized) + different_fluxes = VolumeIntegralShockCapturingHGType(indicator; + volume_integral_default = VolumeIntegralFluxDifferencing(flux_central), + volume_integral_blend_high_order = VolumeIntegralFluxDifferencing(flux_lax_friedrichs), + volume_integral_blend_low_order = VolumeIntegralPureLGLFiniteVolume(flux_lax_friedrichs)) + @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(different_fluxes) + + # Exercise the host reference interfaces used by the GPU comparison tests. + for nd in 1:3 + equations = getproperty(Trixi, Symbol("LinearScalarAdvectionEquation$(nd)D"))(nd == 1 ? 1.0 : ntuple(_ -> 1.0, nd)) + coordinates_min = nd == 1 ? -1.0 : ntuple(_ -> -1.0, nd) + coordinates_max = nd == 1 ? 1.0 : ntuple(_ -> 1.0, nd) + mesh = TreeMesh(coordinates_min, coordinates_max; + initial_refinement_level = 1, periodicity = false) + solver = DGSEM(polydeg = 3, surface_flux = flux_lax_friedrichs) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, + solver; + boundary_conditions = BoundaryConditionDirichlet(initial_condition_convergence_test)) + ode = semidiscretize(semi, (0.0, 0.1)) + (; cache) = semi + u = Trixi.wrap_array(ode.u0, mesh, equations, solver, cache) + du = similar(u) + Trixi.set_zero!(du, solver, cache) + Trixi.calc_volume_integral!(nothing, du, u, mesh, + Trixi.have_nonconservative_terms(equations), equations, + solver.volume_integral, solver, cache) + if nd == 1 + Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.have_nonconservative_terms(equations), equations, + solver.surface_integral, solver, cache) + else + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, + Trixi.have_nonconservative_terms(equations), equations, + solver.surface_integral, solver, cache) + end + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) + Trixi.calc_boundary_flux!(nothing, cache, 0.0, semi.boundary_conditions, + mesh, equations, solver.surface_integral, solver) + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, + solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, 0.0, nothing, equations, solver, cache) + reference = similar(ode.u0) + ode.f(reference, ode.u0, ode.p, 0.0) + @test vec(du) ≈ reference + @test all(isfinite, du) + end + + if CUDA.functional() + for RealT in (Float32, Float64), degree in (1, 3, 5) + basis_cpu = LobattoLegendreBasis(RealT, degree) + basis_gpu = LobattoLegendreBasisGPU(RealT, degree) + @test Array(basis_gpu.derivative_hat) ≈ basis_cpu.derivative_hat + @test Array(basis_gpu.derivative_split) ≈ basis_cpu.derivative_split + @test Array(basis_gpu.derivative_split_transpose) ≈ transpose(basis_cpu.derivative_split) + expected_boundary = zeros(RealT, degree + 1, 2) + expected_boundary[1, 1] = first(basis_cpu.inverse_weights) + expected_boundary[end, 2] = last(basis_cpu.inverse_weights) + @test basis_gpu.boundary_interpolation ≈ expected_boundary + indicator = IndicatorHennemannGassner(LinearScalarAdvectionEquation1D(one(RealT)), basis_gpu; + variable = (u, equations) -> first(u)) + @test length(indicator.cache.indicator_threaded) == Threads.maxthreadid() + end + end +end diff --git a/test/runtests.jl b/test/runtests.jl index 097637ac..5ac90572 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -15,6 +15,8 @@ using CUDA println("- Max threads per block: ", TrixiCUDA.MAX_THREADS_PER_BLOCK) println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) + include("dependency_compatibility.jl") + @info "Starting TrixiCUDA test suite..." for (dim, path) in [("1D", "./tree_dgsem_1d/tree_dgsem_1d.jl"), ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), diff --git a/test/tree_dgsem_1d/advection_basic.jl b/test/tree_dgsem_1d/advection_basic.jl index 26eaf59f..529e3e76 100644 --- a/test/tree_dgsem_1d/advection_basic.jl +++ b/test/tree_dgsem_1d/advection_basic.jl @@ -17,10 +17,11 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, - solver) + solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,13 +52,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -76,29 +77,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/advection_extended.jl b/test/tree_dgsem_1d/advection_extended.jl index 51e36e25..31e5fb6d 100644 --- a/test/tree_dgsem_1d/advection_extended.jl +++ b/test/tree_dgsem_1d/advection_extended.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000, + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -56,13 +56,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -81,29 +81,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/burgers_basic.jl b/test/tree_dgsem_1d/burgers_basic.jl index 6770e38c..c278abc2 100644 --- a/test/tree_dgsem_1d/burgers_basic.jl +++ b/test/tree_dgsem_1d/burgers_basic.jl @@ -17,10 +17,11 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -51,13 +52,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -76,29 +77,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/burgers_rarefraction.jl b/test/tree_dgsem_1d/burgers_rarefraction.jl index 49a5f4cd..c762aa04 100644 --- a/test/tree_dgsem_1d/burgers_rarefraction.jl +++ b/test/tree_dgsem_1d/burgers_rarefraction.jl @@ -34,7 +34,7 @@ include("../test_macros.jl") mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, - n_cells_max = 10_000, + periodicity = false) # Discontinuous initial condition (Riemann Problem) leading to a rarefaction fan. @@ -92,13 +92,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -117,29 +117,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/burgers_shock.jl b/test/tree_dgsem_1d/burgers_shock.jl index ffba737b..4f95995f 100644 --- a/test/tree_dgsem_1d/burgers_shock.jl +++ b/test/tree_dgsem_1d/burgers_shock.jl @@ -35,7 +35,7 @@ include("../test_macros.jl") # Make sure to turn periodicity explicitly off as special boundary conditions are specified mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, - n_cells_max = 10_000, + periodicity = false) # Discontinuous initial condition (Riemann Problem) leading to a shock to test e.g. correct shock speed. @@ -93,13 +93,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -118,29 +118,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/euler_blast_wave.jl b/test/tree_dgsem_1d/euler_blast_wave.jl index add40741..8a922c1b 100644 --- a/test/tree_dgsem_1d/euler_blast_wave.jl +++ b/test/tree_dgsem_1d/euler_blast_wave.jl @@ -44,9 +44,10 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 6, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 12.5) @@ -76,13 +77,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -101,29 +102,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/euler_ec.jl b/test/tree_dgsem_1d/euler_ec.jl index 7186c89b..1e09d1c4 100644 --- a/test/tree_dgsem_1d/euler_ec.jl +++ b/test/tree_dgsem_1d/euler_ec.jl @@ -20,9 +20,10 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -52,13 +53,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -77,29 +78,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/euler_shock.jl b/test/tree_dgsem_1d/euler_shock.jl index 04819fd6..09248946 100644 --- a/test/tree_dgsem_1d/euler_shock.jl +++ b/test/tree_dgsem_1d/euler_shock.jl @@ -33,9 +33,10 @@ include("../test_macros.jl") coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -65,13 +66,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -90,29 +91,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/euler_source_terms.jl b/test/tree_dgsem_1d/euler_source_terms.jl index b0fe7be6..acea622c 100644 --- a/test/tree_dgsem_1d/euler_source_terms.jl +++ b/test/tree_dgsem_1d/euler_source_terms.jl @@ -17,10 +17,11 @@ include("../test_macros.jl") coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -51,13 +52,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -76,29 +77,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl index a0e81dfa..0116f6d9 100644 --- a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -58,13 +58,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -83,29 +83,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/eulermulti_ec.jl b/test/tree_dgsem_1d/eulermulti_ec.jl index 8938339e..b440095a 100644 --- a/test/tree_dgsem_1d/eulermulti_ec.jl +++ b/test/tree_dgsem_1d/eulermulti_ec.jl @@ -26,9 +26,10 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -58,13 +59,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -83,29 +84,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/eulermulti_es.jl b/test/tree_dgsem_1d/eulermulti_es.jl index 05856286..0a165c20 100644 --- a/test/tree_dgsem_1d/eulermulti_es.jl +++ b/test/tree_dgsem_1d/eulermulti_es.jl @@ -21,9 +21,10 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -53,13 +54,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -78,29 +79,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/eulerquasi_ec.jl b/test/tree_dgsem_1d/eulerquasi_ec.jl index a4389c82..7a139d6d 100644 --- a/test/tree_dgsem_1d/eulerquasi_ec.jl +++ b/test/tree_dgsem_1d/eulerquasi_ec.jl @@ -30,9 +30,10 @@ include("../test_macros.jl") coordinates_max = (1.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 6, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -62,13 +63,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -87,29 +88,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/eulerquasi_source_terms.jl b/test/tree_dgsem_1d/eulerquasi_source_terms.jl index 9a805735..38fc5c74 100644 --- a/test/tree_dgsem_1d/eulerquasi_source_terms.jl +++ b/test/tree_dgsem_1d/eulerquasi_source_terms.jl @@ -21,10 +21,11 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -55,13 +56,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -80,29 +81,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl index bac21ec2..13b92856 100644 --- a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl @@ -33,7 +33,7 @@ include("../test_macros.jl") coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 30_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -70,13 +70,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -95,29 +95,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl index 80a01312..41012d53 100644 --- a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -56,13 +56,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -81,29 +81,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/mhd_alfven_wave.jl b/test/tree_dgsem_1d/mhd_alfven_wave.jl index 72de5f42..a956ee83 100644 --- a/test/tree_dgsem_1d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_1d/mhd_alfven_wave.jl @@ -21,9 +21,10 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 2.0) @@ -53,13 +54,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -78,29 +79,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/mhd_ec.jl b/test/tree_dgsem_1d/mhd_ec.jl index f41e082f..822493cd 100644 --- a/test/tree_dgsem_1d/mhd_ec.jl +++ b/test/tree_dgsem_1d/mhd_ec.jl @@ -21,9 +21,10 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -53,13 +54,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -78,29 +79,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_1d/shallowwater_shock.jl b/test/tree_dgsem_1d/shallowwater_shock.jl index a763e893..056b584d 100644 --- a/test/tree_dgsem_1d/shallowwater_shock.jl +++ b/test/tree_dgsem_1d/shallowwater_shock.jl @@ -60,7 +60,7 @@ include("../test_macros.jl") coordinates_max = 3.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -95,13 +95,13 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) @@ -120,29 +120,29 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/advection_basic.jl b/test/tree_dgsem_2d/advection_basic.jl index b847c9fb..b0231bf7 100644 --- a/test/tree_dgsem_2d/advection_basic.jl +++ b/test/tree_dgsem_2d/advection_basic.jl @@ -17,10 +17,11 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, - solver) + solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,24 +52,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -76,13 +77,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -104,17 +105,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/advection_mortar.jl b/test/tree_dgsem_2d/advection_mortar.jl index c71694d4..3d813235 100644 --- a/test/tree_dgsem_2d/advection_mortar.jl +++ b/test/tree_dgsem_2d/advection_mortar.jl @@ -20,9 +20,10 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -52,24 +53,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -77,13 +78,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -105,17 +106,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/euler_blob_mortar.jl b/test/tree_dgsem_2d/euler_blob_mortar.jl index 3d1e90e1..cf31db1e 100644 --- a/test/tree_dgsem_2d/euler_blob_mortar.jl +++ b/test/tree_dgsem_2d/euler_blob_mortar.jl @@ -65,9 +65,10 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, refinement_patches = refinement_patches, - n_cells_max = 100_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 16.0) @@ -97,24 +98,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -122,13 +123,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -150,17 +151,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/euler_ec.jl b/test/tree_dgsem_2d/euler_ec.jl index 0efa559d..f35a4e3e 100644 --- a/test/tree_dgsem_2d/euler_ec.jl +++ b/test/tree_dgsem_2d/euler_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000, + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -55,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -80,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -108,17 +108,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/euler_shock.jl b/test/tree_dgsem_2d/euler_shock.jl index f5a2544a..c0cb64fe 100644 --- a/test/tree_dgsem_2d/euler_shock.jl +++ b/test/tree_dgsem_2d/euler_shock.jl @@ -33,9 +33,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -65,24 +66,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -90,13 +91,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -118,17 +119,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/euler_source_terms.jl b/test/tree_dgsem_2d/euler_source_terms.jl index 96861d49..2016fd86 100644 --- a/test/tree_dgsem_2d/euler_source_terms.jl +++ b/test/tree_dgsem_2d/euler_source_terms.jl @@ -16,10 +16,11 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -50,24 +51,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -75,13 +76,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -103,17 +104,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl index 1dc50cd9..e4c7df3f 100644 --- a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl @@ -23,7 +23,7 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -60,24 +60,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -85,13 +85,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -113,17 +113,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/eulermulti_ec.jl b/test/tree_dgsem_2d/eulermulti_ec.jl index d241edaa..8ec55079 100644 --- a/test/tree_dgsem_2d/eulermulti_ec.jl +++ b/test/tree_dgsem_2d/eulermulti_ec.jl @@ -21,9 +21,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -53,24 +54,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -78,13 +79,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -106,17 +107,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/eulermulti_es.jl b/test/tree_dgsem_2d/eulermulti_es.jl index 2e1e6321..4f0bbae1 100644 --- a/test/tree_dgsem_2d/eulermulti_es.jl +++ b/test/tree_dgsem_2d/eulermulti_es.jl @@ -26,9 +26,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -58,24 +59,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -83,13 +84,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -111,17 +112,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl index b836f6fc..c0c85246 100644 --- a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl @@ -22,7 +22,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000, + periodicity = (false, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -59,24 +59,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -84,13 +84,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -112,17 +112,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/mhd_alfven_wave.jl b/test/tree_dgsem_2d/mhd_alfven_wave.jl index 39697a07..5af1e9db 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave.jl @@ -7,7 +7,7 @@ include("../test_macros.jl") @testset "MHD Alfven Wave 2D" begin gamma = 5 / 3 - equations = IdealGlmMhdEquations2D(gamma) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -23,9 +23,10 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 2.0) @@ -55,24 +56,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -80,13 +81,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -108,17 +109,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl index e087d5b4..1d2cecc1 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl @@ -7,7 +7,7 @@ include("../test_macros.jl") @testset "MHD Alfven Wave Mortar 2D" begin gamma = 5 / 3 - equations = IdealGlmMhdEquations2D(gamma) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -28,9 +28,10 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 2.0) @@ -60,24 +61,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -85,13 +86,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -113,17 +114,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/mhd_ec.jl b/test/tree_dgsem_2d/mhd_ec.jl index f01b5fee..b44e0393 100644 --- a/test/tree_dgsem_2d/mhd_ec.jl +++ b/test/tree_dgsem_2d/mhd_ec.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD EC 2D" begin - equations = IdealGlmMhdEquations2D(1.4) + equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) initial_condition = initial_condition_weak_blast_wave @@ -22,9 +22,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -54,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -79,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -107,17 +108,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/mhd_shock.jl b/test/tree_dgsem_2d/mhd_shock.jl index 0c9335a2..df67e3c2 100644 --- a/test/tree_dgsem_2d/mhd_shock.jl +++ b/test/tree_dgsem_2d/mhd_shock.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Shock 2D" begin - equations = IdealGlmMhdEquations2D(1.4) + equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) initial_condition = initial_condition_weak_blast_wave @@ -33,9 +33,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -65,24 +66,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -90,13 +91,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -118,17 +119,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/shallowwater_ec.jl b/test/tree_dgsem_2d/shallowwater_ec.jl index babd5b86..a3732744 100644 --- a/test/tree_dgsem_2d/shallowwater_ec.jl +++ b/test/tree_dgsem_2d/shallowwater_ec.jl @@ -22,9 +22,10 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 2.0) @@ -54,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -79,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -107,17 +108,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/shallowwater_source_terms.jl b/test/tree_dgsem_2d/shallowwater_source_terms.jl index a7b8be25..5fc1fb04 100644 --- a/test/tree_dgsem_2d/shallowwater_source_terms.jl +++ b/test/tree_dgsem_2d/shallowwater_source_terms.jl @@ -22,11 +22,12 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -57,24 +58,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -82,13 +83,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -110,17 +111,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl index 75d39ea3..76b93552 100644 --- a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000, + periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -61,24 +61,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -86,13 +86,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -114,17 +114,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/advection_basic.jl b/test/tree_dgsem_3d/advection_basic.jl index b7338e64..252cc80b 100644 --- a/test/tree_dgsem_3d/advection_basic.jl +++ b/test/tree_dgsem_3d/advection_basic.jl @@ -17,10 +17,11 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 30_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, - solver) + solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -51,24 +52,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -76,13 +77,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -106,17 +107,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/advection_mortar.jl b/test/tree_dgsem_3d/advection_mortar.jl index 1308c12f..c3a54dda 100644 --- a/test/tree_dgsem_3d/advection_mortar.jl +++ b/test/tree_dgsem_3d/advection_mortar.jl @@ -22,9 +22,10 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 5.0) @@ -54,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -79,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -109,17 +110,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/euler_convergence.jl b/test/tree_dgsem_3d/euler_convergence.jl index 05bd1fe8..57a62aac 100644 --- a/test/tree_dgsem_3d/euler_convergence.jl +++ b/test/tree_dgsem_3d/euler_convergence.jl @@ -19,10 +19,11 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_eoc_test_euler) + source_terms = source_terms_eoc_test_euler, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_eoc_test_euler) @@ -53,24 +54,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -78,13 +79,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -108,17 +109,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/euler_ec.jl b/test/tree_dgsem_3d/euler_ec.jl index 9a11e1c2..8525899f 100644 --- a/test/tree_dgsem_3d/euler_ec.jl +++ b/test/tree_dgsem_3d/euler_ec.jl @@ -20,9 +20,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -52,24 +53,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -77,13 +78,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -107,17 +108,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/euler_mortar.jl b/test/tree_dgsem_3d/euler_mortar.jl index da747d37..212ca8f3 100644 --- a/test/tree_dgsem_3d/euler_mortar.jl +++ b/test/tree_dgsem_3d/euler_mortar.jl @@ -19,10 +19,11 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -53,24 +54,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -78,13 +79,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -108,17 +109,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/euler_shock.jl b/test/tree_dgsem_3d/euler_shock.jl index 97d71cb1..8277929d 100644 --- a/test/tree_dgsem_3d/euler_shock.jl +++ b/test/tree_dgsem_3d/euler_shock.jl @@ -33,9 +33,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 100_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -65,24 +66,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -90,13 +91,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -120,17 +121,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/euler_source_terms.jl b/test/tree_dgsem_3d/euler_source_terms.jl index 5c8bac32..b964db4c 100644 --- a/test/tree_dgsem_3d/euler_source_terms.jl +++ b/test/tree_dgsem_3d/euler_source_terms.jl @@ -19,10 +19,11 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - source_terms = source_terms_convergence_test) + source_terms = source_terms_convergence_test, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -53,24 +54,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -78,13 +79,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -108,17 +109,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl index a34c974a..7120f57f 100644 --- a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl @@ -23,7 +23,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 30_000, + periodicity = (false, true, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -60,24 +60,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -85,13 +85,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -115,17 +115,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl index e40817ca..c3b1723b 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Alfven Wave 3D" begin - equations = IdealGlmMhdEquations3D(5 / 3) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -22,9 +22,10 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -54,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -79,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -109,17 +110,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl index 81b62e63..5a6c5e2c 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Alfven Wave Mortar 3D" begin - equations = IdealGlmMhdEquations3D(5 / 3) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) initial_condition = initial_condition_convergence_test @@ -27,9 +27,10 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -59,24 +60,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -84,13 +85,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -114,17 +115,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/mhd_ec.jl b/test/tree_dgsem_3d/mhd_ec.jl index 08736a1d..081b3b5a 100644 --- a/test/tree_dgsem_3d/mhd_ec.jl +++ b/test/tree_dgsem_3d/mhd_ec.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD EC 3D" begin - equations = IdealGlmMhdEquations3D(1.4) + equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) initial_condition = initial_condition_weak_blast_wave @@ -22,9 +22,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 0.4) @@ -54,24 +55,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -79,13 +80,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -109,17 +110,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end diff --git a/test/tree_dgsem_3d/mhd_shock.jl b/test/tree_dgsem_3d/mhd_shock.jl index bc533db0..ab7ef9fd 100644 --- a/test/tree_dgsem_3d/mhd_shock.jl +++ b/test/tree_dgsem_3d/mhd_shock.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Shock 3D" begin - equations = IdealGlmMhdEquations3D(1.4) + equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) initial_condition = initial_condition_weak_blast_wave @@ -33,9 +33,10 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - n_cells_max = 10_000) + periodicity = true) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0, 1.0) @@ -65,24 +66,24 @@ include("../test_macros.jl") # Tests for semidiscretization process @test_approx (u_gpu, u) # du is initlaizaed as undefined, cannot test now - Trixi.reset_du!(du, solver, cache) + Trixi.set_zero!(du, solver, cache) TrixiCUDA.cuda_volume_integral!(du_gpu, u_gpu, mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu.volume_integral, solver_gpu, cache_gpu, cache_cpu) - Trixi.calc_volume_integral!(du, u, mesh, Trixi.have_nonconservative_terms(equations), + Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_prolong2interfaces!(u_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) + Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.interfaces.u, cache.interfaces.u) TrixiCUDA.cuda_interface_flux!(mesh_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, + Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.surface_integral, solver, cache) @test_approx (cache_gpu.elements.surface_flux_values, @@ -90,13 +91,13 @@ include("../test_macros.jl") TrixiCUDA.cuda_prolong2boundaries!(u_gpu, mesh_gpu, boundary_conditions_gpu, equations_gpu, cache_gpu) - Trixi.prolong2boundaries!(cache, u, mesh, equations, solver.surface_integral, solver) + Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) @test_approx (cache_gpu.boundaries.u, cache.boundaries.u) TrixiCUDA.cuda_boundary_flux!(t_gpu, mesh_gpu, boundary_conditions_gpu, Trixi.have_nonconservative_terms(equations_gpu), equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_boundary_flux!(cache, t, boundary_conditions, mesh, equations, + Trixi.calc_boundary_flux!(nothing, cache, t, boundary_conditions, mesh, equations, solver.surface_integral, solver) @test_approx (cache_gpu.elements.surface_flux_values, cache.elements.surface_flux_values) @@ -120,17 +121,17 @@ include("../test_macros.jl") cache.elements.surface_flux_values) TrixiCUDA.cuda_surface_integral!(du_gpu, mesh_gpu, equations_gpu, solver_gpu, cache_gpu) - Trixi.calc_surface_integral!(du, u, mesh, equations, solver.surface_integral, + Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_jacobian!(du_gpu, mesh_gpu, equations_gpu, cache_gpu) - Trixi.apply_jacobian!(du, mesh, equations, solver, cache) + Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) @test_approx (du_gpu, du) TrixiCUDA.cuda_sources!(du_gpu, u_gpu, t_gpu, source_terms_gpu, equations_gpu, cache_gpu) - Trixi.calc_sources!(du, u, t, source_terms, equations, solver, cache) + Trixi.calc_sources!(nothing, du, u, t, source_terms, equations, solver, cache) @test_approx (du_gpu, du) end From 06ddcfca1df0bc0bec7dec612ac19dcb00f94152 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Thu, 15 Oct 2026 17:32:40 +0800 Subject: [PATCH 02/28] Use descriptive dimension names in compatibility tests --- test/dependency_compatibility.jl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/dependency_compatibility.jl b/test/dependency_compatibility.jl index 3a1e816c..a0b3ed85 100644 --- a/test/dependency_compatibility.jl +++ b/test/dependency_compatibility.jl @@ -21,10 +21,11 @@ using CUDA, Trixi, TrixiCUDA @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(different_fluxes) # Exercise the host reference interfaces used by the GPU comparison tests. - for nd in 1:3 - equations = getproperty(Trixi, Symbol("LinearScalarAdvectionEquation$(nd)D"))(nd == 1 ? 1.0 : ntuple(_ -> 1.0, nd)) - coordinates_min = nd == 1 ? -1.0 : ntuple(_ -> -1.0, nd) - coordinates_max = nd == 1 ? 1.0 : ntuple(_ -> 1.0, nd) + for spatial_dimension in 1:3 + equations = getproperty(Trixi, Symbol("LinearScalarAdvectionEquation$(spatial_dimension)D"))(spatial_dimension == 1 ? 1.0 : + ntuple(_ -> 1.0, spatial_dimension)) + coordinates_min = spatial_dimension == 1 ? -1.0 : ntuple(_ -> -1.0, spatial_dimension) + coordinates_max = spatial_dimension == 1 ? 1.0 : ntuple(_ -> 1.0, spatial_dimension) mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 1, periodicity = false) solver = DGSEM(polydeg = 3, surface_flux = flux_lax_friedrichs) @@ -39,7 +40,7 @@ using CUDA, Trixi, TrixiCUDA Trixi.calc_volume_integral!(nothing, du, u, mesh, Trixi.have_nonconservative_terms(equations), equations, solver.volume_integral, solver, cache) - if nd == 1 + if spatial_dimension == 1 Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, Trixi.have_nonconservative_terms(equations), equations, From cac47bf9500fb3ef747de9229bce15f670da26dd Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Thu, 15 Oct 2026 17:37:22 +0800 Subject: [PATCH 03/28] Apply JuliaFormatter 2 formatting --- benchmark/advection_basic_1d.jl | 6 ++--- benchmark/advection_basic_2d.jl | 6 ++--- benchmark/advection_basic_3d.jl | 6 ++--- benchmark/advection_mortar_2d.jl | 6 ++--- benchmark/advection_mortar_3d.jl | 6 ++--- benchmark/euler_ec_1d.jl | 6 ++--- benchmark/euler_ec_2d.jl | 3 +-- benchmark/euler_ec_3d.jl | 6 ++--- benchmark/euler_shock_1d.jl | 6 ++--- benchmark/euler_shock_2d.jl | 6 ++--- benchmark/euler_shock_3d.jl | 6 ++--- benchmark/hypdiff_nonperiodic_1d.jl | 3 +-- benchmark/hypdiff_nonperiodic_2d.jl | 3 +-- benchmark/hypdiff_nonperiodic_3d.jl | 3 +-- benchmark/mhd_alfven_wave_1d.jl | 6 ++--- benchmark/mhd_alfven_wave_2d.jl | 6 ++--- benchmark/mhd_alfven_wave_3d.jl | 6 ++--- benchmark/mhd_alfven_wave_mortar_2d.jl | 5 ++-- benchmark/mhd_alfven_wave_mortar_3d.jl | 5 ++-- benchmark/mhd_ec_1d.jl | 6 ++--- benchmark/mhd_ec_2d.jl | 6 ++--- benchmark/mhd_ec_3d.jl | 6 ++--- benchmark/shallowwater_ec_1d.jl | 5 ++-- benchmark/shallowwater_ec_2d.jl | 5 ++-- benchmark/shallowwater_source_terms_1d.jl | 5 ++-- benchmark/shallowwater_source_terms_2d.jl | 5 ++-- examples/euler_ec_2d.jl | 1 - examples/hypdiff_nonperiodic_1d.jl | 1 - examples/hypdiff_nonperiodic_2d.jl | 1 - examples/hypdiff_nonperiodic_3d.jl | 1 - examples/shallowwater_dirichlet_1d.jl | 1 - examples/shallowwater_dirichlet_2d.jl | 1 - examples/shallowwater_source_terms_1d.jl | 1 - examples/shallowwater_source_terms_2d.jl | 1 - profile/profiling_kernel.jl | 2 +- profile/profiling_kernel2.jl | 2 +- profile/profiling_kernel3.jl | 2 +- src/TrixiCUDA.jl | 5 ++-- src/auxiliary/timer.jl | 4 ++-- .../semidiscretization_hyperbolic.jl | 11 +++++---- src/solvers/containers_1d.jl | 12 ++++------ src/solvers/containers_2d.jl | 24 +++++++------------ src/solvers/containers_3d.jl | 24 +++++++------------ src/solvers/solvers.jl | 2 +- test/runtests.jl | 4 ++-- test/tree_dgsem_1d/advection_extended.jl | 1 - test/tree_dgsem_1d/burgers_rarefraction.jl | 1 - test/tree_dgsem_1d/burgers_shock.jl | 1 - .../euler_source_terms_nonperiodic.jl | 1 - .../hypdiff_harmonic_nonperiodic.jl | 1 - test/tree_dgsem_1d/hypdiff_nonperiodic.jl | 1 - test/tree_dgsem_1d/shallowwater_shock.jl | 1 - test/tree_dgsem_2d/euler_ec.jl | 1 - .../euler_source_terms_nonperiodic.jl | 1 - test/tree_dgsem_2d/hypdiff_nonperiodic.jl | 1 - .../shallowwater_source_terms.jl | 1 - .../shawllowwater_source_terms_nonperiodic.jl | 1 - test/tree_dgsem_3d/hypdiff_nonperiodic.jl | 1 - 58 files changed, 100 insertions(+), 151 deletions(-) diff --git a/benchmark/advection_basic_1d.jl b/benchmark/advection_basic_1d.jl index 8f404682..61b6dbce 100644 --- a/benchmark/advection_basic_1d.jl +++ b/benchmark/advection_basic_1d.jl @@ -17,13 +17,13 @@ coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -63,7 +63,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/advection_basic_2d.jl b/benchmark/advection_basic_2d.jl index 1b8d0a10..c6439dd2 100644 --- a/benchmark/advection_basic_2d.jl +++ b/benchmark/advection_basic_2d.jl @@ -17,13 +17,13 @@ coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -63,7 +63,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/advection_basic_3d.jl b/benchmark/advection_basic_3d.jl index ef96d5eb..11718da1 100644 --- a/benchmark/advection_basic_3d.jl +++ b/benchmark/advection_basic_3d.jl @@ -17,13 +17,13 @@ coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, solver_gpu) @@ -63,7 +63,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/advection_mortar_2d.jl b/benchmark/advection_mortar_2d.jl index 9be96c44..5ef5a753 100644 --- a/benchmark/advection_mortar_2d.jl +++ b/benchmark/advection_mortar_2d.jl @@ -20,12 +20,12 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -64,7 +64,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/advection_mortar_3d.jl b/benchmark/advection_mortar_3d.jl index 2e96fd55..fbe9e629 100644 --- a/benchmark/advection_mortar_3d.jl +++ b/benchmark/advection_mortar_3d.jl @@ -22,12 +22,12 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0, -1.0f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 5.0f0) @@ -66,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_ec_1d.jl b/benchmark/euler_ec_1d.jl index 649bde98..d1c4a848 100644 --- a/benchmark/euler_ec_1d.jl +++ b/benchmark/euler_ec_1d.jl @@ -22,12 +22,12 @@ coordinates_min = (-2.0f0,) coordinates_max = (2.0f0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -66,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_ec_2d.jl b/benchmark/euler_ec_2d.jl index 2e2d03af..000980bc 100644 --- a/benchmark/euler_ec_2d.jl +++ b/benchmark/euler_ec_2d.jl @@ -22,7 +22,6 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = true, RealT = RealT) # Cache initialization @@ -67,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_ec_3d.jl b/benchmark/euler_ec_3d.jl index e7ce5ea0..f5b009fa 100644 --- a/benchmark/euler_ec_3d.jl +++ b/benchmark/euler_ec_3d.jl @@ -22,12 +22,12 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -66,7 +66,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_shock_1d.jl b/benchmark/euler_shock_1d.jl index c3ff0a4a..4a624fcd 100644 --- a/benchmark/euler_shock_1d.jl +++ b/benchmark/euler_shock_1d.jl @@ -35,12 +35,12 @@ coordinates_min = -2.0f0 coordinates_max = 2.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -79,7 +79,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_shock_2d.jl b/benchmark/euler_shock_2d.jl index 344626a0..82255c90 100644 --- a/benchmark/euler_shock_2d.jl +++ b/benchmark/euler_shock_2d.jl @@ -35,12 +35,12 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -79,7 +79,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/euler_shock_3d.jl b/benchmark/euler_shock_3d.jl index 744707b4..146d0c9c 100644 --- a/benchmark/euler_shock_3d.jl +++ b/benchmark/euler_shock_3d.jl @@ -35,13 +35,13 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -81,7 +81,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/hypdiff_nonperiodic_1d.jl b/benchmark/hypdiff_nonperiodic_1d.jl index 523d4a99..4e603fd1 100644 --- a/benchmark/hypdiff_nonperiodic_1d.jl +++ b/benchmark/hypdiff_nonperiodic_1d.jl @@ -21,7 +21,6 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false, RealT = RealT) @@ -69,7 +68,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/hypdiff_nonperiodic_2d.jl b/benchmark/hypdiff_nonperiodic_2d.jl index 7a6f0f3b..050d656c 100644 --- a/benchmark/hypdiff_nonperiodic_2d.jl +++ b/benchmark/hypdiff_nonperiodic_2d.jl @@ -24,7 +24,6 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = (false, true), RealT = RealT) @@ -72,7 +71,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/hypdiff_nonperiodic_3d.jl b/benchmark/hypdiff_nonperiodic_3d.jl index e8722187..fefc8faf 100644 --- a/benchmark/hypdiff_nonperiodic_3d.jl +++ b/benchmark/hypdiff_nonperiodic_3d.jl @@ -26,7 +26,6 @@ coordinates_min = (0.0f0, 0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = (false, true, true), RealT = RealT) @@ -74,7 +73,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_alfven_wave_1d.jl b/benchmark/mhd_alfven_wave_1d.jl index 60dbc7ab..e4fe64cf 100644 --- a/benchmark/mhd_alfven_wave_1d.jl +++ b/benchmark/mhd_alfven_wave_1d.jl @@ -21,12 +21,12 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -65,7 +65,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_alfven_wave_2d.jl b/benchmark/mhd_alfven_wave_2d.jl index 5c61a2fd..bc36de3d 100644 --- a/benchmark/mhd_alfven_wave_2d.jl +++ b/benchmark/mhd_alfven_wave_2d.jl @@ -23,12 +23,12 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -67,7 +67,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_alfven_wave_3d.jl b/benchmark/mhd_alfven_wave_3d.jl index 1dc0b997..c654f0aa 100644 --- a/benchmark/mhd_alfven_wave_3d.jl +++ b/benchmark/mhd_alfven_wave_3d.jl @@ -23,12 +23,12 @@ coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -67,7 +67,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_alfven_wave_mortar_2d.jl b/benchmark/mhd_alfven_wave_mortar_2d.jl index 4ff04741..049975ff 100644 --- a/benchmark/mhd_alfven_wave_mortar_2d.jl +++ b/benchmark/mhd_alfven_wave_mortar_2d.jl @@ -30,13 +30,12 @@ refinement_patches = ((type = "box", coordinates_min = 0.25f0 .* coordinates_max mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -75,7 +74,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_alfven_wave_mortar_3d.jl b/benchmark/mhd_alfven_wave_mortar_3d.jl index 294cbd5b..e84660a0 100644 --- a/benchmark/mhd_alfven_wave_mortar_3d.jl +++ b/benchmark/mhd_alfven_wave_mortar_3d.jl @@ -30,13 +30,12 @@ refinement_patches = ((type = "box", coordinates_min = (-0.5f0, -0.5f0, -0.5f0), mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 1.0f0) @@ -75,7 +74,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_ec_1d.jl b/benchmark/mhd_ec_1d.jl index f0adafe6..0e678122 100644 --- a/benchmark/mhd_ec_1d.jl +++ b/benchmark/mhd_ec_1d.jl @@ -23,12 +23,12 @@ coordinates_min = 0.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -67,7 +67,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_ec_2d.jl b/benchmark/mhd_ec_2d.jl index f3df3180..07a7fe7d 100644 --- a/benchmark/mhd_ec_2d.jl +++ b/benchmark/mhd_ec_2d.jl @@ -24,12 +24,12 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -68,7 +68,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/mhd_ec_3d.jl b/benchmark/mhd_ec_3d.jl index 7423f8a4..0f3087af 100644 --- a/benchmark/mhd_ec_3d.jl +++ b/benchmark/mhd_ec_3d.jl @@ -24,12 +24,12 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, + RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 0.4f0) @@ -68,7 +68,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/shallowwater_ec_1d.jl b/benchmark/shallowwater_ec_1d.jl index 5f34bf0d..50031944 100644 --- a/benchmark/shallowwater_ec_1d.jl +++ b/benchmark/shallowwater_ec_1d.jl @@ -45,13 +45,12 @@ coordinates_min = -1.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -90,7 +89,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/shallowwater_ec_2d.jl b/benchmark/shallowwater_ec_2d.jl index c41bda6b..81468c49 100644 --- a/benchmark/shallowwater_ec_2d.jl +++ b/benchmark/shallowwater_ec_2d.jl @@ -56,13 +56,12 @@ coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - RealT = RealT, periodicity = true) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) tspan = tspan_gpu = (0.0f0, 2.0f0) @@ -123,7 +122,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/shallowwater_source_terms_1d.jl b/benchmark/shallowwater_source_terms_1d.jl index 399bb4ff..52b2824b 100644 --- a/benchmark/shallowwater_source_terms_1d.jl +++ b/benchmark/shallowwater_source_terms_1d.jl @@ -24,14 +24,13 @@ coordinates_min = 0.0f0 coordinates_max = sqrt(2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = true, RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -71,7 +70,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/benchmark/shallowwater_source_terms_2d.jl b/benchmark/shallowwater_source_terms_2d.jl index 4d925f5a..36026a2b 100644 --- a/benchmark/shallowwater_source_terms_2d.jl +++ b/benchmark/shallowwater_source_terms_2d.jl @@ -24,14 +24,13 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = true, RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, source_terms = source_terms_convergence_test, - boundary_conditions = boundary_condition_periodic) + boundary_conditions = boundary_condition_periodic) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) @@ -71,7 +70,7 @@ dofs = Trixi.ndofsglobal(semi) # Benchmark on CPU and GPU @info "Benchmarking rhs! on CPU" cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, - solver, cache) + solver, cache) @info "Benchmarking rhs! on GPU" gpu_trial = @benchmark CUDA.@sync TrixiCUDA.rhs_gpu!(du_gpu, u_gpu, t_gpu, mesh_gpu, equations_gpu, diff --git a/examples/euler_ec_2d.jl b/examples/euler_ec_2d.jl index 0bffe2cd..8c7c64b0 100644 --- a/examples/euler_ec_2d.jl +++ b/examples/euler_ec_2d.jl @@ -17,7 +17,6 @@ coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - periodicity = true) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/hypdiff_nonperiodic_1d.jl b/examples/hypdiff_nonperiodic_1d.jl index 73904455..94fa4700 100644 --- a/examples/hypdiff_nonperiodic_1d.jl +++ b/examples/hypdiff_nonperiodic_1d.jl @@ -21,7 +21,6 @@ coordinates_min = 0.0 coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/hypdiff_nonperiodic_2d.jl b/examples/hypdiff_nonperiodic_2d.jl index 1a3ff231..cc5aa5eb 100644 --- a/examples/hypdiff_nonperiodic_2d.jl +++ b/examples/hypdiff_nonperiodic_2d.jl @@ -24,7 +24,6 @@ coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = (false, true)) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/hypdiff_nonperiodic_3d.jl b/examples/hypdiff_nonperiodic_3d.jl index 6ad2d260..b20926a8 100644 --- a/examples/hypdiff_nonperiodic_3d.jl +++ b/examples/hypdiff_nonperiodic_3d.jl @@ -25,7 +25,6 @@ coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - periodicity = (false, true, true)) semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver, diff --git a/examples/shallowwater_dirichlet_1d.jl b/examples/shallowwater_dirichlet_1d.jl index f519cba3..6d87cb2c 100644 --- a/examples/shallowwater_dirichlet_1d.jl +++ b/examples/shallowwater_dirichlet_1d.jl @@ -27,7 +27,6 @@ coordinates_min = 0.0 coordinates_max = sqrt(2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) # create the semi discretization object diff --git a/examples/shallowwater_dirichlet_2d.jl b/examples/shallowwater_dirichlet_2d.jl index a6b94b89..a11c8693 100644 --- a/examples/shallowwater_dirichlet_2d.jl +++ b/examples/shallowwater_dirichlet_2d.jl @@ -27,7 +27,6 @@ coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) # create the semi discretization object diff --git a/examples/shallowwater_source_terms_1d.jl b/examples/shallowwater_source_terms_1d.jl index a613767d..4558ba27 100644 --- a/examples/shallowwater_source_terms_1d.jl +++ b/examples/shallowwater_source_terms_1d.jl @@ -25,7 +25,6 @@ coordinates_min = 0.0 coordinates_max = sqrt(2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = true) # create the semi discretization object diff --git a/examples/shallowwater_source_terms_2d.jl b/examples/shallowwater_source_terms_2d.jl index 18700f9c..8632557c 100644 --- a/examples/shallowwater_source_terms_2d.jl +++ b/examples/shallowwater_source_terms_2d.jl @@ -25,7 +25,6 @@ coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = true) # create the semi discretization object diff --git a/profile/profiling_kernel.jl b/profile/profiling_kernel.jl index 604095cd..1242f2a8 100644 --- a/profile/profiling_kernel.jl +++ b/profile/profiling_kernel.jl @@ -29,7 +29,7 @@ coordinates_min = -2.0f0 coordinates_max = 2.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - RealT = RealT, + RealT = RealT, periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel2.jl b/profile/profiling_kernel2.jl index cddd2b92..d20d4f5f 100644 --- a/profile/profiling_kernel2.jl +++ b/profile/profiling_kernel2.jl @@ -29,7 +29,7 @@ coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - RealT = RealT, + RealT = RealT, periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel3.jl b/profile/profiling_kernel3.jl index a528fa2a..ccb8462f 100644 --- a/profile/profiling_kernel3.jl +++ b/profile/profiling_kernel3.jl @@ -29,7 +29,7 @@ coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - RealT = RealT, + RealT = RealT, periodicity = true) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 4212bd0e..15acb914 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -67,9 +67,8 @@ set_sqrt_type!("sqrt_Base") set_loop_vectorization!(false) # The existing GPU kernels implement the classic first-order HG blend. -const SupportedShockCapturingHG = VolumeIntegralShockCapturingHGType{ - <:Any, <:VolumeIntegralFluxDifferencing, <:VolumeIntegralFluxDifferencing, - <:VolumeIntegralPureLGLFiniteVolume} +const SupportedShockCapturingHG = VolumeIntegralShockCapturingHGType{<:Any, <:VolumeIntegralFluxDifferencing, <:VolumeIntegralFluxDifferencing, + <:VolumeIntegralPureLGLFiniteVolume} # Include other source files include("auxiliary/auxiliary.jl") diff --git a/src/auxiliary/timer.jl b/src/auxiliary/timer.jl index 1ce97623..a6cfcd77 100644 --- a/src/auxiliary/timer.jl +++ b/src/auxiliary/timer.jl @@ -42,8 +42,8 @@ macro timer(args...) end local val, cpu_time, - cpu_alloc_size, cpu_gc_time, cpu_mem_stats, - gpu_alloc_size, gpu_mem_time, gpu_mem_stats = CUDA.@timed $(esc(expr)) # synchronize in CUDA.@timed + cpu_alloc_size, cpu_gc_time, cpu_mem_stats, + gpu_alloc_size, gpu_mem_time, gpu_mem_stats = CUDA.@timed $(esc(expr)) # synchronize in CUDA.@timed local cpu_alloc_count = Base.gc_alloc_count(cpu_mem_stats) local gpu_alloc_count = gpu_mem_stats.alloc_count diff --git a/src/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index a3a44e88..0205dde9 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -68,11 +68,12 @@ function SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, sol cache_gpu = (; create_cache_gpu(mesh, equations, solver, RealT, uEltype)..., initial_cache_gpu...) - cache_cpu = (; create_cache(mesh, equations, - DGSEM(RealT = real(solver), polydeg = polydeg(solver), - surface_integral = solver.surface_integral, - volume_integral = solver.volume_integral), - RealT, uEltype)..., + cache_cpu = (; + create_cache(mesh, equations, + DGSEM(RealT = real(solver), polydeg = polydeg(solver), + surface_integral = solver.surface_integral, + volume_integral = solver.volume_integral), + RealT, uEltype)..., initial_cache_cpu...) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, diff --git a/src/solvers/containers_1d.jl b/src/solvers/containers_1d.jl index 68e07359..d939ac04 100644 --- a/src/solvers/containers_1d.jl +++ b/src/solvers/containers_1d.jl @@ -13,11 +13,9 @@ mutable struct ElementContainerGPU1D{RealT <: Real, uEltype <: Real} <: Abstract function ElementContainerGPU1D{RealT, uEltype}(dims_inverse_jacobian::NTuple{1, Int}, dims_node_coordinates::NTuple{3, Int}, dims_surface_flux_values::NTuple{3, Int}, - dims_cell_ids::NTuple{1, Int}) where { - RealT, + dims_cell_ids::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} inverse_jacobian = CuArray{RealT}(undef, dims_inverse_jacobian...) node_coordinates = CuArray{RealT}(undef, dims_node_coordinates...) surface_flux_values = CuArray{uEltype}(undef, dims_surface_flux_values...) @@ -107,11 +105,9 @@ mutable struct BoundaryContainerGPU1D{RealT <: Real, uEltype <: Real} <: Abstrac dims_orientations::NTuple{1, Int}, dims_neighbor_sides::NTuple{1, Int}, dims_node_coordinates::NTuple{2, Int}, - dims_n_boundaries_per_direction::NTuple{1, Int}) where { - RealT, + dims_n_boundaries_per_direction::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} u = CuArray{uEltype}(undef, dims_u...) neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) orientations = CuArray{Int}(undef, dims_orientations...) diff --git a/src/solvers/containers_2d.jl b/src/solvers/containers_2d.jl index 827a0100..ea3f239d 100644 --- a/src/solvers/containers_2d.jl +++ b/src/solvers/containers_2d.jl @@ -13,11 +13,9 @@ mutable struct ElementContainerGPU2D{RealT <: Real, uEltype <: Real} <: Abstract function ElementContainerGPU2D{RealT, uEltype}(dims_inverse_jacobian::NTuple{1, Int}, dims_node_coordinates::NTuple{4, Int}, dims_surface_flux_values::NTuple{4, Int}, - dims_cell_ids::NTuple{1, Int}) where { - RealT, + dims_cell_ids::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} inverse_jacobian = CuArray{RealT}(undef, dims_inverse_jacobian...) node_coordinates = CuArray{RealT}(undef, dims_node_coordinates...) surface_flux_values = CuArray{uEltype}(undef, dims_surface_flux_values...) @@ -62,10 +60,8 @@ mutable struct InterfaceContainerGPU2D{uEltype <: Real} <: AbstractContainer # Inner constructor function InterfaceContainerGPU2D{uEltype}(dims_u::NTuple{4, Int}, dims_neighbor_ids::NTuple{2, Int}, - dims_orientations::NTuple{1, Int}) where { - uEltype <: - Real - } + dims_orientations::NTuple{1, Int}) where {uEltype <: + Real} u = CuArray{uEltype}(undef, dims_u...) neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) orientations = CuArray{Int}(undef, dims_orientations...) @@ -110,11 +106,9 @@ mutable struct BoundaryContainerGPU2D{RealT <: Real, uEltype <: Real} <: Abstrac dims_orientations::NTuple{1, Int}, dims_neighbor_sides::NTuple{1, Int}, dims_node_coordinates::NTuple{3, Int}, - dims_n_boundaries_per_direction::NTuple{1, Int}) where { - RealT, + dims_n_boundaries_per_direction::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} u = CuArray{uEltype}(undef, dims_u...) neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) orientations = CuArray{Int}(undef, dims_orientations...) @@ -167,10 +161,8 @@ mutable struct L2MortarContainerGPU2D{uEltype <: Real} <: AbstractContainer dims_u_lower::NTuple{4, Int}, dims_neighbor_ids::NTuple{2, Int}, dims_large_sides::NTuple{1, Int}, - dims_orientations::NTuple{1, Int}) where { - uEltype <: - Real - } + dims_orientations::NTuple{1, Int}) where {uEltype <: + Real} u_upper = CUDA.zeros(dims_u_upper...) # initialize with zeros u_lower = CUDA.zeros(dims_u_lower...) # initialize with zeros neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) diff --git a/src/solvers/containers_3d.jl b/src/solvers/containers_3d.jl index 8a048fb1..a81afe72 100644 --- a/src/solvers/containers_3d.jl +++ b/src/solvers/containers_3d.jl @@ -13,11 +13,9 @@ mutable struct ElementContainerGPU3D{RealT <: Real, uEltype <: Real} <: Abstract function ElementContainerGPU3D{RealT, uEltype}(dims_inverse_jacobian::NTuple{1, Int}, dims_node_coordinates::NTuple{5, Int}, dims_surface_flux_values::NTuple{5, Int}, - dims_cell_ids::NTuple{1, Int}) where { - RealT, + dims_cell_ids::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} inverse_jacobian = CuArray{RealT}(undef, dims_inverse_jacobian...) node_coordinates = CuArray{RealT}(undef, dims_node_coordinates...) surface_flux_values = CuArray{uEltype}(undef, dims_surface_flux_values...) @@ -62,10 +60,8 @@ mutable struct InterfaceContainerGPU3D{uEltype <: Real} <: AbstractContainer # Inner constructor function InterfaceContainerGPU3D{uEltype}(dims_u::NTuple{5, Int}, dims_neighbor_ids::NTuple{2, Int}, - dims_orientations::NTuple{1, Int}) where { - uEltype <: - Real - } + dims_orientations::NTuple{1, Int}) where {uEltype <: + Real} u = CuArray{uEltype}(undef, dims_u...) neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) orientations = CuArray{Int}(undef, dims_orientations...) @@ -110,11 +106,9 @@ mutable struct BoundaryContainerGPU3D{RealT <: Real, uEltype <: Real} <: Abstrac dims_orientations::NTuple{1, Int}, dims_neighbor_sides::NTuple{1, Int}, dims_node_coordinates::NTuple{4, Int}, - dims_n_boundaries_per_direction::NTuple{1, Int}) where { - RealT, + dims_n_boundaries_per_direction::NTuple{1, Int}) where {RealT, uEltype <: - Real - } + Real} u = CuArray{uEltype}(undef, dims_u...) neighbor_ids = CuArray{Int}(undef, dims_neighbor_ids...) orientations = CuArray{Int}(undef, dims_orientations...) @@ -173,10 +167,8 @@ mutable struct L2MortarContainerGPU3D{uEltype <: Real} <: AbstractContainer dims_u_lower_right::NTuple{5, Int}, dims_neighbor_ids::NTuple{2, Int}, dims_large_sides::NTuple{1, Int}, - dims_orientations::NTuple{1, Int}) where { - uEltype <: - Real - } + dims_orientations::NTuple{1, Int}) where {uEltype <: + Real} u_upper_left = CUDA.zeros(dims_u_upper_left...) # initialize with zeros u_upper_right = CUDA.zeros(dims_u_upper_right...) # initialize with zeros u_lower_left = CUDA.zeros(dims_u_lower_left...) # initialize with zeros diff --git a/src/solvers/solvers.jl b/src/solvers/solvers.jl index e477a5cd..bc807676 100644 --- a/src/solvers/solvers.jl +++ b/src/solvers/solvers.jl @@ -17,7 +17,7 @@ include("dg.jl") # See also `rhs!` function in Trixi.jl function rhs_gpu!(du_ode, u_ode, semi::SemidiscretizationHyperbolicGPU, t) (; mesh, equations, boundary_conditions, source_terms, solver, - cache_gpu, cache_cpu) = semi + cache_gpu, cache_cpu) = semi # In Trixi.jl, function `wrap_array` is called to adapt adaptive mesh refinement (AMR). # For more details, see https://trixi-framework.github.io/Trixi.jl/stable/conventions/#Array-types-and-wrapping diff --git a/test/runtests.jl b/test/runtests.jl index 5ac90572..b15b41c6 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -19,8 +19,8 @@ using CUDA @info "Starting TrixiCUDA test suite..." for (dim, path) in [("1D", "./tree_dgsem_1d/tree_dgsem_1d.jl"), - ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), - ("3D", "./tree_dgsem_3d/tree_dgsem_3d.jl")] + ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), + ("3D", "./tree_dgsem_3d/tree_dgsem_3d.jl")] @info "Running tests of $dim Galerkin spectral element method with tree mesh on GPU..." @time include(path) @info "Completed tests of $dim Galerkin spectral element method with tree mesh on GPU..." diff --git a/test/tree_dgsem_1d/advection_extended.jl b/test/tree_dgsem_1d/advection_extended.jl index 31e5fb6d..463adfbb 100644 --- a/test/tree_dgsem_1d/advection_extended.jl +++ b/test/tree_dgsem_1d/advection_extended.jl @@ -21,7 +21,6 @@ include("../test_macros.jl") mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_1d/burgers_rarefraction.jl b/test/tree_dgsem_1d/burgers_rarefraction.jl index c762aa04..17fb15d3 100644 --- a/test/tree_dgsem_1d/burgers_rarefraction.jl +++ b/test/tree_dgsem_1d/burgers_rarefraction.jl @@ -34,7 +34,6 @@ include("../test_macros.jl") mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, - periodicity = false) # Discontinuous initial condition (Riemann Problem) leading to a rarefaction fan. diff --git a/test/tree_dgsem_1d/burgers_shock.jl b/test/tree_dgsem_1d/burgers_shock.jl index 4f95995f..5bade26e 100644 --- a/test/tree_dgsem_1d/burgers_shock.jl +++ b/test/tree_dgsem_1d/burgers_shock.jl @@ -35,7 +35,6 @@ include("../test_macros.jl") # Make sure to turn periodicity explicitly off as special boundary conditions are specified mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, - periodicity = false) # Discontinuous initial condition (Riemann Problem) leading to a shock to test e.g. correct shock speed. diff --git a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl index 0116f6d9..f57215ae 100644 --- a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl @@ -21,7 +21,6 @@ include("../test_macros.jl") coordinates_max = (2.0,) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl index 13b92856..059724b2 100644 --- a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl @@ -33,7 +33,6 @@ include("../test_macros.jl") coordinates_max = 2.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl index 41012d53..559ae777 100644 --- a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl @@ -19,7 +19,6 @@ include("../test_macros.jl") coordinates_max = 1.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_1d/shallowwater_shock.jl b/test/tree_dgsem_1d/shallowwater_shock.jl index 056b584d..a6627a3c 100644 --- a/test/tree_dgsem_1d/shallowwater_shock.jl +++ b/test/tree_dgsem_1d/shallowwater_shock.jl @@ -60,7 +60,6 @@ include("../test_macros.jl") coordinates_max = 3.0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_2d/euler_ec.jl b/test/tree_dgsem_2d/euler_ec.jl index f35a4e3e..b66c19aa 100644 --- a/test/tree_dgsem_2d/euler_ec.jl +++ b/test/tree_dgsem_2d/euler_ec.jl @@ -20,7 +20,6 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, - periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl index e4c7df3f..6fe163ae 100644 --- a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl @@ -23,7 +23,6 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl index c0c85246..4bacb92a 100644 --- a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl @@ -22,7 +22,6 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = (false, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_2d/shallowwater_source_terms.jl b/test/tree_dgsem_2d/shallowwater_source_terms.jl index 5fc1fb04..19fb68fc 100644 --- a/test/tree_dgsem_2d/shallowwater_source_terms.jl +++ b/test/tree_dgsem_2d/shallowwater_source_terms.jl @@ -22,7 +22,6 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl index 76b93552..44c48904 100644 --- a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl @@ -24,7 +24,6 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl index 7120f57f..a8245f29 100644 --- a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl @@ -23,7 +23,6 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - periodicity = (false, true, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, From 8789a2a538135c056fc775c23ee29df2acdd51a8 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 16 Oct 2026 10:19:44 +0800 Subject: [PATCH 04/28] Fix GPU array dispatch and CUDA 6 device attributes --- src/TrixiCUDA.jl | 2 +- src/auxiliary/auxiliary.jl | 6 +++--- src/solvers/dg.jl | 14 +++++++------- test/dependency_compatibility.jl | 30 ++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 15acb914..9fcc4456 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -5,7 +5,7 @@ using CUDA using CUDA: @cuda, CuArray, HostKernel, threadIdx, blockIdx, blockDim, reshape, similar, launch_configuration -using GPUArraysCore: AbstractGPUArray +using GPUArraysCore: AbstractGPUVector using Printf: @printf, @sprintf using SciMLBase: ODEProblem, FullSpecialize diff --git a/src/auxiliary/auxiliary.jl b/src/auxiliary/auxiliary.jl index 00ec5b99..75073eb9 100644 --- a/src/auxiliary/auxiliary.jl +++ b/src/auxiliary/auxiliary.jl @@ -9,9 +9,9 @@ function init_device() device = CUDA.device() # Get the device properties - global MULTIPROCESSOR_COUNT = CUDA.attribute(device, CUDA.CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT) - global MAX_THREADS_PER_BLOCK = CUDA.attribute(device, CUDA.CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK) - global MAX_SHARED_MEMORY_PER_BLOCK = CUDA.attribute(device, CUDA.CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK) + global MULTIPROCESSOR_COUNT = CUDA.attribute(device, CUDA.DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT) + global MAX_THREADS_PER_BLOCK = CUDA.attribute(device, CUDA.DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK) + global MAX_SHARED_MEMORY_PER_BLOCK = CUDA.attribute(device, CUDA.DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK) catch e # Handle the errors if e isa CUDA.CuError diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl index 16a35364..cf583eaf 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -1,7 +1,7 @@ # Do we really need to compute the coefficients on the GPU, and do we need to # initialize `du` and `u` with a 1D shape, as Trixi.jl does? -# Adapt a general polynomial degree function since `DGSEMGPU` gives a `DG` type +# Get the polynomial degree from the solver basis. @inline polydeg(dg::DG) = polydeg(dg.basis) # Based on benchmarks, using `reshape` is faster than `unsafe_wrap` for GPU arrays (why?), @@ -10,9 +10,10 @@ # Can we make `unsafe_wrap` faster on GPU arrays? -# Should we use `CuArray` or `AbstractGPUArray`? -@inline function wrap_array(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, - dg::DG, cache) +# Specialize both the vector and solver arguments to avoid ambiguity with Trixi's +# AbstractVector/DGSEM method. +@inline function wrap_array(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, + dg::DGSEM, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) @@ -20,9 +21,8 @@ nelements(dg, cache)) end -# Should we use `CuArray` or `AbstractGPUArray`? -@inline function wrap_array_native(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, - dg::DG, cache) +@inline function wrap_array_native(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, + dg::DGSEM, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) diff --git a/test/dependency_compatibility.jl b/test/dependency_compatibility.jl index a0b3ed85..600cba04 100644 --- a/test/dependency_compatibility.jl +++ b/test/dependency_compatibility.jl @@ -20,6 +20,11 @@ using CUDA, Trixi, TrixiCUDA volume_integral_blend_low_order = VolumeIntegralPureLGLFiniteVolume(flux_lax_friedrichs)) @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(different_fluxes) + # These public CUDA constants must resolve even on hosts without a GPU. + @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT) + @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK) + @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK) + # Exercise the host reference interfaces used by the GPU comparison tests. for spatial_dimension in 1:3 equations = getproperty(Trixi, Symbol("LinearScalarAdvectionEquation$(spatial_dimension)D"))(spatial_dimension == 1 ? 1.0 : @@ -62,9 +67,34 @@ using CUDA, Trixi, TrixiCUDA ode.f(reference, ode.u0, ode.p, 0.0) @test vec(du) ≈ reference @test all(isfinite, du) + + # Check GPU-vector dispatch without allocating device memory. This also + # runs in the CPU-only dependency CI jobs. + for RealT in (Float32, Float64) + argument_types = Tuple{CuArray{RealT, 1, CUDA.DeviceMemory}, typeof(mesh), + typeof(equations), typeof(solver), typeof(cache)} + @test which(Trixi.wrap_array, argument_types).module === TrixiCUDA + @test which(Trixi.wrap_array_native, argument_types).module === TrixiCUDA + end + + if CUDA.functional() + solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs) + u_gpu_flat = CuArray(ode.u0) + GC.@preserve u_gpu_flat begin + for wrap in (Trixi.wrap_array, Trixi.wrap_array_native) + u_gpu = wrap(u_gpu_flat, mesh, equations, solver_gpu, cache) + @test size(u_gpu) == size(u) + @test Array(u_gpu) ≈ Array(u) + @test pointer(u_gpu) == pointer(u_gpu_flat) + end + end + end end if CUDA.functional() + @test TrixiCUDA.MULTIPROCESSOR_COUNT > 0 + @test TrixiCUDA.MAX_THREADS_PER_BLOCK > 0 + @test TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK > 0 for RealT in (Float32, Float64), degree in (1, 3, 5) basis_cpu = LobattoLegendreBasis(RealT, degree) basis_gpu = LobattoLegendreBasisGPU(RealT, degree) From 51e5dc95de4a3c852298f6d28e60492ffd5f3f32 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 16 Oct 2026 10:51:07 +0800 Subject: [PATCH 05/28] Support multidimensional GPU states without dispatch ambiguity --- src/TrixiCUDA.jl | 2 +- src/solvers/dg.jl | 22 ++++++++++++++++++++-- test/dependency_compatibility.jl | 27 +++++++++++++++++++++------ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 9fcc4456..e06e3cb1 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -5,7 +5,7 @@ using CUDA using CUDA: @cuda, CuArray, HostKernel, threadIdx, blockIdx, blockDim, reshape, similar, launch_configuration -using GPUArraysCore: AbstractGPUVector +using GPUArraysCore: AbstractGPUArray, AbstractGPUVector using Printf: @printf, @sprintf using SciMLBase: ODEProblem, FullSpecialize diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl index cf583eaf..5f667034 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -10,10 +10,19 @@ # Can we make `unsafe_wrap` faster on GPU arrays? -# Specialize both the vector and solver arguments to avoid ambiguity with Trixi's -# AbstractVector/DGSEM method. +# Accept both flat ODE vectors and the shaped state returned by semidiscretizeGPU. +# The vector specialization resolves the overlap with Trixi's AbstractVector method. +@inline function wrap_array(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, + dg::DGSEM, cache) + wrap_array_gpu(u_ode, mesh, equations, dg, cache) +end + @inline function wrap_array(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, dg::DGSEM, cache) + wrap_array_gpu(u_ode, mesh, equations, dg, cache) +end + +@inline function wrap_array_gpu(u_ode, mesh, equations, dg, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) @@ -21,8 +30,17 @@ nelements(dg, cache)) end +@inline function wrap_array_native(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, + dg::DGSEM, cache) + wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) +end + @inline function wrap_array_native(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, dg::DGSEM, cache) + wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) +end + +@inline function wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) diff --git a/test/dependency_compatibility.jl b/test/dependency_compatibility.jl index 600cba04..50c5f23b 100644 --- a/test/dependency_compatibility.jl +++ b/test/dependency_compatibility.jl @@ -68,10 +68,10 @@ using CUDA, Trixi, TrixiCUDA @test vec(du) ≈ reference @test all(isfinite, du) - # Check GPU-vector dispatch without allocating device memory. This also - # runs in the CPU-only dependency CI jobs. - for RealT in (Float32, Float64) - argument_types = Tuple{CuArray{RealT, 1, CUDA.DeviceMemory}, typeof(mesh), + # Check both flat and already-shaped GPU inputs without allocating device + # memory, so CPU-only CI also covers the semidiscretizeGPU return shape. + for RealT in (Float32, Float64), array_dimension in (1, spatial_dimension + 2) + argument_types = Tuple{CuArray{RealT, array_dimension, CUDA.DeviceMemory}, typeof(mesh), typeof(equations), typeof(solver), typeof(cache)} @test which(Trixi.wrap_array, argument_types).module === TrixiCUDA @test which(Trixi.wrap_array_native, argument_types).module === TrixiCUDA @@ -81,13 +81,28 @@ using CUDA, Trixi, TrixiCUDA solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs) u_gpu_flat = CuArray(ode.u0) GC.@preserve u_gpu_flat begin - for wrap in (Trixi.wrap_array, Trixi.wrap_array_native) - u_gpu = wrap(u_gpu_flat, mesh, equations, solver_gpu, cache) + for wrap in (Trixi.wrap_array, Trixi.wrap_array_native), + input in (u_gpu_flat, reshape(u_gpu_flat, size(u))) + u_gpu = wrap(input, mesh, equations, solver_gpu, cache) @test size(u_gpu) == size(u) @test Array(u_gpu) ≈ Array(u) @test pointer(u_gpu) == pointer(u_gpu_flat) end end + + # Exercise the actual initialization and RHS path, where the ODE + # state is already a multidimensional CuArray. + semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, + initial_condition_convergence_test, + solver_gpu; + boundary_conditions = BoundaryConditionDirichlet(initial_condition_convergence_test)) + ode_gpu = semidiscretizeGPU(semi_gpu, (0.0, 0.1)) + u_gpu = Trixi.wrap_array(ode_gpu.u0, semi_gpu) + @test size(u_gpu) == size(u) + @test Array(u_gpu) ≈ Array(u) + du_gpu = similar(ode_gpu.u0) + ode_gpu.f(du_gpu, ode_gpu.u0, ode_gpu.p, 0.0) + @test vec(Array(du_gpu)) ≈ reference end end From d9d82581a8a395af3a022fa7226871c6fbd2ae44 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 16 Oct 2026 10:58:29 +0800 Subject: [PATCH 06/28] Resolve the local package in documentation CI --- .buildkite/pipeline.yml | 1 + docs/Project.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 117f091d..b072e602 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -48,6 +48,7 @@ steps: Pkg.instantiate() Pkg.build() Pkg.activate("docs") + Pkg.develop(path=pwd()) Pkg.instantiate() push!(LOAD_PATH, @__DIR__) diff --git a/docs/Project.toml b/docs/Project.toml index 7fbc25f7..6fd83011 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -3,7 +3,7 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" TrixiCUDA = "5056661c-942a-472c-b3bc-01507f717a60" [sources] -TrixiCUDA = {path = "/workspace/scratch/6354733ba1f5/TrixiCUDA.jl"} +TrixiCUDA = {path = ".."} [compat] Documenter = "1.19" From 3b2965f140b5f8148a50b33cd378d7a54f800193 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 16 Oct 2026 11:02:35 +0800 Subject: [PATCH 07/28] Use the current finite volume flux field in shock capturing --- src/solvers/dg_1d.jl | 4 ++-- src/solvers/dg_2d.jl | 4 ++-- src/solvers/dg_3d.jl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index 97cc111a..716998f6 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -143,7 +143,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -205,7 +205,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index f7195356..bfc6ccf8 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -162,7 +162,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -236,7 +236,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index ea5929ee..a8a76059 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -178,7 +178,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -262,7 +262,7 @@ function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms:: RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux - volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux + volume_flux_fv, noncons_flux_fv = volume_integral.volume_integral_blend_low_order.volume_flux_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights From 35e34c92cbd0df1bacf71fe6c4fc77a4915031a3 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Tue, 20 Oct 2026 22:55:25 +0800 Subject: [PATCH 08/28] Restore Aqua quality tests and update dependency compatibility --- Project.toml | 4 ++-- test/runtests.jl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index 57340087..081fe168 100644 --- a/Project.toml +++ b/Project.toml @@ -15,11 +15,11 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" Aqua = "0.8.18" CUDA = "6.4.2" GPUArraysCore = "0.2.1" -Printf = "1" +Printf = "1.10" SciMLBase = "3.58" StaticArrays = "1.9.23" Test = "1.10" -Trixi = "0.17.15" +Trixi = "0.17.16" julia = "1.10" [extras] diff --git a/test/runtests.jl b/test/runtests.jl index b15b41c6..b2b1cfbb 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -26,8 +26,8 @@ using CUDA @info "Completed tests of $dim Galerkin spectral element method with tree mesh on GPU..." end - # @info "Starting TrixiCUDA quality test..." - # include("./quality_test.jl") + @info "Starting TrixiCUDA quality test..." + include("quality_test.jl") # For debugging # include("../test.jl") From 6cfce502105773fe7b49ce4d733551249b1efb9e Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Tue, 20 Oct 2026 23:11:55 +0800 Subject: [PATCH 09/28] Resolve GPU callback ambiguities and run Aqua in dependency CI --- .github/workflows/DependencyCheck.yml | 2 ++ src/TrixiCUDA.jl | 2 +- src/callbacks_step/analysis_dg_1d.jl | 10 +++++----- src/callbacks_step/analysis_dg_2d.jl | 10 +++++----- src/callbacks_step/analysis_dg_3d.jl | 10 +++++----- src/callbacks_step/stepsize_dg_1d.jl | 8 ++++---- src/callbacks_step/stepsize_dg_2d.jl | 8 ++++---- src/callbacks_step/stepsize_dg_3d.jl | 8 ++++---- test/runtests.jl | 5 +++++ 9 files changed, 35 insertions(+), 28 deletions(-) diff --git a/.github/workflows/DependencyCheck.yml b/.github/workflows/DependencyCheck.yml index 7c2c8dbb..723ff513 100644 --- a/.github/workflows/DependencyCheck.yml +++ b/.github/workflows/DependencyCheck.yml @@ -25,5 +25,7 @@ jobs: - uses: julia-actions/cache@v2 - name: Resolve latest compatible runtime dependencies run: julia --project=. -e 'using Pkg; Pkg.update(); Pkg.status(; outdated=true); include("test/dependency_compatibility.jl")' + - name: Run Aqua quality tests + run: julia --project=. -e 'using Pkg; Pkg.test(test_args=["--quality-only"])' - name: Resolve latest compatible documentation dependencies run: julia --project=docs -e 'using Pkg; Pkg.develop(path=pwd()); Pkg.update(); Pkg.status(; outdated=true); using Documenter, TrixiCUDA' diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index e06e3cb1..9eb74fb5 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -30,7 +30,7 @@ using Trixi: allocate_coefficients, compute_coefficients, create_cache, # Trixi.jl structs using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, AbstractSurfaceIntegral, AbstractBasisSBP, - PerformanceCounter, True, False, TreeMesh, StructuredMesh, + PerformanceCounter, True, False, TreeMesh, TreeMeshSerial, StructuredMesh, DG, DGSEM, FDSBP, SemidiscretizationHyperbolic, LobattoLegendreBasis, LobattoLegendreMortarL2, TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D, diff --git a/src/callbacks_step/analysis_dg_1d.jl b/src/callbacks_step/analysis_dg_1d.jl index b68aad10..2a79d1aa 100644 --- a/src/callbacks_step/analysis_dg_1d.jl +++ b/src/callbacks_step/analysis_dg_1d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{1}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::CuArray, + mesh::TreeMeshSerial{1}, equations, dg::DGSEM, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -31,9 +31,9 @@ function integrate_via_indices(func::Func, u, return integral end -function integrate(func::Func, u, - mesh::TreeMesh{1}, - equations, dg::DG, cache; normalize = true) where {Func} +function integrate(func::Func, u::CuArray, + mesh::TreeMeshSerial{1}, + equations, dg::DGSEM, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/analysis_dg_2d.jl b/src/callbacks_step/analysis_dg_2d.jl index 37b19853..660e830b 100644 --- a/src/callbacks_step/analysis_dg_2d.jl +++ b/src/callbacks_step/analysis_dg_2d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{2}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::CuArray, + mesh::TreeMeshSerial{2}, equations, dg::DGSEM, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -31,9 +31,9 @@ function integrate_via_indices(func::Func, u, return integral end -function integrate(func::Func, u, - mesh::TreeMesh{2}, - equations, dg::DG, cache; normalize = true) where {Func} +function integrate(func::Func, u::CuArray, + mesh::TreeMeshSerial{2}, + equations, dg::DGSEM, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/analysis_dg_3d.jl b/src/callbacks_step/analysis_dg_3d.jl index 3a4499e0..2599bd03 100644 --- a/src/callbacks_step/analysis_dg_3d.jl +++ b/src/callbacks_step/analysis_dg_3d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{3}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::CuArray, + mesh::TreeMeshSerial{3}, equations, dg::DGSEM, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -32,9 +32,9 @@ function integrate_via_indices(func::Func, u, return integral end -function integrate(func::Func, u, - mesh::TreeMesh{3}, - equations, dg::DG, cache; normalize = true) where {Func} +function integrate(func::Func, u::CuArray, + mesh::TreeMeshSerial{3}, + equations, dg::DGSEM, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, k, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, k, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/stepsize_dg_1d.jl b/src/callbacks_step/stepsize_dg_1d.jl index f616d9a2..4d169a52 100644 --- a/src/callbacks_step/stepsize_dg_1d.jl +++ b/src/callbacks_step/stepsize_dg_1d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{1}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -16,8 +16,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{1}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{1}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_2d.jl b/src/callbacks_step/stepsize_dg_2d.jl index 0f2ec16b..9982e908 100644 --- a/src/callbacks_step/stepsize_dg_2d.jl +++ b/src/callbacks_step/stepsize_dg_2d.jl @@ -1,6 +1,6 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{2}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -18,8 +18,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{2}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{2}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_3d.jl b/src/callbacks_step/stepsize_dg_3d.jl index f63771da..00524239 100644 --- a/src/callbacks_step/stepsize_dg_3d.jl +++ b/src/callbacks_step/stepsize_dg_3d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{3}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -17,8 +17,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{3}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{3}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/test/runtests.jl b/test/runtests.jl index b2b1cfbb..44976d3a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,6 +1,11 @@ using TrixiCUDA using Test +if "--quality-only" in ARGS + include("quality_test.jl") + exit() +end + using CUDA # Currently we need to allow scalar indexing on GPU arrays for the tests to pass, # once the issues are resolved, this line can be removed. From 3f6ad8ed2ad734f81c39c0720adcc6c3c46cf152 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Tue, 20 Oct 2026 23:27:21 +0800 Subject: [PATCH 10/28] Consolidate CI tests and documentation checks in Buildkite --- .buildkite/pipeline.yml | 42 +++++++-------------------- .github/workflows/DependencyCheck.yml | 31 -------------------- .github/workflows/Documenter.yml | 8 +++-- .github/workflows/FormatCheck.yml | 21 -------------- .github/workflows/SpellCheck.yml | 16 ---------- .github/workflows/Style.yml | 26 +++++++++++++++++ docs/make.jl | 9 ++++-- test/runtests.jl | 11 ++----- 8 files changed, 52 insertions(+), 112 deletions(-) delete mode 100644 .github/workflows/DependencyCheck.yml delete mode 100644 .github/workflows/FormatCheck.yml delete mode 100644 .github/workflows/SpellCheck.yml create mode 100644 .github/workflows/Style.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b072e602..0cc96034 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,37 +1,20 @@ steps: - - label: "CUDA Test - Julia 1.10" + - label: "Tests and Aqua - Julia {{matrix.julia}}" + matrix: + setup: + julia: ["1.10", "1"] plugins: - JuliaCI/julia#v1: - version: "1.10" - command: | - julia -e 'using Pkg - - println("--- :julia: Instantiating environment") - Pkg.develop(path=".") - Pkg.update() - Pkg.status() - - println("+++ :julia: Running tests") - Pkg.test("TrixiCUDA")' - agents: - queue: "cuda" - if: build.message !~ /\[skip tests\]/ - timeout_in_minutes: 60 - - - label: "CUDA Test - latest stable Julia" - plugins: - - JuliaCI/julia#v1: - version: "1" + version: "{{matrix.julia}}" command: | - julia -e 'using Pkg + julia --project=. -e 'using Pkg println("--- :julia: Instantiating environment") - Pkg.develop(path=".") Pkg.update() Pkg.status() println("+++ :julia: Running tests") - Pkg.test("TrixiCUDA")' + Pkg.test()' agents: queue: "cuda" if: build.message !~ /\[skip tests\]/ @@ -42,19 +25,16 @@ steps: - JuliaCI/julia#v1: version: "1.10" command: | - julia --project -e ' + julia --project=docs -e ' println("--- :julia: Instantiating project") using Pkg - Pkg.instantiate() - Pkg.build() - Pkg.activate("docs") Pkg.develop(path=pwd()) Pkg.instantiate() - push!(LOAD_PATH, @__DIR__) println("+++ :julia: Building documentation") include("docs/make.jl")' + artifact_paths: "docs/build/**/*" agents: queue: "cuda" - if: build.message !~ /\[skip docs\]/ - timeout_in_minutes: 10 + if: build.pull_request.id != null && build.message !~ /\[skip docs\]/ + timeout_in_minutes: 15 diff --git a/.github/workflows/DependencyCheck.yml b/.github/workflows/DependencyCheck.yml deleted file mode 100644 index 723ff513..00000000 --- a/.github/workflows/DependencyCheck.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Dependency Check - -on: - push: - branches: - - main - pull_request: - workflow_dispatch: - -jobs: - dependencies: - name: Resolve and load dependencies - Julia ${{ matrix.julia-version }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - julia-version: ['1.10', '1'] - env: - JULIA_PKG_PRECOMPILE_AUTO: '0' - steps: - - uses: actions/checkout@v5 - - uses: julia-actions/setup-julia@v2 - with: - version: ${{ matrix.julia-version }} - - uses: julia-actions/cache@v2 - - name: Resolve latest compatible runtime dependencies - run: julia --project=. -e 'using Pkg; Pkg.update(); Pkg.status(; outdated=true); include("test/dependency_compatibility.jl")' - - name: Run Aqua quality tests - run: julia --project=. -e 'using Pkg; Pkg.test(test_args=["--quality-only"])' - - name: Resolve latest compatible documentation dependencies - run: julia --project=docs -e 'using Pkg; Pkg.develop(path=pwd()); Pkg.update(); Pkg.status(; outdated=true); using Documenter, TrixiCUDA' diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml index 9ab20739..7f84205f 100644 --- a/.github/workflows/Documenter.yml +++ b/.github/workflows/Documenter.yml @@ -5,7 +5,11 @@ on: branches: - main tags: "*" - pull_request: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build: @@ -35,4 +39,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for Documenter via GitHub Actions DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # optional: SSH deploy key - run: julia --project=docs/ --color=yes docs/make.jl \ No newline at end of file + run: julia --project=docs/ --color=yes docs/make.jl diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml deleted file mode 100644 index eade52cf..00000000 --- a/.github/workflows/FormatCheck.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Format Check - -on: - push: - branches: - - 'main' - tags: '*' - pull_request: - -jobs: - format-suggestions: - name: Check and Suggest Code Format - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v5 - - - name: Run Julia Format Check - uses: julia-actions/julia-format@v4 - with: - version: '2.14.0' diff --git a/.github/workflows/SpellCheck.yml b/.github/workflows/SpellCheck.yml deleted file mode 100644 index 3697e1ba..00000000 --- a/.github/workflows/SpellCheck.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Spell Check - -on: [push, pull_request, workflow_dispatch] - -jobs: - typos-check: - name: Run Spell Check with Typos - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v5 - - - name: Run Typo and Spelling Check - uses: crate-ci/typos@v1.39.0 - with: - config: .typos.toml # Specify the custom configuration file diff --git a/.github/workflows/Style.yml b/.github/workflows/Style.yml new file mode 100644 index 00000000..b23e6fd9 --- /dev/null +++ b/.github/workflows/Style.yml @@ -0,0 +1,26 @@ +name: Style + +on: + pull_request: + push: + branches: [main] + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + style: + name: Formatting and spelling + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: Check spelling + uses: crate-ci/typos@v1.39.0 + with: + config: .typos.toml + - name: Check formatting + uses: julia-actions/julia-format@v4 + with: + version: '2.14.0' diff --git a/docs/make.jl b/docs/make.jl index 54cd6e49..7585c480 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -15,6 +15,9 @@ makedocs(modules = [TrixiCUDA], format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true", assets = ["assets/favicon.ico"])) -deploydocs(repo = "github.com/trixi-gpu/TrixiCUDA.jl", - devbranch = "main", - push_preview = true) +# Buildkite builds PR documentation; GitHub Actions handles publishing. +if get(ENV, "BUILDKITE", "false") != "true" + deploydocs(repo = "github.com/trixi-gpu/TrixiCUDA.jl", + devbranch = "main", + push_preview = true) +end diff --git a/test/runtests.jl b/test/runtests.jl index 44976d3a..7cf6553a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,11 +1,6 @@ using TrixiCUDA using Test -if "--quality-only" in ARGS - include("quality_test.jl") - exit() -end - using CUDA # Currently we need to allow scalar indexing on GPU arrays for the tests to pass, # once the issues are resolved, this line can be removed. @@ -20,6 +15,9 @@ using CUDA println("- Max threads per block: ", TrixiCUDA.MAX_THREADS_PER_BLOCK) println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) + @info "Starting TrixiCUDA quality test..." + include("quality_test.jl") + include("dependency_compatibility.jl") @info "Starting TrixiCUDA test suite..." @@ -31,9 +29,6 @@ using CUDA @info "Completed tests of $dim Galerkin spectral element method with tree mesh on GPU..." end - @info "Starting TrixiCUDA quality test..." - include("quality_test.jl") - # For debugging # include("../test.jl") From 48a4be3f4982a1593918c48b8b3e6ab6b7e828d4 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Tue, 20 Oct 2026 23:47:59 +0800 Subject: [PATCH 11/28] Test TrixiCUDA.jl on Julia 1.10 through 1.13 --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 0cc96034..287664ea 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,8 +1,8 @@ steps: - - label: "Tests and Aqua - Julia {{matrix.julia}}" + - label: "Test TrixiCUDA.jl - Julia {{matrix.julia}}" matrix: setup: - julia: ["1.10", "1"] + julia: ["1.10", "1.11", "1.12", "1.13"] plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}" From 128fd50989029cbc84c567c2cb64e1fa7eb9a1ea Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Wed, 21 Oct 2026 14:49:10 +0800 Subject: [PATCH 12/28] Preserve resolved dependencies in persistent-task checks --- Project.toml | 4 ++- test/persistent_tasks.jl | 59 ++++++++++++++++++++++++++++++++++++++++ test/quality_test.jl | 7 ++++- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 test/persistent_tasks.jl diff --git a/Project.toml b/Project.toml index 081fe168..47484732 100644 --- a/Project.toml +++ b/Project.toml @@ -15,6 +15,7 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" Aqua = "0.8.18" CUDA = "6.4.2" GPUArraysCore = "0.2.1" +Pkg = "1.10" Printf = "1.10" SciMLBase = "3.58" StaticArrays = "1.9.23" @@ -24,7 +25,8 @@ julia = "1.10" [extras] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "Test"] +test = ["Aqua", "Pkg", "Test"] diff --git a/test/persistent_tasks.jl b/test/persistent_tasks.jl new file mode 100644 index 00000000..1b9ab38e --- /dev/null +++ b/test/persistent_tasks.jl @@ -0,0 +1,59 @@ +using Pkg + +# Aqua 0.8.18 reconstructs dependencies from package Project.toml files, losing +# registry corrections such as CUDA_Runtime_jll's CUDA_Compiler_jll dependency. +# Use the resolved test manifest while checking precompilation and task shutdown. +function precompile_finishes_from_manifest(package::Module; tmax = 30) + mktempdir() do directory + package_id = Base.PkgId(package) + wrapper_name = "TrixiCUDAPrecompileCheck" + write(joinpath(directory, "Project.toml"), """ + name = "$wrapper_name" + uuid = "2b90b810-3847-44f4-89af-b1f7d499a628" + version = "0.1.0" + + [deps] + $(package_id.name) = "$(package_id.uuid)" + """) + manifest = Pkg.Types.EnvCache().manifest_file + cp(manifest, joinpath(directory, "Manifest.toml")) + preferences = joinpath(dirname(Base.active_project()), "LocalPreferences.toml") + if isfile(preferences) + cp(preferences, joinpath(directory, "LocalPreferences.toml")) + end + + ready = joinpath(directory, "loaded") + mkpath(joinpath(directory, "src")) + write(joinpath(directory, "src", "$wrapper_name.jl"), """ + module $wrapper_name + using $(package_id.name) + touch($(repr(ready))) + end + """) + log_path = joinpath(directory, "precompile.log") + expression = "using Pkg; Pkg.precompile(; already_instantiated = true)" + command = `$(Base.julia_cmd()) --startup-file=no --project=$directory -e $expression` + open(log_path, "w") do log + process = run(pipeline(command; stdout = log, stderr = log); wait = false) + try + timedwait(() -> isfile(ready) || !process_running(process), Inf; pollint = 0.5) + if !isfile(ready) + wait(process) + error("Precompilation failed before loading $(package_id.name):\n" * + read(log_path, String)) + end + finished = timedwait(() -> !process_running(process), tmax; pollint = 0.1) == :ok + if finished + wait(process) + success(process) || error("Precompilation failed:\n" * read(log_path, String)) + end + return finished + finally + if process_running(process) + kill(process, Base.SIGKILL) + wait(process) + end + end + end + end +end diff --git a/test/quality_test.jl b/test/quality_test.jl index 90bc77ad..e3e50348 100644 --- a/test/quality_test.jl +++ b/test/quality_test.jl @@ -1,5 +1,10 @@ @testset "Aqua test" begin using Aqua - Aqua.test_all(TrixiCUDA, piracies = false) + include("persistent_tasks.jl") + # Keep the persistent-task check below on the resolved dependency graph. + Aqua.test_all(TrixiCUDA, piracies = false, persistent_tasks = false) + @testset "Persistent tasks" begin + @test precompile_finishes_from_manifest(TrixiCUDA) + end end From 5f613e1c94176da0e0bf0d674d96b4f644011de1 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Wed, 21 Oct 2026 23:25:48 +0800 Subject: [PATCH 13/28] Defer Aqua integration to a separate pull request --- Project.toml | 6 +-- src/TrixiCUDA.jl | 2 +- src/callbacks_step/analysis_dg_1d.jl | 10 ++--- src/callbacks_step/analysis_dg_2d.jl | 10 ++--- src/callbacks_step/analysis_dg_3d.jl | 10 ++--- src/callbacks_step/stepsize_dg_1d.jl | 8 ++-- src/callbacks_step/stepsize_dg_2d.jl | 8 ++-- src/callbacks_step/stepsize_dg_3d.jl | 8 ++-- test/persistent_tasks.jl | 59 ---------------------------- test/quality_test.jl | 10 ----- test/runtests.jl | 3 -- 11 files changed, 29 insertions(+), 105 deletions(-) delete mode 100644 test/persistent_tasks.jl delete mode 100644 test/quality_test.jl diff --git a/Project.toml b/Project.toml index 47484732..69dfb551 100644 --- a/Project.toml +++ b/Project.toml @@ -12,10 +12,8 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" [compat] -Aqua = "0.8.18" CUDA = "6.4.2" GPUArraysCore = "0.2.1" -Pkg = "1.10" Printf = "1.10" SciMLBase = "3.58" StaticArrays = "1.9.23" @@ -24,9 +22,7 @@ Trixi = "0.17.16" julia = "1.10" [extras] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "Pkg", "Test"] +test = ["Test"] diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 9eb74fb5..e06e3cb1 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -30,7 +30,7 @@ using Trixi: allocate_coefficients, compute_coefficients, create_cache, # Trixi.jl structs using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, AbstractSurfaceIntegral, AbstractBasisSBP, - PerformanceCounter, True, False, TreeMesh, TreeMeshSerial, StructuredMesh, + PerformanceCounter, True, False, TreeMesh, StructuredMesh, DG, DGSEM, FDSBP, SemidiscretizationHyperbolic, LobattoLegendreBasis, LobattoLegendreMortarL2, TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D, diff --git a/src/callbacks_step/analysis_dg_1d.jl b/src/callbacks_step/analysis_dg_1d.jl index 2a79d1aa..b68aad10 100644 --- a/src/callbacks_step/analysis_dg_1d.jl +++ b/src/callbacks_step/analysis_dg_1d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u::CuArray, - mesh::TreeMeshSerial{1}, equations, dg::DGSEM, cache, +function integrate_via_indices(func::Func, u, + mesh::TreeMesh{1}, equations, dg::DG, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -31,9 +31,9 @@ function integrate_via_indices(func::Func, u::CuArray, return integral end -function integrate(func::Func, u::CuArray, - mesh::TreeMeshSerial{1}, - equations, dg::DGSEM, cache; normalize = true) where {Func} +function integrate(func::Func, u, + mesh::TreeMesh{1}, + equations, dg::DG, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/analysis_dg_2d.jl b/src/callbacks_step/analysis_dg_2d.jl index 660e830b..37b19853 100644 --- a/src/callbacks_step/analysis_dg_2d.jl +++ b/src/callbacks_step/analysis_dg_2d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u::CuArray, - mesh::TreeMeshSerial{2}, equations, dg::DGSEM, cache, +function integrate_via_indices(func::Func, u, + mesh::TreeMesh{2}, equations, dg::DG, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -31,9 +31,9 @@ function integrate_via_indices(func::Func, u::CuArray, return integral end -function integrate(func::Func, u::CuArray, - mesh::TreeMeshSerial{2}, - equations, dg::DGSEM, cache; normalize = true) where {Func} +function integrate(func::Func, u, + mesh::TreeMesh{2}, + equations, dg::DG, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/analysis_dg_3d.jl b/src/callbacks_step/analysis_dg_3d.jl index 2599bd03..3a4499e0 100644 --- a/src/callbacks_step/analysis_dg_3d.jl +++ b/src/callbacks_step/analysis_dg_3d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u::CuArray, - mesh::TreeMeshSerial{3}, equations, dg::DGSEM, cache, +function integrate_via_indices(func::Func, u, + mesh::TreeMesh{3}, equations, dg::DG, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -32,9 +32,9 @@ function integrate_via_indices(func::Func, u::CuArray, return integral end -function integrate(func::Func, u::CuArray, - mesh::TreeMeshSerial{3}, - equations, dg::DGSEM, cache; normalize = true) where {Func} +function integrate(func::Func, u, + mesh::TreeMesh{3}, + equations, dg::DG, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, k, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, k, element) # call view to avoid scalar indexing diff --git a/src/callbacks_step/stepsize_dg_1d.jl b/src/callbacks_step/stepsize_dg_1d.jl index 4d169a52..f616d9a2 100644 --- a/src/callbacks_step/stepsize_dg_1d.jl +++ b/src/callbacks_step/stepsize_dg_1d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, - constant_speed::True, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{1}, + constant_speed::True, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -16,8 +16,8 @@ function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, - constant_speed::False, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{1}, + constant_speed::False, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_2d.jl b/src/callbacks_step/stepsize_dg_2d.jl index 9982e908..0f2ec16b 100644 --- a/src/callbacks_step/stepsize_dg_2d.jl +++ b/src/callbacks_step/stepsize_dg_2d.jl @@ -1,6 +1,6 @@ -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, - constant_speed::True, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{2}, + constant_speed::True, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -18,8 +18,8 @@ function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, - constant_speed::False, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{2}, + constant_speed::False, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_3d.jl b/src/callbacks_step/stepsize_dg_3d.jl index 00524239..f63771da 100644 --- a/src/callbacks_step/stepsize_dg_3d.jl +++ b/src/callbacks_step/stepsize_dg_3d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, - constant_speed::True, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{3}, + constant_speed::True, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -17,8 +17,8 @@ function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, - constant_speed::False, equations, dg::DGSEM, cache) +function max_dt(u::CuArray, t, mesh::TreeMesh{3}, + constant_speed::False, equations, dg::DG, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/test/persistent_tasks.jl b/test/persistent_tasks.jl deleted file mode 100644 index 1b9ab38e..00000000 --- a/test/persistent_tasks.jl +++ /dev/null @@ -1,59 +0,0 @@ -using Pkg - -# Aqua 0.8.18 reconstructs dependencies from package Project.toml files, losing -# registry corrections such as CUDA_Runtime_jll's CUDA_Compiler_jll dependency. -# Use the resolved test manifest while checking precompilation and task shutdown. -function precompile_finishes_from_manifest(package::Module; tmax = 30) - mktempdir() do directory - package_id = Base.PkgId(package) - wrapper_name = "TrixiCUDAPrecompileCheck" - write(joinpath(directory, "Project.toml"), """ - name = "$wrapper_name" - uuid = "2b90b810-3847-44f4-89af-b1f7d499a628" - version = "0.1.0" - - [deps] - $(package_id.name) = "$(package_id.uuid)" - """) - manifest = Pkg.Types.EnvCache().manifest_file - cp(manifest, joinpath(directory, "Manifest.toml")) - preferences = joinpath(dirname(Base.active_project()), "LocalPreferences.toml") - if isfile(preferences) - cp(preferences, joinpath(directory, "LocalPreferences.toml")) - end - - ready = joinpath(directory, "loaded") - mkpath(joinpath(directory, "src")) - write(joinpath(directory, "src", "$wrapper_name.jl"), """ - module $wrapper_name - using $(package_id.name) - touch($(repr(ready))) - end - """) - log_path = joinpath(directory, "precompile.log") - expression = "using Pkg; Pkg.precompile(; already_instantiated = true)" - command = `$(Base.julia_cmd()) --startup-file=no --project=$directory -e $expression` - open(log_path, "w") do log - process = run(pipeline(command; stdout = log, stderr = log); wait = false) - try - timedwait(() -> isfile(ready) || !process_running(process), Inf; pollint = 0.5) - if !isfile(ready) - wait(process) - error("Precompilation failed before loading $(package_id.name):\n" * - read(log_path, String)) - end - finished = timedwait(() -> !process_running(process), tmax; pollint = 0.1) == :ok - if finished - wait(process) - success(process) || error("Precompilation failed:\n" * read(log_path, String)) - end - return finished - finally - if process_running(process) - kill(process, Base.SIGKILL) - wait(process) - end - end - end - end -end diff --git a/test/quality_test.jl b/test/quality_test.jl deleted file mode 100644 index e3e50348..00000000 --- a/test/quality_test.jl +++ /dev/null @@ -1,10 +0,0 @@ -@testset "Aqua test" begin - using Aqua - - include("persistent_tasks.jl") - # Keep the persistent-task check below on the resolved dependency graph. - Aqua.test_all(TrixiCUDA, piracies = false, persistent_tasks = false) - @testset "Persistent tasks" begin - @test precompile_finishes_from_manifest(TrixiCUDA) - end -end diff --git a/test/runtests.jl b/test/runtests.jl index 7cf6553a..d0ccc46f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -15,9 +15,6 @@ using CUDA println("- Max threads per block: ", TrixiCUDA.MAX_THREADS_PER_BLOCK) println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) - @info "Starting TrixiCUDA quality test..." - include("quality_test.jl") - include("dependency_compatibility.jl") @info "Starting TrixiCUDA test suite..." From c5be89d5009551c3ae6fa2c53b8034948c5309ff Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Wed, 21 Oct 2026 23:48:09 +0800 Subject: [PATCH 14/28] Remove dependency compatibility check and standardize TreeMesh formatting --- benchmark/advection_basic_1d.jl | 6 +- benchmark/advection_basic_2d.jl | 6 +- benchmark/advection_basic_3d.jl | 6 +- benchmark/advection_mortar_2d.jl | 6 +- benchmark/advection_mortar_3d.jl | 6 +- benchmark/euler_ec_1d.jl | 6 +- benchmark/euler_ec_2d.jl | 5 +- benchmark/euler_ec_3d.jl | 6 +- benchmark/euler_shock_1d.jl | 6 +- benchmark/euler_shock_2d.jl | 6 +- benchmark/euler_shock_3d.jl | 6 +- benchmark/hypdiff_nonperiodic_1d.jl | 2 +- benchmark/hypdiff_nonperiodic_2d.jl | 2 +- benchmark/hypdiff_nonperiodic_3d.jl | 2 +- benchmark/mhd_alfven_wave_1d.jl | 6 +- benchmark/mhd_alfven_wave_2d.jl | 6 +- benchmark/mhd_alfven_wave_3d.jl | 6 +- benchmark/mhd_alfven_wave_mortar_2d.jl | 6 +- benchmark/mhd_alfven_wave_mortar_3d.jl | 6 +- benchmark/mhd_ec_1d.jl | 6 +- benchmark/mhd_ec_2d.jl | 6 +- benchmark/mhd_ec_3d.jl | 6 +- benchmark/shallowwater_ec_1d.jl | 6 +- benchmark/shallowwater_ec_2d.jl | 6 +- benchmark/shallowwater_source_terms_1d.jl | 2 +- benchmark/shallowwater_source_terms_2d.jl | 2 +- examples/advection_basic_1d.jl | 2 +- examples/advection_basic_2d.jl | 2 +- examples/advection_basic_3d.jl | 2 +- examples/advection_mortar_2d.jl | 2 +- examples/advection_mortar_3d.jl | 2 +- examples/euler_ec_1d.jl | 2 +- examples/euler_ec_2d.jl | 2 +- examples/euler_ec_3d.jl | 2 +- examples/euler_shockcapturing_1d.jl | 2 +- examples/euler_shockcapturing_2d.jl | 2 +- examples/euler_shockcapturing_3d.jl | 2 +- examples/euler_source_terms_1d.jl | 2 +- examples/euler_source_terms_2d.jl | 2 +- examples/euler_source_terms_3d.jl | 2 +- examples/eulermulti_ec_1d.jl | 2 +- examples/eulermulti_ec_2d.jl | 2 +- examples/hypdiff_nonperiodic_1d.jl | 2 +- examples/hypdiff_nonperiodic_2d.jl | 2 +- examples/hypdiff_nonperiodic_3d.jl | 2 +- examples/shallowwater_dirichlet_1d.jl | 2 +- examples/shallowwater_dirichlet_2d.jl | 2 +- examples/shallowwater_ec_1d.jl | 2 +- examples/shallowwater_ec_2d.jl | 2 +- examples/shallowwater_source_terms_1d.jl | 2 +- examples/shallowwater_source_terms_2d.jl | 2 +- profile/profiling.jl | 2 +- profile/profiling_kernel.jl | 6 +- profile/profiling_kernel2.jl | 6 +- profile/profiling_kernel3.jl | 6 +- test/dependency_compatibility.jl | 128 ------------------ test/runtests.jl | 2 - test/tree_dgsem_1d/advection_basic.jl | 2 +- test/tree_dgsem_1d/advection_extended.jl | 2 +- test/tree_dgsem_1d/burgers_basic.jl | 2 +- test/tree_dgsem_1d/burgers_rarefraction.jl | 2 +- test/tree_dgsem_1d/burgers_shock.jl | 2 +- test/tree_dgsem_1d/euler_blast_wave.jl | 2 +- test/tree_dgsem_1d/euler_ec.jl | 2 +- test/tree_dgsem_1d/euler_shock.jl | 2 +- test/tree_dgsem_1d/euler_source_terms.jl | 2 +- .../euler_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_1d/eulermulti_ec.jl | 2 +- test/tree_dgsem_1d/eulermulti_es.jl | 2 +- test/tree_dgsem_1d/eulerquasi_ec.jl | 2 +- test/tree_dgsem_1d/eulerquasi_source_terms.jl | 2 +- .../hypdiff_harmonic_nonperiodic.jl | 2 +- test/tree_dgsem_1d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_1d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_1d/mhd_ec.jl | 2 +- test/tree_dgsem_1d/shallowwater_shock.jl | 2 +- test/tree_dgsem_2d/advection_basic.jl | 2 +- test/tree_dgsem_2d/advection_mortar.jl | 2 +- test/tree_dgsem_2d/euler_blob_mortar.jl | 2 +- test/tree_dgsem_2d/euler_ec.jl | 2 +- test/tree_dgsem_2d/euler_shock.jl | 2 +- test/tree_dgsem_2d/euler_source_terms.jl | 2 +- .../euler_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_2d/eulermulti_ec.jl | 2 +- test/tree_dgsem_2d/eulermulti_es.jl | 2 +- test/tree_dgsem_2d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_2d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_2d/mhd_ec.jl | 2 +- test/tree_dgsem_2d/mhd_shock.jl | 2 +- test/tree_dgsem_2d/shallowwater_ec.jl | 2 +- .../shallowwater_source_terms.jl | 2 +- .../shawllowwater_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_3d/advection_basic.jl | 2 +- test/tree_dgsem_3d/advection_mortar.jl | 2 +- test/tree_dgsem_3d/euler_convergence.jl | 2 +- test/tree_dgsem_3d/euler_ec.jl | 2 +- test/tree_dgsem_3d/euler_mortar.jl | 2 +- test/tree_dgsem_3d/euler_shock.jl | 2 +- test/tree_dgsem_3d/euler_source_terms.jl | 2 +- test/tree_dgsem_3d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_3d/mhd_ec.jl | 2 +- test/tree_dgsem_3d/mhd_shock.jl | 2 +- 105 files changed, 151 insertions(+), 280 deletions(-) delete mode 100644 test/dependency_compatibility.jl diff --git a/benchmark/advection_basic_1d.jl b/benchmark/advection_basic_1d.jl index 61b6dbce..dddf28ec 100644 --- a/benchmark/advection_basic_1d.jl +++ b/benchmark/advection_basic_1d.jl @@ -15,10 +15,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = -1.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, diff --git a/benchmark/advection_basic_2d.jl b/benchmark/advection_basic_2d.jl index c6439dd2..40ce7991 100644 --- a/benchmark/advection_basic_2d.jl +++ b/benchmark/advection_basic_2d.jl @@ -15,10 +15,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, diff --git a/benchmark/advection_basic_3d.jl b/benchmark/advection_basic_3d.jl index 11718da1..62fc0fc1 100644 --- a/benchmark/advection_basic_3d.jl +++ b/benchmark/advection_basic_3d.jl @@ -15,10 +15,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, diff --git a/benchmark/advection_mortar_2d.jl b/benchmark/advection_mortar_2d.jl index 5ef5a753..eef0f995 100644 --- a/benchmark/advection_mortar_2d.jl +++ b/benchmark/advection_mortar_2d.jl @@ -17,11 +17,11 @@ coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0), coordinates_max = (1.0f0, 1.0f0)),) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/advection_mortar_3d.jl b/benchmark/advection_mortar_3d.jl index fbe9e629..1436e464 100644 --- a/benchmark/advection_mortar_3d.jl +++ b/benchmark/advection_mortar_3d.jl @@ -19,11 +19,11 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0, -1.0f0), coordinates_max = (1.0f0, 1.0f0, 1.0f0)), (type = "box", coordinates_min = (0.0f0, -0.5f0, -0.5f0), coordinates_max = (0.5f0, 0.5f0, 0.5f0))) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/euler_ec_1d.jl b/benchmark/euler_ec_1d.jl index d1c4a848..0c228d11 100644 --- a/benchmark/euler_ec_1d.jl +++ b/benchmark/euler_ec_1d.jl @@ -20,10 +20,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0,) coordinates_max = (2.0f0,) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/euler_ec_2d.jl b/benchmark/euler_ec_2d.jl index 000980bc..89fd289d 100644 --- a/benchmark/euler_ec_2d.jl +++ b/benchmark/euler_ec_2d.jl @@ -20,9 +20,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - periodicity = true, RealT = RealT) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, diff --git a/benchmark/euler_ec_3d.jl b/benchmark/euler_ec_3d.jl index f5b009fa..3d5def12 100644 --- a/benchmark/euler_ec_3d.jl +++ b/benchmark/euler_ec_3d.jl @@ -20,10 +20,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/euler_shock_1d.jl b/benchmark/euler_shock_1d.jl index 4a624fcd..29b7767e 100644 --- a/benchmark/euler_shock_1d.jl +++ b/benchmark/euler_shock_1d.jl @@ -33,10 +33,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = -2.0f0 coordinates_max = 2.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/euler_shock_2d.jl b/benchmark/euler_shock_2d.jl index 82255c90..6769418b 100644 --- a/benchmark/euler_shock_2d.jl +++ b/benchmark/euler_shock_2d.jl @@ -33,10 +33,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/euler_shock_3d.jl b/benchmark/euler_shock_3d.jl index 146d0c9c..91cd8313 100644 --- a/benchmark/euler_shock_3d.jl +++ b/benchmark/euler_shock_3d.jl @@ -33,10 +33,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/hypdiff_nonperiodic_1d.jl b/benchmark/hypdiff_nonperiodic_1d.jl index 4e603fd1..33867f25 100644 --- a/benchmark/hypdiff_nonperiodic_1d.jl +++ b/benchmark/hypdiff_nonperiodic_1d.jl @@ -19,7 +19,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false, RealT = RealT) diff --git a/benchmark/hypdiff_nonperiodic_2d.jl b/benchmark/hypdiff_nonperiodic_2d.jl index 050d656c..23dfb5fb 100644 --- a/benchmark/hypdiff_nonperiodic_2d.jl +++ b/benchmark/hypdiff_nonperiodic_2d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = (false, true), RealT = RealT) diff --git a/benchmark/hypdiff_nonperiodic_3d.jl b/benchmark/hypdiff_nonperiodic_3d.jl index fefc8faf..052e0fe7 100644 --- a/benchmark/hypdiff_nonperiodic_3d.jl +++ b/benchmark/hypdiff_nonperiodic_3d.jl @@ -24,7 +24,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (0.0f0, 0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = (false, true, true), RealT = RealT) diff --git a/benchmark/mhd_alfven_wave_1d.jl b/benchmark/mhd_alfven_wave_1d.jl index e4fe64cf..cc2fb1d6 100644 --- a/benchmark/mhd_alfven_wave_1d.jl +++ b/benchmark/mhd_alfven_wave_1d.jl @@ -19,10 +19,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_alfven_wave_2d.jl b/benchmark/mhd_alfven_wave_2d.jl index bc36de3d..a8b650b9 100644 --- a/benchmark/mhd_alfven_wave_2d.jl +++ b/benchmark/mhd_alfven_wave_2d.jl @@ -21,10 +21,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_alfven_wave_3d.jl b/benchmark/mhd_alfven_wave_3d.jl index c654f0aa..7acb9501 100644 --- a/benchmark/mhd_alfven_wave_3d.jl +++ b/benchmark/mhd_alfven_wave_3d.jl @@ -21,10 +21,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_alfven_wave_mortar_2d.jl b/benchmark/mhd_alfven_wave_mortar_2d.jl index 049975ff..e2c775db 100644 --- a/benchmark/mhd_alfven_wave_mortar_2d.jl +++ b/benchmark/mhd_alfven_wave_mortar_2d.jl @@ -27,11 +27,11 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) refinement_patches = ((type = "box", coordinates_min = 0.25f0 .* coordinates_max, coordinates_max = 0.75f0 .* coordinates_max),) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_alfven_wave_mortar_3d.jl b/benchmark/mhd_alfven_wave_mortar_3d.jl index e84660a0..8ec2dcc0 100644 --- a/benchmark/mhd_alfven_wave_mortar_3d.jl +++ b/benchmark/mhd_alfven_wave_mortar_3d.jl @@ -27,11 +27,11 @@ coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) refinement_patches = ((type = "box", coordinates_min = (-0.5f0, -0.5f0, -0.5f0), coordinates_max = (0.5f0, 0.5f0, 0.5f0)),) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_ec_1d.jl b/benchmark/mhd_ec_1d.jl index 0e678122..f5b9bd5b 100644 --- a/benchmark/mhd_ec_1d.jl +++ b/benchmark/mhd_ec_1d.jl @@ -21,10 +21,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_hindenlang_gassner, coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_ec_2d.jl b/benchmark/mhd_ec_2d.jl index 07a7fe7d..b450586a 100644 --- a/benchmark/mhd_ec_2d.jl +++ b/benchmark/mhd_ec_2d.jl @@ -22,10 +22,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/mhd_ec_3d.jl b/benchmark/mhd_ec_3d.jl index 0f3087af..715496d6 100644 --- a/benchmark/mhd_ec_3d.jl +++ b/benchmark/mhd_ec_3d.jl @@ -22,10 +22,10 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/shallowwater_ec_1d.jl b/benchmark/shallowwater_ec_1d.jl index 50031944..2819e794 100644 --- a/benchmark/shallowwater_ec_1d.jl +++ b/benchmark/shallowwater_ec_1d.jl @@ -43,10 +43,10 @@ solver_gpu = DGSEMGPU(polydeg = 4, coordinates_min = -1.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/shallowwater_ec_2d.jl b/benchmark/shallowwater_ec_2d.jl index 81468c49..9cec262b 100644 --- a/benchmark/shallowwater_ec_2d.jl +++ b/benchmark/shallowwater_ec_2d.jl @@ -54,10 +54,10 @@ solver_gpu = DGSEMGPU(polydeg = 4, coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, diff --git a/benchmark/shallowwater_source_terms_1d.jl b/benchmark/shallowwater_source_terms_1d.jl index 52b2824b..b3e007e8 100644 --- a/benchmark/shallowwater_source_terms_1d.jl +++ b/benchmark/shallowwater_source_terms_1d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = 0.0f0 coordinates_max = sqrt(2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true, RealT = RealT) diff --git a/benchmark/shallowwater_source_terms_2d.jl b/benchmark/shallowwater_source_terms_2d.jl index 36026a2b..1934f166 100644 --- a/benchmark/shallowwater_source_terms_2d.jl +++ b/benchmark/shallowwater_source_terms_2d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true, RealT = RealT) diff --git a/examples/advection_basic_1d.jl b/examples/advection_basic_1d.jl index f536dcd6..05a2dd45 100644 --- a/examples/advection_basic_1d.jl +++ b/examples/advection_basic_1d.jl @@ -16,7 +16,7 @@ coordinates_min = -1.0 # minimum coordinate coordinates_max = 1.0 # maximum coordinate # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_basic_2d.jl b/examples/advection_basic_2d.jl index cf71de2f..d84a83d3 100644 --- a/examples/advection_basic_2d.jl +++ b/examples/advection_basic_2d.jl @@ -16,7 +16,7 @@ coordinates_min = (-1.0, -1.0) # minimum coordinates (min(x), min(y)) coordinates_max = (1.0, 1.0) # maximum coordinates (max(x), max(y)) # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_basic_3d.jl b/examples/advection_basic_3d.jl index 07b52b58..64ad3f6e 100644 --- a/examples/advection_basic_3d.jl +++ b/examples/advection_basic_3d.jl @@ -16,7 +16,7 @@ coordinates_min = (-1.0, -1.0, -1.0) # minimum coordinates (min(x), min(y), min( coordinates_max = (1.0, 1.0, 1.0) # maximum coordinates (max(x), max(y), max(z)) # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_mortar_2d.jl b/examples/advection_mortar_2d.jl index 615d9f1a..56b624a4 100644 --- a/examples/advection_mortar_2d.jl +++ b/examples/advection_mortar_2d.jl @@ -19,7 +19,7 @@ coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0), coordinates_max = (1.0, 1.0)),) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/examples/advection_mortar_3d.jl b/examples/advection_mortar_3d.jl index c832f2cf..b5418dfe 100644 --- a/examples/advection_mortar_3d.jl +++ b/examples/advection_mortar_3d.jl @@ -22,7 +22,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0, -1.0), coordinates_max = (1.0, 1.0, 1.0)), (type = "box", coordinates_min = (0.0, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5))) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/examples/euler_ec_1d.jl b/examples/euler_ec_1d.jl index c47de28b..04d2243c 100644 --- a/examples/euler_ec_1d.jl +++ b/examples/euler_ec_1d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0,) coordinates_max = (2.0,) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_ec_2d.jl b/examples/euler_ec_2d.jl index 8c7c64b0..e84254d7 100644 --- a/examples/euler_ec_2d.jl +++ b/examples/euler_ec_2d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_ec_3d.jl b/examples/euler_ec_3d.jl index d4728385..5fb4bc90 100644 --- a/examples/euler_ec_3d.jl +++ b/examples/euler_ec_3d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/examples/euler_shockcapturing_1d.jl b/examples/euler_shockcapturing_1d.jl index 0be01896..ba3d6a4e 100644 --- a/examples/euler_shockcapturing_1d.jl +++ b/examples/euler_shockcapturing_1d.jl @@ -30,7 +30,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = -2.0 coordinates_max = 2.0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_shockcapturing_2d.jl b/examples/euler_shockcapturing_2d.jl index 19a62cb1..328832a1 100644 --- a/examples/euler_shockcapturing_2d.jl +++ b/examples/euler_shockcapturing_2d.jl @@ -30,7 +30,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_shockcapturing_3d.jl b/examples/euler_shockcapturing_3d.jl index c41a076a..f062a8b6 100644 --- a/examples/euler_shockcapturing_3d.jl +++ b/examples/euler_shockcapturing_3d.jl @@ -31,7 +31,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/examples/euler_source_terms_1d.jl b/examples/euler_source_terms_1d.jl index c0ccd1ea..bbf8573d 100644 --- a/examples/euler_source_terms_1d.jl +++ b/examples/euler_source_terms_1d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = 0.0 coordinates_max = 2.0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/examples/euler_source_terms_2d.jl b/examples/euler_source_terms_2d.jl index 20be977c..5097b82e 100644 --- a/examples/euler_source_terms_2d.jl +++ b/examples/euler_source_terms_2d.jl @@ -13,7 +13,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/examples/euler_source_terms_3d.jl b/examples/euler_source_terms_3d.jl index 8027f437..fdf63cd6 100644 --- a/examples/euler_source_terms_3d.jl +++ b/examples/euler_source_terms_3d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/examples/eulermulti_ec_1d.jl b/examples/eulermulti_ec_1d.jl index c96de152..fc5c95b7 100644 --- a/examples/eulermulti_ec_1d.jl +++ b/examples/eulermulti_ec_1d.jl @@ -21,7 +21,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0,) coordinates_max = (2.0,) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/eulermulti_ec_2d.jl b/examples/eulermulti_ec_2d.jl index 0fb93323..716c6427 100644 --- a/examples/eulermulti_ec_2d.jl +++ b/examples/eulermulti_ec_2d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/examples/hypdiff_nonperiodic_1d.jl b/examples/hypdiff_nonperiodic_1d.jl index 94fa4700..a5919f79 100644 --- a/examples/hypdiff_nonperiodic_1d.jl +++ b/examples/hypdiff_nonperiodic_1d.jl @@ -19,7 +19,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = 0.0 coordinates_max = 1.0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/examples/hypdiff_nonperiodic_2d.jl b/examples/hypdiff_nonperiodic_2d.jl index cc5aa5eb..020328a4 100644 --- a/examples/hypdiff_nonperiodic_2d.jl +++ b/examples/hypdiff_nonperiodic_2d.jl @@ -22,7 +22,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = (false, true)) diff --git a/examples/hypdiff_nonperiodic_3d.jl b/examples/hypdiff_nonperiodic_3d.jl index b20926a8..a69373d1 100644 --- a/examples/hypdiff_nonperiodic_3d.jl +++ b/examples/hypdiff_nonperiodic_3d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = (false, true, true)) diff --git a/examples/shallowwater_dirichlet_1d.jl b/examples/shallowwater_dirichlet_1d.jl index 6d87cb2c..d2fb23f5 100644 --- a/examples/shallowwater_dirichlet_1d.jl +++ b/examples/shallowwater_dirichlet_1d.jl @@ -25,7 +25,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = surface_flux, coordinates_min = 0.0 coordinates_max = sqrt(2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/examples/shallowwater_dirichlet_2d.jl b/examples/shallowwater_dirichlet_2d.jl index a11c8693..c2f20d3b 100644 --- a/examples/shallowwater_dirichlet_2d.jl +++ b/examples/shallowwater_dirichlet_2d.jl @@ -25,7 +25,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/examples/shallowwater_ec_1d.jl b/examples/shallowwater_ec_1d.jl index 8d8fa7c7..fb67dd8f 100644 --- a/examples/shallowwater_ec_1d.jl +++ b/examples/shallowwater_ec_1d.jl @@ -51,7 +51,7 @@ solver = DGSEMGPU(polydeg = 4, coordinates_min = -1.0 coordinates_max = 1.0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/examples/shallowwater_ec_2d.jl b/examples/shallowwater_ec_2d.jl index 0afb0719..830f00b5 100644 --- a/examples/shallowwater_ec_2d.jl +++ b/examples/shallowwater_ec_2d.jl @@ -26,7 +26,7 @@ solver = DGSEMGPU(polydeg = 4, coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/examples/shallowwater_source_terms_1d.jl b/examples/shallowwater_source_terms_1d.jl index 4558ba27..57932cfb 100644 --- a/examples/shallowwater_source_terms_1d.jl +++ b/examples/shallowwater_source_terms_1d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = 0.0 coordinates_max = sqrt(2.0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/examples/shallowwater_source_terms_2d.jl b/examples/shallowwater_source_terms_2d.jl index 8632557c..c7e4ab73 100644 --- a/examples/shallowwater_source_terms_2d.jl +++ b/examples/shallowwater_source_terms_2d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/profile/profiling.jl b/profile/profiling.jl index 985c3751..3c3721ae 100644 --- a/profile/profiling.jl +++ b/profile/profiling.jl @@ -9,7 +9,7 @@ coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) refinement_patches = ((type = "box", coordinates_min = (0.5, 0.5, 0.5), coordinates_max = (1.5, 1.5, 1.5)),) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/profile/profiling_kernel.jl b/profile/profiling_kernel.jl index 1242f2a8..b09325cd 100644 --- a/profile/profiling_kernel.jl +++ b/profile/profiling_kernel.jl @@ -27,10 +27,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = -2.0f0 coordinates_max = 2.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel2.jl b/profile/profiling_kernel2.jl index d20d4f5f..a820b771 100644 --- a/profile/profiling_kernel2.jl +++ b/profile/profiling_kernel2.jl @@ -27,10 +27,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu) diff --git a/profile/profiling_kernel3.jl b/profile/profiling_kernel3.jl index ccb8462f..e9a76726 100644 --- a/profile/profiling_kernel3.jl +++ b/profile/profiling_kernel3.jl @@ -27,10 +27,10 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max, +mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, - RealT = RealT, - periodicity = true) + periodicity = true, + RealT = RealT) semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver_gpu, source_terms = source_terms_convergence_test) diff --git a/test/dependency_compatibility.jl b/test/dependency_compatibility.jl deleted file mode 100644 index 50c5f23b..00000000 --- a/test/dependency_compatibility.jl +++ /dev/null @@ -1,128 +0,0 @@ -using Test -using CUDA, Trixi, TrixiCUDA - -@testset "Dependency compatibility" begin - equations = LinearScalarAdvectionEquation1D(1.0) - basis = LobattoLegendreBasis(3) - indicator = IndicatorHennemannGassner(equations, basis; variable = (u, equations) -> first(u)) - volume_integral = VolumeIntegralShockCapturingHG(indicator) - @test TrixiCUDA.check_gpu_volume_integral(volume_integral) === nothing - @test TrixiCUDA.check_gpu_volume_integral(VolumeIntegralWeakForm()) === nothing - - generalized = VolumeIntegralShockCapturingHGType(indicator; - volume_integral_default = VolumeIntegralWeakForm(), - volume_integral_blend_high_order = VolumeIntegralFluxDifferencing(flux_central), - volume_integral_blend_low_order = VolumeIntegralPureLGLFiniteVolume(flux_lax_friedrichs)) - @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(generalized) - different_fluxes = VolumeIntegralShockCapturingHGType(indicator; - volume_integral_default = VolumeIntegralFluxDifferencing(flux_central), - volume_integral_blend_high_order = VolumeIntegralFluxDifferencing(flux_lax_friedrichs), - volume_integral_blend_low_order = VolumeIntegralPureLGLFiniteVolume(flux_lax_friedrichs)) - @test_throws ArgumentError TrixiCUDA.check_gpu_volume_integral(different_fluxes) - - # These public CUDA constants must resolve even on hosts without a GPU. - @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT) - @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK) - @test isdefined(CUDA, :DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK) - - # Exercise the host reference interfaces used by the GPU comparison tests. - for spatial_dimension in 1:3 - equations = getproperty(Trixi, Symbol("LinearScalarAdvectionEquation$(spatial_dimension)D"))(spatial_dimension == 1 ? 1.0 : - ntuple(_ -> 1.0, spatial_dimension)) - coordinates_min = spatial_dimension == 1 ? -1.0 : ntuple(_ -> -1.0, spatial_dimension) - coordinates_max = spatial_dimension == 1 ? 1.0 : ntuple(_ -> 1.0, spatial_dimension) - mesh = TreeMesh(coordinates_min, coordinates_max; - initial_refinement_level = 1, periodicity = false) - solver = DGSEM(polydeg = 3, surface_flux = flux_lax_friedrichs) - semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_convergence_test, - solver; - boundary_conditions = BoundaryConditionDirichlet(initial_condition_convergence_test)) - ode = semidiscretize(semi, (0.0, 0.1)) - (; cache) = semi - u = Trixi.wrap_array(ode.u0, mesh, equations, solver, cache) - du = similar(u) - Trixi.set_zero!(du, solver, cache) - Trixi.calc_volume_integral!(nothing, du, u, mesh, - Trixi.have_nonconservative_terms(equations), equations, - solver.volume_integral, solver, cache) - if spatial_dimension == 1 - Trixi.prolong2interfaces!(cache, u, mesh, equations, solver) - Trixi.calc_interface_flux!(cache.elements.surface_flux_values, mesh, - Trixi.have_nonconservative_terms(equations), equations, - solver.surface_integral, solver, cache) - else - Trixi.prolong2interfaces!(nothing, cache, u, mesh, equations, solver) - Trixi.calc_interface_flux!(nothing, cache.elements.surface_flux_values, mesh, - Trixi.have_nonconservative_terms(equations), equations, - solver.surface_integral, solver, cache) - end - Trixi.prolong2boundaries!(nothing, cache, u, mesh, equations, solver) - Trixi.calc_boundary_flux!(nothing, cache, 0.0, semi.boundary_conditions, - mesh, equations, solver.surface_integral, solver) - Trixi.calc_surface_integral!(nothing, du, u, mesh, equations, solver.surface_integral, - solver, cache) - Trixi.apply_jacobian!(nothing, du, mesh, equations, solver, cache) - Trixi.calc_sources!(nothing, du, u, 0.0, nothing, equations, solver, cache) - reference = similar(ode.u0) - ode.f(reference, ode.u0, ode.p, 0.0) - @test vec(du) ≈ reference - @test all(isfinite, du) - - # Check both flat and already-shaped GPU inputs without allocating device - # memory, so CPU-only CI also covers the semidiscretizeGPU return shape. - for RealT in (Float32, Float64), array_dimension in (1, spatial_dimension + 2) - argument_types = Tuple{CuArray{RealT, array_dimension, CUDA.DeviceMemory}, typeof(mesh), - typeof(equations), typeof(solver), typeof(cache)} - @test which(Trixi.wrap_array, argument_types).module === TrixiCUDA - @test which(Trixi.wrap_array_native, argument_types).module === TrixiCUDA - end - - if CUDA.functional() - solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs) - u_gpu_flat = CuArray(ode.u0) - GC.@preserve u_gpu_flat begin - for wrap in (Trixi.wrap_array, Trixi.wrap_array_native), - input in (u_gpu_flat, reshape(u_gpu_flat, size(u))) - u_gpu = wrap(input, mesh, equations, solver_gpu, cache) - @test size(u_gpu) == size(u) - @test Array(u_gpu) ≈ Array(u) - @test pointer(u_gpu) == pointer(u_gpu_flat) - end - end - - # Exercise the actual initialization and RHS path, where the ODE - # state is already a multidimensional CuArray. - semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, - initial_condition_convergence_test, - solver_gpu; - boundary_conditions = BoundaryConditionDirichlet(initial_condition_convergence_test)) - ode_gpu = semidiscretizeGPU(semi_gpu, (0.0, 0.1)) - u_gpu = Trixi.wrap_array(ode_gpu.u0, semi_gpu) - @test size(u_gpu) == size(u) - @test Array(u_gpu) ≈ Array(u) - du_gpu = similar(ode_gpu.u0) - ode_gpu.f(du_gpu, ode_gpu.u0, ode_gpu.p, 0.0) - @test vec(Array(du_gpu)) ≈ reference - end - end - - if CUDA.functional() - @test TrixiCUDA.MULTIPROCESSOR_COUNT > 0 - @test TrixiCUDA.MAX_THREADS_PER_BLOCK > 0 - @test TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK > 0 - for RealT in (Float32, Float64), degree in (1, 3, 5) - basis_cpu = LobattoLegendreBasis(RealT, degree) - basis_gpu = LobattoLegendreBasisGPU(RealT, degree) - @test Array(basis_gpu.derivative_hat) ≈ basis_cpu.derivative_hat - @test Array(basis_gpu.derivative_split) ≈ basis_cpu.derivative_split - @test Array(basis_gpu.derivative_split_transpose) ≈ transpose(basis_cpu.derivative_split) - expected_boundary = zeros(RealT, degree + 1, 2) - expected_boundary[1, 1] = first(basis_cpu.inverse_weights) - expected_boundary[end, 2] = last(basis_cpu.inverse_weights) - @test basis_gpu.boundary_interpolation ≈ expected_boundary - indicator = IndicatorHennemannGassner(LinearScalarAdvectionEquation1D(one(RealT)), basis_gpu; - variable = (u, equations) -> first(u)) - @test length(indicator.cache.indicator_threaded) == Threads.maxthreadid() - end - end -end diff --git a/test/runtests.jl b/test/runtests.jl index d0ccc46f..fead93ad 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -15,8 +15,6 @@ using CUDA println("- Max threads per block: ", TrixiCUDA.MAX_THREADS_PER_BLOCK) println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) - include("dependency_compatibility.jl") - @info "Starting TrixiCUDA test suite..." for (dim, path) in [("1D", "./tree_dgsem_1d/tree_dgsem_1d.jl"), ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), diff --git a/test/tree_dgsem_1d/advection_basic.jl b/test/tree_dgsem_1d/advection_basic.jl index 529e3e76..42e04bc5 100644 --- a/test/tree_dgsem_1d/advection_basic.jl +++ b/test/tree_dgsem_1d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/advection_extended.jl b/test/tree_dgsem_1d/advection_extended.jl index 463adfbb..73016169 100644 --- a/test/tree_dgsem_1d/advection_extended.jl +++ b/test/tree_dgsem_1d/advection_extended.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/burgers_basic.jl b/test/tree_dgsem_1d/burgers_basic.jl index c278abc2..e62f2e82 100644 --- a/test/tree_dgsem_1d/burgers_basic.jl +++ b/test/tree_dgsem_1d/burgers_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/burgers_rarefraction.jl b/test/tree_dgsem_1d/burgers_rarefraction.jl index 17fb15d3..663184fe 100644 --- a/test/tree_dgsem_1d/burgers_rarefraction.jl +++ b/test/tree_dgsem_1d/burgers_rarefraction.jl @@ -32,7 +32,7 @@ include("../test_macros.jl") coordinate_min = 0.0 coordinate_max = 1.0 - mesh = TreeMesh(coordinate_min, coordinate_max, + mesh = TreeMesh(coordinate_min, coordinate_max; initial_refinement_level = 6, periodicity = false) diff --git a/test/tree_dgsem_1d/burgers_shock.jl b/test/tree_dgsem_1d/burgers_shock.jl index 5bade26e..25493074 100644 --- a/test/tree_dgsem_1d/burgers_shock.jl +++ b/test/tree_dgsem_1d/burgers_shock.jl @@ -33,7 +33,7 @@ include("../test_macros.jl") coordinate_max = 1.0 # Make sure to turn periodicity explicitly off as special boundary conditions are specified - mesh = TreeMesh(coordinate_min, coordinate_max, + mesh = TreeMesh(coordinate_min, coordinate_max; initial_refinement_level = 6, periodicity = false) diff --git a/test/tree_dgsem_1d/euler_blast_wave.jl b/test/tree_dgsem_1d/euler_blast_wave.jl index 8a922c1b..6a4058d8 100644 --- a/test/tree_dgsem_1d/euler_blast_wave.jl +++ b/test/tree_dgsem_1d/euler_blast_wave.jl @@ -42,7 +42,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 6, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_ec.jl b/test/tree_dgsem_1d/euler_ec.jl index 1e09d1c4..e4acef1b 100644 --- a/test/tree_dgsem_1d/euler_ec.jl +++ b/test/tree_dgsem_1d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_shock.jl b/test/tree_dgsem_1d/euler_shock.jl index 09248946..ebdd54b8 100644 --- a/test/tree_dgsem_1d/euler_shock.jl +++ b/test/tree_dgsem_1d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = -2.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_source_terms.jl b/test/tree_dgsem_1d/euler_source_terms.jl index acea622c..1414c79e 100644 --- a/test/tree_dgsem_1d/euler_source_terms.jl +++ b/test/tree_dgsem_1d/euler_source_terms.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl index f57215ae..aa7d1197 100644 --- a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (0.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = false) diff --git a/test/tree_dgsem_1d/eulermulti_ec.jl b/test/tree_dgsem_1d/eulermulti_ec.jl index b440095a..0c9ebc6d 100644 --- a/test/tree_dgsem_1d/eulermulti_ec.jl +++ b/test/tree_dgsem_1d/eulermulti_ec.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/eulermulti_es.jl b/test/tree_dgsem_1d/eulermulti_es.jl index 0a165c20..5b31db94 100644 --- a/test/tree_dgsem_1d/eulermulti_es.jl +++ b/test/tree_dgsem_1d/eulermulti_es.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/eulerquasi_ec.jl b/test/tree_dgsem_1d/eulerquasi_ec.jl index 7a139d6d..43f19ee4 100644 --- a/test/tree_dgsem_1d/eulerquasi_ec.jl +++ b/test/tree_dgsem_1d/eulerquasi_ec.jl @@ -28,7 +28,7 @@ include("../test_macros.jl") coordinates_min = (-1.0,) coordinates_max = (1.0,) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 6, periodicity = true) diff --git a/test/tree_dgsem_1d/eulerquasi_source_terms.jl b/test/tree_dgsem_1d/eulerquasi_source_terms.jl index 38fc5c74..9118a47e 100644 --- a/test/tree_dgsem_1d/eulerquasi_source_terms.jl +++ b/test/tree_dgsem_1d/eulerquasi_source_terms.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl index 059724b2..62e70dcc 100644 --- a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = false) diff --git a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl index 559ae777..58a644fd 100644 --- a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_1d/mhd_alfven_wave.jl b/test/tree_dgsem_1d/mhd_alfven_wave.jl index a956ee83..c1550682 100644 --- a/test/tree_dgsem_1d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_1d/mhd_alfven_wave.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_1d/mhd_ec.jl b/test/tree_dgsem_1d/mhd_ec.jl index 822493cd..9a774593 100644 --- a/test/tree_dgsem_1d/mhd_ec.jl +++ b/test/tree_dgsem_1d/mhd_ec.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/shallowwater_shock.jl b/test/tree_dgsem_1d/shallowwater_shock.jl index a6627a3c..ddf052d5 100644 --- a/test/tree_dgsem_1d/shallowwater_shock.jl +++ b/test/tree_dgsem_1d/shallowwater_shock.jl @@ -58,7 +58,7 @@ include("../test_macros.jl") coordinates_min = -3.0 coordinates_max = 3.0 - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_2d/advection_basic.jl b/test/tree_dgsem_2d/advection_basic.jl index b0231bf7..3de271db 100644 --- a/test/tree_dgsem_2d/advection_basic.jl +++ b/test/tree_dgsem_2d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/advection_mortar.jl b/test/tree_dgsem_2d/advection_mortar.jl index 3d813235..0177d636 100644 --- a/test/tree_dgsem_2d/advection_mortar.jl +++ b/test/tree_dgsem_2d/advection_mortar.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0), coordinates_max = (1.0, 1.0)),) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_blob_mortar.jl b/test/tree_dgsem_2d/euler_blob_mortar.jl index cf31db1e..f09d6dbd 100644 --- a/test/tree_dgsem_2d/euler_blob_mortar.jl +++ b/test/tree_dgsem_2d/euler_blob_mortar.jl @@ -62,7 +62,7 @@ include("../test_macros.jl") coordinates_max = (40.0, 5.0)), (type = "box", coordinates_min = (-40.0, -5.0), coordinates_max = (40.0, 5.0))) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_ec.jl b/test/tree_dgsem_2d/euler_ec.jl index b66c19aa..5d1ac1fe 100644 --- a/test/tree_dgsem_2d/euler_ec.jl +++ b/test/tree_dgsem_2d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_shock.jl b/test/tree_dgsem_2d/euler_shock.jl index c0cb64fe..29156805 100644 --- a/test/tree_dgsem_2d/euler_shock.jl +++ b/test/tree_dgsem_2d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_source_terms.jl b/test/tree_dgsem_2d/euler_source_terms.jl index 2016fd86..9ec854c3 100644 --- a/test/tree_dgsem_2d/euler_source_terms.jl +++ b/test/tree_dgsem_2d/euler_source_terms.jl @@ -14,7 +14,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl index 6fe163ae..835755e3 100644 --- a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = false) diff --git a/test/tree_dgsem_2d/eulermulti_ec.jl b/test/tree_dgsem_2d/eulermulti_ec.jl index 8ec55079..59dd5fc1 100644 --- a/test/tree_dgsem_2d/eulermulti_ec.jl +++ b/test/tree_dgsem_2d/eulermulti_ec.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/eulermulti_es.jl b/test/tree_dgsem_2d/eulermulti_es.jl index 4f0bbae1..af08260d 100644 --- a/test/tree_dgsem_2d/eulermulti_es.jl +++ b/test/tree_dgsem_2d/eulermulti_es.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl index 4bacb92a..2b87a929 100644 --- a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = (false, true)) diff --git a/test/tree_dgsem_2d/mhd_alfven_wave.jl b/test/tree_dgsem_2d/mhd_alfven_wave.jl index 5af1e9db..7749e2b0 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl index 1d2cecc1..8f42fa4f 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl @@ -25,7 +25,7 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) refinement_patches = ((type = "box", coordinates_min = 0.25 .* coordinates_max, coordinates_max = 0.75 .* coordinates_max),) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_ec.jl b/test/tree_dgsem_2d/mhd_ec.jl index b44e0393..b024a37d 100644 --- a/test/tree_dgsem_2d/mhd_ec.jl +++ b/test/tree_dgsem_2d/mhd_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_shock.jl b/test/tree_dgsem_2d/mhd_shock.jl index df67e3c2..bf7d0e3a 100644 --- a/test/tree_dgsem_2d/mhd_shock.jl +++ b/test/tree_dgsem_2d/mhd_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_2d/shallowwater_ec.jl b/test/tree_dgsem_2d/shallowwater_ec.jl index a3732744..546e5ff5 100644 --- a/test/tree_dgsem_2d/shallowwater_ec.jl +++ b/test/tree_dgsem_2d/shallowwater_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_2d/shallowwater_source_terms.jl b/test/tree_dgsem_2d/shallowwater_source_terms.jl index 19fb68fc..c7131855 100644 --- a/test/tree_dgsem_2d/shallowwater_source_terms.jl +++ b/test/tree_dgsem_2d/shallowwater_source_terms.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl index 44c48904..ccde6136 100644 --- a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl @@ -22,7 +22,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_3d/advection_basic.jl b/test/tree_dgsem_3d/advection_basic.jl index 252cc80b..75b7d21e 100644 --- a/test/tree_dgsem_3d/advection_basic.jl +++ b/test/tree_dgsem_3d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/advection_mortar.jl b/test/tree_dgsem_3d/advection_mortar.jl index c3a54dda..5ee318cf 100644 --- a/test/tree_dgsem_3d/advection_mortar.jl +++ b/test/tree_dgsem_3d/advection_mortar.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0)), (type = "box", coordinates_min = (0.0, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5))) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_convergence.jl b/test/tree_dgsem_3d/euler_convergence.jl index 57a62aac..82333657 100644 --- a/test/tree_dgsem_3d/euler_convergence.jl +++ b/test/tree_dgsem_3d/euler_convergence.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_ec.jl b/test/tree_dgsem_3d/euler_ec.jl index 8525899f..99462a2e 100644 --- a/test/tree_dgsem_3d/euler_ec.jl +++ b/test/tree_dgsem_3d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_mortar.jl b/test/tree_dgsem_3d/euler_mortar.jl index 212ca8f3..c055f896 100644 --- a/test/tree_dgsem_3d/euler_mortar.jl +++ b/test/tree_dgsem_3d/euler_mortar.jl @@ -16,7 +16,7 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) refinement_patches = ((type = "box", coordinates_min = (0.5, 0.5, 0.5), coordinates_max = (1.5, 1.5, 1.5)),) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_shock.jl b/test/tree_dgsem_3d/euler_shock.jl index 8277929d..fa0ff008 100644 --- a/test/tree_dgsem_3d/euler_shock.jl +++ b/test/tree_dgsem_3d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_source_terms.jl b/test/tree_dgsem_3d/euler_source_terms.jl index b964db4c..8bbd8fcc 100644 --- a/test/tree_dgsem_3d/euler_source_terms.jl +++ b/test/tree_dgsem_3d/euler_source_terms.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl index a8245f29..29251e74 100644 --- a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = (false, true, true)) diff --git a/test/tree_dgsem_3d/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl index c3b1723b..7d0cf2c0 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl index 5a6c5e2c..587c6c56 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (-0.5, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5)),) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_ec.jl b/test/tree_dgsem_3d/mhd_ec.jl index 081b3b5a..a4eb1ed4 100644 --- a/test/tree_dgsem_3d/mhd_ec.jl +++ b/test/tree_dgsem_3d/mhd_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_shock.jl b/test/tree_dgsem_3d/mhd_shock.jl index ab7ef9fd..8eb56ab7 100644 --- a/test/tree_dgsem_3d/mhd_shock.jl +++ b/test/tree_dgsem_3d/mhd_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max, + mesh = TreeMesh(coordinates_min, coordinates_max; initial_refinement_level = 3, periodicity = true) From 758b17caf32430c09e664ec57309b7e11657fe0a Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Wed, 21 Oct 2026 23:51:47 +0800 Subject: [PATCH 15/28] Restore comma separators in TreeMesh constructors --- benchmark/advection_basic_1d.jl | 2 +- benchmark/advection_basic_2d.jl | 2 +- benchmark/advection_basic_3d.jl | 2 +- benchmark/advection_mortar_2d.jl | 2 +- benchmark/advection_mortar_3d.jl | 2 +- benchmark/euler_ec_1d.jl | 2 +- benchmark/euler_ec_2d.jl | 2 +- benchmark/euler_ec_3d.jl | 2 +- benchmark/euler_shock_1d.jl | 2 +- benchmark/euler_shock_2d.jl | 2 +- benchmark/euler_shock_3d.jl | 2 +- benchmark/hypdiff_nonperiodic_1d.jl | 2 +- benchmark/hypdiff_nonperiodic_2d.jl | 2 +- benchmark/hypdiff_nonperiodic_3d.jl | 2 +- benchmark/mhd_alfven_wave_1d.jl | 2 +- benchmark/mhd_alfven_wave_2d.jl | 2 +- benchmark/mhd_alfven_wave_3d.jl | 2 +- benchmark/mhd_alfven_wave_mortar_2d.jl | 2 +- benchmark/mhd_alfven_wave_mortar_3d.jl | 2 +- benchmark/mhd_ec_1d.jl | 2 +- benchmark/mhd_ec_2d.jl | 2 +- benchmark/mhd_ec_3d.jl | 2 +- benchmark/shallowwater_ec_1d.jl | 2 +- benchmark/shallowwater_ec_2d.jl | 2 +- benchmark/shallowwater_source_terms_1d.jl | 2 +- benchmark/shallowwater_source_terms_2d.jl | 2 +- examples/advection_basic_1d.jl | 2 +- examples/advection_basic_2d.jl | 2 +- examples/advection_basic_3d.jl | 2 +- examples/advection_mortar_2d.jl | 2 +- examples/advection_mortar_3d.jl | 2 +- examples/euler_ec_1d.jl | 2 +- examples/euler_ec_2d.jl | 2 +- examples/euler_ec_3d.jl | 2 +- examples/euler_shockcapturing_1d.jl | 2 +- examples/euler_shockcapturing_2d.jl | 2 +- examples/euler_shockcapturing_3d.jl | 2 +- examples/euler_source_terms_1d.jl | 2 +- examples/euler_source_terms_2d.jl | 2 +- examples/euler_source_terms_3d.jl | 2 +- examples/eulermulti_ec_1d.jl | 2 +- examples/eulermulti_ec_2d.jl | 2 +- examples/hypdiff_nonperiodic_1d.jl | 2 +- examples/hypdiff_nonperiodic_2d.jl | 2 +- examples/hypdiff_nonperiodic_3d.jl | 2 +- examples/shallowwater_dirichlet_1d.jl | 2 +- examples/shallowwater_dirichlet_2d.jl | 2 +- examples/shallowwater_ec_1d.jl | 2 +- examples/shallowwater_ec_2d.jl | 2 +- examples/shallowwater_source_terms_1d.jl | 2 +- examples/shallowwater_source_terms_2d.jl | 2 +- profile/profiling.jl | 2 +- profile/profiling_kernel.jl | 2 +- profile/profiling_kernel2.jl | 2 +- profile/profiling_kernel3.jl | 2 +- test/tree_dgsem_1d/advection_basic.jl | 2 +- test/tree_dgsem_1d/advection_extended.jl | 2 +- test/tree_dgsem_1d/burgers_basic.jl | 2 +- test/tree_dgsem_1d/burgers_rarefraction.jl | 2 +- test/tree_dgsem_1d/burgers_shock.jl | 2 +- test/tree_dgsem_1d/euler_blast_wave.jl | 2 +- test/tree_dgsem_1d/euler_ec.jl | 2 +- test/tree_dgsem_1d/euler_shock.jl | 2 +- test/tree_dgsem_1d/euler_source_terms.jl | 2 +- test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_1d/eulermulti_ec.jl | 2 +- test/tree_dgsem_1d/eulermulti_es.jl | 2 +- test/tree_dgsem_1d/eulerquasi_ec.jl | 2 +- test/tree_dgsem_1d/eulerquasi_source_terms.jl | 2 +- test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl | 2 +- test/tree_dgsem_1d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_1d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_1d/mhd_ec.jl | 2 +- test/tree_dgsem_1d/shallowwater_shock.jl | 2 +- test/tree_dgsem_2d/advection_basic.jl | 2 +- test/tree_dgsem_2d/advection_mortar.jl | 2 +- test/tree_dgsem_2d/euler_blob_mortar.jl | 2 +- test/tree_dgsem_2d/euler_ec.jl | 2 +- test/tree_dgsem_2d/euler_shock.jl | 2 +- test/tree_dgsem_2d/euler_source_terms.jl | 2 +- test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_2d/eulermulti_ec.jl | 2 +- test/tree_dgsem_2d/eulermulti_es.jl | 2 +- test/tree_dgsem_2d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_2d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_2d/mhd_ec.jl | 2 +- test/tree_dgsem_2d/mhd_shock.jl | 2 +- test/tree_dgsem_2d/shallowwater_ec.jl | 2 +- test/tree_dgsem_2d/shallowwater_source_terms.jl | 2 +- test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl | 2 +- test/tree_dgsem_3d/advection_basic.jl | 2 +- test/tree_dgsem_3d/advection_mortar.jl | 2 +- test/tree_dgsem_3d/euler_convergence.jl | 2 +- test/tree_dgsem_3d/euler_ec.jl | 2 +- test/tree_dgsem_3d/euler_mortar.jl | 2 +- test/tree_dgsem_3d/euler_shock.jl | 2 +- test/tree_dgsem_3d/euler_source_terms.jl | 2 +- test/tree_dgsem_3d/hypdiff_nonperiodic.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_3d/mhd_ec.jl | 2 +- test/tree_dgsem_3d/mhd_shock.jl | 2 +- 103 files changed, 103 insertions(+), 103 deletions(-) diff --git a/benchmark/advection_basic_1d.jl b/benchmark/advection_basic_1d.jl index dddf28ec..cfa5e315 100644 --- a/benchmark/advection_basic_1d.jl +++ b/benchmark/advection_basic_1d.jl @@ -15,7 +15,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = -1.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/advection_basic_2d.jl b/benchmark/advection_basic_2d.jl index 40ce7991..40612212 100644 --- a/benchmark/advection_basic_2d.jl +++ b/benchmark/advection_basic_2d.jl @@ -15,7 +15,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/advection_basic_3d.jl b/benchmark/advection_basic_3d.jl index 62fc0fc1..513ebd02 100644 --- a/benchmark/advection_basic_3d.jl +++ b/benchmark/advection_basic_3d.jl @@ -15,7 +15,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/advection_mortar_2d.jl b/benchmark/advection_mortar_2d.jl index eef0f995..53ed69cc 100644 --- a/benchmark/advection_mortar_2d.jl +++ b/benchmark/advection_mortar_2d.jl @@ -17,7 +17,7 @@ coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0), coordinates_max = (1.0f0, 1.0f0)),) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true, diff --git a/benchmark/advection_mortar_3d.jl b/benchmark/advection_mortar_3d.jl index 1436e464..7a1a3a86 100644 --- a/benchmark/advection_mortar_3d.jl +++ b/benchmark/advection_mortar_3d.jl @@ -19,7 +19,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.0f0, -1.0f0, -1.0f0), coordinates_max = (1.0f0, 1.0f0, 1.0f0)), (type = "box", coordinates_min = (0.0f0, -0.5f0, -0.5f0), coordinates_max = (0.5f0, 0.5f0, 0.5f0))) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true, diff --git a/benchmark/euler_ec_1d.jl b/benchmark/euler_ec_1d.jl index 0c228d11..c317f2e1 100644 --- a/benchmark/euler_ec_1d.jl +++ b/benchmark/euler_ec_1d.jl @@ -20,7 +20,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0,) coordinates_max = (2.0f0,) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/euler_ec_2d.jl b/benchmark/euler_ec_2d.jl index 89fd289d..6877a60c 100644 --- a/benchmark/euler_ec_2d.jl +++ b/benchmark/euler_ec_2d.jl @@ -20,7 +20,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/euler_ec_3d.jl b/benchmark/euler_ec_3d.jl index 3d5def12..4d1c9a92 100644 --- a/benchmark/euler_ec_3d.jl +++ b/benchmark/euler_ec_3d.jl @@ -20,7 +20,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/euler_shock_1d.jl b/benchmark/euler_shock_1d.jl index 29b7767e..aa51f726 100644 --- a/benchmark/euler_shock_1d.jl +++ b/benchmark/euler_shock_1d.jl @@ -33,7 +33,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = -2.0f0 coordinates_max = 2.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/euler_shock_2d.jl b/benchmark/euler_shock_2d.jl index 6769418b..7d037474 100644 --- a/benchmark/euler_shock_2d.jl +++ b/benchmark/euler_shock_2d.jl @@ -33,7 +33,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/euler_shock_3d.jl b/benchmark/euler_shock_3d.jl index 91cd8313..70deefdc 100644 --- a/benchmark/euler_shock_3d.jl +++ b/benchmark/euler_shock_3d.jl @@ -33,7 +33,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/benchmark/hypdiff_nonperiodic_1d.jl b/benchmark/hypdiff_nonperiodic_1d.jl index 33867f25..4e603fd1 100644 --- a/benchmark/hypdiff_nonperiodic_1d.jl +++ b/benchmark/hypdiff_nonperiodic_1d.jl @@ -19,7 +19,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false, RealT = RealT) diff --git a/benchmark/hypdiff_nonperiodic_2d.jl b/benchmark/hypdiff_nonperiodic_2d.jl index 23dfb5fb..050d656c 100644 --- a/benchmark/hypdiff_nonperiodic_2d.jl +++ b/benchmark/hypdiff_nonperiodic_2d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = (false, true), RealT = RealT) diff --git a/benchmark/hypdiff_nonperiodic_3d.jl b/benchmark/hypdiff_nonperiodic_3d.jl index 052e0fe7..fefc8faf 100644 --- a/benchmark/hypdiff_nonperiodic_3d.jl +++ b/benchmark/hypdiff_nonperiodic_3d.jl @@ -24,7 +24,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs, RealT = R coordinates_min = (0.0f0, 0.0f0, 0.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = (false, true, true), RealT = RealT) diff --git a/benchmark/mhd_alfven_wave_1d.jl b/benchmark/mhd_alfven_wave_1d.jl index cc2fb1d6..46b4aa39 100644 --- a/benchmark/mhd_alfven_wave_1d.jl +++ b/benchmark/mhd_alfven_wave_1d.jl @@ -19,7 +19,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/mhd_alfven_wave_2d.jl b/benchmark/mhd_alfven_wave_2d.jl index a8b650b9..aee7b0fc 100644 --- a/benchmark/mhd_alfven_wave_2d.jl +++ b/benchmark/mhd_alfven_wave_2d.jl @@ -21,7 +21,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/mhd_alfven_wave_3d.jl b/benchmark/mhd_alfven_wave_3d.jl index 7acb9501..8d5ca7d8 100644 --- a/benchmark/mhd_alfven_wave_3d.jl +++ b/benchmark/mhd_alfven_wave_3d.jl @@ -21,7 +21,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/mhd_alfven_wave_mortar_2d.jl b/benchmark/mhd_alfven_wave_mortar_2d.jl index e2c775db..23493f20 100644 --- a/benchmark/mhd_alfven_wave_mortar_2d.jl +++ b/benchmark/mhd_alfven_wave_mortar_2d.jl @@ -27,7 +27,7 @@ coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) refinement_patches = ((type = "box", coordinates_min = 0.25f0 .* coordinates_max, coordinates_max = 0.75f0 .* coordinates_max),) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true, diff --git a/benchmark/mhd_alfven_wave_mortar_3d.jl b/benchmark/mhd_alfven_wave_mortar_3d.jl index 8ec2dcc0..fc841deb 100644 --- a/benchmark/mhd_alfven_wave_mortar_3d.jl +++ b/benchmark/mhd_alfven_wave_mortar_3d.jl @@ -27,7 +27,7 @@ coordinates_min = (-1.0f0, -1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0, 1.0f0) refinement_patches = ((type = "box", coordinates_min = (-0.5f0, -0.5f0, -0.5f0), coordinates_max = (0.5f0, 0.5f0, 0.5f0)),) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true, diff --git a/benchmark/mhd_ec_1d.jl b/benchmark/mhd_ec_1d.jl index f5b9bd5b..a632976d 100644 --- a/benchmark/mhd_ec_1d.jl +++ b/benchmark/mhd_ec_1d.jl @@ -21,7 +21,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, surface_flux = flux_hindenlang_gassner, coordinates_min = 0.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/mhd_ec_2d.jl b/benchmark/mhd_ec_2d.jl index b450586a..735eaa1b 100644 --- a/benchmark/mhd_ec_2d.jl +++ b/benchmark/mhd_ec_2d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/mhd_ec_3d.jl b/benchmark/mhd_ec_3d.jl index 715496d6..9683967c 100644 --- a/benchmark/mhd_ec_3d.jl +++ b/benchmark/mhd_ec_3d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/shallowwater_ec_1d.jl b/benchmark/shallowwater_ec_1d.jl index 2819e794..6003b43b 100644 --- a/benchmark/shallowwater_ec_1d.jl +++ b/benchmark/shallowwater_ec_1d.jl @@ -43,7 +43,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, coordinates_min = -1.0f0 coordinates_max = 1.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/shallowwater_ec_2d.jl b/benchmark/shallowwater_ec_2d.jl index 9cec262b..210273d1 100644 --- a/benchmark/shallowwater_ec_2d.jl +++ b/benchmark/shallowwater_ec_2d.jl @@ -54,7 +54,7 @@ solver_gpu = DGSEMGPU(polydeg = 4, coordinates_min = (-1.0f0, -1.0f0) coordinates_max = (1.0f0, 1.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true, RealT = RealT) diff --git a/benchmark/shallowwater_source_terms_1d.jl b/benchmark/shallowwater_source_terms_1d.jl index b3e007e8..52b2824b 100644 --- a/benchmark/shallowwater_source_terms_1d.jl +++ b/benchmark/shallowwater_source_terms_1d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = 0.0f0 coordinates_max = sqrt(2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true, RealT = RealT) diff --git a/benchmark/shallowwater_source_terms_2d.jl b/benchmark/shallowwater_source_terms_2d.jl index 1934f166..36026a2b 100644 --- a/benchmark/shallowwater_source_terms_2d.jl +++ b/benchmark/shallowwater_source_terms_2d.jl @@ -22,7 +22,7 @@ solver_gpu = DGSEMGPU(polydeg = 3, coordinates_min = (0.0f0, 0.0f0) coordinates_max = (sqrt(2.0f0), sqrt(2.0f0)) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true, RealT = RealT) diff --git a/examples/advection_basic_1d.jl b/examples/advection_basic_1d.jl index 05a2dd45..f536dcd6 100644 --- a/examples/advection_basic_1d.jl +++ b/examples/advection_basic_1d.jl @@ -16,7 +16,7 @@ coordinates_min = -1.0 # minimum coordinate coordinates_max = 1.0 # maximum coordinate # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_basic_2d.jl b/examples/advection_basic_2d.jl index d84a83d3..cf71de2f 100644 --- a/examples/advection_basic_2d.jl +++ b/examples/advection_basic_2d.jl @@ -16,7 +16,7 @@ coordinates_min = (-1.0, -1.0) # minimum coordinates (min(x), min(y)) coordinates_max = (1.0, 1.0) # maximum coordinates (max(x), max(y)) # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_basic_3d.jl b/examples/advection_basic_3d.jl index 64ad3f6e..07b52b58 100644 --- a/examples/advection_basic_3d.jl +++ b/examples/advection_basic_3d.jl @@ -16,7 +16,7 @@ coordinates_min = (-1.0, -1.0, -1.0) # minimum coordinates (min(x), min(y), min( coordinates_max = (1.0, 1.0, 1.0) # maximum coordinates (max(x), max(y), max(z)) # Create a uniformly refined mesh with periodic boundaries -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) # set maximum capacity of tree data structure diff --git a/examples/advection_mortar_2d.jl b/examples/advection_mortar_2d.jl index 56b624a4..615d9f1a 100644 --- a/examples/advection_mortar_2d.jl +++ b/examples/advection_mortar_2d.jl @@ -19,7 +19,7 @@ coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0), coordinates_max = (1.0, 1.0)),) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/examples/advection_mortar_3d.jl b/examples/advection_mortar_3d.jl index b5418dfe..c832f2cf 100644 --- a/examples/advection_mortar_3d.jl +++ b/examples/advection_mortar_3d.jl @@ -22,7 +22,7 @@ refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0, -1.0), coordinates_max = (1.0, 1.0, 1.0)), (type = "box", coordinates_min = (0.0, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5))) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/examples/euler_ec_1d.jl b/examples/euler_ec_1d.jl index 04d2243c..c47de28b 100644 --- a/examples/euler_ec_1d.jl +++ b/examples/euler_ec_1d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0,) coordinates_max = (2.0,) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_ec_2d.jl b/examples/euler_ec_2d.jl index e84254d7..8c7c64b0 100644 --- a/examples/euler_ec_2d.jl +++ b/examples/euler_ec_2d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_ec_3d.jl b/examples/euler_ec_3d.jl index 5fb4bc90..d4728385 100644 --- a/examples/euler_ec_3d.jl +++ b/examples/euler_ec_3d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/examples/euler_shockcapturing_1d.jl b/examples/euler_shockcapturing_1d.jl index ba3d6a4e..0be01896 100644 --- a/examples/euler_shockcapturing_1d.jl +++ b/examples/euler_shockcapturing_1d.jl @@ -30,7 +30,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = -2.0 coordinates_max = 2.0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_shockcapturing_2d.jl b/examples/euler_shockcapturing_2d.jl index 328832a1..19a62cb1 100644 --- a/examples/euler_shockcapturing_2d.jl +++ b/examples/euler_shockcapturing_2d.jl @@ -30,7 +30,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/euler_shockcapturing_3d.jl b/examples/euler_shockcapturing_3d.jl index f062a8b6..c41a076a 100644 --- a/examples/euler_shockcapturing_3d.jl +++ b/examples/euler_shockcapturing_3d.jl @@ -31,7 +31,7 @@ solver = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/examples/euler_source_terms_1d.jl b/examples/euler_source_terms_1d.jl index bbf8573d..c0ccd1ea 100644 --- a/examples/euler_source_terms_1d.jl +++ b/examples/euler_source_terms_1d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = 0.0 coordinates_max = 2.0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/examples/euler_source_terms_2d.jl b/examples/euler_source_terms_2d.jl index 5097b82e..20be977c 100644 --- a/examples/euler_source_terms_2d.jl +++ b/examples/euler_source_terms_2d.jl @@ -13,7 +13,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/examples/euler_source_terms_3d.jl b/examples/euler_source_terms_3d.jl index fdf63cd6..8027f437 100644 --- a/examples/euler_source_terms_3d.jl +++ b/examples/euler_source_terms_3d.jl @@ -15,7 +15,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_lax_friedrichs, coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/examples/eulermulti_ec_1d.jl b/examples/eulermulti_ec_1d.jl index fc5c95b7..c96de152 100644 --- a/examples/eulermulti_ec_1d.jl +++ b/examples/eulermulti_ec_1d.jl @@ -21,7 +21,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0,) coordinates_max = (2.0,) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/eulermulti_ec_2d.jl b/examples/eulermulti_ec_2d.jl index 716c6427..0fb93323 100644 --- a/examples/eulermulti_ec_2d.jl +++ b/examples/eulermulti_ec_2d.jl @@ -16,7 +16,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = flux_ranocha, coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/examples/hypdiff_nonperiodic_1d.jl b/examples/hypdiff_nonperiodic_1d.jl index a5919f79..94fa4700 100644 --- a/examples/hypdiff_nonperiodic_1d.jl +++ b/examples/hypdiff_nonperiodic_1d.jl @@ -19,7 +19,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = 0.0 coordinates_max = 1.0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/examples/hypdiff_nonperiodic_2d.jl b/examples/hypdiff_nonperiodic_2d.jl index 020328a4..cc5aa5eb 100644 --- a/examples/hypdiff_nonperiodic_2d.jl +++ b/examples/hypdiff_nonperiodic_2d.jl @@ -22,7 +22,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = (false, true)) diff --git a/examples/hypdiff_nonperiodic_3d.jl b/examples/hypdiff_nonperiodic_3d.jl index a69373d1..b20926a8 100644 --- a/examples/hypdiff_nonperiodic_3d.jl +++ b/examples/hypdiff_nonperiodic_3d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 4, surface_flux = flux_lax_friedrichs) coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = (false, true, true)) diff --git a/examples/shallowwater_dirichlet_1d.jl b/examples/shallowwater_dirichlet_1d.jl index d2fb23f5..6d87cb2c 100644 --- a/examples/shallowwater_dirichlet_1d.jl +++ b/examples/shallowwater_dirichlet_1d.jl @@ -25,7 +25,7 @@ solver = DGSEMGPU(polydeg = 3, surface_flux = surface_flux, coordinates_min = 0.0 coordinates_max = sqrt(2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/examples/shallowwater_dirichlet_2d.jl b/examples/shallowwater_dirichlet_2d.jl index c2f20d3b..a11c8693 100644 --- a/examples/shallowwater_dirichlet_2d.jl +++ b/examples/shallowwater_dirichlet_2d.jl @@ -25,7 +25,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/examples/shallowwater_ec_1d.jl b/examples/shallowwater_ec_1d.jl index fb67dd8f..8d8fa7c7 100644 --- a/examples/shallowwater_ec_1d.jl +++ b/examples/shallowwater_ec_1d.jl @@ -51,7 +51,7 @@ solver = DGSEMGPU(polydeg = 4, coordinates_min = -1.0 coordinates_max = 1.0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/examples/shallowwater_ec_2d.jl b/examples/shallowwater_ec_2d.jl index 830f00b5..0afb0719 100644 --- a/examples/shallowwater_ec_2d.jl +++ b/examples/shallowwater_ec_2d.jl @@ -26,7 +26,7 @@ solver = DGSEMGPU(polydeg = 4, coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/examples/shallowwater_source_terms_1d.jl b/examples/shallowwater_source_terms_1d.jl index 57932cfb..4558ba27 100644 --- a/examples/shallowwater_source_terms_1d.jl +++ b/examples/shallowwater_source_terms_1d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = 0.0 coordinates_max = sqrt(2.0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/examples/shallowwater_source_terms_2d.jl b/examples/shallowwater_source_terms_2d.jl index c7e4ab73..8632557c 100644 --- a/examples/shallowwater_source_terms_2d.jl +++ b/examples/shallowwater_source_terms_2d.jl @@ -23,7 +23,7 @@ solver = DGSEMGPU(polydeg = 3, coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/profile/profiling.jl b/profile/profiling.jl index 3c3721ae..985c3751 100644 --- a/profile/profiling.jl +++ b/profile/profiling.jl @@ -9,7 +9,7 @@ coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) refinement_patches = ((type = "box", coordinates_min = (0.5, 0.5, 0.5), coordinates_max = (1.5, 1.5, 1.5)),) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/profile/profiling_kernel.jl b/profile/profiling_kernel.jl index b09325cd..3c787e1b 100644 --- a/profile/profiling_kernel.jl +++ b/profile/profiling_kernel.jl @@ -27,7 +27,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = -2.0f0 coordinates_max = 2.0f0 -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true, RealT = RealT) diff --git a/profile/profiling_kernel2.jl b/profile/profiling_kernel2.jl index a820b771..44c58660 100644 --- a/profile/profiling_kernel2.jl +++ b/profile/profiling_kernel2.jl @@ -27,7 +27,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = (-2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true, RealT = RealT) diff --git a/profile/profiling_kernel3.jl b/profile/profiling_kernel3.jl index e9a76726..3e714508 100644 --- a/profile/profiling_kernel3.jl +++ b/profile/profiling_kernel3.jl @@ -27,7 +27,7 @@ solver_gpu = DGSEMGPU(polydeg = polydeg, surface_flux = surface_flux, volume_int coordinates_min = (-2.0f0, -2.0f0, -2.0f0) coordinates_max = (2.0f0, 2.0f0, 2.0f0) -mesh = TreeMesh(coordinates_min, coordinates_max; +mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true, RealT = RealT) diff --git a/test/tree_dgsem_1d/advection_basic.jl b/test/tree_dgsem_1d/advection_basic.jl index 42e04bc5..529e3e76 100644 --- a/test/tree_dgsem_1d/advection_basic.jl +++ b/test/tree_dgsem_1d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/advection_extended.jl b/test/tree_dgsem_1d/advection_extended.jl index 73016169..463adfbb 100644 --- a/test/tree_dgsem_1d/advection_extended.jl +++ b/test/tree_dgsem_1d/advection_extended.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/burgers_basic.jl b/test/tree_dgsem_1d/burgers_basic.jl index e62f2e82..c278abc2 100644 --- a/test/tree_dgsem_1d/burgers_basic.jl +++ b/test/tree_dgsem_1d/burgers_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/burgers_rarefraction.jl b/test/tree_dgsem_1d/burgers_rarefraction.jl index 663184fe..17fb15d3 100644 --- a/test/tree_dgsem_1d/burgers_rarefraction.jl +++ b/test/tree_dgsem_1d/burgers_rarefraction.jl @@ -32,7 +32,7 @@ include("../test_macros.jl") coordinate_min = 0.0 coordinate_max = 1.0 - mesh = TreeMesh(coordinate_min, coordinate_max; + mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, periodicity = false) diff --git a/test/tree_dgsem_1d/burgers_shock.jl b/test/tree_dgsem_1d/burgers_shock.jl index 25493074..5bade26e 100644 --- a/test/tree_dgsem_1d/burgers_shock.jl +++ b/test/tree_dgsem_1d/burgers_shock.jl @@ -33,7 +33,7 @@ include("../test_macros.jl") coordinate_max = 1.0 # Make sure to turn periodicity explicitly off as special boundary conditions are specified - mesh = TreeMesh(coordinate_min, coordinate_max; + mesh = TreeMesh(coordinate_min, coordinate_max, initial_refinement_level = 6, periodicity = false) diff --git a/test/tree_dgsem_1d/euler_blast_wave.jl b/test/tree_dgsem_1d/euler_blast_wave.jl index 6a4058d8..8a922c1b 100644 --- a/test/tree_dgsem_1d/euler_blast_wave.jl +++ b/test/tree_dgsem_1d/euler_blast_wave.jl @@ -42,7 +42,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 6, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_ec.jl b/test/tree_dgsem_1d/euler_ec.jl index e4acef1b..1e09d1c4 100644 --- a/test/tree_dgsem_1d/euler_ec.jl +++ b/test/tree_dgsem_1d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_shock.jl b/test/tree_dgsem_1d/euler_shock.jl index ebdd54b8..09248946 100644 --- a/test/tree_dgsem_1d/euler_shock.jl +++ b/test/tree_dgsem_1d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = -2.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_source_terms.jl b/test/tree_dgsem_1d/euler_source_terms.jl index 1414c79e..acea622c 100644 --- a/test/tree_dgsem_1d/euler_source_terms.jl +++ b/test/tree_dgsem_1d/euler_source_terms.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl index aa7d1197..f57215ae 100644 --- a/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_1d/euler_source_terms_nonperiodic.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (0.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = false) diff --git a/test/tree_dgsem_1d/eulermulti_ec.jl b/test/tree_dgsem_1d/eulermulti_ec.jl index 0c9ebc6d..b440095a 100644 --- a/test/tree_dgsem_1d/eulermulti_ec.jl +++ b/test/tree_dgsem_1d/eulermulti_ec.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/eulermulti_es.jl b/test/tree_dgsem_1d/eulermulti_es.jl index 5b31db94..0a165c20 100644 --- a/test/tree_dgsem_1d/eulermulti_es.jl +++ b/test/tree_dgsem_1d/eulermulti_es.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (-2.0,) coordinates_max = (2.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_1d/eulerquasi_ec.jl b/test/tree_dgsem_1d/eulerquasi_ec.jl index 43f19ee4..7a139d6d 100644 --- a/test/tree_dgsem_1d/eulerquasi_ec.jl +++ b/test/tree_dgsem_1d/eulerquasi_ec.jl @@ -28,7 +28,7 @@ include("../test_macros.jl") coordinates_min = (-1.0,) coordinates_max = (1.0,) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 6, periodicity = true) diff --git a/test/tree_dgsem_1d/eulerquasi_source_terms.jl b/test/tree_dgsem_1d/eulerquasi_source_terms.jl index 9118a47e..38fc5c74 100644 --- a/test/tree_dgsem_1d/eulerquasi_source_terms.jl +++ b/test/tree_dgsem_1d/eulerquasi_source_terms.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl index 62e70dcc..059724b2 100644 --- a/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_harmonic_nonperiodic.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = -1.0 coordinates_max = 2.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = false) diff --git a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl index 58a644fd..559ae777 100644 --- a/test/tree_dgsem_1d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_1d/hypdiff_nonperiodic.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_1d/mhd_alfven_wave.jl b/test/tree_dgsem_1d/mhd_alfven_wave.jl index c1550682..a956ee83 100644 --- a/test/tree_dgsem_1d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_1d/mhd_alfven_wave.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_1d/mhd_ec.jl b/test/tree_dgsem_1d/mhd_ec.jl index 9a774593..822493cd 100644 --- a/test/tree_dgsem_1d/mhd_ec.jl +++ b/test/tree_dgsem_1d/mhd_ec.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = 0.0 coordinates_max = 1.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_1d/shallowwater_shock.jl b/test/tree_dgsem_1d/shallowwater_shock.jl index ddf052d5..a6627a3c 100644 --- a/test/tree_dgsem_1d/shallowwater_shock.jl +++ b/test/tree_dgsem_1d/shallowwater_shock.jl @@ -58,7 +58,7 @@ include("../test_macros.jl") coordinates_min = -3.0 coordinates_max = 3.0 - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_2d/advection_basic.jl b/test/tree_dgsem_2d/advection_basic.jl index 3de271db..b0231bf7 100644 --- a/test/tree_dgsem_2d/advection_basic.jl +++ b/test/tree_dgsem_2d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/advection_mortar.jl b/test/tree_dgsem_2d/advection_mortar.jl index 0177d636..3d813235 100644 --- a/test/tree_dgsem_2d/advection_mortar.jl +++ b/test/tree_dgsem_2d/advection_mortar.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (0.0, -1.0), coordinates_max = (1.0, 1.0)),) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_blob_mortar.jl b/test/tree_dgsem_2d/euler_blob_mortar.jl index f09d6dbd..cf31db1e 100644 --- a/test/tree_dgsem_2d/euler_blob_mortar.jl +++ b/test/tree_dgsem_2d/euler_blob_mortar.jl @@ -62,7 +62,7 @@ include("../test_macros.jl") coordinates_max = (40.0, 5.0)), (type = "box", coordinates_min = (-40.0, -5.0), coordinates_max = (40.0, 5.0))) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_ec.jl b/test/tree_dgsem_2d/euler_ec.jl index 5d1ac1fe..b66c19aa 100644 --- a/test/tree_dgsem_2d/euler_ec.jl +++ b/test/tree_dgsem_2d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_shock.jl b/test/tree_dgsem_2d/euler_shock.jl index 29156805..c0cb64fe 100644 --- a/test/tree_dgsem_2d/euler_shock.jl +++ b/test/tree_dgsem_2d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_source_terms.jl b/test/tree_dgsem_2d/euler_source_terms.jl index 9ec854c3..2016fd86 100644 --- a/test/tree_dgsem_2d/euler_source_terms.jl +++ b/test/tree_dgsem_2d/euler_source_terms.jl @@ -14,7 +14,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl index 835755e3..6fe163ae 100644 --- a/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/euler_source_terms_nonperiodic.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = false) diff --git a/test/tree_dgsem_2d/eulermulti_ec.jl b/test/tree_dgsem_2d/eulermulti_ec.jl index 59dd5fc1..8ec55079 100644 --- a/test/tree_dgsem_2d/eulermulti_ec.jl +++ b/test/tree_dgsem_2d/eulermulti_ec.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/eulermulti_es.jl b/test/tree_dgsem_2d/eulermulti_es.jl index af08260d..4f0bbae1 100644 --- a/test/tree_dgsem_2d/eulermulti_es.jl +++ b/test/tree_dgsem_2d/eulermulti_es.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 5, periodicity = true) diff --git a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl index 2b87a929..4bacb92a 100644 --- a/test/tree_dgsem_2d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_2d/hypdiff_nonperiodic.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = (false, true)) diff --git a/test/tree_dgsem_2d/mhd_alfven_wave.jl b/test/tree_dgsem_2d/mhd_alfven_wave.jl index 7749e2b0..5af1e9db 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl index 8f42fa4f..1d2cecc1 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl @@ -25,7 +25,7 @@ include("../test_macros.jl") coordinates_max = (sqrt(2.0), sqrt(2.0)) refinement_patches = ((type = "box", coordinates_min = 0.25 .* coordinates_max, coordinates_max = 0.75 .* coordinates_max),) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_ec.jl b/test/tree_dgsem_2d/mhd_ec.jl index b024a37d..b44e0393 100644 --- a/test/tree_dgsem_2d/mhd_ec.jl +++ b/test/tree_dgsem_2d/mhd_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, periodicity = true) diff --git a/test/tree_dgsem_2d/mhd_shock.jl b/test/tree_dgsem_2d/mhd_shock.jl index bf7d0e3a..df67e3c2 100644 --- a/test/tree_dgsem_2d/mhd_shock.jl +++ b/test/tree_dgsem_2d/mhd_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0) coordinates_max = (2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_2d/shallowwater_ec.jl b/test/tree_dgsem_2d/shallowwater_ec.jl index 546e5ff5..a3732744 100644 --- a/test/tree_dgsem_2d/shallowwater_ec.jl +++ b/test/tree_dgsem_2d/shallowwater_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0) coordinates_max = (1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_2d/shallowwater_source_terms.jl b/test/tree_dgsem_2d/shallowwater_source_terms.jl index c7131855..19fb68fc 100644 --- a/test/tree_dgsem_2d/shallowwater_source_terms.jl +++ b/test/tree_dgsem_2d/shallowwater_source_terms.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl index ccde6136..44c48904 100644 --- a/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl +++ b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl @@ -22,7 +22,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0) coordinates_max = (sqrt(2.0), sqrt(2.0)) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = false) diff --git a/test/tree_dgsem_3d/advection_basic.jl b/test/tree_dgsem_3d/advection_basic.jl index 75b7d21e..252cc80b 100644 --- a/test/tree_dgsem_3d/advection_basic.jl +++ b/test/tree_dgsem_3d/advection_basic.jl @@ -15,7 +15,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/advection_mortar.jl b/test/tree_dgsem_3d/advection_mortar.jl index 5ee318cf..c3a54dda 100644 --- a/test/tree_dgsem_3d/advection_mortar.jl +++ b/test/tree_dgsem_3d/advection_mortar.jl @@ -19,7 +19,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0)), (type = "box", coordinates_min = (0.0, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5))) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_convergence.jl b/test/tree_dgsem_3d/euler_convergence.jl index 82333657..57a62aac 100644 --- a/test/tree_dgsem_3d/euler_convergence.jl +++ b/test/tree_dgsem_3d/euler_convergence.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_ec.jl b/test/tree_dgsem_3d/euler_ec.jl index 99462a2e..8525899f 100644 --- a/test/tree_dgsem_3d/euler_ec.jl +++ b/test/tree_dgsem_3d/euler_ec.jl @@ -18,7 +18,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_mortar.jl b/test/tree_dgsem_3d/euler_mortar.jl index c055f896..212ca8f3 100644 --- a/test/tree_dgsem_3d/euler_mortar.jl +++ b/test/tree_dgsem_3d/euler_mortar.jl @@ -16,7 +16,7 @@ include("../test_macros.jl") coordinates_max = (2.0, 2.0, 2.0) refinement_patches = ((type = "box", coordinates_min = (0.5, 0.5, 0.5), coordinates_max = (1.5, 1.5, 1.5)),) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_shock.jl b/test/tree_dgsem_3d/euler_shock.jl index fa0ff008..8277929d 100644 --- a/test/tree_dgsem_3d/euler_shock.jl +++ b/test/tree_dgsem_3d/euler_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) diff --git a/test/tree_dgsem_3d/euler_source_terms.jl b/test/tree_dgsem_3d/euler_source_terms.jl index 8bbd8fcc..b964db4c 100644 --- a/test/tree_dgsem_3d/euler_source_terms.jl +++ b/test/tree_dgsem_3d/euler_source_terms.jl @@ -17,7 +17,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl index 29251e74..a8245f29 100644 --- a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl +++ b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl @@ -21,7 +21,7 @@ include("../test_macros.jl") coordinates_min = (0.0, 0.0, 0.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = (false, true, true)) diff --git a/test/tree_dgsem_3d/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl index 7d0cf2c0..c3b1723b 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = (1.0, 1.0, 1.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl index 587c6c56..5a6c5e2c 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl @@ -24,7 +24,7 @@ include("../test_macros.jl") coordinates_max = (1.0, 1.0, 1.0) refinement_patches = ((type = "box", coordinates_min = (-0.5, -0.5, -0.5), coordinates_max = (0.5, 0.5, 0.5)),) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, refinement_patches = refinement_patches, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_ec.jl b/test/tree_dgsem_3d/mhd_ec.jl index a4eb1ed4..081b3b5a 100644 --- a/test/tree_dgsem_3d/mhd_ec.jl +++ b/test/tree_dgsem_3d/mhd_ec.jl @@ -20,7 +20,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, periodicity = true) diff --git a/test/tree_dgsem_3d/mhd_shock.jl b/test/tree_dgsem_3d/mhd_shock.jl index 8eb56ab7..ab7ef9fd 100644 --- a/test/tree_dgsem_3d/mhd_shock.jl +++ b/test/tree_dgsem_3d/mhd_shock.jl @@ -31,7 +31,7 @@ include("../test_macros.jl") coordinates_min = (-2.0, -2.0, -2.0) coordinates_max = (2.0, 2.0, 2.0) - mesh = TreeMesh(coordinates_min, coordinates_max; + mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, periodicity = true) From f9a6b914c9fe2a097c0227130d610ca186e2ac8a Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 17:26:59 +0800 Subject: [PATCH 16/28] Apply batched suggestions from code review Co-authored-by: Huiyu Xie --- benchmark/mhd_alfven_wave_2d.jl | 2 +- benchmark/mhd_alfven_wave_3d.jl | 2 +- benchmark/mhd_alfven_wave_mortar_2d.jl | 2 +- benchmark/mhd_alfven_wave_mortar_3d.jl | 2 +- benchmark/mhd_ec_2d.jl | 2 +- benchmark/mhd_ec_3d.jl | 2 +- docs/Project.toml | 2 -- examples/advection_basic_1d.jl | 2 +- examples/advection_basic_2d.jl | 2 +- examples/advection_basic_3d.jl | 2 +- src/TrixiCUDA.jl | 6 +----- .../semidiscretization_hyperbolic.jl | 3 ++- src/solvers/basis_lobatto_legendre.jl | 5 +++-- src/solvers/cache.jl | 6 +++--- src/solvers/dg_1d.jl | 4 ++-- src/solvers/dg_2d.jl | 4 ++-- src/solvers/dg_3d.jl | 4 ++-- src/solvers/dgsem_gpu.jl | 17 ++++------------- src/solvers/indicators.jl | 4 +--- test/tree_dgsem_2d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_2d/mhd_ec.jl | 2 +- test/tree_dgsem_2d/mhd_shock.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave.jl | 2 +- test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl | 2 +- test/tree_dgsem_3d/mhd_ec.jl | 2 +- test/tree_dgsem_3d/mhd_shock.jl | 2 +- 27 files changed, 37 insertions(+), 52 deletions(-) diff --git a/benchmark/mhd_alfven_wave_2d.jl b/benchmark/mhd_alfven_wave_2d.jl index aee7b0fc..e38bcf8a 100644 --- a/benchmark/mhd_alfven_wave_2d.jl +++ b/benchmark/mhd_alfven_wave_2d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/benchmark/mhd_alfven_wave_3d.jl b/benchmark/mhd_alfven_wave_3d.jl index 8d5ca7d8..ef12b7df 100644 --- a/benchmark/mhd_alfven_wave_3d.jl +++ b/benchmark/mhd_alfven_wave_3d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/benchmark/mhd_alfven_wave_mortar_2d.jl b/benchmark/mhd_alfven_wave_mortar_2d.jl index 23493f20..1a966cdc 100644 --- a/benchmark/mhd_alfven_wave_mortar_2d.jl +++ b/benchmark/mhd_alfven_wave_mortar_2d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/benchmark/mhd_alfven_wave_mortar_3d.jl b/benchmark/mhd_alfven_wave_mortar_3d.jl index fc841deb..98308a6b 100644 --- a/benchmark/mhd_alfven_wave_mortar_3d.jl +++ b/benchmark/mhd_alfven_wave_mortar_3d.jl @@ -7,7 +7,7 @@ RealT = Float32 # Set up the problem gamma = 5.0f0 / 3 -equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/benchmark/mhd_ec_2d.jl b/benchmark/mhd_ec_2d.jl index 735eaa1b..892f8131 100644 --- a/benchmark/mhd_ec_2d.jl +++ b/benchmark/mhd_ec_2d.jl @@ -6,7 +6,7 @@ using BenchmarkTools RealT = Float32 # Set up the problem -equations = IdealGlmMhdEquations2D(1.4f0; initial_c_h = 1.0f0) +equations = IdealGlmMhdEquations2D(1.4f0; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave diff --git a/benchmark/mhd_ec_3d.jl b/benchmark/mhd_ec_3d.jl index 9683967c..c423afcd 100644 --- a/benchmark/mhd_ec_3d.jl +++ b/benchmark/mhd_ec_3d.jl @@ -6,7 +6,7 @@ using BenchmarkTools RealT = Float32 # Set up the problem -equations = IdealGlmMhdEquations3D(1.4f0; initial_c_h = 1.0f0) +equations = IdealGlmMhdEquations3D(1.4f0; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave diff --git a/docs/Project.toml b/docs/Project.toml index 6fd83011..5ebc31e9 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -2,8 +2,6 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" TrixiCUDA = "5056661c-942a-472c-b3bc-01507f717a60" -[sources] -TrixiCUDA = {path = ".."} [compat] Documenter = "1.19" diff --git a/examples/advection_basic_1d.jl b/examples/advection_basic_1d.jl index f536dcd6..4ad50a34 100644 --- a/examples/advection_basic_1d.jl +++ b/examples/advection_basic_1d.jl @@ -18,7 +18,7 @@ coordinates_max = 1.0 # maximum coordinate # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = true) # set maximum capacity of tree data structure + periodicity = true) # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/examples/advection_basic_2d.jl b/examples/advection_basic_2d.jl index cf71de2f..30318942 100644 --- a/examples/advection_basic_2d.jl +++ b/examples/advection_basic_2d.jl @@ -18,7 +18,7 @@ coordinates_max = (1.0, 1.0) # maximum coordinates (max(x), max(y)) # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - periodicity = true) # set maximum capacity of tree data structure + periodicity = true) # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/examples/advection_basic_3d.jl b/examples/advection_basic_3d.jl index 07b52b58..03a20f45 100644 --- a/examples/advection_basic_3d.jl +++ b/examples/advection_basic_3d.jl @@ -18,7 +18,7 @@ coordinates_max = (1.0, 1.0, 1.0) # maximum coordinates (max(x), max(y), max(z)) # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 3, - periodicity = true) # set maximum capacity of tree data structure + periodicity = true) # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test, diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index e06e3cb1..ec09a775 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -18,7 +18,7 @@ using Trixi: allocate_coefficients, compute_coefficients, create_cache, init_elements, init_interfaces, init_boundaries, init_mortars, have_nonconservative_terms, boundary_condition_periodic, digest_boundary_conditions, check_periodicity_mesh_boundary_conditions, - gauss_lobatto_nodes_weights, vandermonde_legendre, + gauss_lobatto_nodes_weights, polynomial_interpolation_matrix, volume_jacobian, total_volume, calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower, polynomial_derivative_matrix, @@ -66,10 +66,6 @@ set_log_type!("log_Base") set_sqrt_type!("sqrt_Base") set_loop_vectorization!(false) -# The existing GPU kernels implement the classic first-order HG blend. -const SupportedShockCapturingHG = VolumeIntegralShockCapturingHGType{<:Any, <:VolumeIntegralFluxDifferencing, <:VolumeIntegralFluxDifferencing, - <:VolumeIntegralPureLGLFiniteVolume} - # Include other source files include("auxiliary/auxiliary.jl") include("semidiscretization/semidiscretization.jl") diff --git a/src/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index 0205dde9..2b3cdd9b 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -68,13 +68,14 @@ function SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, sol cache_gpu = (; create_cache_gpu(mesh, equations, solver, RealT, uEltype)..., initial_cache_gpu...) + # TODO: Compare with adding CPU initialization methods for `LobattoLegendreBasisGPU` cache_cpu = (; create_cache(mesh, equations, DGSEM(RealT = real(solver), polydeg = polydeg(solver), surface_integral = solver.surface_integral, volume_integral = solver.volume_integral), RealT, uEltype)..., - initial_cache_cpu...) +initial_cache_cpu...) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, cache_cpu) diff --git a/src/solvers/basis_lobatto_legendre.jl b/src/solvers/basis_lobatto_legendre.jl index 52cd89f7..3404ee28 100644 --- a/src/solvers/basis_lobatto_legendre.jl +++ b/src/solvers/basis_lobatto_legendre.jl @@ -43,8 +43,9 @@ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) inverse_weights_ = basis_cpu.inverse_weights inverse_vandermonde_legendre_ = basis_cpu.inverse_vandermonde_legendre - # Lobatto nodes coincide with the endpoints. The GPU surface kernels retain - # the weighted endpoint-interpolation matrix used by this package. + # Lobatto nodes include the endpoints. Retain the weighted boundary matrix + # for the current GPU surface kernels. + # TODO: Follow upstream by using `inverse_weights` directly and removing this matrix. boundary_interpolation_ = zeros(RealT, nnodes_, 2) boundary_interpolation_[1, 1] = first(inverse_weights_) boundary_interpolation_[end, 2] = last(inverse_weights_) diff --git a/src/solvers/cache.jl b/src/solvers/cache.jl index fdbfd5de..7c2884aa 100644 --- a/src/solvers/cache.jl +++ b/src/solvers/cache.jl @@ -45,7 +45,7 @@ function create_cache_gpu(mesh::TreeMesh{1}, equations, end function create_cache_gpu(mesh::TreeMesh{1}, equations, - volume_integral::SupportedShockCapturingHG, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) fstar1_R = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) @@ -96,7 +96,7 @@ function create_cache_gpu(mesh::TreeMesh{2}, equations, end function create_cache_gpu(mesh::TreeMesh{2}, equations, - volume_integral::SupportedShockCapturingHG, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nelements(cache.elements)) @@ -167,7 +167,7 @@ function create_cache_gpu(mesh::TreeMesh{3}, equations, end function create_cache_gpu(mesh::TreeMesh{3}, equations, - volume_integral::SupportedShockCapturingHG, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nnodes(dg), nelements(cache.elements)) diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index 716998f6..7f6f8495 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -138,7 +138,7 @@ end # Compute the DG volume term on the GPU for 1D problems using the hybrid DG # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::False, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) @@ -200,7 +200,7 @@ end # Compute the DG volume term on the GPU for 1D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::True, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index bfc6ccf8..c18c3a26 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -157,7 +157,7 @@ end # Compute the DG volume term on the GPU for 2D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::False, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) @@ -231,7 +231,7 @@ end # Compute the DG volume term on the GPU for 2D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::True, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index a8a76059..516fd9b0 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -173,7 +173,7 @@ end # Compute the DG volume term on the GPU for 3D problems using the hybrid DG # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::False, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) @@ -257,7 +257,7 @@ end # Compute the DG volume term on the GPU for 3D problems using the hybrid DG finite volume # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::True, - equations, volume_integral::SupportedShockCapturingHG, + equations, volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, cache_gpu, cache_cpu) RealT = eltype(du) diff --git a/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index 272de139..f43907e5 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -1,13 +1,7 @@ -function check_gpu_volume_integral(volume_integral) - if volume_integral isa VolumeIntegralShockCapturingHGType - volume_integral isa SupportedShockCapturingHG || - throw(ArgumentError("GPU shock capturing requires flux differencing and first-order subcell finite volumes")) - volume_integral.volume_integral_default == volume_integral.volume_integral_blend_high_order || - throw(ArgumentError("GPU shock capturing requires the same default and blended high-order volume integral")) - end - return nothing -end - +# TODO: Support Trixi's generalized HG volume integrals. +# Current GPU kernels require identical default and blended high-order +# flux-differencing operators, combined with first-order subcell FV. +# Upstream: https://github.com/trixi-framework/Trixi.jl/pull/2802 # Rewrite `DGSEM` in Trixi.jl to add the specialized parts of the arrays required to copy the arrays # from CPU to GPU. @@ -19,7 +13,6 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, mortar = MortarL2GPU(basis)) surface_integral = SurfaceIntegralWeakForm(surface_flux) - check_gpu_volume_integral(volume_integral) # Preserve the GPU basis and mortar types in the DG solver. return DG{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) @@ -29,7 +22,6 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_integral::AbstractSurfaceIntegral, volume_integral = VolumeIntegralWeakForm(), mortar = MortarL2GPU(basis)) - check_gpu_volume_integral(volume_integral) # Preserve the GPU basis and mortar types in the DG solver. return DG{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) @@ -54,7 +46,6 @@ function DGSEMGPU(; RealT = Float64, surface_flux = flux_central, surface_integral = SurfaceIntegralWeakForm(surface_flux), volume_integral = VolumeIntegralWeakForm()) - check_gpu_volume_integral(volume_integral) basis = LobattoLegendreBasisGPU(RealT, polydeg) # Preserve the GPU basis and mortar types in the DG solver. return DGSEMGPU(basis, surface_integral, volume_integral) diff --git a/src/solvers/indicators.jl b/src/solvers/indicators.jl index 97db22a4..6fb0233a 100644 --- a/src/solvers/indicators.jl +++ b/src/solvers/indicators.jl @@ -2,9 +2,7 @@ # Note that maybe we should consider optimizing these original CPU code to # get it better run on GPU. -# Same as `IndicatorHennemannGassner` in Trixi.jl but with `DG` signature -# How to implement this in a better way? -function (indicator_hg::IndicatorHennemannGassner)(u, mesh, equations, dg::DG{<:LobattoLegendreBasisGPU}, cache; +function (indicator_hg::IndicatorHennemannGassner)(u, mesh, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; kwargs...) (; alpha_smooth) = indicator_hg (; alpha, alpha_tmp) = indicator_hg.cache diff --git a/test/tree_dgsem_2d/mhd_alfven_wave.jl b/test/tree_dgsem_2d/mhd_alfven_wave.jl index 5af1e9db..94168ac3 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave.jl @@ -7,7 +7,7 @@ include("../test_macros.jl") @testset "MHD Alfven Wave 2D" begin gamma = 5 / 3 - equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl index 1d2cecc1..aaac10ce 100644 --- a/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_2d/mhd_alfven_wave_mortar.jl @@ -7,7 +7,7 @@ include("../test_macros.jl") @testset "MHD Alfven Wave Mortar 2D" begin gamma = 5 / 3 - equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/test/tree_dgsem_2d/mhd_ec.jl b/test/tree_dgsem_2d/mhd_ec.jl index b44e0393..377decc6 100644 --- a/test/tree_dgsem_2d/mhd_ec.jl +++ b/test/tree_dgsem_2d/mhd_ec.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD EC 2D" begin - equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) + equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave diff --git a/test/tree_dgsem_2d/mhd_shock.jl b/test/tree_dgsem_2d/mhd_shock.jl index df67e3c2..cde98cea 100644 --- a/test/tree_dgsem_2d/mhd_shock.jl +++ b/test/tree_dgsem_2d/mhd_shock.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Shock 2D" begin - equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) + equations = IdealGlmMhdEquations2D(1.4; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave diff --git a/test/tree_dgsem_3d/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl index c3b1723b..b7628db7 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Alfven Wave 3D" begin - equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl index 5a6c5e2c..1828ccea 100644 --- a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl +++ b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Alfven Wave Mortar 3D" begin - equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test diff --git a/test/tree_dgsem_3d/mhd_ec.jl b/test/tree_dgsem_3d/mhd_ec.jl index 081b3b5a..19678420 100644 --- a/test/tree_dgsem_3d/mhd_ec.jl +++ b/test/tree_dgsem_3d/mhd_ec.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD EC 3D" begin - equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) + equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave diff --git a/test/tree_dgsem_3d/mhd_shock.jl b/test/tree_dgsem_3d/mhd_shock.jl index ab7ef9fd..8b7451f1 100644 --- a/test/tree_dgsem_3d/mhd_shock.jl +++ b/test/tree_dgsem_3d/mhd_shock.jl @@ -6,7 +6,7 @@ using Test include("../test_macros.jl") @testset "MHD Shock 3D" begin - equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) + equations = IdealGlmMhdEquations3D(1.4; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_weak_blast_wave From 2482f7fdd8ecf54bcb974c9448af7a0ebe20b278 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 17:30:56 +0800 Subject: [PATCH 17/28] Apply Julia formatting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/semidiscretization/semidiscretization_hyperbolic.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index 2b3cdd9b..fd8f9c77 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -75,7 +75,7 @@ function SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, sol surface_integral = solver.surface_integral, volume_integral = solver.volume_integral), RealT, uEltype)..., -initial_cache_cpu...) + initial_cache_cpu...) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, cache_cpu) From 37b369d79693b7923e46aaac81e4a8ff1325e9da Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 18:16:22 +0800 Subject: [PATCH 18/28] Remove unused imports and group module dependencies --- src/TrixiCUDA.jl | 90 +++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 47 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index ec09a775..879a512c 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -1,61 +1,57 @@ module TrixiCUDA -# Include other packages that are used in TrixiCUDA.jl -using CUDA -using CUDA: @cuda, CuArray, HostKernel, - threadIdx, blockIdx, blockDim, reshape, similar, launch_configuration - +# GPU arrays and kernel launches +import CUDA +using CUDA: CuArray, CuDynamicSharedArray +using CUDA: @cuda, HostKernel, launch_configuration +using CUDA: threadIdx, blockIdx, blockDim, sync_threads using GPUArraysCore: AbstractGPUArray, AbstractGPUVector +# Formatting, ODE problems, and static arrays using Printf: @printf, @sprintf using SciMLBase: ODEProblem, FullSpecialize using StaticArrays: SVector -# Trixi.jl methods -using Trixi: allocate_coefficients, compute_coefficients, create_cache, - flux, flux_central, ntuple, nvariables, ndofs, - local_leaf_cells, - init_elements, init_interfaces, init_boundaries, init_mortars, - have_nonconservative_terms, boundary_condition_periodic, - digest_boundary_conditions, check_periodicity_mesh_boundary_conditions, - gauss_lobatto_nodes_weights, - polynomial_interpolation_matrix, volume_jacobian, total_volume, - calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower, - polynomial_derivative_matrix, - analyze, cons2cons, max_abs_speeds, pretty_form_utf, - multiply_dimensionwise!, - set_log_type!, set_sqrt_type!, set_loop_vectorization!, - summary_header, summary_line, summary_footer, increment_indent # IO functions +# Trixi abstractions, meshes, and solvers +using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization +using Trixi: TreeMesh, StructuredMesh, DG, DGSEM +using Trixi: True, False +using Trixi: PerformanceCounter + +# Basis, mortar, and volume-integral types +using Trixi: AbstractBasisSBP, LobattoLegendreBasis, LobattoLegendreMortarL2, LobattoLegendreAnalyzer +using Trixi: AbstractSurfaceIntegral, SurfaceIntegralWeakForm +using Trixi: VolumeIntegralWeakForm, VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType + +# Tree-mesh containers +using Trixi: TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D +using Trixi: TreeInterfaceContainer1D, TreeInterfaceContainer2D, TreeInterfaceContainer3D +using Trixi: TreeBoundaryContainer1D, TreeBoundaryContainer2D, TreeBoundaryContainer3D +using Trixi: TreeL2MortarContainer2D, TreeL2MortarContainer3D + +# Equations, boundary conditions, and mesh initialization +using Trixi: flux, flux_central, have_nonconservative_terms, nvariables, max_abs_speeds +using Trixi: BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, boundary_condition_periodic +using Trixi: digest_boundary_conditions, check_periodicity_mesh_boundary_conditions +using Trixi: local_leaf_cells, init_elements, init_interfaces, init_boundaries, init_mortars +using Trixi: allocate_coefficients, eachelement, ndofs, total_volume -# Trixi.jl structs -using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, - AbstractSurfaceIntegral, AbstractBasisSBP, - PerformanceCounter, True, False, TreeMesh, StructuredMesh, - DG, DGSEM, FDSBP, SemidiscretizationHyperbolic, - LobattoLegendreBasis, LobattoLegendreMortarL2, - TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D, - TreeInterfaceContainer1D, TreeInterfaceContainer2D, TreeInterfaceContainer3D, - TreeBoundaryContainer1D, TreeBoundaryContainer2D, TreeBoundaryContainer3D, - TreeL2MortarContainer2D, TreeL2MortarContainer3D, - SurfaceIntegralWeakForm, VolumeIntegralWeakForm, - BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, - VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType, - VolumeIntegralPureLGLFiniteVolume, - LobattoLegendreAnalyzer +# Interpolation, indicators, and analysis +using Trixi: gauss_lobatto_nodes_weights, polynomial_interpolation_matrix, multiply_dimensionwise! +using Trixi: calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower +using Trixi: IndicatorHennemannGassner, calc_indicator_hennemann_gassner!, apply_smoothing! +using Trixi: analyze, pretty_form_utf -# Trixi.jl indicators (since it is temporarily used to make tests pass, -# we separate it from the above) -using Trixi: IndicatorHennemannGassner, - eachelement, calc_indicator_hennemann_gassner!, apply_smoothing! +# Preferences and display +using Trixi: set_log_type!, set_sqrt_type!, set_loop_vectorization! +using Trixi: summary_header, summary_line, summary_footer, increment_indent -# Trixi.jl imports -import Trixi: get_nodes, get_node_vars, get_node_coords, get_surface_node_vars, - nnodes, nelements, ninterfaces, nmortars, - polydeg, eachnode, integrate, - wrap_array, wrap_array_native, calc_error_norms, - create_cache, mesh_equations_solver_cache, - integrate_via_indices, analyze_integrals, max_dt, - SolutionAnalyzer # function +# Trixi functions and constructors extended by this package +import Trixi: get_nodes, nnodes, polydeg, eachnode, SolutionAnalyzer +import Trixi: get_node_vars, get_node_coords, get_surface_node_vars +import Trixi: nelements, ninterfaces, nmortars +import Trixi: create_cache, mesh_equations_solver_cache, wrap_array, wrap_array_native +import Trixi: integrate, integrate_via_indices, calc_error_norms, analyze_integrals, max_dt # Change to use the Base.log and Base.sqrt and disable loop vectorization # FIXME: This set preference part has to be fixed to avoid precompilation outputs From c3d0764d2eace264b9e84d70051f1bb1761d98a6 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 18:26:41 +0800 Subject: [PATCH 19/28] Consolidate imports within each category --- src/TrixiCUDA.jl | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 879a512c..fdb366a2 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -2,9 +2,9 @@ module TrixiCUDA # GPU arrays and kernel launches import CUDA -using CUDA: CuArray, CuDynamicSharedArray -using CUDA: @cuda, HostKernel, launch_configuration -using CUDA: threadIdx, blockIdx, blockDim, sync_threads +using CUDA: CuArray, CuDynamicSharedArray, + @cuda, HostKernel, launch_configuration, + threadIdx, blockIdx, blockDim, sync_threads using GPUArraysCore: AbstractGPUArray, AbstractGPUVector # Formatting, ODE problems, and static arrays @@ -13,45 +13,44 @@ using SciMLBase: ODEProblem, FullSpecialize using StaticArrays: SVector # Trixi abstractions, meshes, and solvers -using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization -using Trixi: TreeMesh, StructuredMesh, DG, DGSEM -using Trixi: True, False -using Trixi: PerformanceCounter +using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, + TreeMesh, StructuredMesh, DG, DGSEM, + True, False, PerformanceCounter # Basis, mortar, and volume-integral types -using Trixi: AbstractBasisSBP, LobattoLegendreBasis, LobattoLegendreMortarL2, LobattoLegendreAnalyzer -using Trixi: AbstractSurfaceIntegral, SurfaceIntegralWeakForm -using Trixi: VolumeIntegralWeakForm, VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType +using Trixi: AbstractBasisSBP, LobattoLegendreBasis, LobattoLegendreMortarL2, LobattoLegendreAnalyzer, + AbstractSurfaceIntegral, SurfaceIntegralWeakForm, + VolumeIntegralWeakForm, VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType # Tree-mesh containers -using Trixi: TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D -using Trixi: TreeInterfaceContainer1D, TreeInterfaceContainer2D, TreeInterfaceContainer3D -using Trixi: TreeBoundaryContainer1D, TreeBoundaryContainer2D, TreeBoundaryContainer3D -using Trixi: TreeL2MortarContainer2D, TreeL2MortarContainer3D +using Trixi: TreeElementContainer1D, TreeElementContainer2D, TreeElementContainer3D, + TreeInterfaceContainer1D, TreeInterfaceContainer2D, TreeInterfaceContainer3D, + TreeBoundaryContainer1D, TreeBoundaryContainer2D, TreeBoundaryContainer3D, + TreeL2MortarContainer2D, TreeL2MortarContainer3D # Equations, boundary conditions, and mesh initialization -using Trixi: flux, flux_central, have_nonconservative_terms, nvariables, max_abs_speeds -using Trixi: BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, boundary_condition_periodic -using Trixi: digest_boundary_conditions, check_periodicity_mesh_boundary_conditions -using Trixi: local_leaf_cells, init_elements, init_interfaces, init_boundaries, init_mortars -using Trixi: allocate_coefficients, eachelement, ndofs, total_volume +using Trixi: flux, flux_central, have_nonconservative_terms, nvariables, max_abs_speeds, + BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, boundary_condition_periodic, + digest_boundary_conditions, check_periodicity_mesh_boundary_conditions, + local_leaf_cells, init_elements, init_interfaces, init_boundaries, init_mortars, + allocate_coefficients, eachelement, ndofs, total_volume # Interpolation, indicators, and analysis -using Trixi: gauss_lobatto_nodes_weights, polynomial_interpolation_matrix, multiply_dimensionwise! -using Trixi: calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower -using Trixi: IndicatorHennemannGassner, calc_indicator_hennemann_gassner!, apply_smoothing! -using Trixi: analyze, pretty_form_utf +using Trixi: gauss_lobatto_nodes_weights, polynomial_interpolation_matrix, multiply_dimensionwise!, + calc_forward_upper, calc_forward_lower, calc_reverse_upper, calc_reverse_lower, + IndicatorHennemannGassner, calc_indicator_hennemann_gassner!, apply_smoothing!, + analyze, pretty_form_utf # Preferences and display -using Trixi: set_log_type!, set_sqrt_type!, set_loop_vectorization! -using Trixi: summary_header, summary_line, summary_footer, increment_indent +using Trixi: set_log_type!, set_sqrt_type!, set_loop_vectorization!, + summary_header, summary_line, summary_footer, increment_indent # Trixi functions and constructors extended by this package -import Trixi: get_nodes, nnodes, polydeg, eachnode, SolutionAnalyzer -import Trixi: get_node_vars, get_node_coords, get_surface_node_vars -import Trixi: nelements, ninterfaces, nmortars -import Trixi: create_cache, mesh_equations_solver_cache, wrap_array, wrap_array_native -import Trixi: integrate, integrate_via_indices, calc_error_norms, analyze_integrals, max_dt +import Trixi: get_nodes, nnodes, polydeg, eachnode, SolutionAnalyzer, + get_node_vars, get_node_coords, get_surface_node_vars, + nelements, ninterfaces, nmortars, + create_cache, mesh_equations_solver_cache, wrap_array, wrap_array_native, + integrate, integrate_via_indices, calc_error_norms, analyze_integrals, max_dt # Change to use the Base.log and Base.sqrt and disable loop vectorization # FIXME: This set preference part has to be fixed to avoid precompilation outputs From cabf2bd9cc1d9f250b6e229ca02efc3adaf2027f Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 18:43:21 +0800 Subject: [PATCH 20/28] Fix GPU array dispatch ambiguity --- src/solvers/dg.jl | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl index 5f667034..81abd3af 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -9,38 +9,17 @@ # But now we don't take AMR into account, so we can use `reshape` for now. # Can we make `unsafe_wrap` faster on GPU arrays? - -# Accept both flat ODE vectors and the shaped state returned by semidiscretizeGPU. -# The vector specialization resolves the overlap with Trixi's AbstractVector method. +# Should we use `CuArray` or `AbstractGPUArray`? @inline function wrap_array(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, dg::DGSEM, cache) - wrap_array_gpu(u_ode, mesh, equations, dg, cache) -end - -@inline function wrap_array(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, - dg::DGSEM, cache) - wrap_array_gpu(u_ode, mesh, equations, dg, cache) -end - -@inline function wrap_array_gpu(u_ode, mesh, equations, dg, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) reshape(u_ode, nvariables(equations), ntuple(_ -> nnodes(dg), ndims(mesh))..., nelements(dg, cache)) end - @inline function wrap_array_native(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, dg::DGSEM, cache) - wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) -end - -@inline function wrap_array_native(u_ode::AbstractGPUVector, mesh::AbstractMesh, equations, - dg::DGSEM, cache) - wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) -end - -@inline function wrap_array_native_gpu(u_ode, mesh, equations, dg, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) From 30ab723567321de9a45ace1f4ad2c09308ad619e Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 19:02:41 +0800 Subject: [PATCH 21/28] Align GPU DGSEM method signatures with upstream --- src/TrixiCUDA.jl | 2 +- src/callbacks_step/analysis_dg_1d.jl | 8 ++++---- src/callbacks_step/analysis_dg_2d.jl | 12 ++++++------ src/callbacks_step/analysis_dg_3d.jl | 8 ++++---- src/solvers/dg_1d.jl | 12 ++++++------ src/solvers/dg_2d.jl | 14 +++++++------- src/solvers/dg_3d.jl | 16 ++++++++-------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index fdb366a2..a7853e43 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -14,7 +14,7 @@ using StaticArrays: SVector # Trixi abstractions, meshes, and solvers using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, - TreeMesh, StructuredMesh, DG, DGSEM, + TreeMesh, TreeMeshSerial, StructuredMesh, DG, DGSEM, True, False, PerformanceCounter # Basis, mortar, and volume-integral types diff --git a/src/callbacks_step/analysis_dg_1d.jl b/src/callbacks_step/analysis_dg_1d.jl index b68aad10..0bc2473f 100644 --- a/src/callbacks_step/analysis_dg_1d.jl +++ b/src/callbacks_step/analysis_dg_1d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{1}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::AbstractArray, + mesh::TreeMesh{1}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -33,7 +33,7 @@ end function integrate(func::Func, u, mesh::TreeMesh{1}, - equations, dg::DG, cache; normalize = true) where {Func} + equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, element) # call view to avoid scalar indexing @@ -43,7 +43,7 @@ end function calc_error_norms(func, u, t, analyzer, mesh::TreeMesh{1}, equations, initial_condition, - dg::DG, cache, cache_analysis) + dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, cache_analysis) (; vandermonde, weights) = analyzer (; node_coordinates) = cache.elements (; u_local, x_local) = cache_analysis diff --git a/src/callbacks_step/analysis_dg_2d.jl b/src/callbacks_step/analysis_dg_2d.jl index 37b19853..d2b6dc98 100644 --- a/src/callbacks_step/analysis_dg_2d.jl +++ b/src/callbacks_step/analysis_dg_2d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{2}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::AbstractArray, + mesh::TreeMeshSerial{2}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -32,8 +32,8 @@ function integrate_via_indices(func::Func, u, end function integrate(func::Func, u, - mesh::TreeMesh{2}, - equations, dg::DG, cache; normalize = true) where {Func} + mesh::TreeMeshSerial{2}, + equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, element) # call view to avoid scalar indexing @@ -42,8 +42,8 @@ function integrate(func::Func, u, end function calc_error_norms(func, u, t, analyzer, - mesh::TreeMesh{2}, equations, initial_condition, - dg::DG, cache, cache_analysis) + mesh::TreeMeshSerial{2}, equations, initial_condition, + dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, cache_analysis) (; vandermonde, weights) = analyzer (; node_coordinates) = cache.elements (; u_local, u_tmp1, x_local, x_tmp1) = cache_analysis diff --git a/src/callbacks_step/analysis_dg_3d.jl b/src/callbacks_step/analysis_dg_3d.jl index 3a4499e0..611706d7 100644 --- a/src/callbacks_step/analysis_dg_3d.jl +++ b/src/callbacks_step/analysis_dg_3d.jl @@ -1,5 +1,5 @@ -function integrate_via_indices(func::Func, u, - mesh::TreeMesh{3}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::AbstractArray, + mesh::TreeMesh{3}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -34,7 +34,7 @@ end function integrate(func::Func, u, mesh::TreeMesh{3}, - equations, dg::DG, cache; normalize = true) where {Func} + equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, k, element, equations, dg u_local = get_node_vars_view(u, equations, dg, i, j, k, element) # call view to avoid scalar indexing @@ -44,7 +44,7 @@ end function calc_error_norms(func, u, t, analyzer, mesh::TreeMesh{3}, equations, initial_condition, - dg::DG, cache, cache_analysis) + dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, cache_analysis) (; vandermonde, weights) = analyzer (; node_coordinates) = cache.elements (; u_local, u_tmp1, u_tmp2, x_local, x_tmp1, x_tmp2) = cache_analysis diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index 7f6f8495..2ddc586d 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -17,7 +17,7 @@ include("dg_1d_kernel.jl") # weak form volume operator. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms, equations, volume_integral::VolumeIntegralWeakForm, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) derivative_hat = dg.basis.derivative_hat @@ -52,7 +52,7 @@ end # volume operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux = volume_integral.volume_flux @@ -91,7 +91,7 @@ end # volume operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) symmetric_flux, nonconservative_flux = dg.volume_integral.volume_flux @@ -139,7 +139,7 @@ end # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -201,7 +201,7 @@ end # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{1}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -473,7 +473,7 @@ function cuda_boundary_flux!(t, mesh::TreeMesh{1}, boundary_conditions::NamedTup end # Accumulate surface contributions into the DG scheme on the GPU for 1D problems. -function cuda_surface_integral!(du, mesh::TreeMesh{1}, equations, dg::DG, cache) +function cuda_surface_integral!(du, mesh::TreeMesh{1}, equations, dg::DGSEM, cache) factor_arr = CuArray([ dg.basis.boundary_interpolation[1, 1], dg.basis.boundary_interpolation[size(du, 2), 2] diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index c18c3a26..ac2cd1c7 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -17,7 +17,7 @@ include("dg_2d_kernel.jl") # weak form volume operator. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms, equations, volume_integral::VolumeIntegralWeakForm, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) derivative_hat = dg.basis.derivative_hat @@ -55,7 +55,7 @@ end # volume operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux = volume_integral.volume_flux @@ -98,7 +98,7 @@ end # volume operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) symmetric_flux, nonconservative_flux = dg.volume_integral.volume_flux @@ -158,7 +158,7 @@ end # shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -232,7 +232,7 @@ end # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{2}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -541,12 +541,12 @@ function cuda_boundary_flux!(t, mesh::TreeMesh{2}, boundary_conditions::NamedTup end # No operation when mortar data are not allocated. -function cuda_prolong2mortars!(u, mesh::TreeMesh{2}, cache_mortars::False, dg::DG, cache) +function cuda_prolong2mortars!(u, mesh::TreeMesh{2}, cache_mortars::False, dg::DGSEM, cache) @assert iszero(length(cache.mortars.orientations)) end # Prolong the solution from element faces to mortar interfaces on the GPU for 2D problems. -function cuda_prolong2mortars!(u, mesh::TreeMesh{2}, cache_mortars::True, dg::DG, cache) +function cuda_prolong2mortars!(u, mesh::TreeMesh{2}, cache_mortars::True, dg::DGSEM, cache) neighbor_ids = cache.mortars.neighbor_ids large_sides = cache.mortars.large_sides orientations = cache.mortars.orientations diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index 516fd9b0..0156e08b 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -17,7 +17,7 @@ include("dg_3d_kernel.jl") # weak form volume operator. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms, equations, volume_integral::VolumeIntegralWeakForm, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) derivative_hat = dg.basis.derivative_hat @@ -56,7 +56,7 @@ end # volume operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux = volume_integral.volume_flux @@ -105,7 +105,7 @@ end # volume operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralFluxDifferencing, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) symmetric_flux, nonconservative_flux = dg.volume_integral.volume_flux @@ -174,7 +174,7 @@ end # finite volume shock capturing operator with non-conservative terms disabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::False, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -258,7 +258,7 @@ end # shock capturing operator with non-conservative terms enabled. function cuda_volume_integral!(du, u, mesh::TreeMesh{3}, nonconservative_terms::True, equations, volume_integral::VolumeIntegralShockCapturingHGType, - dg::DG, cache_gpu, cache_cpu) + dg::DGSEM, cache_gpu, cache_cpu) RealT = eltype(du) volume_flux_dg, noncons_flux_dg = volume_integral.volume_integral_blend_high_order.volume_flux @@ -539,12 +539,12 @@ function cuda_boundary_flux!(t, mesh::TreeMesh{3}, boundary_conditions::NamedTup end # No operation when mortar data are not allocated. -function cuda_prolong2mortars!(u, mesh::TreeMesh{3}, cache_mortars::False, dg::DG, cache) +function cuda_prolong2mortars!(u, mesh::TreeMesh{3}, cache_mortars::False, dg::DGSEM, cache) @assert iszero(length(cache.mortars.orientations)) end # Prolong the solution from element faces to mortar interfaces on the GPU for 3D problems. -function cuda_prolong2mortars!(u, mesh::TreeMesh{3}, cache_mortars::True, dg::DG, cache) +function cuda_prolong2mortars!(u, mesh::TreeMesh{3}, cache_mortars::True, dg::DGSEM, cache) neighbor_ids = cache.mortars.neighbor_ids large_sides = cache.mortars.large_sides orientations = cache.mortars.orientations @@ -843,7 +843,7 @@ function cuda_mortar_flux!(mesh::TreeMesh{3}, cache_mortars::True, nonconservati end # Accumulate surface contributions into the DG scheme on the GPU for 3D problems. -function cuda_surface_integral!(du, mesh::TreeMesh{3}, equations, dg::DG, cache) +function cuda_surface_integral!(du, mesh::TreeMesh{3}, equations, dg::DGSEM, cache) factor_arr = CuArray([ dg.basis.boundary_interpolation[1, 1], dg.basis.boundary_interpolation[size(du, 2), 2] From f956b896288c57d93162bb4029c057656caa22d9 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 19:30:52 +0800 Subject: [PATCH 22/28] Restrict GPU solver methods to DGSEM Use serial tree meshes consistently in analysis and stepsize callbacks. --- src/auxiliary/auxiliary.jl | 2 +- src/callbacks_step/analysis_dg_1d.jl | 6 +++--- src/callbacks_step/analysis_dg_3d.jl | 6 +++--- src/callbacks_step/stepsize_dg_1d.jl | 8 ++++---- src/callbacks_step/stepsize_dg_2d.jl | 8 ++++---- src/callbacks_step/stepsize_dg_3d.jl | 8 ++++---- src/solvers/cache.jl | 20 ++++++++++---------- src/solvers/dg.jl | 8 ++++---- src/solvers/dg_1d.jl | 12 ++++++------ src/solvers/dg_2d.jl | 20 ++++++++++---------- src/solvers/dg_3d.jl | 16 ++++++++-------- 11 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/auxiliary/auxiliary.jl b/src/auxiliary/auxiliary.jl index 75073eb9..528d8211 100644 --- a/src/auxiliary/auxiliary.jl +++ b/src/auxiliary/auxiliary.jl @@ -53,7 +53,7 @@ end end # To be used outside GPU kernels, accepts both GPU and CPU arrays -@inline function get_node_vars_view(u::Union{CuArray, Array}, equations, solver::DG, indices...) +@inline function get_node_vars_view(u::Union{CuArray, Array}, equations, solver::DGSEM, indices...) return @view u[:, indices...] end diff --git a/src/callbacks_step/analysis_dg_1d.jl b/src/callbacks_step/analysis_dg_1d.jl index 0bc2473f..8c4a6635 100644 --- a/src/callbacks_step/analysis_dg_1d.jl +++ b/src/callbacks_step/analysis_dg_1d.jl @@ -1,5 +1,5 @@ function integrate_via_indices(func::Func, u::AbstractArray, - mesh::TreeMesh{1}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, + mesh::TreeMeshSerial{1}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -32,7 +32,7 @@ function integrate_via_indices(func::Func, u::AbstractArray, end function integrate(func::Func, u, - mesh::TreeMesh{1}, + mesh::TreeMeshSerial{1}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, element, equations, dg @@ -42,7 +42,7 @@ function integrate(func::Func, u, end function calc_error_norms(func, u, t, analyzer, - mesh::TreeMesh{1}, equations, initial_condition, + mesh::TreeMeshSerial{1}, equations, initial_condition, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, cache_analysis) (; vandermonde, weights) = analyzer (; node_coordinates) = cache.elements diff --git a/src/callbacks_step/analysis_dg_3d.jl b/src/callbacks_step/analysis_dg_3d.jl index 611706d7..1405d30c 100644 --- a/src/callbacks_step/analysis_dg_3d.jl +++ b/src/callbacks_step/analysis_dg_3d.jl @@ -1,5 +1,5 @@ function integrate_via_indices(func::Func, u::AbstractArray, - mesh::TreeMesh{3}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, + mesh::TreeMeshSerial{3}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -33,7 +33,7 @@ function integrate_via_indices(func::Func, u::AbstractArray, end function integrate(func::Func, u, - mesh::TreeMesh{3}, + mesh::TreeMeshSerial{3}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache; normalize = true) where {Func} integrate_via_indices(u, mesh, equations, dg, cache; normalize = normalize) do u, i, j, k, element, equations, dg @@ -43,7 +43,7 @@ function integrate(func::Func, u, end function calc_error_norms(func, u, t, analyzer, - mesh::TreeMesh{3}, equations, initial_condition, + mesh::TreeMeshSerial{3}, equations, initial_condition, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, cache_analysis) (; vandermonde, weights) = analyzer (; node_coordinates) = cache.elements diff --git a/src/callbacks_step/stepsize_dg_1d.jl b/src/callbacks_step/stepsize_dg_1d.jl index f616d9a2..4d169a52 100644 --- a/src/callbacks_step/stepsize_dg_1d.jl +++ b/src/callbacks_step/stepsize_dg_1d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{1}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -16,8 +16,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{1}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{1}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{1}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_2d.jl b/src/callbacks_step/stepsize_dg_2d.jl index 0f2ec16b..9982e908 100644 --- a/src/callbacks_step/stepsize_dg_2d.jl +++ b/src/callbacks_step/stepsize_dg_2d.jl @@ -1,6 +1,6 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{2}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -18,8 +18,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{2}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{2}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{2}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/callbacks_step/stepsize_dg_3d.jl b/src/callbacks_step/stepsize_dg_3d.jl index f63771da..00524239 100644 --- a/src/callbacks_step/stepsize_dg_3d.jl +++ b/src/callbacks_step/stepsize_dg_3d.jl @@ -1,5 +1,5 @@ -function max_dt(u::CuArray, t, mesh::TreeMesh{3}, - constant_speed::True, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, + constant_speed::True, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) @@ -17,8 +17,8 @@ function max_dt(u::CuArray, t, mesh::TreeMesh{3}, return 2 / (nnodes(dg) * max_scaled_speed) end -function max_dt(u::CuArray, t, mesh::TreeMesh{3}, - constant_speed::False, equations, dg::DG, cache) +function max_dt(u::CuArray, t, mesh::TreeMeshSerial{3}, + constant_speed::False, equations, dg::DGSEM, cache) # to avoid a division by zero if the speed vanishes everywhere, # e.g. for steady-state linear advection max_scaled_speed = nextfloat(zero(t)) diff --git a/src/solvers/cache.jl b/src/solvers/cache.jl index 7c2884aa..cd0a26a4 100644 --- a/src/solvers/cache.jl +++ b/src/solvers/cache.jl @@ -6,13 +6,13 @@ # Create cache for general tree mesh function create_cache_gpu(mesh, equations, - volume_integral::VolumeIntegralWeakForm, dg::DG, + volume_integral::VolumeIntegralWeakForm, dg::DGSEM, uEltype, cache) NamedTuple() end # Create cache specialized for 1D tree mesh -function create_cache_gpu(mesh::TreeMesh{1}, equations, dg::DG, RealT, uEltype) +function create_cache_gpu(mesh::TreeMesh{1}, equations, dg::DGSEM, RealT, uEltype) # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) @@ -39,13 +39,13 @@ function create_cache_gpu(mesh::TreeMesh{1}, equations, dg::DG, RealT, uEltype) end function create_cache_gpu(mesh::TreeMesh{1}, equations, - volume_integral::VolumeIntegralFluxDifferencing, dg::DG, + volume_integral::VolumeIntegralFluxDifferencing, dg::DGSEM, uEltype, cache) NamedTuple() end function create_cache_gpu(mesh::TreeMesh{1}, equations, - volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DGSEM, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) fstar1_R = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nelements(cache.elements)) @@ -59,7 +59,7 @@ end # Create cache specialized for 2D tree mesh function create_cache_gpu(mesh::TreeMesh{2}, equations, - dg::DG, RealT, uEltype) + dg::DGSEM, RealT, uEltype) # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) @@ -90,13 +90,13 @@ function create_cache_gpu(mesh::TreeMesh{2}, equations, end function create_cache_gpu(mesh::TreeMesh{2}, equations, - volume_integral::VolumeIntegralFluxDifferencing, dg::DG, + volume_integral::VolumeIntegralFluxDifferencing, dg::DGSEM, uEltype, cache) NamedTuple() end function create_cache_gpu(mesh::TreeMesh{2}, equations, - volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DGSEM, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nelements(cache.elements)) @@ -130,7 +130,7 @@ end # Create cache specialized for 3D tree mesh function create_cache_gpu(mesh::TreeMesh{3}, equations, - dg::DG, RealT, uEltype) + dg::DGSEM, RealT, uEltype) # Get cells for which an element needs to be created (i.e., all leaf cells) leaf_cell_ids = local_leaf_cells(mesh.tree) @@ -161,13 +161,13 @@ function create_cache_gpu(mesh::TreeMesh{3}, equations, end function create_cache_gpu(mesh::TreeMesh{3}, equations, - volume_integral::VolumeIntegralFluxDifferencing, dg::DG, + volume_integral::VolumeIntegralFluxDifferencing, dg::DGSEM, uEltype, cache) NamedTuple() end function create_cache_gpu(mesh::TreeMesh{3}, equations, - volume_integral::VolumeIntegralShockCapturingHGType, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DGSEM, uEltype, cache) fstar1_L = CUDA.zeros(uEltype, nvariables(equations), nnodes(dg) + 1, nnodes(dg), nnodes(dg), nelements(cache.elements)) diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl index 81abd3af..3259dc7e 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -2,7 +2,7 @@ # initialize `du` and `u` with a 1D shape, as Trixi.jl does? # Get the polynomial degree from the solver basis. -@inline polydeg(dg::DG) = polydeg(dg.basis) +@inline polydeg(dg::DGSEM{<:LobattoLegendreBasisGPU}) = polydeg(dg.basis) # Based on benchmarks, using `reshape` is faster than `unsafe_wrap` for GPU arrays (why?), # but currently we are not sure about if reshape can be used for later `resize!` operations. @@ -112,7 +112,7 @@ function compute_coefficients_kernel!(u, node_coordinates, func::Any, t, end # Call kernels to compute the coefficients for 1D problems -function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{1}, equations, dg::DG, cache) +function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{1}, equations, dg::DGSEM, cache) node_coordinates = cache.elements.node_coordinates compute_coefficients_kernel = @cuda launch=false compute_coefficients_kernel!(u, @@ -127,7 +127,7 @@ function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{1}, equations, end # Call kernels to compute the coefficients for 2D problems -function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{2}, equations, dg::DG, cache) +function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{2}, equations, dg::DGSEM, cache) node_coordinates = cache.elements.node_coordinates compute_coefficients_kernel = @cuda launch=false compute_coefficients_kernel!(u, @@ -142,7 +142,7 @@ function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{2}, equations, end # Call kernels to compute the coefficients for 3D problems -function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{3}, equations, dg::DG, cache) +function compute_coefficients_gpu(u, func, t, mesh::AbstractMesh{3}, equations, dg::DGSEM, cache) node_coordinates = cache.elements.node_coordinates compute_coefficients_kernel = @cuda launch=false compute_coefficients_kernel!(u, diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index 2ddc586d..a27ea88d 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -285,7 +285,7 @@ function cuda_prolong2interfaces!(u, mesh::TreeMesh{1}, equations, cache) end # Compute interface fluxes on the GPU for 1D problems with non-conservative terms disabled. -function cuda_interface_flux!(mesh::TreeMesh{1}, nonconservative_terms::False, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{1}, nonconservative_terms::False, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -313,7 +313,7 @@ function cuda_interface_flux!(mesh::TreeMesh{1}, nonconservative_terms::False, e end # Compute interface fluxes on the GPU for 1D problems with non-conservative terms enabled. -function cuda_interface_flux!(mesh::TreeMesh{1}, nonconservative_terms::True, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{1}, nonconservative_terms::True, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -379,13 +379,13 @@ end # No operation for periodic boundary conditions. function cuda_boundary_flux!(t, mesh::TreeMesh{1}, boundary_condition::BoundaryConditionPeriodic, - nonconservative_terms, equations, dg::DG, cache) + nonconservative_terms, equations, dg::DGSEM, cache) @assert iszero(length(cache.boundaries.orientations)) end # Compute boundary fluxes on the GPU for 1D problems with non-conservative terms disabled. function cuda_boundary_flux!(t, mesh::TreeMesh{1}, boundary_conditions::NamedTuple, - nonconservative_terms::False, equations, dg::DG, cache) + nonconservative_terms::False, equations, dg::DGSEM, cache) surface_flux = dg.surface_integral.surface_flux n_boundaries_per_direction = cache.boundaries.n_boundaries_per_direction @@ -428,7 +428,7 @@ end # Compute boundary fluxes on the GPU for 1D problems with non-conservative terms enabled. function cuda_boundary_flux!(t, mesh::TreeMesh{1}, boundary_conditions::NamedTuple, - nonconservative_terms::True, equations, dg::DG, cache) + nonconservative_terms::True, equations, dg::DGSEM, cache) # Contain both conservative and nonconservative fluxes surface_flux = dg.surface_integral.surface_flux @@ -521,7 +521,7 @@ end # DG volume term, interface and boundary fluxes, surface accumulation, Jacobian transformation, # and source terms. function rhs_gpu!(du, u, t, mesh::TreeMesh{1}, equations, boundary_conditions, - source_terms::Source, dg::DG, cache_gpu, cache_cpu) where {Source} + source_terms::Source, dg::DGSEM, cache_gpu, cache_cpu) where {Source} # reset_du!(du) # reset_du!(du) is now fused into the next kernel, # removing the need for a separate function call. diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index ac2cd1c7..ca720b88 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -336,7 +336,7 @@ function cuda_prolong2interfaces!(u, mesh::TreeMesh{2}, equations, cache) end # Compute interface fluxes on the GPU for 2D problems with non-conservative terms disabled. -function cuda_interface_flux!(mesh::TreeMesh{2}, nonconservative_terms::False, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{2}, nonconservative_terms::False, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -370,7 +370,7 @@ function cuda_interface_flux!(mesh::TreeMesh{2}, nonconservative_terms::False, e end # Compute interface fluxes on the GPU for 2D problems with non-conservative terms enabled. -function cuda_interface_flux!(mesh::TreeMesh{2}, nonconservative_terms::True, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{2}, nonconservative_terms::True, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -445,13 +445,13 @@ end # No operation for periodic boundary conditions. function cuda_boundary_flux!(t, mesh::TreeMesh{2}, boundary_condition::BoundaryConditionPeriodic, - nonconservative_terms, equations, dg::DG, cache) + nonconservative_terms, equations, dg::DGSEM, cache) @assert iszero(length(cache.boundaries.orientations)) end # Compute boundary fluxes on the GPU for 2D problems with non-conservative terms disabled. function cuda_boundary_flux!(t, mesh::TreeMesh{2}, boundary_conditions::NamedTuple, - nonconservative_terms::False, equations, dg::DG, cache) + nonconservative_terms::False, equations, dg::DGSEM, cache) surface_flux = dg.surface_integral.surface_flux n_boundaries_per_direction = cache.boundaries.n_boundaries_per_direction @@ -495,7 +495,7 @@ end # Compute boundary fluxes on the GPU for 2D problems with non-conservative terms enabled. function cuda_boundary_flux!(t, mesh::TreeMesh{2}, boundary_conditions::NamedTuple, - nonconservative_terms::True, equations, dg::DG, cache) + nonconservative_terms::True, equations, dg::DGSEM, cache) # Contain both conservative and nonconservative fluxes surface_flux = dg.surface_integral.surface_flux @@ -587,13 +587,13 @@ end # No operation when mortar data are not present. function cuda_mortar_flux!(mesh::TreeMesh{2}, cache_mortars::False, nonconservative_terms, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) @assert iszero(length(cache.mortars.orientations)) end # Compute mortar fluxes on the GPU for 2D problems with non-conservative terms disabled. function cuda_mortar_flux!(mesh::TreeMesh{2}, cache_mortars::True, nonconservative_terms::False, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) surface_flux = dg.surface_integral.surface_flux neighbor_ids = cache.mortars.neighbor_ids @@ -650,7 +650,7 @@ end # Compute mortar fluxes on the GPU for 2D problems with non-conservative terms enabled. function cuda_mortar_flux!(mesh::TreeMesh{2}, cache_mortars::True, nonconservative_terms::True, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) surface_flux, nonconservative_flux = dg.surface_integral.surface_flux neighbor_ids = cache.mortars.neighbor_ids @@ -708,7 +708,7 @@ function cuda_mortar_flux!(mesh::TreeMesh{2}, cache_mortars::True, nonconservati end # Accumulate surface contributions into the DG scheme on the GPU for 2D problems. -function cuda_surface_integral!(du, mesh::TreeMesh{2}, equations, dg::DG, cache) +function cuda_surface_integral!(du, mesh::TreeMesh{2}, equations, dg::DGSEM, cache) factor_arr = CuArray([ dg.basis.boundary_interpolation[1, 1], dg.basis.boundary_interpolation[size(du, 2), 2] @@ -758,7 +758,7 @@ end # DG volume term, interface, boundary and mortar fluxes, surface accumulation, Jacobian transformation, # and source terms. function rhs_gpu!(du, u, t, mesh::TreeMesh{2}, equations, boundary_conditions, - source_terms::Source, dg::DG, cache_gpu, cache_cpu) where {Source} + source_terms::Source, dg::DGSEM, cache_gpu, cache_cpu) where {Source} # reset_du!(du) # reset_du!(du) is now fused into the next kernel, # removing the need for a separate function call. diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index 0156e08b..3e26388d 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -377,7 +377,7 @@ function cuda_prolong2interfaces!(u, mesh::TreeMesh{3}, equations, cache) end # Compute interface fluxes on the GPU for 3D problems with non-conservative terms disabled. -function cuda_interface_flux!(mesh::TreeMesh{3}, nonconservative_terms::False, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{3}, nonconservative_terms::False, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -412,7 +412,7 @@ function cuda_interface_flux!(mesh::TreeMesh{3}, nonconservative_terms::False, e end # Compute interface fluxes on the GPU for 3D problems with non-conservative terms enabled. -function cuda_interface_flux!(mesh::TreeMesh{3}, nonconservative_terms::True, equations, dg::DG, +function cuda_interface_flux!(mesh::TreeMesh{3}, nonconservative_terms::True, equations, dg::DGSEM, cache) RealT = eltype(cache.elements) @@ -490,13 +490,13 @@ end # No operation for periodic boundary conditions. function cuda_boundary_flux!(t, mesh::TreeMesh{3}, boundary_condition::BoundaryConditionPeriodic, - nonconservative_terms, equations, dg::DG, cache) + nonconservative_terms, equations, dg::DGSEM, cache) @assert iszero(length(cache.boundaries.orientations)) end # Compute boundary fluxes on the GPU for 3D problems with non-conservative terms enabled. function cuda_boundary_flux!(t, mesh::TreeMesh{3}, boundary_conditions::NamedTuple, - nonconservative_terms, equations, dg::DG, cache) + nonconservative_terms, equations, dg::DGSEM, cache) surface_flux = dg.surface_integral.surface_flux n_boundaries_per_direction = cache.boundaries.n_boundaries_per_direction @@ -619,13 +619,13 @@ end # No operation when mortar data are not present. function cuda_mortar_flux!(mesh::TreeMesh{3}, cache_mortars::False, nonconservative_terms, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) @assert iszero(length(cache.mortars.orientations)) end # Compute mortar fluxes on the GPU for 3D problems with non-conservative terms disabled. function cuda_mortar_flux!(mesh::TreeMesh{3}, cache_mortars::True, nonconservative_terms::False, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) surface_flux = dg.surface_integral.surface_flux neighbor_ids = cache.mortars.neighbor_ids @@ -734,7 +734,7 @@ end # Compute mortar fluxes on the GPU for 3D problems with non-conservative terms enabled. function cuda_mortar_flux!(mesh::TreeMesh{3}, cache_mortars::True, nonconservative_terms::True, - equations, dg::DG, cache) + equations, dg::DGSEM, cache) surface_flux, nonconservative_flux = dg.surface_integral.surface_flux neighbor_ids = cache.mortars.neighbor_ids @@ -893,7 +893,7 @@ end # interface, boundary and mortar fluxes, surface accumulation, Jacobian transformation, and # source terms. function rhs_gpu!(du, u, t, mesh::TreeMesh{3}, equations, boundary_conditions, - source_terms::Source, dg::DG, cache_gpu, cache_cpu) where {Source} + source_terms::Source, dg::DGSEM, cache_gpu, cache_cpu) where {Source} # reset_du!(du) # reset_du!(du) is now fused into the next kernel, # removing the need for a separate function call. From c2558994440caf0fd2a844cba717919e7ad525f4 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 21:52:10 +0800 Subject: [PATCH 23/28] Use explicit DGSEM type construction --- src/TrixiCUDA.jl | 2 +- src/solvers/dgsem_gpu.jl | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index a7853e43..028e1a68 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -14,7 +14,7 @@ using StaticArrays: SVector # Trixi abstractions, meshes, and solvers using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, - TreeMesh, TreeMeshSerial, StructuredMesh, DG, DGSEM, + TreeMesh, TreeMeshSerial, StructuredMesh, DGSEM, True, False, PerformanceCounter # Basis, mortar, and volume-integral types diff --git a/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index f43907e5..3e0e12e6 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -2,11 +2,11 @@ # Current GPU kernels require identical default and blended high-order # flux-differencing operators, combined with first-order subcell FV. # Upstream: https://github.com/trixi-framework/Trixi.jl/pull/2802 + # Rewrite `DGSEM` in Trixi.jl to add the specialized parts of the arrays required to copy the arrays # from CPU to GPU. # Construct a DG solver using this package's GPU basis and kernels. - function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_flux = flux_central, volume_integral = VolumeIntegralWeakForm(), @@ -14,16 +14,15 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_integral = SurfaceIntegralWeakForm(surface_flux) # Preserve the GPU basis and mortar types in the DG solver. - return DG{typeof(basis), typeof(mortar), typeof(surface_integral), + return DGSEM{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end - function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_integral::AbstractSurfaceIntegral, volume_integral = VolumeIntegralWeakForm(), mortar = MortarL2GPU(basis)) # Preserve the GPU basis and mortar types in the DG solver. - return DG{typeof(basis), typeof(mortar), typeof(surface_integral), + return DGSEM{typeof(basis), typeof(mortar), typeof(surface_integral), typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end From d1927876b29de1a4cded32e9782826a66239a631 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 21:54:34 +0800 Subject: [PATCH 24/28] Apply Julia formatting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/solvers/dgsem_gpu.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index 3e0e12e6..dfaafc84 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -15,7 +15,7 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, # Preserve the GPU basis and mortar types in the DG solver. return DGSEM{typeof(basis), typeof(mortar), typeof(surface_integral), - typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) + typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end function DGSEMGPU(basis::LobattoLegendreBasisGPU, surface_integral::AbstractSurfaceIntegral, From 760553cf5d521cca387963f89adbb98076a79521 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 21:54:51 +0800 Subject: [PATCH 25/28] Apply Julia formatting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/solvers/dgsem_gpu.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index dfaafc84..22a4aa15 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -23,7 +23,7 @@ function DGSEMGPU(basis::LobattoLegendreBasisGPU, mortar = MortarL2GPU(basis)) # Preserve the GPU basis and mortar types in the DG solver. return DGSEM{typeof(basis), typeof(mortar), typeof(surface_integral), - typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) + typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) end """ From 5a44e6ddebe462004e482a98a007ef57287bea9a Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 22:08:46 +0800 Subject: [PATCH 26/28] Use inverse quadrature weights directly in GPU surface integrals --- src/solvers/basis_lobatto_legendre.jl | 12 ----- src/solvers/dg_1d.jl | 9 ++-- src/solvers/dg_1d_kernel.jl | 6 +-- src/solvers/dg_2d.jl | 9 ++-- src/solvers/dg_2d_kernel.jl | 6 +-- src/solvers/dg_3d.jl | 9 ++-- src/solvers/dg_3d_kernel.jl | 6 +-- test/runtests.jl | 1 + test/surface_integral.jl | 68 +++++++++++++++++++++++++++ 9 files changed, 87 insertions(+), 39 deletions(-) create mode 100644 test/surface_integral.jl diff --git a/src/solvers/basis_lobatto_legendre.jl b/src/solvers/basis_lobatto_legendre.jl index 3404ee28..57447684 100644 --- a/src/solvers/basis_lobatto_legendre.jl +++ b/src/solvers/basis_lobatto_legendre.jl @@ -4,7 +4,6 @@ struct LobattoLegendreBasisGPU{RealT <: Real, NNODES, VectorT <: CuArray{RealT, 1}, InverseVandermondeLegendre <: AbstractMatrix{RealT}, - BoundaryMatrix <: AbstractMatrix{RealT}, DerivativeMatrix <: CuArray{RealT, 2}} <: AbstractBasisSBP{RealT} # CPU array, no need to convert to GPU array # Will it be better if adapt a CPU type? @@ -16,7 +15,6 @@ struct LobattoLegendreBasisGPU{RealT <: Real, NNODES, # CPU array, can adapt to a GPU type if needed inverse_vandermonde_legendre::InverseVandermondeLegendre - boundary_interpolation::BoundaryMatrix # Set as GPU array type derivative_matrix::DerivativeMatrix @@ -43,13 +41,6 @@ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) inverse_weights_ = basis_cpu.inverse_weights inverse_vandermonde_legendre_ = basis_cpu.inverse_vandermonde_legendre - # Lobatto nodes include the endpoints. Retain the weighted boundary matrix - # for the current GPU surface kernels. - # TODO: Follow upstream by using `inverse_weights` directly and removing this matrix. - boundary_interpolation_ = zeros(RealT, nnodes_, 2) - boundary_interpolation_[1, 1] = first(inverse_weights_) - boundary_interpolation_[end, 2] = last(inverse_weights_) - derivative_matrix_ = basis_cpu.derivative_matrix derivative_split_ = basis_cpu.derivative_split derivative_hat_ = basis_cpu.derivative_hat @@ -64,15 +55,12 @@ function LobattoLegendreBasisGPU(RealT, polydeg::Integer) # Avoid scalar indexing # inverse_vandermonde_legendre = CuArray{RealT}(inverse_vandermonde_legendre_) - # boundary_interpolation = CuArray(boundary_interpolation_) return LobattoLegendreBasisGPU{RealT, nnodes_, typeof(inverse_weights), typeof(inverse_vandermonde_legendre_), - typeof(boundary_interpolation_), typeof(derivative_matrix)}(nodes_, weights_, inverse_weights, inverse_vandermonde_legendre_, - boundary_interpolation_, derivative_matrix, derivative_split, derivative_split_transpose, diff --git a/src/solvers/dg_1d.jl b/src/solvers/dg_1d.jl index a27ea88d..08cdb652 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -474,16 +474,13 @@ end # Accumulate surface contributions into the DG scheme on the GPU for 1D problems. function cuda_surface_integral!(du, mesh::TreeMesh{1}, equations, dg::DGSEM, cache) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) + inverse_weights = dg.basis.inverse_weights surface_flux_values = cache.elements.surface_flux_values - surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, factor_arr, + surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations) - surface_integral_kernel(du, factor_arr, surface_flux_values, equations; + surface_integral_kernel(du, inverse_weights, surface_flux_values, equations; kernel_configurator_3d(surface_integral_kernel, size(du)...)...) return nothing diff --git a/src/solvers/dg_1d_kernel.jl b/src/solvers/dg_1d_kernel.jl index c2a19653..60631f8a 100644 --- a/src/solvers/dg_1d_kernel.jl +++ b/src/solvers/dg_1d_kernel.jl @@ -872,7 +872,7 @@ function boundary_flux_kernel!(surface_flux_values, boundaries_u, node_coordinat end # Kernel for calculating surface integrals -function surface_integral_kernel!(du, factor_arr, surface_flux_values, +function surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations::AbstractEquations{1}) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y @@ -880,8 +880,8 @@ function surface_integral_kernel!(du, factor_arr, surface_flux_values, if (i <= size(du, 1) && j <= size(du, 2) && k <= size(du, 3)) @inbounds begin - du[i, j, k] -= surface_flux_values[i, 1, k] * isequal(j, 1) * factor_arr[1] - du[i, j, k] += surface_flux_values[i, 2, k] * isequal(j, size(du, 2)) * factor_arr[2] + du[i, j, k] -= surface_flux_values[i, 1, k] * isequal(j, 1) * inverse_weights[1] + du[i, j, k] += surface_flux_values[i, 2, k] * isequal(j, size(du, 2)) * inverse_weights[end] end end diff --git a/src/solvers/dg_2d.jl b/src/solvers/dg_2d.jl index ca720b88..f636adb9 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -709,16 +709,13 @@ end # Accumulate surface contributions into the DG scheme on the GPU for 2D problems. function cuda_surface_integral!(du, mesh::TreeMesh{2}, equations, dg::DGSEM, cache) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) + inverse_weights = dg.basis.inverse_weights surface_flux_values = cache.elements.surface_flux_values - surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, factor_arr, + surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations) - surface_integral_kernel(du, factor_arr, surface_flux_values, equations; + surface_integral_kernel(du, inverse_weights, surface_flux_values, equations; kernel_configurator_3d(surface_integral_kernel, size(du, 1), size(du, 2)^2, size(du, 4))...) diff --git a/src/solvers/dg_2d_kernel.jl b/src/solvers/dg_2d_kernel.jl index 3a09632a..1f3e2501 100644 --- a/src/solvers/dg_2d_kernel.jl +++ b/src/solvers/dg_2d_kernel.jl @@ -1397,7 +1397,7 @@ function mortar_flux_copy_to_kernel!(surface_flux_values, tmp_surface_flux_value end # Kernel for calculating surface integrals -function surface_integral_kernel!(du, factor_arr, surface_flux_values, +function surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations::AbstractEquations{2}) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y @@ -1411,9 +1411,9 @@ function surface_integral_kernel!(du, factor_arr, surface_flux_values, @inbounds begin du[i, j1, j2, k] -= (surface_flux_values[i, j2, 1, k] * isequal(j1, 1) + - surface_flux_values[i, j1, 3, k] * isequal(j2, 1)) * factor_arr[1] + surface_flux_values[i, j1, 3, k] * isequal(j2, 1)) * inverse_weights[1] du[i, j1, j2, k] += (surface_flux_values[i, j2, 2, k] * isequal(j1, u2) + - surface_flux_values[i, j1, 4, k] * isequal(j2, u2)) * factor_arr[2] + surface_flux_values[i, j1, 4, k] * isequal(j2, u2)) * inverse_weights[end] end end diff --git a/src/solvers/dg_3d.jl b/src/solvers/dg_3d.jl index 3e26388d..017f37e7 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -844,16 +844,13 @@ end # Accumulate surface contributions into the DG scheme on the GPU for 3D problems. function cuda_surface_integral!(du, mesh::TreeMesh{3}, equations, dg::DGSEM, cache) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) + inverse_weights = dg.basis.inverse_weights surface_flux_values = cache.elements.surface_flux_values - surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, factor_arr, + surface_integral_kernel = @cuda launch=false surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations) - surface_integral_kernel(du, factor_arr, surface_flux_values, equations; + surface_integral_kernel(du, inverse_weights, surface_flux_values, equations; kernel_configurator_3d(surface_integral_kernel, size(du, 1), size(du, 2)^3, size(du, 5))...) diff --git a/src/solvers/dg_3d_kernel.jl b/src/solvers/dg_3d_kernel.jl index 16288cba..bb934f28 100644 --- a/src/solvers/dg_3d_kernel.jl +++ b/src/solvers/dg_3d_kernel.jl @@ -1770,7 +1770,7 @@ function mortar_flux_copy_to_kernel!(surface_flux_values, tmp_surface_flux_value end # Kernel for calculating surface integrals -function surface_integral_kernel!(du, factor_arr, surface_flux_values, +function surface_integral_kernel!(du, inverse_weights, surface_flux_values, equations::AbstractEquations{3}) i = (blockIdx().x - 1) * blockDim().x + threadIdx().x j = (blockIdx().y - 1) * blockDim().y + threadIdx().y @@ -1787,11 +1787,11 @@ function surface_integral_kernel!(du, factor_arr, surface_flux_values, du[i, j1, j2, j3, k] -= (surface_flux_values[i, j2, j3, 1, k] * isequal(j1, 1) + surface_flux_values[i, j1, j3, 3, k] * isequal(j2, 1) + surface_flux_values[i, j1, j2, 5, k] * isequal(j3, 1)) * - factor_arr[1] + inverse_weights[1] du[i, j1, j2, j3, k] += (surface_flux_values[i, j2, j3, 2, k] * isequal(j1, u2) + surface_flux_values[i, j1, j3, 4, k] * isequal(j2, u2) + surface_flux_values[i, j1, j2, 6, k] * isequal(j3, u2)) * - factor_arr[2] + inverse_weights[end] end end diff --git a/test/runtests.jl b/test/runtests.jl index fead93ad..f495f6e3 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -16,6 +16,7 @@ using CUDA println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) @info "Starting TrixiCUDA test suite..." + include("surface_integral.jl") for (dim, path) in [("1D", "./tree_dgsem_1d/tree_dgsem_1d.jl"), ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), ("3D", "./tree_dgsem_3d/tree_dgsem_3d.jl")] diff --git a/test/surface_integral.jl b/test/surface_integral.jl new file mode 100644 index 00000000..a8e80b50 --- /dev/null +++ b/test/surface_integral.jl @@ -0,0 +1,68 @@ +module SurfaceIntegralTests + +using CUDA, Test, Trixi, TrixiCUDA + +# Accumulate each face independently, without the kernels' flattened node indexing. +function reference_surface_integral!(du, surface_flux_values, inverse_weights, ndims_) + for index in CartesianIndices(du) + variable = index[1] + nodes = ntuple(axis -> index[axis + 1], ndims_) + element = index[ndims_ + 2] + for axis in 1:ndims_ + transverse = Tuple(nodes[other] for other in 1:ndims_ if other != axis) + if nodes[axis] == 1 + du[index] -= surface_flux_values[variable, transverse..., 2 * axis - 1, element] * + first(inverse_weights) + end + if nodes[axis] == size(du, axis + 1) + du[index] += surface_flux_values[variable, transverse..., 2 * axis, element] * + last(inverse_weights) + end + end + end + return du +end + +@testset "Surface integrals use inverse quadrature weights" begin + equation_types = (CompressibleEulerEquations1D, CompressibleEulerEquations2D, + CompressibleEulerEquations3D) + for ndims_ in 1:3, RealT in (Float32, Float64), polydeg in (1, 3, 4) + @testset "$ndims_ dimensions, $RealT, degree $polydeg" begin + basis = LobattoLegendreBasisGPU(RealT, polydeg) + basis_cpu = LobattoLegendreBasis(RealT, polydeg) + @test !hasproperty(basis, :boundary_interpolation) + @test Array(basis.inverse_weights) == basis_cpu.inverse_weights + solver = DGSEMGPU(basis) + equations = equation_types[ndims_](RealT(1.4)) + mesh = TreeMesh(ntuple(_ -> -one(RealT), ndims_), ntuple(_ -> one(RealT), ndims_), + initial_refinement_level = 1, + periodicity = true, + RealT = RealT) + + nnodes_ = polydeg + 1 + nelements_ = 2^ndims_ + shape = (Trixi.nvariables(equations), ntuple(_ -> nnodes_, ndims_)..., nelements_) + face_shape = (shape[1], ntuple(_ -> nnodes_, ndims_ - 1)..., 2 * ndims_, nelements_) + initial_du = reshape(sin.(RealT.(1:prod(shape))), shape) + surface_flux_values = reshape(cos.(RealT.(1:prod(face_shape))), face_shape) + cache = (; elements = (; surface_flux_values = CuArray(surface_flux_values))) + + for asymmetric_weights in (false, true) + # Distinct endpoints also catch accidentally reading an interior weight. + inverse_weights = collect(basis_cpu.inverse_weights) + if asymmetric_weights + inverse_weights[1] = RealT(7) + inverse_weights[end] = RealT(11) + end + copyto!(basis.inverse_weights, inverse_weights) + expected = reference_surface_integral!(copy(initial_du), surface_flux_values, + inverse_weights, ndims_) + du = CuArray(initial_du) + TrixiCUDA.cuda_surface_integral!(du, mesh, equations, solver, cache) + @test isapprox(Array(du), expected; rtol = 20 * eps(RealT), atol = 20 * eps(RealT)) + end + end + end +end + +end # module From d1a43767cc01c510d1a17e1b417edff2355d0fc2 Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 22:46:08 +0800 Subject: [PATCH 27/28] Remove extra surface integral test --- test/runtests.jl | 1 - test/surface_integral.jl | 68 ---------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 test/surface_integral.jl diff --git a/test/runtests.jl b/test/runtests.jl index f495f6e3..fead93ad 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -16,7 +16,6 @@ using CUDA println("- Max shared memory per block: ", TrixiCUDA.MAX_SHARED_MEMORY_PER_BLOCK) @info "Starting TrixiCUDA test suite..." - include("surface_integral.jl") for (dim, path) in [("1D", "./tree_dgsem_1d/tree_dgsem_1d.jl"), ("2D", "./tree_dgsem_2d/tree_dgsem_2d.jl"), ("3D", "./tree_dgsem_3d/tree_dgsem_3d.jl")] diff --git a/test/surface_integral.jl b/test/surface_integral.jl deleted file mode 100644 index a8e80b50..00000000 --- a/test/surface_integral.jl +++ /dev/null @@ -1,68 +0,0 @@ -module SurfaceIntegralTests - -using CUDA, Test, Trixi, TrixiCUDA - -# Accumulate each face independently, without the kernels' flattened node indexing. -function reference_surface_integral!(du, surface_flux_values, inverse_weights, ndims_) - for index in CartesianIndices(du) - variable = index[1] - nodes = ntuple(axis -> index[axis + 1], ndims_) - element = index[ndims_ + 2] - for axis in 1:ndims_ - transverse = Tuple(nodes[other] for other in 1:ndims_ if other != axis) - if nodes[axis] == 1 - du[index] -= surface_flux_values[variable, transverse..., 2 * axis - 1, element] * - first(inverse_weights) - end - if nodes[axis] == size(du, axis + 1) - du[index] += surface_flux_values[variable, transverse..., 2 * axis, element] * - last(inverse_weights) - end - end - end - return du -end - -@testset "Surface integrals use inverse quadrature weights" begin - equation_types = (CompressibleEulerEquations1D, CompressibleEulerEquations2D, - CompressibleEulerEquations3D) - for ndims_ in 1:3, RealT in (Float32, Float64), polydeg in (1, 3, 4) - @testset "$ndims_ dimensions, $RealT, degree $polydeg" begin - basis = LobattoLegendreBasisGPU(RealT, polydeg) - basis_cpu = LobattoLegendreBasis(RealT, polydeg) - @test !hasproperty(basis, :boundary_interpolation) - @test Array(basis.inverse_weights) == basis_cpu.inverse_weights - solver = DGSEMGPU(basis) - equations = equation_types[ndims_](RealT(1.4)) - mesh = TreeMesh(ntuple(_ -> -one(RealT), ndims_), ntuple(_ -> one(RealT), ndims_), - initial_refinement_level = 1, - periodicity = true, - RealT = RealT) - - nnodes_ = polydeg + 1 - nelements_ = 2^ndims_ - shape = (Trixi.nvariables(equations), ntuple(_ -> nnodes_, ndims_)..., nelements_) - face_shape = (shape[1], ntuple(_ -> nnodes_, ndims_ - 1)..., 2 * ndims_, nelements_) - initial_du = reshape(sin.(RealT.(1:prod(shape))), shape) - surface_flux_values = reshape(cos.(RealT.(1:prod(face_shape))), face_shape) - cache = (; elements = (; surface_flux_values = CuArray(surface_flux_values))) - - for asymmetric_weights in (false, true) - # Distinct endpoints also catch accidentally reading an interior weight. - inverse_weights = collect(basis_cpu.inverse_weights) - if asymmetric_weights - inverse_weights[1] = RealT(7) - inverse_weights[end] = RealT(11) - end - copyto!(basis.inverse_weights, inverse_weights) - expected = reference_surface_integral!(copy(initial_du), surface_flux_values, - inverse_weights, ndims_) - du = CuArray(initial_du) - TrixiCUDA.cuda_surface_integral!(du, mesh, equations, solver, cache) - @test isapprox(Array(du), expected; rtol = 20 * eps(RealT), atol = 20 * eps(RealT)) - end - end - end -end - -end # module From eee360679708ed7e03c49b2059a55558e18f9f0b Mon Sep 17 00:00:00 2001 From: Huiyu Xie Date: Fri, 23 Oct 2026 22:49:07 +0800 Subject: [PATCH 28/28] Remove unused AbstractGPUVector import --- src/TrixiCUDA.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TrixiCUDA.jl b/src/TrixiCUDA.jl index 028e1a68..fe4c2cd4 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -5,7 +5,7 @@ import CUDA using CUDA: CuArray, CuDynamicSharedArray, @cuda, HostKernel, launch_configuration, threadIdx, blockIdx, blockDim, sync_threads -using GPUArraysCore: AbstractGPUArray, AbstractGPUVector +using GPUArraysCore: AbstractGPUArray # Formatting, ODE problems, and static arrays using Printf: @printf, @sprintf