wolfhece 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

wolfhece/drowning_victims/{Class.py → drowning_class.py}

@@ -20,7 +20,7 @@ from datetime import datetime, timedelta
 try:
     from ..PyParams import *
     from ..drawing_obj import Element_To_Draw
-    from ..Results2DGPU import getkeyblock 
+    from ..Results2DGPU import getkeyblock
     from ..PyTranslate import _
     from ..PyVertex import cloud_vertices
     from ..wolf_array import WolfArray, header_wolf
@@ -28,16 +28,16 @@ try:
 except:
     from wolfhece.PyParams import *
     from wolfhece.drawing_obj import Element_To_Draw
-    from wolfhece.Results2DGPU import getkeyblock 
+    from wolfhece.Results2DGPU import getkeyblock
     from wolfhece.PyTranslate import _
     from wolfhece.PyVertex import cloud_vertices
     from wolfhece.wolf_array import WolfArray
     from wolfhece.PandasGrid import PandasGrid
 
 try:
-    from .Functions import *
+    from .drowning_functions import *
 except:
-    from Drowning_victims.Functions import *
+    from wolfhece.drowning_victims.drowning_functions import *
 
 
 #index               0         1     2       3         4          5     6         7
@@ -49,9 +49,9 @@ class Drowning_victim:
         """
     Initialize the simulation parameters.
 
-    :param Path_loading: 
+    :param Path_loading:
         Path of the simulation loaded.
-    
+
     Attributes:
         Profile_this (bool): Binary parameter to activate the profiling of the code.
         saving (bool): Binary parameter to save your results.
@@ -94,7 +94,7 @@ class Drowning_victim:
 
     def Default_values(self):
         """
-        Sets the default values for each parameter by creating a first parameter.param 
+        Sets the default values for each parameter by creating a first parameter.param
         """
         import pandas as pd
         import math
@@ -122,7 +122,7 @@ class Drowning_victim:
 
         self.CFL = 0.01
         self.dt_min = 0.01
-        self.dt_max = 1 #s 
+        self.dt_max = 1 #s
         self.t_initial = 0*60*60*24
         self.i_initial = math.floor(self.t_initial/self.dt_max)+1
 
@@ -540,7 +540,7 @@ class Drowning_victim:
         self.param_dict = param_dict
 
         return
-    
+
     def from_dictionnary_to_attributes(self):
         """
         Update the attributes of the class based on the values in self.param_dict.
@@ -552,7 +552,7 @@ class Drowning_victim:
                 value = param_data.get("value", None)
                 if param_data.get("type", None)=='Integer':
                     value = int(value)
-                
+
                 # Mettre à jour l'attribut correspondant dans self
                 if section == "Options":
                     if key == "Profile":
@@ -643,7 +643,7 @@ class Drowning_victim:
                         self.nby = value
 
         # Initialise the parameters of the simulation with default values and values given in the parameters.param file
-        self.t_initial = 0 
+        self.t_initial = 0
         self.i_initial = 0
         self.time_goal = self.Days*24*60*60 + self.Hours*60*60 + self.Minutes*60 + self.Seconds #s
         self.wanted_time = np.array([self.t_initial])
@@ -696,7 +696,7 @@ class Drowning_victim:
         Z_param.ADD = self.time_goal/60/60/24*self.T_w
         Z_param.ADD_resurface = 5250/self.T_w * rnd.beta(4,4,size=n_b) #source: Heaton 2011 considering a TADS between 14 and 15 as maximum expension
         self.Z_param = Z_param
-    
+
     def from_dot_param_to_dictionnary(self,store_dir: Path = None):
         """
         Update the parameters with the modifications made by the user with the file parameters.param
@@ -716,7 +716,7 @@ class Drowning_victim:
         with open(text_file_path, 'r', encoding='ISO-8859-1') as file:
             for line in file:
                 line = line.strip()
-                
+
                 # Vérifier si la ligne est un nom de section (par exemple, 'Options:', 'Path:', etc.)
                 if line.endswith(":"):
                     # Crée une nouvelle sous-section
@@ -725,13 +725,13 @@ class Drowning_victim:
                 elif "\t" in line and current_section:
                     # Split clé et valeur
                     key, value = line.split("\t", 1)
-                    
+
                     # Convertir la valeur en nombre si possible
                     try:
                         value = float(value)
                     except ValueError:
                         pass  # Garde la valeur comme chaîne de caractères si non convertible
-                    
+
                     # Ajout de la clé et de la valeur dans la section actuelle
                     data[current_section][key] = value
 
@@ -748,7 +748,7 @@ class Drowning_victim:
 
         # Sauvegarder le dictionnaire mis à jour dans self.param_dict
         self.param_dict = param_dict
-        
+
         return
 
     def Human_generation(self):
@@ -786,7 +786,7 @@ class Drowning_victim:
         """
 
         Human = pd.DataFrame(data=None,columns=COLUMNS_HUMAN,dtype=np.int32)
-        
+
         n_b = self.n_b
 
         ##Gender
@@ -803,8 +803,8 @@ class Drowning_victim:
         if self.Age==-1:
             age_min = 18
             age_max = 90 + 1
-            Human.Age = rnd.randint(age_min,age_max,size=(n_b)) 
-        
+            Human.Age = rnd.randint(age_min,age_max,size=(n_b))
+
         #Height
         h_av = self.height
         h_max = np.array([205, 190]) /100
@@ -816,7 +816,7 @@ class Drowning_victim:
         if h_av == -1:
             Human.loc[ind_m,'height'] = rnd.beta(5.8697,6.075,size=(len(ind_m)))*(h_max[0]-h_min[0])+h_min[0] #men
             Human.loc[ind_w,'height'] = rnd.beta(3.976,5.965,size=(len(ind_w)))*(h_max[1]-h_min[1])+h_min[1] #women
-        
+
         ##Mass or BMI
         m_av = self.mass
         m_max = np.array([135, 130])
@@ -828,7 +828,7 @@ class Drowning_victim:
         Human.BMI = Human.mass / Human.height**2
         known = 1
         if m_av < 0:
-            BMI = self.BMI 
+            BMI = self.BMI
             BMI_min = 16
             BMI_max = 40
             BMI_25 = [20, 21.3, 22.5, 23.3, 22.9, 23.7, 23.1]
@@ -850,7 +850,7 @@ class Drowning_victim:
         clothes = self.clothes #simpledialog.askinteger('Dialog title','Clothing type with: \n-1 if unknown \n0 for naked or in underwear\n1 for summer clothes (short and a t-shirt or dress)\n2 for autumn/spring clothes (trousers, a t-shirt, a sweater, and eventually a water/windproof jacket)\n3 for winter clothes (trousers, a t-shirt, a sweater, and a heavy warm jacket or more clothes)',minvalue=-1,maxvalue=3,parent=root) #0 for naked, 1 for summer clothes, 2 for autumn/spring clothes, 3 for winter clothes
         if clothes==-1:
             clothes=2
-        
+
         Human,error_perc_fat = Skinfold(n_b,known,Human)
 
 
@@ -863,50 +863,50 @@ class Drowning_victim:
         # Human.CDA = rnd.normal(0.4181,0.03434,n_b)*(clothes<2) + rnd.normal(0.5172,0.0406,n_b)*(clothes>=2)
         # Human.CLA = rnd.normal(0.07019,0.05035,n_b)*(clothes<2) + rnd.normal(0.08387,0.08138,n_b)*(clothes>=2)
         # Human.CSA = rnd.normal(0.03554,0.02545,n_b)*(clothes<2) + rnd.normal(0.04047,0.04311,n_b)*(clothes>=2)
-        
+
         #Mandatory for the structure of the numpy variable Human generated for the calculations
         Human.fp_x = rnd.beta(1,1,size=(n_b))*(0.36-0.16)+0.16
         Human.fp_y = 0.36-Human.fp_x+0.16
         Human.fp_z = np.ones((n_b)) * 0.2
-        
-        
+
+
         Human.lungs_volume_TLC = 10**-3 * ((7.99*Human.height-7.08) * (2-Human.gender) + (6.6*Human.height-5.79) * (Human.gender-1)) #Formulas ERC valid for men between 1.55 and 1.95 m and women between 1.45 and 1.8 m
         Human.lungs_volume_FRC = 10**-3 * ((2.34*Human.height+0.01*Human.Age-1.09) * (2-Human.gender) + (2.24*Human.height+0.001*Human.Age-1) * (Human.gender-1)) #Formulas ERC valid for men between 1.55 and 1.95 m and women between 1.45 and 1.8 m
         Human.lungs_volume_TLC = Human.lungs_volume_TLC * (0.0403*Human.BMI**2 - 3.1049*Human.BMI + 149.58)/100 #Digitalization of TOTAL part of figure 4 of doi:10.1136/bmjresp-2017-000231
         Human.lungs_volume_FRC = Human.lungs_volume_FRC * (0.102*Human.BMI**2 - 7.4504*Human.BMI + 229.61)/100 #Digitalization of TOTAL part of figure 4 of doi:10.1136/bmjresp-2017-000231
-        
+
         Human.dm = Human.mass * (0.1 * rnd.beta(1.5,1.5,size=((n_b))) + 0.0) #Between x and y% of the body mass (usually around 10 according to test on dogs)
         Human.dm += self.m_b_add
 
         Human.BSA = ((128.1 * Human.mass**0.44 * (Human.height*100)**0.6) * (2-Human.gender) + (147.4 * Human.mass**0.47 * (Human.height*100)**0.55) * (Human.gender-1))*10**-4
-        
+
         Human.Death = np.ones(n_b)
-        
+
         Human.eps = np.ones(n_b)*0.2
-        
-        
+
+
         clothes_alpha_m = np.array([[1,0.1771,0.0192,0.0082],[1,5.7342e-6,0.0253,0.8511],[1,5.9719e-6,0.333,4.981e-6]])
         clothes_alpha_w = np.array([[1,0.7676,4.4037,0.8523],[1,0.5375,0.3333,3.5128],[1,0.5375,0.7082,2.333]])
         clothes_beta_m = np.array([[1,0.3542,0.0385,0.0095],[1,9.9565e-6,0.0505,1.7022],[1,1.1522e-5,0.667,8.7348e-6]])
         clothes_beta_w = np.array([[1,1.5353,8.8072,1.7046],[1,1.0749,0.6667,7.0255],[1,1.0749,1.4165,4.6659]])
-        
+
         clothes_mean_m = np.array([[0.5,0.6127,2.7573,4.3912],[0.5,0.204,0.715,1.021],[0.5,0.408,1.1233,0.613]])*10**-3
         clothes_mean_w = np.array([[0.5,1.123,2.655,4.493],[0.5,0.9191,1.1233,1.94],[0.5,0.9191,1.2254,2.0424]])*10**-3
         clothes_std_m = np.array([[0.5,0.7148,0.817,0.6127],[0.5,0.9191,1.1233,0.817],[0.5,0.817,1.1233,2.451]])*10**-3
         clothes_std_w = np.array([[0.5,0.9191,1.6339,1.6339],[0.5,0.817,1.1233,1.225],[0.5,0.817,1.0212,0.817]])*10**-3
-        
+
         clothes_max_m = clothes_mean_m + 2*clothes_std_m
         clothes_min_m = clothes_mean_m - 2*clothes_std_m
         clothes_max_w = clothes_mean_w + 2*clothes_std_w
         clothes_min_w = clothes_mean_w - 2*clothes_std_w
 
-        
+
         Human.V_clothes_o = (clothes!=0)* ((rnd.beta(clothes_alpha_m[0,clothes],clothes_beta_m[0,clothes],size=(n_b))*(clothes_max_m[0,clothes]-clothes_min_m[0,clothes])+clothes_min_m[0,clothes])*(2-Human.gender) + (rnd.beta(clothes_alpha_w[0,clothes],clothes_beta_w[0,clothes],size=(n_b))*(clothes_max_w[0,clothes]-clothes_min_w[0,clothes])+clothes_min_w[0,clothes])*(Human.gender-1))
         Human.V_clothes_one = (clothes!=0)* ((rnd.beta(clothes_alpha_m[1,clothes],clothes_beta_m[1,clothes],size=(n_b))*(clothes_max_m[1,clothes]-clothes_min_m[1,clothes])+clothes_min_m[1,clothes])*(2-Human.gender) + (rnd.beta(clothes_alpha_w[1,clothes],clothes_beta_w[1,clothes],size=(n_b))*(clothes_max_w[1,clothes]-clothes_min_w[1,clothes])+clothes_min_w[1,clothes])*(Human.gender-1))
         Human.V_clothes_two = (clothes!=0)* ((rnd.beta(clothes_alpha_m[2,clothes],clothes_beta_m[2,clothes],size=(n_b))*(clothes_max_m[2,clothes]-clothes_min_m[2,clothes])+clothes_min_m[2,clothes])*(2-Human.gender) + (rnd.beta(clothes_alpha_w[2,clothes],clothes_beta_w[2,clothes],size=(n_b))*(clothes_max_w[2,clothes]-clothes_min_w[2,clothes])+clothes_min_w[2,clothes])*(Human.gender-1))
-        
+
         Human.error_perc_fat = error_perc_fat
-        
+
         self.Human = Human
 
     def Initialisation_arrays(self):
@@ -938,7 +938,7 @@ class Drowning_victim:
         self.Human_generation()
         n_b = self.n_b
         n_saved = self.n_saved
-    
+
         self.BC_cells,self.DT_WOLF,DX,DY,H_mat,self.NbX,self.NbY,t_tot_Wolf = Read_Wolf_GPU_metadata(self.Path_Wolf)
 
         X = np.arange(0,DX*self.NbX,DX)+DX/2
@@ -955,9 +955,9 @@ class Drowning_victim:
         Delta[3] = self.dt_max
         Delta[4] = np.sqrt(DX**2+DY**2)
         self.Delta = Delta
-            
-        ind_pos_0_x = self.ind_pos_0_x 
-        ind_pos_0_y = self.ind_pos_0_y 
+
+        ind_pos_0_x = self.ind_pos_0_x
+        ind_pos_0_y = self.ind_pos_0_y
         NbZ = H_mat[ind_pos_0_y,ind_pos_0_x]/Delta[2]
         ind_pos_0_z = NbZ.astype(int)
 
@@ -997,14 +997,14 @@ class Drowning_victim:
 
         else:
             self.count_initial,self.Human,n_loaded,Pos_b,self.time_b,U_b,self.Z_param = Loading(self.Path_loading,Pos_b,self.time_b,U_b)
-            
+
             Pos[:,0,0] = Pos_b[:,0,n_loaded]
             Pos[:,1,0] = Pos_b[:,1,n_loaded]
             Pos[:,2,0] = Pos_b[:,2,n_loaded]
             Pos[:,0,1] = Pos_b[:,0,n_loaded]
             Pos[:,1,1] = Pos_b[:,1,n_loaded]
             Pos[:,2,1] = Pos_b[:,2,n_loaded]
-            
+
             U[:,0,0] = U_b[:,0,n_loaded]
             U[:,1,0] = U_b[:,1,n_loaded]
             U[:,2,0] = U_b[:,2,n_loaded]
@@ -1028,7 +1028,7 @@ class Drowning_victim:
 
         """
         Main of the class, runs the code with a parallelised code (n_parallel>1) or without
-        
+
         """
 
         start = timeit.default_timer()
@@ -1058,7 +1058,7 @@ class Drowning_victim:
                 else:
                     frame = ProgressBar(None,n_processes=self.n_parallel,total=self.time_goal)
                 frame.Show()
-                
+
                 tasks = Preparation_parallelisation(progress_queue,self.a_RK,self.BC_cells,self.count,self.count_Wolf,self.CFL,self.Delta,Human_np,self.i_initial,self.n_b,self.n_saved,self.n_parallel,self.n_t,self.NbX,self.NbY,self.Path_saving,self.Path_Wolf,self.Pos,self.Pos_b,self.resurface,self.sinking,self.time,self.time_b,self.time_goal,self.U,self.U_b,self.wanted_time,self.wanted_Wolf,Z_param_np)
 
                 # Création de la thread de suivi de la progression
@@ -1073,7 +1073,7 @@ class Drowning_victim:
                         wx.Yield()  # This allows the GUI to update while waiting for the results
                     # Wait for the result to be ready
                     results = result_async.get()
-                    
+
 
                 def on_close(event):
                     frame.Close()  # Ferme la fenêtre
@@ -1092,7 +1092,7 @@ class Drowning_victim:
         # No use of multiprocessing
         else:
             self.Pos_b,self.resurface,self.sinking,self.time_b,self.U_b = Loop_management(-1,-1,self.a_RK,self.BC_cells,self.count,self.count_Wolf,self.CFL,self.Delta,Human_np,self.i_initial,self.n_b,self.n_saved,self.n_t,self.NbX,self.NbY,self.Path_saving,self.Path_Wolf,self.Pos,self.Pos_b,self.resurface,self.sinking,self.time,self.time_b,self.time_goal,self.U,self.U_b,self.wanted_time,self.wanted_Wolf,Z_param_np)
-            
+
 
         stop = timeit.default_timer()
         execution_time = stop - start
@@ -1111,7 +1111,7 @@ class Drowning_victim:
             stats = pstats.Stats(profiler).sort_stats('ncalls')
             stats.sort_stats('tottime')
             stats.print_stats()
-            
+
 
         if self.saving == 1:
             np.savez(self.Path_saving,Pos_b=self.Pos_b,U_b=self.U_b,Human=self.Human,Z_param=self.Z_param,wanted_time=self.wanted_time,time_b=self.time_b)
@@ -1121,7 +1121,7 @@ class Drowning_victim:
         Necessary for the parallelisation as we have to give a list of arguments to the function instead of all the args separately
         """
 
-        result = Loop_management(*args) 
+        result = Loop_management(*args)
 
         return result
 
@@ -1150,13 +1150,13 @@ class Drowning_victim_Viewer(Element_To_Draw):
 
         if not liste:
             dialog = wx.DirDialog(None, "Folder containing the wanted simulation WOLF 2D GPU", style=wx.DD_DEFAULT_STYLE)
-    
+
             # Afficher la boîte de dialogue et attendre l'interaction de l'utilisateur
             if dialog.ShowModal() == wx.ID_OK:
                 # Récupérer le chemin sélectionné
                 self.newdrowning.Path_Wolf = dialog.GetPath()
                 self.wp.change_param('Paths','Results of Wolf GPU simulation path',self.newdrowning.Path_Wolf)
-                
+
                 # Ajouter l'objet avec le chemin sélectionné
                 self.mapviewer.add_object(which='res2d_gpu', ToCheck=True, filename=join(self.newdrowning.Path_Wolf, 'Results'))
                 self.mapviewer.menu_wolf2d()
@@ -1169,7 +1169,7 @@ class Drowning_victim_Viewer(Element_To_Draw):
                 # Détruire la boîte de dialogue pour libérer les ressources
                 dialog.Destroy()
                 return
-    
+
         else:
             myitem = self.mapviewer.single_choice_key(draw_type.RES2D,checked_state=None)
             # nameitem = self.mapviewer.treelist.GetItemText(myitem).lower()
@@ -1208,7 +1208,7 @@ class Drowning_victim_Viewer(Element_To_Draw):
         if self.mapviewer.active_res2d.SelectionData.nb==0:
             wx.MessageBox(_("No point selected, please select a drowning point"), "Error", wx.OK | wx.ICON_ERROR)
             return
-        
+
         elif self.mapviewer.active_res2d.SelectionData.nb==1:
             value_got = self.mapviewer.active_res2d.myblocks[getkeyblock(0)].SelectionData.myselection
             x,y = value_got[0]
@@ -1218,7 +1218,7 @@ class Drowning_victim_Viewer(Element_To_Draw):
             self.button_selection_progress.SetBackgroundColour(wx.Colour(50, 190, 50))
             self.file_drowning = 1
             return
-            
+
         elif self.mapviewer.active_res2d.SelectionData.nb>1:
             wx.MessageBox(_("More than one point selected, please select only one drowning point"), "Error", wx.OK | wx.ICON_ERROR)
             return
@@ -1237,10 +1237,10 @@ class Drowning_victim_Viewer(Element_To_Draw):
         """
         import subprocess
         try:
-            if self.filedir is None:    
+            if self.filedir is None:
                 wx.MessageBox(_("No directory selected for the simulation. \nPlease, save your drowning in a directory."), "Error", wx.OK | wx.ICON_ERROR)
                 return
-            
+
             self.filedir = Path(self.filedir)
             # Créer le répertoire self.Path_saving s'il n'existe pas
             self.filedir.mkdir(parents=True, exist_ok=True)
@@ -1299,7 +1299,7 @@ if __name__ == "__main__":
 
         self.wp._set_gui(title='Parameters for the drowning simulation', toShow=True, w=self.w)
         self.wp.hide_selected_buttons([Buttons.Reload,Buttons.Save])
-            
+
         select_button = wx.Button(self.wp,id=10,label="Wolf2D simulation")
         select_button.SetToolTip(_("Select reference Wolf2D simulation to choose your drowning point"))
         create_file_button = wx.Button(self.wp,id=11,label="Create exe file")
@@ -1435,7 +1435,7 @@ if __name__ == "__main__":
 
         else:
             self.wp.Save(self.filename)
- 
+
     def saveas(self):
         '''
         Save the parameters in a text file
@@ -1448,14 +1448,14 @@ if __name__ == "__main__":
             self.Path_saving = self.filedir
             self.wp.change_param("Paths","Save path",self.filedir)
             self.save()
- 
+
         fdlg.Destroy()
 
     def load_results(self):
         """
         Load the results from the 'Results.npz' file and assign the arrays as attributes of the class.
         """
-  
+
         # Construire le chemin du fichier Results.npz
         results_file = join(self.filedir, 'Results.npz')
 
@@ -1495,7 +1495,7 @@ if __name__ == "__main__":
         """
         Read one result of the simulation and update the parameters in the GUI
         """
-        
+
         count=0
 
         self.time_id = idx
@@ -1521,11 +1521,11 @@ if __name__ == "__main__":
         """
 
         self.time_id = -1
-        
+
         self.read_oneresult(idx=-1)
 
         return
-    
+
     def find_minmax(self, update=False):
         """
         Generic function to find min and max spatial extent in data
@@ -1572,7 +1572,7 @@ if __name__ == "__main__":
             self.ymin = min(self.ymin, self.vertex_bottom_run.ymin)
             self.ymax = max(self.ymax, self.vertex_bottom_run.ymax)
         if self.vertex_surface_run is not None:
-            self.vertex_surface_run.find_minmax(update)            
+            self.vertex_surface_run.find_minmax(update)
             self.xmin = min(self.xmin, self.vertex_surface_run.xmin)
             self.xmax = max(self.xmax, self.vertex_surface_run.xmax)
             self.ymin = min(self.ymin, self.vertex_surface_run.ymin)
@@ -1605,7 +1605,7 @@ if __name__ == "__main__":
             if self.vertex_bottom_run is not None:
                 self.vertex_bottom_run.plot()
             if self.vertex_surface_run is not None:
-                self.vertex_surface_run.plot()       
+                self.vertex_surface_run.plot()
 
             self.plotting = False
 
@@ -1651,7 +1651,7 @@ if __name__ == "__main__":
         self.vertex_bottom_run = None
         self.vertex_surface_run = None
         self.plot_runs = None
-    
+
     def kde_on_grid(self,points, bandwidth, xmin, xmax, ymin, ymax, grid_size):
         """
         Function used to calculate the kde on a point cloud. Use a large grid size to identify peaks and a small one to refine
@@ -1814,7 +1814,7 @@ if __name__ == "__main__":
         values_array = np.concatenate(all_values) if all_values else np.array([])
 
         return coords_array,values_array
-        
+
     def prepare_plot_kde(self):
         """
         Plot the kernel density estimation of positions on a georeferenced map with bodies in blue being at the bottom and red being at the surface.
@@ -1823,7 +1823,7 @@ if __name__ == "__main__":
         self.plot_KDE = 1
 
         self.n_peaks = 2
-        
+
         ind_bottom,ind_surface,time_id = self.sort_positions_bodies()
 
         head = header_wolf()
@@ -1836,9 +1836,9 @@ if __name__ == "__main__":
         self.bottom_kde = WolfArray(mapviewer=self.mapviewer, srcheader= head, nullvalue= 0.)
         self.surface_kde = WolfArray(mapviewer=self.mapviewer, srcheader= head, nullvalue= 0.)
 
-        for locarray, locind in zip([self.bottom_kde, self.surface_kde], 
+        for locarray, locind in zip([self.bottom_kde, self.surface_kde],
                                     [ind_bottom, ind_surface]):
-            
+
             xy = self.Pos_b[locind,:2,time_id]
             coords,values = self.kde_refined_based_coarse(xy,locarray,bandwidth=50,coarse_grid_size=200,fine_grid_size=5,window_size=50,radius=25,n_peaks=self.n_peaks)
 
@@ -1853,7 +1853,7 @@ if __name__ == "__main__":
         self.surface_kde.reset_plot()
 
         return
-    
+
     def reset_plot_kde(self):
         self.bottom_kde = None
         self.surface_kde = None
@@ -1877,7 +1877,7 @@ if __name__ == "__main__":
         self.bottom_cells = WolfArray(mapviewer=self.mapviewer, srcheader= head, nullvalue= 0.)
         self.surface_cells = WolfArray(mapviewer=self.mapviewer, srcheader= head, nullvalue= 0.)
 
-        for locarray, locind in zip([self.bottom_cells, self.surface_cells], 
+        for locarray, locind in zip([self.bottom_cells, self.surface_cells],
                                     [ind_bottom, ind_surface]):
 
             # i_bottom,j_bottom = self.bottom_cells.get_ij_from_xy_array(self.Pos_b[ind_bottom,:2,time_id])
@@ -1905,7 +1905,7 @@ if __name__ == "__main__":
 
         self.bottom_cells.reset_plot()
         self.surface_cells.reset_plot()
-        
+
         return
 
     def reset_plot_cells_positions(self):
@@ -1930,7 +1930,7 @@ if __name__ == "__main__":
 
         for locxy,locname in zip(xy_peaks,names):
             xmin = locxy[0] - delta
-            xmax = locxy[0] + delta  
+            xmax = locxy[0] + delta
             ymin = locxy[1] - delta
             ymax = locxy[1] + delta
 
@@ -1952,7 +1952,7 @@ if __name__ == "__main__":
         self.grid.ShowModal()
         self.grid.Destroy()
 
-        return 
+        return
 
     def get_vertical_position_proportion(self):
         """
@@ -1981,7 +1981,7 @@ if __name__ == "__main__":
             counts = [len(surface)/self.newdrowning.n_b*100, len(bottom)/self.newdrowning.n_b*100]
             labels = ['Surface', 'Bottom']
             colors = [[1,0.7,0.6,1], [0.6,0.7,1,1]]
-            
+
             ax.pie(counts, labels=labels, colors=colors, autopct='%1.1f%%')
 
             # Rafraîchissement du graphique
@@ -1989,7 +1989,7 @@ if __name__ == "__main__":
 
         # Initialisation de la figure et des axes
         fig, ax = plt.subplots()
-        
+
         time_idx_initial = 0
         z = self.Pos_b[:,2,time_idx_initial]
 
@@ -1999,7 +1999,7 @@ if __name__ == "__main__":
         counts = [len(surface)/self.newdrowning.n_b*100, len(bottom)/self.newdrowning.n_b*100]
         labels = ['Surface', 'Bottom']
         colors = [[1,0.7,0.6,1], [0.6,0.7,1,1]]
-        
+
         ax.pie(counts, labels=labels, colors=colors, autopct='%1.1f%%')
 
         # Création du slider pour ajuster l'indice temporel
@@ -2084,7 +2084,7 @@ class ProgressImage(wx.Frame):
 
         # Initialize a 2D list to hold each segment for each process
         self.image_segments = []
-        
+
         # Create a grid of segments for each process
         for row in range(total_segments):
             row_segments = []
@@ -2093,13 +2093,13 @@ class ProgressImage(wx.Frame):
                 x = col * segment_width
                 y = row * segment_height
                 segment = image.GetSubImage((x, y, segment_width, segment_height))
-                
+
                 # Create a bitmap for the segment and add it to the grid, initially hidden
                 segment_bitmap = wx.StaticBitmap(panel, bitmap=wx.Bitmap(segment))
                 segment_bitmap.Hide()  # Hide initially; show as progress advances
                 grid_sizer.Add(segment_bitmap, flag=wx.ALIGN_CENTER)
                 row_segments.append(segment_bitmap)
-                
+
             self.image_segments.append(row_segments)
 
         panel.SetSizer(grid_sizer)
@@ -2114,7 +2114,7 @@ class ProgressImage(wx.Frame):
             if progress is not None:
                 # Calculate the number of segments to show based on progress
                 num_segments_to_show = int((progress / self.total) * (self.total_segments // self.n_processes))
-                
+
                 # Show the segments that correspond to the current progress
                 for segment_id in range(num_segments_to_show):
                     self.image_segments[segment_id][process_id].Show()
@@ -2122,44 +2122,3 @@ class ProgressImage(wx.Frame):
         # Refresh the layout after updating visibility
         self.Layout()
         self.Refresh()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-