diff --git a/plotter.py b/plotter.py index efb7337..2f823dd 100644 --- a/plotter.py +++ b/plotter.py @@ -94,7 +94,7 @@ def streamplot(ax, map_h, map_v, extent, **kwargs): ax.streamplot(hh, vv, map_h, map_v, **kwargs) -def quiver(ax, map_h, map_v, extent, key_v, label, **kwargs): +def quiver(ax, map_h, map_v, extent, key_v=None, label="", **kwargs): hh, vv = gethv(map_h, map_v, extent) @@ -228,7 +228,7 @@ class Plotter(Aggregator, BaseProcessor): # Select runs if selector is None: self.selector = RunSelector( - path, runs, nums, self.params.input.nml_filename, **kwargs + path, runs, nums, self.params.input.nml_filename, unit_time=unit_time, **kwargs ) else: self.selector = selector @@ -968,11 +968,11 @@ class Plotter(Aggregator, BaseProcessor): elif kind == "lic": line_integral_convolution(plt.gca(), map_h, map_v, extent=extent, **kwargs) - def _overlay_speed(self, ax_los, **kwargs): - self._overlay_vector("speed", ax_los, **kwargs) + def _overlay_speed(self, ax_los, extent, **kwargs): + self._overlay_vector("speed", ax_los, extent, **kwargs) - def _overlay_B(self, ax_los, **kwargs): - self._overlay_vector("B", ax_los, **kwargs) + def _overlay_B(self, ax_los, extent, **kwargs): + self._overlay_vector("B", ax_los, extent, **kwargs) def _plot_hist( self, diff --git a/snapshotprocessor.py b/snapshotprocessor.py index 00ccfa4..e4fcd18 100644 --- a/snapshotprocessor.py +++ b/snapshotprocessor.py @@ -1363,8 +1363,8 @@ class SnapshotProcessor(HDF5Container): f.close() if first_line[1] == "#": - header = first_line[3:-1].split(",") - units = second_line[3:-1].split(",") + header = first_line[3:-2].split(",") + units = second_line[3:-2].split(",") df = pd.read_csv(csv_name, header=None, names=header, skiprows=2) for key in header: if units[header.index(key)] == "m": diff --git a/studyprocessor.py b/studyprocessor.py index 83ef311..80cbcac 100644 --- a/studyprocessor.py +++ b/studyprocessor.py @@ -55,7 +55,7 @@ class StudyProcessor(Aggregator, HDF5Container): # Select runs if selector is None: selector = RunSelector( - path, runs, nums, self.params.input.nml_filename, **kwargs + path, runs, nums, self.params.input.nml_filename, unit_time=unit_time, **kwargs ) # Save infos