src/Solver/AdisTS.py

@@ -749,29 +749,29 @@ class AdisTSwc(AdisTS):
                                                         ) - k)
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
 
-            # fifth line (useless)
+                # fifth line (useless)
-            data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-            zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
-            data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
-            # sixth line
-            zf = np.zeros(ismax, dtype=np.float32)
-            z = np.zeros(ismax * 3, dtype=np.float32)
-            for k in range(0, ismax, kbl):
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                z[3 * k:3 * min(k + kbl, ismax)] = \
+                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
-                    np.fromfile(f,
-                                dtype=np.float32,
-                                count=3 * (min(k + kbl, ismax) - k)
-                                )
-                # z[i*3+1] and z[i*3+2] are useless
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
-            zf = [z[i * 3] for i in range(ismax)]
+                # sixth line
-            # seventh line (useless)
+                zf = np.zeros(ismax, dtype=np.float32)
-            for k in range(0, ismax, kbl):
+                z = np.zeros(ismax * 3, dtype=np.float32)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                for k in range(0, ismax, kbl):
-                zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                    z[3 * k:3 * min(k + kbl, ismax)] = \
-            # end header
+                        np.fromfile(f,
+                                    dtype=np.float32,
+                                    count=3 * (min(k + kbl, ismax) - k)
+                                    )
+                    # z[i*3+1] and z[i*3+2] are useless
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                zf = [z[i * 3] for i in range(ismax)]
+                # seventh line (useless)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # end header
 
         def ip_to_r(i):
             return iprofiles[
@@ -793,7 +793,6 @@ class AdisTSwc(AdisTS):
         for file_bin in path_files:
             key_pol = os.path.basename(file_bin)[0:-4]
             data_tmp[key_pol] = {}
-            logger.info(f"read_bin: Start reading '{file_bin}' ...")
             with open(file_bin, 'rb') as f:
                 # header
                 # first line
@@ -845,7 +844,7 @@ class AdisTSwc(AdisTS):
                 # seventh line (useless)
                 for k in range(0, ismax, kbl):
                     data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                    zero = np.fromfile(f, dtype=np.int32, count=min(k + kbl, ismax) - k)
+                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
                     data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
                 # end header
                 # data
@@ -876,6 +875,7 @@ class AdisTSwc(AdisTS):
         for r, reach in enumerate(reachs):
             for i in range(is1[r]-1, is2[r]):
                 p_i = ip_to_ri(reach, i)
+
                 for t_data in timestamps_keys:
                     pol_view = []
                     for pol in pollutants_keys:

src/Solver/Mage.py

@@ -19,7 +19,6 @@
 import os
 import logging
 import numpy as np
-import time
 from functools import reduce
 
 from itertools import chain
@@ -1037,7 +1036,6 @@ class Mage8(Mage):
     @timer
     def read_bin(self, study, fname, results, qlog=None, name="0"):
         logger.info(f"read_bin: Start reading '{fname}' ...")
-        start = time.time()
 
         with mage_file_open(fname, "r") as f:
             def newline(): return np.fromfile(f, dtype=np.int32, count=1)
@@ -1184,7 +1182,8 @@ class Mage8(Mage):
             logger.info(f"compute tab...")
             for r in reachs:
                 for p in r.profiles:
-                    p.geometry.compute_tabulation()
+                    if not p.geometry.tab_up_to_date:
+                        p.geometry.compute_tabulation()
 
             logger.info(f"compute velocily...")
 
@@ -1201,7 +1200,6 @@ class Mage8(Mage):
         results.bufferize("Z")
         results.bufferize("Q")
         results.bufferize("V")
-        logger.info(f"reading time: '{time.time() - start}'")
 
     @timer
     def read_gra(self, study, repertory, results, qlog=None, name="0"):
@@ -1210,7 +1208,6 @@ class Mage8(Mage):
 
         fname = os.path.join(repertory, f"{name}.GRA")
         logger.info(f"read_gra: Start reading '{fname}' ...")
-        start = time.time()
 
         with mage_file_open(fname, "r") as f:
             def newline(): return np.fromfile(f, dtype=np.int32, count=1)
@@ -1406,7 +1403,6 @@ class Mage8(Mage):
 
             results.set("sediment_timestamps", ts)
             logger.info(f"read_gra: ... end with {len(ts)} timestamp read")
-        logger.debug(f"reading time: '{time.time() - start}'")
 
     @timer
     def results(self, study, repertory,