Merge pull request #35 from FormingWorlds/tl/deprecation_fixes

Fix NumPy 2.0 deprecation: replace np.trapz with np.trapezoid

Author: timlichtenberg

src/mors/spectrum.py

@@ -106,13 +106,13 @@ def CalcBandFluxes(self):
             # With idxs defined, integrate over band
             band_wl = self.wl[idxs]
             band_fl = self.fl[idxs]
-            self.fl_integ[b] = np.trapz(band_fl,band_wl)
+            self.fl_integ[b] = np.trapezoid(band_fl,band_wl)
 
             # Reset idxs
             idxs = []
 
         # For bolometric "band"
-        self.fl_integ["bo"] = np.trapz(self.fl,self.wl)
+        self.fl_integ["bo"] = np.trapezoid(self.fl,self.wl)
 
         return self.fl_integ
 

src/mors/synthesis.py

@@ -70,7 +70,7 @@ def GetProperties(Mstar:float, pctle:float, age:float):
     wl_pl = np.logspace(np.log10(spec.bands_limits["pl"][0]), np.log10(spec.bands_limits["pl"][1]), 1000)
     fl_pl = spec.PlanckFunction_surf(wl_pl, Tstar)
     fl_pl = spec.ScaleTo1AU(fl_pl, Rstar)
-    out["F_pl"] = np.trapz(fl_pl, wl_pl)
+    out["F_pl"] = np.trapezoid(fl_pl, wl_pl)
     out["L_pl"] = out["F_pl"] * area
 
     # Get flux of UV band from remainder