Replace deprecated scipy.integrate.trapz() with trapezoid()

artis-mcrt · Jul 1, 2024 · d648520 · d648520
1 parent f52bbfa
commit d648520
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/artisatomic/__init__.py b/artisatomic/__init__.py
@@ -974,8 +974,8 @@ def integrand(nu):
                     for sigma, integrand_val in zip(arr_sigma_megabarns, integrand_vals, strict=True)
                 ]
 
-                integralnosigma = integrate.trapz(integrand_vals, arr_energyryd)
-                integralwithsigma = integrate.trapz(sigma_integrand_vals, arr_energyryd)
+                integralnosigma = integrate.trapezoid(integrand_vals, arr_energyryd)
+                integralwithsigma = integrate.trapezoid(sigma_integrand_vals, arr_energyryd)
 
             else:
                 integralnosigma = 1.0

diff --git a/artisatomic/recombinationrateintegralsnahar.py b/artisatomic/recombinationrateintegralsnahar.py
@@ -298,7 +298,7 @@ def integrand(en_ryd, sigma_megabarns):
         if kind == "simps":
             integral = integrate.simps(arr_integrand, arr_nu)
         elif kind == "trapz":
-            integral = integrate.trapz(arr_integrand, arr_nu)
+            integral = integrate.trapezoid(arr_integrand, arr_nu)
         else:
             print(f"UNKNOWN INTEGRAL KIND: {kind}")
             sys.exit()
@@ -315,7 +315,7 @@ def integrand(en_ryd, sigma_megabarns):
     # arr_epsilon = [en - E_threshold for en in arr_en]
     # arr_sigmamb = [sigma_megabarns for _, sigma_megabarns in phixslist]
     # arr_integrand = [integrand_nahar(en, sigma_megabarns) for en, sigma_megabarns in zip(arr_en, arr_sigmamb)]
-    # integral_trapz = integrate.trapz(arr_integrand, arr_epsilon)
+    # integral_trapz = integrate.trapezoid(arr_integrand, arr_epsilon)
     #
     # factor = g_lower / g_upper * 2 / (KB * T * math.sqrt(2 * math.pi * (ME ** 3) * KB * CLIGHT2 * T))
     #