From 497016eaa2bd96549c5da5988a2584edc70fa453 Mon Sep 17 00:00:00 2001 From: Anna Jaruga Date: Fri, 26 Jul 2024 14:12:44 -0700 Subject: [PATCH] Bring back the velocity perf test --- src/P3_particle_properties.jl | 4 ++-- test/performance_tests.jl | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/P3_particle_properties.jl b/src/P3_particle_properties.jl index 1717a8c75..4c189621e 100644 --- a/src/P3_particle_properties.jl +++ b/src/P3_particle_properties.jl @@ -174,8 +174,8 @@ function p3_mass( return mass_nl(p3, D) # dense nonspherical ice elseif th.D_cr > D >= th.D_gr return mass_s(D, th.ρ_g) # graupel - elseif D >= th.D_cr - return mass_r(p3, D, F_r) # partially rimed ice + else #elseif D >= th.D_cr + mass_r(p3, D, F_r) # partially rimed ice end end diff --git a/test/performance_tests.jl b/test/performance_tests.jl index c3c5211c2..0b9129969 100644 --- a/test/performance_tests.jl +++ b/test/performance_tests.jl @@ -155,14 +155,13 @@ function benchmark_test(FT) (p3, q_ice, N, ρ_r, F_r), 1e5, ) - # TODO - #bench_press( - # P3.ice_terminal_velocity, - # (p3, ch2022.snow_ice, q_ice, N, ρ_r, F_r, ρ_air), - # 2e5, - # 3e4, - # 2e3, - #) + bench_press( + P3.ice_terminal_velocity, + (p3, ch2022.snow_ice, q_ice, N, ρ_r, F_r, ρ_air), + 2.1e5, + 3e4, + 2e3, + ) bench_press(P3.D_m, (p3, q_ice, N, ρ_r, F_r), 1e5) end