Skip to content

Commit ec62880

Browse files
committed
fmk - scipy changed on cumtrapz, fixing code in computeResponseSpectrum for newer and older scipy
1 parent 7803380 commit ec62880

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

modules/Workflow/computeResponseSpectrum.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44

55
import numpy as np
66
from scipy.constants import g
7-
from scipy.integrate import cumtrapz
87
from scipy.interpolate import interp1d
8+
try:
9+
from scipy.integrate import cumulative_trapezoid as cumtrapz
10+
except ImportError:
11+
from scipy.integrate import cumtrapz
912

1013

1114
def convert_accel_units(acceleration, from_, to_='cm/s/s'): # noqa: C901

0 commit comments

Comments
 (0)