Processing update to reduce memory usage

swash/processing/read_swash.py

@@ -1,3 +1,6 @@
+import subprocess
+import tempfile
+
 import numpy as np
 
 
@@ -7,43 +10,44 @@ class ReadSwash:
         self._n_t = None
         self._t = None
         self._x = None
-        self._data = {}
 
     @classmethod
     def read_nohead(cls, path):
-        with open(path) as file:
-            return np.asarray(file.read().split(), dtype=np.float64)
+        with open(path) as file, tempfile.TemporaryFile() as tmpfile:
+            subprocess.run(("tr", "-d", "\n"), stdin=file, stdout=tmpfile)
+            return np.loadtxt(tmpfile)
 
     def read_time(self, path):
         self._t = np.unique(self.read_nohead(path))
         self._n_t = self._t.size
+        return self.t
 
     def read_x(self, path):
         self._x = np.unique(self.read_nohead(path))
         self._n_x = self._x.size
+        return self.x
 
     def read_scalar(self, path, const=False):
         if const:
-            self._data[path.stem] = self.read_nohead(path).reshape(
+            return self.read_nohead(path).reshape(
                 (self._n_t, self._n_x)
             )[0, :]
-            return
-        self._data[path.stem] = self.read_nohead(path).reshape(
+        return self.read_nohead(path).reshape(
             (self._n_t, self._n_x)
         )
 
     def read_vector(self, path):
-        self._data[path.stem] = self.read_nohead(path).reshape(
+        return self.read_nohead(path).reshape(
             (self._n_t, 2, self._n_x)
         )
 
     def read_scalar_lay(self, path):
-        self._data[path.stem] = self.read_nohead(path).reshape(
+        return self.read_nohead(path).reshape(
             (self._n_t, -1, self._n_x)
         )
 
     def read_vector_lay(self, path):
-        self._data[path.stem] = self.read_nohead(path).reshape(
+        return self.read_nohead(path).reshape(
             (self._n_t, 2, -1, self._n_x)
         )
 
@@ -54,7 +58,3 @@ class ReadSwash:
     @property
     def x(self):
         return self._x
-
-    @property
-    def data(self):
-        return self._data