Merge pull request #597 from bobmyhill/rm_cumtrapz

remove deprecated cumtrapz call
geodynamics · Jul 4, 2024 · 7b89822 · 7b89822
2 parents 26d9048 + 55b4b54
commit 7b89822
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/burnman/classes/seismic.py b/burnman/classes/seismic.py
@@ -312,7 +312,7 @@ def _compute_gravity(self):
 
         if len(density) > 0:
             radii = self.table_radius[::-1]
-            g = scipy.integrate.cumtrapz(
+            g = scipy.integrate.cumulative_trapezoid(
                 constants.G * 4.0 * np.pi * density * radii * radii, x=radii, initial=0
             )
             g[1:] = g[1:] / radii[1:] / radii[1:]
@@ -332,7 +332,9 @@ def _compute_pressure(self):
 
         # convert radii to depths
         depth = self.earth_radius - radii
-        pressure = scipy.integrate.cumtrapz(gravity * density, x=depth, initial=0.0)
+        pressure = scipy.integrate.cumulative_trapezoid(
+            gravity * density, x=depth, initial=0.0
+        )
 
         self.table_pressure = pressure
 

diff --git a/burnman/utils/math.py b/burnman/utils/math.py
@@ -413,7 +413,7 @@ def l2(x, funca, funcb):
     diff = np.array(funca - funcb)
     diff = diff * diff
 
-    return integrate.trapz(diff, x)
+    return integrate.trapezoid(diff, x)
 
 
 def nrmse(x, funca, funcb):