From 21876586dfb57937f1fe7e1ce07607e7f13380ca Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Mon, 2 Dec 2024 13:48:57 +0100 Subject: [PATCH] debug read_bin --- src/Solver/AdisTS.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index a468a1f3..7bb89c36 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -791,7 +791,7 @@ class AdisTSwc(AdisTS): c = np.fromfile(f, dtype=np.byte, count=1) # possible values : # sediment : C, G, M, D, L, N, R - # polutant : C, G, M, D + # polutant : C phys_var = bytearray(c).decode() data_tmp[key_pol][t][phys_var] = {} real_data = np.fromfile(f, dtype=np.float32, count=ismax) @@ -817,24 +817,19 @@ class AdisTSwc(AdisTS): print("reading bin files is ok =======") - for i in range(ismax): - # print("first i: ", i) - reach = ip_to_r(i) - # print("reach i:", reach) - # print("second i: ", i) - p_i = ip_to_ri(reach, i) + 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: - # print("pol results: ", - # type(list(data_tmp[pol][t_data].values()))) - pol_view.append(tuple(list(map( - lambda data_el: data_el[p_i], - list(data_tmp[pol][t_data].values()) - )))) + for t_data in timestamps_keys: + pol_view = [] + for pol in pollutants_keys: + pol_view.append(tuple(list(map( + lambda data_el: data_el[i], + list(data_tmp[pol][t_data].values()) + )))) - reach.set(p_i, t_data, "pols", pol_view) + reach.set(p_i, t_data, "pols", pol_view) # ##print("pi_tmp: ", pi_tmp) # ##print("pol view: ", pol_view)