From ba238d218f34ca3a00ba3355e26a3d90b27b4ac4 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Tue, 13 May 2025 14:51:46 +0200 Subject: [PATCH 01/20] fix --- test/validation/validation.jl | 8 ++++++++ .../validation_lid_driven_cavity_2d.jl | 4 ++-- .../validation_taylor_green_vortex_2d.jl | 19 +++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index d19c84274..97c85172a 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -83,4 +83,12 @@ # Verify number of plots @test length(axs_edac[1].scene.plots) >= 2 end + + @trixi_testset "TGV_2D" begin + @trixi_test_nowarn trixi_include(@__MODULE__, + joinpath(validation_dir(), "taylor_green_vortex_2d", + "validation_taylor_green_vortex_2d.jl")) + @test sol.retcode == ReturnCode.Success + @test count_rhs_allocations(sol, semi) == 0 + end end diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 40818ed4d..37ddfab5f 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -9,9 +9,9 @@ particle_spacings = [0.02, 0.01, 0.005] tspan = (0.0, 25.0) reynolds_numbers = [100.0, 1000.0, 10_000.0] -interpolated_velocity(v, u, t, system) = nothing +interpolated_velocity(system, v, u, semi, t) = nothing -function interpolated_velocity(v, u, t, system::TrixiParticles.FluidSystem) +function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t) if t < 24.8 return nothing end diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index a30f26f98..70b47d457 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -2,7 +2,8 @@ using TrixiParticles # ========================================================================================== # ==== Resolution -particle_spacings = [0.02, 0.01, 0.005] +# particle_spacings = [0.02, 0.01, 0.005] +particle_spacings = [0.02] # ========================================================================================== # ==== Experiment Setup @@ -12,10 +13,13 @@ reynolds_number = 100.0 density_calculators = [ContinuityDensity(), SummationDensity()] perturb_coordinates = [false, true] -function compute_l1v_error(v, u, t, system) +function compute_l1v_error(system, v_ode, u_ode, semi, t) v_analytical_avg = 0.0 v_avg = 0.0 + v = TrixiParticles.wrap_v(v_ode, system, semi) + u = TrixiParticles.wrap_u(u_ode, system, semi) + for particle in TrixiParticles.eachparticle(system) position = TrixiParticles.current_coords(u, system, particle) @@ -32,11 +36,14 @@ function compute_l1v_error(v, u, t, system) return v_avg /= v_analytical_avg end -function compute_l1p_error(v, u, t, system) +function compute_l1p_error(system, v_ode, u_ode, semi, t) p_max_exact = 0.0 L1p = 0.0 + v = TrixiParticles.wrap_v(v_ode, system, semi) + u = TrixiParticles.wrap_u(u_ode, system, semi) + for particle in TrixiParticles.eachparticle(system) position = TrixiParticles.current_coords(u, system, particle) @@ -57,8 +64,8 @@ end # The pressure plotted in the paper is the difference of the local pressure minus # the average of the pressure of all particles. -function diff_p_loc_p_avg(v, u, t, system) - p_avg_tot = avg_pressure(v, u, t, system) +function diff_p_loc_p_avg(system, v, u, semi, t) + p_avg_tot = avg_pressure(system, v, u, semi, t) return v[end, :] .- p_avg_tot end @@ -74,7 +81,7 @@ for density_calculator in density_calculators, perturbation in perturb_coordinat output_directory = joinpath("out_tgv", name_density_calculator * name_perturbation, wcsph ? "wcsph" : "edac", "validation_run_taylor_green_vortex_2d_nparticles_$(n_particles_xy)x$(n_particles_xy)") - saving_callback = SolutionSavingCallback(dt=0.02, + saving_callback = SolutionSavingCallback(dt=0.1, output_directory=output_directory, p_avg=diff_p_loc_p_avg) From d308c7253db4051e3e250848229a1d60024fc916 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Tue, 13 May 2025 14:53:39 +0200 Subject: [PATCH 02/20] format --- test/validation/validation.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 97c85172a..45c1fcd5e 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -86,7 +86,8 @@ @trixi_testset "TGV_2D" begin @trixi_test_nowarn trixi_include(@__MODULE__, - joinpath(validation_dir(), "taylor_green_vortex_2d", + joinpath(validation_dir(), + "taylor_green_vortex_2d", "validation_taylor_green_vortex_2d.jl")) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 From 9bea7f29ba666eadf65f44e03e2eb169d07b14ac Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Wed, 14 May 2025 14:09:42 +0200 Subject: [PATCH 03/20] suppress warnings --- test/validation/validation.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 45c1fcd5e..8333b34f2 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -88,7 +88,12 @@ @trixi_test_nowarn trixi_include(@__MODULE__, joinpath(validation_dir(), "taylor_green_vortex_2d", - "validation_taylor_green_vortex_2d.jl")) + "validation_taylor_green_vortex_2d.jl")) [ + r"WARNING: Method definition pressure_function.*\n", + r"WARNING: Method definition initial_pressure_function.*\n", + r"WARNING: Method definition velocity_function.*\n", + r"WARNING: Method definition initial_velocity_function.*\n" + ] @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end From 4a0969e8c29942e1c6344c98e2bf6667266bf7cb Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Wed, 14 May 2025 14:10:17 +0200 Subject: [PATCH 04/20] update --- test/validation/validation.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 8333b34f2..3b2b39051 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -89,11 +89,11 @@ joinpath(validation_dir(), "taylor_green_vortex_2d", "validation_taylor_green_vortex_2d.jl")) [ - r"WARNING: Method definition pressure_function.*\n", - r"WARNING: Method definition initial_pressure_function.*\n", - r"WARNING: Method definition velocity_function.*\n", - r"WARNING: Method definition initial_velocity_function.*\n" - ] + r"WARNING: Method definition pressure_function.*\n", + r"WARNING: Method definition initial_pressure_function.*\n", + r"WARNING: Method definition velocity_function.*\n", + r"WARNING: Method definition initial_velocity_function.*\n" + ] @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end From 891432901b533b4bf557541deea9b89f3e49c578 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Mon, 19 May 2025 13:02:44 +0200 Subject: [PATCH 05/20] review --- .../validation_taylor_green_vortex_2d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index 70b47d457..599b3d967 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -81,11 +81,11 @@ for density_calculator in density_calculators, perturbation in perturb_coordinat output_directory = joinpath("out_tgv", name_density_calculator * name_perturbation, wcsph ? "wcsph" : "edac", "validation_run_taylor_green_vortex_2d_nparticles_$(n_particles_xy)x$(n_particles_xy)") - saving_callback = SolutionSavingCallback(dt=0.1, + saving_callback = SolutionSavingCallback(dt=1//10, output_directory=output_directory, p_avg=diff_p_loc_p_avg) - pp_callback = PostprocessCallback(; dt=0.02, + pp_callback = PostprocessCallback(; dt=2//100, L1v=compute_l1v_error, L1p=compute_l1p_error, output_directory=output_directory, From 145a5e174632a2e2f010ead072f53d1cf5e77152 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Mon, 19 May 2025 15:49:34 +0200 Subject: [PATCH 06/20] revert --- .../validation_taylor_green_vortex_2d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index 599b3d967..83f1c15e2 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -81,11 +81,11 @@ for density_calculator in density_calculators, perturbation in perturb_coordinat output_directory = joinpath("out_tgv", name_density_calculator * name_perturbation, wcsph ? "wcsph" : "edac", "validation_run_taylor_green_vortex_2d_nparticles_$(n_particles_xy)x$(n_particles_xy)") - saving_callback = SolutionSavingCallback(dt=1//10, + saving_callback = SolutionSavingCallback(dt=1/10, output_directory=output_directory, p_avg=diff_p_loc_p_avg) - pp_callback = PostprocessCallback(; dt=2//100, + pp_callback = PostprocessCallback(; dt=2/100, L1v=compute_l1v_error, L1p=compute_l1p_error, output_directory=output_directory, From 84de0518da3b838528017f4c8cd4109df451778a Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Wed, 21 May 2025 12:16:59 +0200 Subject: [PATCH 07/20] Update validation_taylor_green_vortex_2d.jl --- .../validation_taylor_green_vortex_2d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index 83f1c15e2..0a1429fdf 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -81,11 +81,11 @@ for density_calculator in density_calculators, perturbation in perturb_coordinat output_directory = joinpath("out_tgv", name_density_calculator * name_perturbation, wcsph ? "wcsph" : "edac", "validation_run_taylor_green_vortex_2d_nparticles_$(n_particles_xy)x$(n_particles_xy)") - saving_callback = SolutionSavingCallback(dt=1/10, + saving_callback = SolutionSavingCallback(dt=0.02, output_directory=output_directory, p_avg=diff_p_loc_p_avg) - pp_callback = PostprocessCallback(; dt=2/100, + pp_callback = PostprocessCallback(; dt=0.02, L1v=compute_l1v_error, L1p=compute_l1p_error, output_directory=output_directory, From 8db29c156db3b70a4f282cb978c02726307dbe92 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Wed, 21 May 2025 14:31:27 +0200 Subject: [PATCH 08/20] Update validation_taylor_green_vortex_2d.jl --- .../taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index 0a1429fdf..a5b9aba04 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -3,7 +3,7 @@ using TrixiParticles # ========================================================================================== # ==== Resolution # particle_spacings = [0.02, 0.01, 0.005] -particle_spacings = [0.02] +particle_spacings = 0.02 # ========================================================================================== # ==== Experiment Setup From a083889b78c9b5dacf4229d7b17a6ac0e54a0dac Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Wed, 21 May 2025 14:44:34 +0200 Subject: [PATCH 09/20] add LDC to test --- test/validation/validation.jl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 3b2b39051..dcd403c55 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -97,4 +97,13 @@ @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end + + @trixi_testset "LDC_2D" begin + @trixi_test_nowarn trixi_include(@__MODULE__, + joinpath(validation_dir(), + "lid_driven_cavity_2d", + "validation_lid_driven_cavity_2d.jl")) + @test sol.retcode == ReturnCode.Success + @test count_rhs_allocations(sol, semi) == 0 + end end From 944232bd61d3282df349fb784e70c07530396f85 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Thu, 22 May 2025 09:04:25 +0200 Subject: [PATCH 10/20] update --- test/validation/validation.jl | 4 ++-- .../validation_lid_driven_cavity_2d.jl | 9 ++++++--- .../validation_taylor_green_vortex_2d.jl | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index dcd403c55..be98c9432 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -88,7 +88,7 @@ @trixi_test_nowarn trixi_include(@__MODULE__, joinpath(validation_dir(), "taylor_green_vortex_2d", - "validation_taylor_green_vortex_2d.jl")) [ + "validation_taylor_green_vortex_2d.jl"), tspan=(0.0, 0.01)) [ r"WARNING: Method definition pressure_function.*\n", r"WARNING: Method definition initial_pressure_function.*\n", r"WARNING: Method definition velocity_function.*\n", @@ -102,7 +102,7 @@ @trixi_test_nowarn trixi_include(@__MODULE__, joinpath(validation_dir(), "lid_driven_cavity_2d", - "validation_lid_driven_cavity_2d.jl")) + "validation_lid_driven_cavity_2d.jl"), tspan=(0.0, 0.01)) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 37ddfab5f..35a0913ec 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -2,7 +2,8 @@ using TrixiParticles # ========================================================================================== # ==== Resolution -particle_spacings = [0.02, 0.01, 0.005] +# particle_spacings = [0.02, 0.01, 0.005] +particle_spacing = 0.02 # ========================================================================================== # ==== Experiment Setup @@ -55,8 +56,10 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t return nothing end -for particle_spacing in particle_spacings, reynolds_number in reynolds_numbers, - density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true] +for reynolds_number in reynolds_numbers, + density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true], + #particle_spacing in particle_spacings + n_particles_xy = round(Int, 1.0 / particle_spacing) Re = Int(reynolds_number) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index a5b9aba04..a5250edf5 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -3,7 +3,7 @@ using TrixiParticles # ========================================================================================== # ==== Resolution # particle_spacings = [0.02, 0.01, 0.005] -particle_spacings = 0.02 +particle_spacing = 0.02 # ========================================================================================== # ==== Experiment Setup @@ -71,7 +71,8 @@ function diff_p_loc_p_avg(system, v, u, semi, t) end for density_calculator in density_calculators, perturbation in perturb_coordinates, - particle_spacing in particle_spacings, wcsph in [false, true] + wcsph in [false, true] + #particle_spacing in particle_spacings n_particles_xy = round(Int, 1.0 / particle_spacing) name_density_calculator = density_calculator isa SummationDensity ? From 2f0290b14965d41f70e00f3c6cdbc340cb8cdecc Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Thu, 22 May 2025 09:25:40 +0200 Subject: [PATCH 11/20] format --- test/validation/validation.jl | 6 ++++-- .../lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index be98c9432..663e94846 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -88,7 +88,8 @@ @trixi_test_nowarn trixi_include(@__MODULE__, joinpath(validation_dir(), "taylor_green_vortex_2d", - "validation_taylor_green_vortex_2d.jl"), tspan=(0.0, 0.01)) [ + "validation_taylor_green_vortex_2d.jl"), + tspan=(0.0, 0.01)) [ r"WARNING: Method definition pressure_function.*\n", r"WARNING: Method definition initial_pressure_function.*\n", r"WARNING: Method definition velocity_function.*\n", @@ -102,7 +103,8 @@ @trixi_test_nowarn trixi_include(@__MODULE__, joinpath(validation_dir(), "lid_driven_cavity_2d", - "validation_lid_driven_cavity_2d.jl"), tspan=(0.0, 0.01)) + "validation_lid_driven_cavity_2d.jl"), + tspan=(0.0, 0.01)) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 35a0913ec..530ccfcc0 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -60,7 +60,7 @@ for reynolds_number in reynolds_numbers, density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true], #particle_spacing in particle_spacings - n_particles_xy = round(Int, 1.0 / particle_spacing) + n_particles_xy in round(Int, 1.0 / particle_spacing) Re = Int(reynolds_number) From c36ddb7e5c8c86b1e2d19cb516eb2e18f1e25ad6 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Thu, 22 May 2025 12:03:14 +0200 Subject: [PATCH 12/20] fix test --- test/validation/validation.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 663e94846..5ad89c8f3 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -104,7 +104,7 @@ joinpath(validation_dir(), "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), - tspan=(0.0, 0.01)) + tspan=(0.0, 0.02)) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end From 134fde18b462a8cd4a50e1a87b59b385f2866025 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Thu, 22 May 2025 13:34:55 +0200 Subject: [PATCH 13/20] fix test --- test/validation/validation.jl | 2 +- .../lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 5ad89c8f3..cb75e7563 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -104,7 +104,7 @@ joinpath(validation_dir(), "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), - tspan=(0.0, 0.02)) + tspan=(0.0, 0.02), dt=0.01) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 530ccfcc0..ab4b717c1 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -71,7 +71,7 @@ for reynolds_number in reynolds_numbers, name_density_calculator, "validation_run_lid_driven_cavity_2d_nparticles_$(n_particles_xy)x$(n_particles_xy)_Re_$Re") - saving_callback = SolutionSavingCallback(dt=0.1, output_directory=output_directory) + saving_callback = SolutionSavingCallback(dt=0.02, output_directory=output_directory) pp_callback = PostprocessCallback(; dt=0.02, interpolated_velocity=interpolated_velocity, From 5462f46ca7a42a945bb4f4d68f17c639ac9d4070 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Fri, 23 May 2025 11:49:25 +0200 Subject: [PATCH 14/20] fix test --- test/validation/validation.jl | 2 +- .../validation_lid_driven_cavity_2d.jl | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index cb75e7563..644c9ccd1 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -104,7 +104,7 @@ joinpath(validation_dir(), "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), - tspan=(0.0, 0.02), dt=0.01) + tspan=(0.0, 0.02), dt=0.01, sensor_capture_time=0.01) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index ab4b717c1..685dfb5a0 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -10,10 +10,13 @@ particle_spacing = 0.02 tspan = (0.0, 25.0) reynolds_numbers = [100.0, 1000.0, 10_000.0] +const sensor_capture_time = 24.8 +const capture_started = Ref(false) + interpolated_velocity(system, v, u, semi, t) = nothing function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t) - if t < 24.8 + if t < sensor_capture_time return nothing end @@ -33,7 +36,7 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t file = joinpath(output_directory, "interpolated_velocities.csv") - if isfile(file) + if capture_started[] data = TrixiParticles.CSV.read(file, TrixiParticles.DataFrame) vy_y_ = (data.vy_y .+ vy_y) vy_x_ = (data.vy_x .+ vy_x) @@ -51,6 +54,7 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t counter=1, vy_y=vy_y, vy_x=vy_x, vx_y=vx_y, vx_x=vx_x) TrixiParticles.CSV.write(output_directory * "/interpolated_velocities.csv", df) + capture_started[] = true end return nothing @@ -73,6 +77,7 @@ for reynolds_number in reynolds_numbers, saving_callback = SolutionSavingCallback(dt=0.02, output_directory=output_directory) + capture_started[] = false pp_callback = PostprocessCallback(; dt=0.02, interpolated_velocity=interpolated_velocity, filename="interpolated_velocities", From 85ecb290604ef30972fb81ceebe9c1f21b6c198a Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Fri, 23 May 2025 11:51:11 +0200 Subject: [PATCH 15/20] format --- test/validation/validation.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 644c9ccd1..e789b578a 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -104,7 +104,8 @@ joinpath(validation_dir(), "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), - tspan=(0.0, 0.02), dt=0.01, sensor_capture_time=0.01) + tspan=(0.0, 0.02), dt=0.01, + sensor_capture_time=0.01) @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end From 4d929aa01836713ba4b891f093133c1173341c78 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Fri, 23 May 2025 13:19:15 +0200 Subject: [PATCH 16/20] suppress warnings --- test/validation/validation.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index e789b578a..1697cdf0c 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -105,7 +105,10 @@ "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), tspan=(0.0, 0.02), dt=0.01, - sensor_capture_time=0.01) + sensor_capture_time=0.01) [ + r"WARNING: Method definition lid_movement_function.*\n", + r"WARNING: Method definition is_moving.*\n" + ] @test sol.retcode == ReturnCode.Success @test count_rhs_allocations(sol, semi) == 0 end From 8a922799c38fbf26b1acdbf14752c22f227e3381 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Fri, 23 May 2025 16:33:49 +0200 Subject: [PATCH 17/20] Update validation_lid_driven_cavity_2d.jl --- .../validation_lid_driven_cavity_2d.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 685dfb5a0..7f1b036da 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -10,13 +10,13 @@ particle_spacing = 0.02 tspan = (0.0, 25.0) reynolds_numbers = [100.0, 1000.0, 10_000.0] -const sensor_capture_time = 24.8 -const capture_started = Ref(false) +const SENSOR_CAPTURE_TIME = 24.8 +const CAPTURE_STARTED = Ref(false) interpolated_velocity(system, v, u, semi, t) = nothing function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t) - if t < sensor_capture_time + if t < SENSOR_CAPTURE_TIME return nothing end @@ -36,7 +36,7 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t file = joinpath(output_directory, "interpolated_velocities.csv") - if capture_started[] + if CAPTURE_STARTED[] data = TrixiParticles.CSV.read(file, TrixiParticles.DataFrame) vy_y_ = (data.vy_y .+ vy_y) vy_x_ = (data.vy_x .+ vy_x) @@ -54,7 +54,7 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t counter=1, vy_y=vy_y, vy_x=vy_x, vx_y=vx_y, vx_x=vx_x) TrixiParticles.CSV.write(output_directory * "/interpolated_velocities.csv", df) - capture_started[] = true + CAPTURE_STARTED[] = true end return nothing @@ -77,7 +77,7 @@ for reynolds_number in reynolds_numbers, saving_callback = SolutionSavingCallback(dt=0.02, output_directory=output_directory) - capture_started[] = false + CAPTURE_STARTED[] = false pp_callback = PostprocessCallback(; dt=0.02, interpolated_velocity=interpolated_velocity, filename="interpolated_velocities", From c19d8bc75f55efb7d053d7983bce3384a86198b0 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Fri, 23 May 2025 16:51:01 +0200 Subject: [PATCH 18/20] implement suggestions --- .../lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl | 6 ++---- .../validation_taylor_green_vortex_2d.jl | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index 7f1b036da..f5e769b47 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -2,7 +2,7 @@ using TrixiParticles # ========================================================================================== # ==== Resolution -# particle_spacings = [0.02, 0.01, 0.005] +# The paper provides reference data for particle spacings particle_spacings = [0.02, 0.01, 0.005] particle_spacing = 0.02 # ========================================================================================== @@ -61,9 +61,7 @@ function interpolated_velocity(system::TrixiParticles.FluidSystem, v, u, semi, t end for reynolds_number in reynolds_numbers, - density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true], - #particle_spacing in particle_spacings - + density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true] n_particles_xy in round(Int, 1.0 / particle_spacing) Re = Int(reynolds_number) diff --git a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl index a5250edf5..73884e38c 100644 --- a/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl +++ b/validation/taylor_green_vortex_2d/validation_taylor_green_vortex_2d.jl @@ -2,7 +2,7 @@ using TrixiParticles # ========================================================================================== # ==== Resolution -# particle_spacings = [0.02, 0.01, 0.005] +# The paper provides reference data for particle spacings particle_spacings = [0.02, 0.01, 0.005] particle_spacing = 0.02 # ========================================================================================== @@ -72,7 +72,6 @@ end for density_calculator in density_calculators, perturbation in perturb_coordinates, wcsph in [false, true] - #particle_spacing in particle_spacings n_particles_xy = round(Int, 1.0 / particle_spacing) name_density_calculator = density_calculator isa SummationDensity ? From b1a1cfeb037aad86303eb3dc203209f36326ef4e Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Mon, 26 May 2025 13:25:28 +0200 Subject: [PATCH 19/20] missing rename --- test/validation/validation.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validation/validation.jl b/test/validation/validation.jl index 1697cdf0c..d1c842084 100644 --- a/test/validation/validation.jl +++ b/test/validation/validation.jl @@ -105,7 +105,7 @@ "lid_driven_cavity_2d", "validation_lid_driven_cavity_2d.jl"), tspan=(0.0, 0.02), dt=0.01, - sensor_capture_time=0.01) [ + SENSOR_CAPTURE_TIME=0.01) [ r"WARNING: Method definition lid_movement_function.*\n", r"WARNING: Method definition is_moving.*\n" ] From 35cdff638cff7caca77b15945810c27858d9ff88 Mon Sep 17 00:00:00 2001 From: Sven Berger Date: Mon, 26 May 2025 17:17:02 +0200 Subject: [PATCH 20/20] weird autocompletion from vscode... --- .../lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl index f5e769b47..c75d1500e 100644 --- a/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl +++ b/validation/lid_driven_cavity_2d/validation_lid_driven_cavity_2d.jl @@ -62,7 +62,7 @@ end for reynolds_number in reynolds_numbers, density_calculator in [SummationDensity(), ContinuityDensity()], wcsph in [false, true] - n_particles_xy in round(Int, 1.0 / particle_spacing) + n_particles_xy = round(Int, 1.0 / particle_spacing) Re = Int(reynolds_number)