Skip to content

Commit

Permalink
Update for compatability with latest SciPy version
Browse files Browse the repository at this point in the history
  • Loading branch information
og113 committed Apr 9, 2024
1 parent d80c5e2 commit 35eeeed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cosmoTransitions/pathDeformation.py
Original file line number Diff line number Diff line change
Expand Up @@ -773,8 +773,8 @@ def V_lin(x, p0, dp0, V): return V(p0+x*dp0)
# Recalculate the derivative
dpts = _pathDeriv(pts)
# 3. Find knot positions and fit the spline.
pdist = integrate.cumtrapz(np.sqrt(np.sum(dpts*dpts, axis=1)),
initial=0.0)
pdist = integrate.cumulative_trapezoid(np.sqrt(np.sum(dpts*dpts, axis=1)),
initial=0.0)
self.L = pdist[-1]
k = min(len(pts)-1, 3) # degree of the spline
self._path_tck = interpolate.splprep(pts.T, u=pdist, s=0, k=k)[0]
Expand Down
2 changes: 1 addition & 1 deletion cosmoTransitions/tunneling1D.py
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ def findAction(self, profile):
# And integrate the profile
integrand = 0.5 * dphi**2 + self.V(phi) - self.V(self.phi_metaMin)
integrand *= area
S = integrate.simps(integrand, r)
S = integrate.simpson(integrand, x=r)
# Find the bulk term in the bubble interior
volume = r[0]**d * np.pi**(d*.5)/special.gamma(d*.5 + 1)
S += volume * (self.V(phi[0]) - self.V(self.phi_metaMin))
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@
author="Carroll L. Wainwright",
author_email="[email protected]",
url="https://github.com/clwainwright/CosmoTransitions",
install_requires=['numpy>=1.8', 'scipy>=0.11'],
python_requires='>3.7',
install_requires=['numpy>=1.16.5', 'scipy>=1.6'],
license="MIT",
classifiers=[
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
],
)

0 comments on commit 35eeeed

Please sign in to comment.