From b77ba84c5bba2033f359110fa76f4bc202d7b9f1 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 20 Jan 2022 09:00:22 +0000 Subject: [PATCH] Corrected bug with passing interp params to interp function for user waveforms. --- gprMax/cmds_multiuse.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py index 25ff613a..b9dfa026 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/cmds_multiuse.py @@ -164,6 +164,12 @@ class Waveform(UserObjectMulti): else: 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): logger.exception(self.params_str() + (f' with ID {ID} already ' 'exists.')) @@ -174,7 +180,7 @@ class Waveform(UserObjectMulti): w.type = wavetype 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.')) grid.waveforms.append(w)