Skip to content

Commit

Permalink
updated scipy dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Tjalling-dejong committed Nov 12, 2024
1 parent 4395831 commit e96842e
Show file tree
Hide file tree
Showing 2 changed files with 1,839 additions and 1,630 deletions.
6 changes: 3 additions & 3 deletions fm2prof/CrossSection.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import numpy as np
import pandas as pd
import scipy.optimize as so
from scipy.integrate import cumtrapz
from scipy.integrate import cumulative_trapezoid
from tqdm import tqdm

from fm2prof import Functions as FE
Expand Down Expand Up @@ -374,10 +374,10 @@ def get_timeseries(name: str):

# Compute 1D volume as integral of width with respect to z times length
self._css_total_volume = np.append(
[0], cumtrapz(self._css_total_width, self._css_z) * self.length
[0], cumulative_trapezoid(self._css_total_width, self._css_z) * self.length
)
self._css_flow_volume = np.append(
[0], cumtrapz(self._css_flow_width, self._css_z) * self.length
[0], cumulative_trapezoid(self._css_flow_width, self._css_z) * self.length
)

# If sd correction is run, these attributes will be updated.
Expand Down
Loading

0 comments on commit e96842e

Please sign in to comment.