From ffea3661c3977abf6b067e56160a68ab348e8cbb Mon Sep 17 00:00:00 2001 From: Colin Caprani Date: Sat, 24 Aug 2024 10:10:40 +1000 Subject: [PATCH] Upgrade scipy to cumulative_trapezoidal --- pyproject.toml | 2 +- src/pycba/__init__.py | 2 +- src/pycba/results.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f16ea52..56be57c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ requires-python = ">=3.8" dependencies = [ "matplotlib", "numpy", - "scipy", + "scipy>=1.6.0", ] [project.readme] diff --git a/src/pycba/__init__.py b/src/pycba/__init__.py index c0de612..3b333b8 100644 --- a/src/pycba/__init__.py +++ b/src/pycba/__init__.py @@ -2,7 +2,7 @@ PyCBA - Continuous Beam Analysis in Python """ -__version__ = "0.5.1" +__version__ = "0.5.2" from .analysis import * from .beam import * diff --git a/src/pycba/results.py b/src/pycba/results.py index def591b..b11760a 100644 --- a/src/pycba/results.py +++ b/src/pycba/results.py @@ -173,8 +173,8 @@ def _member_values( # And superimpose end displacements using Moment-Area h = L / self.npts - R = integrate.cumtrapz(res.M[1:-1], dx=h, initial=0) / EI + R0 - D = integrate.cumtrapz(R, dx=h, initial=0) + d[0] + R = integrate.cumulative_trapezoid(res.M[1:-1], dx=h, initial=0) / EI + R0 + D = integrate.cumulative_trapezoid(R, dx=h, initial=0) + d[0] res.R[1:-1] = R res.D[1:-1] = D