diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 037599ee..287664ea 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,16 +1,20 @@ steps: - - label: "CUDA Test - Julia 1.10" + - label: "Test TrixiCUDA.jl - Julia {{matrix.julia}}" + matrix: + setup: + julia: ["1.10", "1.11", "1.12", "1.13"] plugins: - JuliaCI/julia#v1: - version: "1.10" + 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\]/ @@ -21,18 +25,16 @@ steps: - JuliaCI/julia#v1: version: "1.10" command: | - julia --project -e ' + julia --project=docs -e ' println("--- :julia: Instantiating project") using Pkg + Pkg.develop(path=pwd()) Pkg.instantiate() - Pkg.build() - Pkg.activate("docs") - 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 \ No newline at end of file + if: build.pull_request.id != null && build.message !~ /\[skip docs\]/ + timeout_in_minutes: 15 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 3f97d0c2..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: '1.0.56' 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/Project.toml b/Project.toml index f0e7e4ef..69dfb551 100644 --- a/Project.toml +++ b/Project.toml @@ -5,23 +5,24 @@ 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" +CUDA = "6.4.2" +GPUArraysCore = "0.2.1" +Printf = "1.10" +SciMLBase = "3.58" +StaticArrays = "1.9.23" Test = "1.10" -Trixi = "0.11 - 0.13.5" +Trixi = "0.17.16" julia = "1.10" [extras] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "Test"] +test = ["Test"] 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..cfa5e315 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) + periodicity = true, + RealT = RealT) # 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,8 +62,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 ebc0b219..40612212 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) + periodicity = true, + RealT = RealT) # 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,8 +62,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 03b310c6..513ebd02 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) + periodicity = true, + RealT = RealT) # 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,8 +62,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 9371ed4a..53ed69cc 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) + periodicity = true, + RealT = RealT) # 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,8 +63,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 1499f382..7a1a3a86 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) + periodicity = true, + RealT = RealT) # 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,8 +65,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 59285132..c317f2e1 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) + periodicity = true, + RealT = RealT) # 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,8 +65,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 4657f615..6877a60c 100644 --- a/benchmark/euler_ec_2d.jl +++ b/benchmark/euler_ec_2d.jl @@ -22,8 +22,8 @@ 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) + periodicity = true, + RealT = RealT) # Cache initialization semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, @@ -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,8 +66,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 882b9d37..4d1c9a92 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) + periodicity = true, + RealT = RealT) # 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,8 +65,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 e90c8a7c..aa51f726 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) + periodicity = true, + RealT = RealT) # 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,8 +78,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 f7daa4e7..7d037474 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) + periodicity = true, + RealT = RealT) # 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,8 +78,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 2c337f67..70deefdc 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) + 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) @@ -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,8 +80,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 ce129279..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, - n_cells_max = 30_000, periodicity = false, RealT = RealT) @@ -59,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) @@ -68,8 +67,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 732b8e20..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, - n_cells_max = 30_000, periodicity = (false, true), RealT = RealT) @@ -62,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) @@ -71,8 +70,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 9a42ea9d..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, - n_cells_max = 30_000, periodicity = (false, true, true), RealT = RealT) @@ -64,7 +63,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,8 +72,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 89f1fa0e..46b4aa39 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) + periodicity = true, + RealT = RealT) # 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,8 +64,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 81eb26b8..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) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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) + periodicity = true, + RealT = RealT) # 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,8 +66,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 efbbd854..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) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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) + periodicity = true, + RealT = RealT) # 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,8 +66,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 a9e3ad7e..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) +equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test @@ -30,11 +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, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # 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 +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) @@ -72,8 +73,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 8e8c0dd3..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) +equations = IdealGlmMhdEquations3D(gamma; initial_c_h = 1.0f0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN initial_condition = initial_condition_convergence_test @@ -30,11 +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, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # 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 +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) @@ -72,8 +73,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 2099bb93..a632976d 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) + periodicity = true, + RealT = RealT) # 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,8 +66,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 7802c633..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) +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 @@ -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) + periodicity = true, + RealT = RealT) # 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,8 +67,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 0a339156..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) +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 @@ -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) + periodicity = true, + RealT = RealT) # 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,8 +67,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 a22cea39..6003b43b 100644 --- a/benchmark/shallowwater_ec_1d.jl +++ b/benchmark/shallowwater_ec_1d.jl @@ -45,11 +45,12 @@ coordinates_min = -1.0f0 coordinates_max = 1.0f0 mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 2, - n_cells_max = 10_000, + periodicity = true, RealT = RealT) # 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 +79,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,8 +88,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 0957b794..210273d1 100644 --- a/benchmark/shallowwater_ec_2d.jl +++ b/benchmark/shallowwater_ec_2d.jl @@ -56,11 +56,12 @@ 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, + periodicity = true, RealT = RealT) # 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 +112,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,8 +121,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 18b9b9ba..52b2824b 100644 --- a/benchmark/shallowwater_source_terms_1d.jl +++ b/benchmark/shallowwater_source_terms_1d.jl @@ -24,13 +24,13 @@ 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 +60,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,8 +69,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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 2399e316..36026a2b 100644 --- a/benchmark/shallowwater_source_terms_2d.jl +++ b/benchmark/shallowwater_source_terms_2d.jl @@ -24,13 +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, - 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 +60,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,8 +69,8 @@ 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, - solver, cache) +cpu_trial = @benchmark Trixi.rhs_hyperbolic!(nothing, du, u, t, mesh, equations, boundary_conditions, source_terms, + 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/docs/Project.toml b/docs/Project.toml index 6b178765..5ebc31e9 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,8 +1,8 @@ [deps] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +TrixiCUDA = "5056661c-942a-472c-b3bc-01507f717a60" -[compat] -Documenter = "1" -[extras] -Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" +[compat] +Documenter = "1.19" +TrixiCUDA = "1" 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/examples/advection_basic_1d.jl b/examples/advection_basic_1d.jl index 05215703..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, - n_cells_max = 30_000) # 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 3b7395e5..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, - n_cells_max = 30_000) # 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 f455241e..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, - n_cells_max = 30_000) # 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_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..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, - 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..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, - 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..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, - 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..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, - 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..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, - 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..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, - 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..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, - 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..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, - 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..3c787e1b 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) + 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 3f849e34..44c58660 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) + 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 38da11ca..3e714508 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) + periodicity = true, + RealT = RealT) 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..fe4c2cd4 100644 --- a/src/TrixiCUDA.jl +++ b/src/TrixiCUDA.jl @@ -1,59 +1,56 @@ module TrixiCUDA -# Include other packages that are used in TrixiCUDA.jl -using CUDA -using CUDA: @cuda, CuArray, AbstractGPUArray, HostKernel, - threadIdx, blockIdx, blockDim, reshape, similar, launch_configuration +# GPU arrays and kernel launches +import CUDA +using CUDA: CuArray, CuDynamicSharedArray, + @cuda, HostKernel, launch_configuration, + threadIdx, blockIdx, blockDim, sync_threads +using GPUArraysCore: AbstractGPUArray +# 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, ntuple, nvariables, ndofs, - local_leaf_cells, - init_elements, init_interfaces, init_boundaries, init_mortars, - have_nonconservative_terms, boundary_condition_periodic, +# Trixi abstractions, meshes, and solvers +using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, + TreeMesh, TreeMeshSerial, StructuredMesh, DGSEM, + True, False, PerformanceCounter + +# Basis, mortar, and volume-integral types +using Trixi: AbstractBasisSBP, LobattoLegendreBasis, LobattoLegendreMortarL2, LobattoLegendreAnalyzer, + AbstractSurfaceIntegral, SurfaceIntegralWeakForm, + VolumeIntegralWeakForm, VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHGType + +# Tree-mesh containers +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, + BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, 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, - multiply_dimensionwise!, - set_log_type!, set_sqrt_type!, set_loop_vectorization!, - summary_header, summary_line, summary_footer, increment_indent # IO functions + local_leaf_cells, init_elements, init_interfaces, init_boundaries, init_mortars, + allocate_coefficients, eachelement, ndofs, total_volume -# Trixi.jl structs -using Trixi: AbstractEquations, AbstractContainer, AbstractMesh, AbstractSemidiscretization, - AbstractSurfaceIntegral, AbstractBasisSBP, - PerformanceCounter, True, False, TreeMesh, StructuredMesh, - DG, FDSBP, SemidiscretizationHyperbolic, - LobattoLegendreBasis, LobattoLegendreMortarL2, - ElementContainer1D, ElementContainer2D, ElementContainer3D, - InterfaceContainer1D, InterfaceContainer2D, InterfaceContainer3D, - BoundaryContainer1D, BoundaryContainer2D, BoundaryContainer3D, - L2MortarContainer2D, L2MortarContainer3D, - SurfaceIntegralWeakForm, VolumeIntegralWeakForm, - BoundaryConditionPeriodic, UnstructuredSortedBoundaryTypes, - VolumeIntegralFluxDifferencing, VolumeIntegralShockCapturingHG, - LobattoLegendreAnalyzer +# Interpolation, indicators, and analysis +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 -# 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!, + 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, + 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 diff --git a/src/auxiliary/auxiliary.jl b/src/auxiliary/auxiliary.jl index 00ec5b99..528d8211 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 @@ -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/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/callbacks_step/analysis_dg_1d.jl b/src/callbacks_step/analysis_dg_1d.jl index b68aad10..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, - mesh::TreeMesh{1}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::AbstractArray, + mesh::TreeMeshSerial{1}, 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{1}, - equations, dg::DG, cache; normalize = true) where {Func} + 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 u_local = get_node_vars_view(u, equations, dg, i, 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{1}, equations, initial_condition, - dg::DG, cache, cache_analysis) + mesh::TreeMeshSerial{1}, equations, initial_condition, + 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..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, - mesh::TreeMesh{3}, equations, dg::DG, cache, +function integrate_via_indices(func::Func, u::AbstractArray, + mesh::TreeMeshSerial{3}, equations, dg::DGSEM{<:LobattoLegendreBasisGPU}, cache, args...; normalize = true) where {Func} (; weights) = dg.basis @@ -33,8 +33,8 @@ function integrate_via_indices(func::Func, u, end function integrate(func::Func, u, - mesh::TreeMesh{3}, - equations, dg::DG, cache; normalize = true) where {Func} + 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 u_local = get_node_vars_view(u, equations, dg, i, j, k, element) # call view to avoid scalar indexing @@ -43,8 +43,8 @@ function integrate(func::Func, u, end function calc_error_norms(func, u, t, analyzer, - mesh::TreeMesh{3}, equations, initial_condition, - dg::DG, cache, cache_analysis) + mesh::TreeMeshSerial{3}, equations, initial_condition, + 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/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/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index 38c4a2da..fd8f9c77 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -68,7 +68,13 @@ 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)..., + # 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...) _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..57447684 100644 --- a/src/solvers/basis_lobatto_legendre.jl +++ b/src/solvers/basis_lobatto_legendre.jl @@ -1,31 +1,9 @@ # 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}, 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? @@ -37,13 +15,12 @@ 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 derivative_split::DerivativeMatrix derivative_split_transpose::DerivativeMatrix - derivative_dhat::DerivativeMatrix + derivative_hat::DerivativeMatrix end """ @@ -58,21 +35,15 @@ 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) - - boundary_interpolation_ = zeros(RealT, nnodes_, 2) - boundary_interpolation_[:, 1] = calc_lhat(-one(RealT), nodes_, weights_) - boundary_interpolation_[:, 2] = calc_lhat(one(RealT), nodes_, weights_) + 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 - 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,23 +51,20 @@ 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_) - # 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, - 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..cd0a26a4 100644 --- a/src/solvers/cache.jl +++ b/src/solvers/cache.jl @@ -6,21 +6,22 @@ # 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) - 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) @@ -38,19 +39,19 @@ 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::VolumeIntegralShockCapturingHG, 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)) 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) @@ -58,15 +59,16 @@ 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) - 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) @@ -88,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::VolumeIntegralShockCapturingHG, dg::DG, + volume_integral::VolumeIntegralShockCapturingHGType, dg::DGSEM, 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) @@ -128,15 +130,16 @@ 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) - 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) @@ -158,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::VolumeIntegralShockCapturingHG, 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)) @@ -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..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...) @@ -31,7 +29,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 +73,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) @@ -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...) @@ -125,7 +121,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..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...) @@ -31,7 +29,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) @@ -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...) @@ -77,7 +73,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) @@ -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...) @@ -128,7 +122,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) @@ -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...) @@ -184,7 +176,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..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...) @@ -31,7 +29,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) @@ -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...) @@ -77,7 +73,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) @@ -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...) @@ -128,7 +122,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) @@ -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 @@ -193,7 +185,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.jl b/src/solvers/dg.jl index 16a35364..3259dc7e 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -1,28 +1,25 @@ # 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 -@inline polydeg(dg::DG) = polydeg(dg.basis) +# Get the polynomial degree from the solver 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. # 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? - # Should we use `CuArray` or `AbstractGPUArray`? @inline function wrap_array(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, - dg::DG, cache) + dg::DGSEM, 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 - -# Should we use `CuArray` or `AbstractGPUArray`? @inline function wrap_array_native(u_ode::AbstractGPUArray, mesh::AbstractMesh, equations, - dg::DG, cache) + dg::DGSEM, cache) # We skip bounds checking here for better performance. # @assert length(u_ode) == nvariables(equations) * nnodes(mesh) * nelements(dg, cache) @@ -115,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, @@ -130,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, @@ -145,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 fd8073ad..08cdb652 100644 --- a/src/solvers/dg_1d.jl +++ b/src/solvers/dg_1d.jl @@ -17,10 +17,10 @@ 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_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 @@ -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 @@ -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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv 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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -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 @@ -473,17 +473,14 @@ 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) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) +function cuda_surface_integral!(du, mesh::TreeMesh{1}, equations, dg::DGSEM, cache) + 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 @@ -521,7 +518,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_1d_kernel.jl b/src/solvers/dg_1d_kernel.jl index 9ae49c78..60631f8a 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 @@ -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 65ae1102..f636adb9 100644 --- a/src/solvers/dg_2d.jl +++ b/src/solvers/dg_2d.jl @@ -17,10 +17,10 @@ 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_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 @@ -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 @@ -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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv 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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -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 @@ -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 @@ -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,17 +708,14 @@ 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) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) +function cuda_surface_integral!(du, mesh::TreeMesh{2}, equations, dg::DGSEM, cache) + 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))...) @@ -758,7 +755,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_2d_kernel.jl b/src/solvers/dg_2d_kernel.jl index 681c71a1..1f3e2501 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) @@ -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 88688e9e..017f37e7 100644 --- a/src/solvers/dg_3d.jl +++ b/src/solvers/dg_3d.jl @@ -17,10 +17,10 @@ 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_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 @@ -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 @@ -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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv 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, - dg::DG, cache_gpu, cache_cpu) + equations, volume_integral::VolumeIntegralShockCapturingHGType, + dg::DGSEM, 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_fv indicator = dg.volume_integral.indicator derivative_split = dg.basis.derivative_split inverse_weights = dg.basis.inverse_weights @@ -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 @@ -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 @@ -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 @@ -843,17 +843,14 @@ 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) - factor_arr = CuArray([ - dg.basis.boundary_interpolation[1, 1], - dg.basis.boundary_interpolation[size(du, 2), 2] - ]) +function cuda_surface_integral!(du, mesh::TreeMesh{3}, equations, dg::DGSEM, cache) + 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))...) @@ -893,7 +890,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. diff --git a/src/solvers/dg_3d_kernel.jl b/src/solvers/dg_3d_kernel.jl index e2438edd..bb934f28 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) @@ -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/src/solvers/dgsem_gpu.jl b/src/solvers/dgsem_gpu.jl index 85def4ea..22a4aa15 100644 --- a/src/solvers/dgsem_gpu.jl +++ b/src/solvers/dgsem_gpu.jl @@ -1,29 +1,29 @@ +# 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. -# 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, volume_integral = VolumeIntegralWeakForm(), mortar = MortarL2GPU(basis)) surface_integral = SurfaceIntegralWeakForm(surface_flux) - # Since we use `LobattoLegendreBasisGPU`, the type degrades to `DG` if - # we create a new `DGSEMGPU` struct. - return DG{typeof(basis), typeof(mortar), typeof(surface_integral), - typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) + # 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) end - 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. - return DG{typeof(basis), typeof(mortar), typeof(surface_integral), - typeof(volume_integral)}(basis, mortar, surface_integral, volume_integral) + # 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) end """ @@ -46,9 +46,7 @@ function DGSEMGPU(; RealT = Float64, surface_integral = SurfaceIntegralWeakForm(surface_flux), volume_integral = VolumeIntegralWeakForm()) 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..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, 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/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/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/quality_test.jl b/test/quality_test.jl deleted file mode 100644 index 90bc77ad..00000000 --- a/test/quality_test.jl +++ /dev/null @@ -1,5 +0,0 @@ -@testset "Aqua test" begin - using Aqua - - Aqua.test_all(TrixiCUDA, piracies = false) -end diff --git a/test/runtests.jl b/test/runtests.jl index 097637ac..fead93ad 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -17,16 +17,13 @@ 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..." end - # @info "Starting TrixiCUDA quality test..." - # include("./quality_test.jl") - # For debugging # include("../test.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..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, - n_cells_max = 30_000, periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -56,13 +55,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 +80,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..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, - n_cells_max = 10_000, periodicity = false) # Discontinuous initial condition (Riemann Problem) leading to a rarefaction fan. @@ -92,13 +91,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 +116,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..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, - 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 +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) @@ -118,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/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..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, - n_cells_max = 10_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -58,13 +57,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 +82,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..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, - n_cells_max = 30_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -70,13 +69,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 +94,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..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, - n_cells_max = 30_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -56,13 +55,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 +80,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..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, - n_cells_max = 10_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -95,13 +94,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 +119,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..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, - n_cells_max = 10_000, periodicity = true) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -55,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, @@ -80,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 +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/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..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, - n_cells_max = 10_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -60,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, @@ -85,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) @@ -113,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/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..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, - n_cells_max = 30_000, periodicity = (false, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -59,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, @@ -84,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) @@ -112,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/mhd_alfven_wave.jl b/test/tree_dgsem_2d/mhd_alfven_wave.jl index 39697a07..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) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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..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) + equations = IdealGlmMhdEquations2D(gamma; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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..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) + 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 @@ -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..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) + 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 @@ -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..19fb68fc 100644 --- a/test/tree_dgsem_2d/shallowwater_source_terms.jl +++ b/test/tree_dgsem_2d/shallowwater_source_terms.jl @@ -22,11 +22,11 @@ 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 +57,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 +82,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 +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_2d/shawllowwater_source_terms_nonperiodic.jl b/test/tree_dgsem_2d/shawllowwater_source_terms_nonperiodic.jl index 75d39ea3..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, - n_cells_max = 10_000, periodicity = false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -61,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, @@ -86,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 +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_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..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, - n_cells_max = 30_000, periodicity = (false, true, true)) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -60,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, @@ -85,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) @@ -115,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/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl index e40817ca..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) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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..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) + equations = IdealGlmMhdEquations3D(5 / 3; initial_c_h = 1.0) # set GLM speed explicitly without `GlmSpeedCallback` to avoid NaN 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..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) + 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 @@ -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..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) + 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 @@ -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