Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions wecsim/hydrodynamics/passiveYaw.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dataclasses import dataclass

import numpy as np
from scipy.interpolate import CubicSpline
from scipy.interpolate import CubicSpline, make_interp_spline

from wecsim.environment.irregularWave import IrregularComponents

Expand Down Expand Up @@ -56,14 +56,10 @@ def from_hydro_data(cls, hydro_data, *, omega, incident_direction,
real = CubicSpline(frequency, real, axis=2)(omega) * rho * g
imaginary = CubicSpline(frequency, imaginary, axis=2)(omega) * rho * g
else:
real = np.array([
[np.interp(omega, frequency, row) for row in dof]
for dof in real
]) * rho * g
imaginary = np.array([
[np.interp(omega, frequency, row) for row in dof]
for dof in imaginary
]) * rho * g
real = make_interp_spline(frequency, real, k=1, axis=2)(omega) * rho * g
imaginary = make_interp_spline(
frequency, imaginary, k=1, axis=2,
)(omega) * rho * g
return cls(headings, real, imaginary, incident_direction,
omega, amplitude, ramp_time)

Expand Down
Loading