Merge pull request #427 from CliMA/aj/quadgk_debug

Bring back the velocity perf test
CliMA · Jul 26, 2024 · b246f0d · b246f0d
2 parents fa6ccfe + 497016e
commit b246f0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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