Corrected bug with passing interp params to interp function for user waveforms.

这个提交包含在:
Craig Warren
2022-01-20 09:00:22 +00:00
父节点 3a19a5b433
当前提交 b77ba84c5b

查看文件

@@ -164,6 +164,12 @@ class Waveform(UserObjectMulti):
else: else:
waveformtime = np.arange(0, grid.timewindow + grid.dt, grid.dt) waveformtime = np.arange(0, grid.timewindow + grid.dt, grid.dt)
# Set args for interpolation if given by user
if 'kind' in self.kwargs:
kwargs['kind'] = self.kwargs['kind']
if 'fill_value' in self.kwargs:
kwargs['fill_value'] = self.kwargs['fill_value']
if any(x.ID == ID for x in grid.waveforms): if any(x.ID == ID for x in grid.waveforms):
logger.exception(self.params_str() + (f' with ID {ID} already ' logger.exception(self.params_str() + (f' with ID {ID} already '
'exists.')) 'exists.'))
@@ -174,7 +180,7 @@ class Waveform(UserObjectMulti):
w.type = wavetype w.type = wavetype
w.userfunc = interpolate.interp1d(waveformtime, uservalues, **kwargs) w.userfunc = interpolate.interp1d(waveformtime, uservalues, **kwargs)
logger.info(self.grid_name(grid) + (f'Waveform {w.ID} that is' logger.info(self.grid_name(grid) + (f'Waveform {w.ID} that is '
'user-defined created.')) 'user-defined created.'))
grid.waveforms.append(w) grid.waveforms.append(w)