wolfhece 2.2.15__py3-none-any.whl → 2.2.17__py3-none-any.whl

wolfhece/hydrology/SubBasin.py

@@ -130,7 +130,7 @@ class SubBasin:
     _version:float                  # version of the wolfHydro python code. Useful for identifying the file versions to read and how to interpret them
 
 
-    def __init__(self, _dateBegin:datetime.datetime=None, _dateEnd:datetime.datetime=None, _deltaT:int=0, _model=cst.measures,_workingDir:str="", 
+    def __init__(self, _dateBegin:datetime.datetime=None, _dateEnd:datetime.datetime=None, _deltaT:int=0, _model=cst.measures,_workingDir:str="",
                  _hyeto:dict={}, _x:float=0.0, _y:float=0.0, surfaceDrained:float=0.0,
                  _iD_interiorPoint:int=1,_idSorted:int=1, name:str=None, readHydro=True, _tz:int=0, version:str=cst.VERSION_WOLFHYDRO):
         if(name is None):
@@ -296,19 +296,19 @@ class SubBasin:
 
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
-                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                 microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
 
             secondsInDay = 24*60*60
-            prevDate = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                         hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+            prevDate = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                         hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                          microsecond=0, tzinfo=datetime.timezone.utc)
             prevDate -= tzDelta
             if(self.dateBegin!=prevDate):
@@ -327,12 +327,12 @@ class SubBasin:
             nbData = len(matrixData)
 
             for i in range(1,nbData):
-                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]), 
-                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),  
+                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]),
+                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 currDate -= tzDelta
-                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]), 
-                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),  
+                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]),
+                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 prevDate -= tzDelta
                 diffDate = currDate - prevDate
@@ -432,14 +432,14 @@ class SubBasin:
 
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
-                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                 microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
 
             secondsInDay = 24*60*60
@@ -458,12 +458,12 @@ class SubBasin:
                 outFlow[0][0] = matrixData[0][6]
             for i in range(1,len(matrixData)):
 
-                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]), 
-                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),  
+                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]),
+                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 currDate -= tzDelta
-                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]), 
-                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),  
+                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]),
+                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 prevDate -= tzDelta
                 diffDate = currDate - prevDate
@@ -593,16 +593,16 @@ class SubBasin:
 
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
-                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                 microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
-                
+
             # Init of the outflow array
             outFlow = np.zeros((len(matrixData),3),dtype=ct.c_double, order='F')
 
@@ -734,14 +734,14 @@ class SubBasin:
 
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
-                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                 microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
 
             secondsInDay = 24*60*60
@@ -756,12 +756,12 @@ class SubBasin:
             # outFlow[0][0] = matrixData[0][6]*self.surfaceDrained/3.6
             outFlow[0][0] = matrixData[0][6]
             for i in range(1,len(matrixData)):
-                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]), 
-                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),  
+                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]),
+                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 currDate -= tzDelta
-                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]), 
-                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),  
+                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]),
+                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 prevDate -= tzDelta
                 diffDate = currDate - prevDate
@@ -819,20 +819,20 @@ class SubBasin:
                 if nbCl==5:
                     self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), hour=int(matrixData[0][3]), tzinfo=datetime.timezone.utc)
                     self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), hour=int(matrixData[-1][3]), tzinfo=datetime.timezone.utc)
-                    self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), hour=int(matrixData[1][3]), tzinfo=datetime.timezone.utc) 
+                    self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), hour=int(matrixData[1][3]), tzinfo=datetime.timezone.utc)
                                     - self.dateBegin).total_seconds()
                 if nbCl==7:
-                    self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                       hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                    self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                       hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                        microsecond=0, tzinfo=datetime.timezone.utc)
-                    self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                       hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                    self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                       hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                        microsecond=0, tzinfo=datetime.timezone.utc)
-                    self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                    hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                    self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                    hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                     microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
-                    
-            # Init of the outflow array                    
+
+            # Init of the outflow array
             timeInterval = self.dateEnd-self.dateBegin+datetime.timedelta(seconds=self.deltaT)
             outFlow = np.zeros(int(timeInterval.total_seconds()/self.deltaT),dtype=ct.c_double, order='F')
             timeArray = np.zeros(int(timeInterval.total_seconds()/self.deltaT))
@@ -932,7 +932,7 @@ class SubBasin:
                     i += 1
 
             matrixData = np.array(list_data).astype("float")
-            
+
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
                 self.dateBegin = datetime.datetime.fromtimestamp(matrixData[0][0], tz=datetime.timezone.utc)
@@ -991,7 +991,7 @@ class SubBasin:
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
                 sys.exit()
             return timeArray[:index], outFlow[:index]
-        
+
         else:
             # Valid for any hydro model with an assement module at the end, there is only 1 output to consider.
 
@@ -1027,14 +1027,14 @@ class SubBasin:
 
             # Init the time properties if not already done
             if self.dateBegin is None or self.dateEnd is None or self.deltaT == 0:
-                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]), 
-                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),  
+                self.dateBegin = datetime.datetime(year=int(matrixData[0][2]), month=int(matrixData[0][1]), day=int(matrixData[0][0]),
+                                                    hour=int(matrixData[0][3]), minute=int(matrixData[0][4]), second=int(matrixData[0][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]), 
-                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),  
+                self.dateEnd = datetime.datetime(year=int(matrixData[-1][2]), month=int(matrixData[-1][1]), day=int(matrixData[-1][0]),
+                                                    hour=int(matrixData[-1][3]), minute=int(matrixData[-1][4]), second=int(matrixData[-1][5]),
                                                     microsecond=0, tzinfo=datetime.timezone.utc)
-                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]), 
-                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),  
+                self.deltaT = (datetime.datetime(year=int(matrixData[1][2]), month=int(matrixData[1][1]), day=int(matrixData[1][0]),
+                                hour=int(matrixData[1][3]), minute=int(matrixData[1][4]), second=int(matrixData[1][5]),
                                 microsecond=0, tzinfo=datetime.timezone.utc) - self.dateBegin).total_seconds()
 
             secondsInDay = 24*60*60
@@ -1047,14 +1047,14 @@ class SubBasin:
                 sys.exit()
             timeArray[0] = datetime.datetime.timestamp(prevDate)
             outFlow[0][0] = matrixData[0][6]
-            
+
             for i in range(1,len(matrixData)):
-                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]), 
-                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),  
+                currDate = datetime.datetime(year=int(matrixData[i][2]), month=int(matrixData[i][1]), day=int(matrixData[i][0]),
+                                             hour=int(matrixData[i][3]), minute=int(matrixData[i][4]), second=int(matrixData[i][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 currDate -= tzDelta
-                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]), 
-                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),  
+                prevDate = datetime.datetime(year=int(matrixData[i-1][2]), month=int(matrixData[i-1][1]), day=int(matrixData[i-1][0]),
+                                             hour=int(matrixData[i-1][3]), minute=int(matrixData[i-1][4]), second=int(matrixData[i-1][5]),
                                              microsecond=0, tzinfo=datetime.timezone.utc)
                 prevDate -= tzDelta
                 diffDate = currDate - prevDate
@@ -1209,7 +1209,7 @@ class SubBasin:
 
 
     def compute_hydro(self):
-        """
+        r"""
         This procedure computes the total hydrograph and raw hydrograph of subbasin
 
         The total hydrograph $q_{tot} is obtained with the formula:
@@ -1230,7 +1230,7 @@ class SubBasin:
         nameOutFlow = list(self._outFlow.items())[0][0]
         # Sum all the inlets hydrographs
         self.sum_inlets()
-        if(self.model==cst.tom_UH or self.model==cst.measures or 
+        if(self.model==cst.tom_UH or self.model==cst.measures or
            self.model==cst.tom_GR4 or self.model==cst.compare_opti):
             tmpHydro = np.zeros(len(self.myHydro),dtype=ct.c_double, order='F')
             if(self.model==cst.tom_GR4):
@@ -1243,7 +1243,7 @@ class SubBasin:
             self._outFlow[nameOutFlow]["Raw"] = self.inletsRaw + tmpHydro
             # Real hydrograph
             self._outFlow[nameOutFlow]["Net"]  = self.inlets + tmpHydro
-        elif(self.model==cst.tom_VHM or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or 
+        elif(self.model==cst.tom_VHM or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or
              self.model==cst.tom_HBV, self.model==cst.tom_SAC_SMA, self.model==cst.tom_NAM):
             tmpOutFlow = np.sum(self.myHydro,1)*self.surfaceDrained/3.6
 
@@ -1551,7 +1551,7 @@ class SubBasin:
         - the raw outlet: in black dashed line
         """
 
-        if(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or self.model==cst.tom_GR4 or 
+        if(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or self.model==cst.tom_GR4 or
            self.model==cst.tom_HBV, self.model==cst.tom_SAC_SMA, self.model==cst.tom_NAM):
             # x = self.time/3600.0
             if(axis=="Hours"):
@@ -1983,7 +1983,7 @@ class SubBasin:
         tmpSum = np.zeros(len(myOutFlow)-lastElement)
         # y = np.zeros((len(self.outFlow)-lastElement,nbElements))
         y = []
-        if(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or 
+        if(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or
            cst.tom_GR4 or cst.tom_HBV or cst.tom_SAC_SMA or cst.tom_NAM):
             if(withDelay):
                 # y[:,0] = self.outFlow[:-1]
@@ -2052,7 +2052,7 @@ class SubBasin:
             # y_titles.append("Baseflow")
             # y_titles.append("Total")
             y_titles.append(_('Débits simulés'))
-        elif(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or 
+        elif(self.model==cst.tom_UH or self.model==cst.tom_2layers_linIF or self.model==cst.tom_2layers_UH or
              self.model==cst.tom_HBV or self.model==cst.tom_SAC_SMA or self.model==cst.tom_NAM):
             if(ylabel==[]):
                 y_titles.append(_('Débits simulés'))
@@ -2410,7 +2410,7 @@ class SubBasin:
             myOutFlow *= 3.6/self.surfaceDrainedHydro
 
         return myOutFlow
-    
+
 
     def get_outFlow_at_time(self, time:datetime.datetime, typeOutFlow:str="Net", unit:str='m3/s', whichOutFlow="", lag:float=0.0):
         if time.tzname() != "UTC":
@@ -2492,7 +2492,7 @@ class SubBasin:
             myParams.append(float(wolf_If.get_param("Horton parameters","F0")))
             myParams.append(float(wolf_If.get_param("Horton parameters","Fc")))
             myParams.append(float(wolf_If.get_param("Horton parameters","k")))
-            
+
 
             uMax = float(wolf_If.get_param("Distributed production model parameters","Umax"))
             p = self.myRain[:]
@@ -2788,7 +2788,7 @@ class SubBasin:
             timeDelays = self.intletsObj[element].get_timeDelays(timeDelays)
 
         return timeDelays
-    
+
 
     def get_timeDelays_inlets(self):
 
@@ -3236,7 +3236,7 @@ class SubBasin:
     def collect_x_from_production(self) -> dict[str,np.array]:
         """
         This procedure is collecting all the time series fractions of each outflow of the hydrological production models written in Fortran
-        
+
         Returns:
             dict[str, np.array]: A dictionary containing the fractions of each outflow.
         """
@@ -3248,13 +3248,13 @@ class SubBasin:
             all_x = self.collect_x_GR4()
         elif self.model == cst.tom_2layers_linIF:
             all_x = self.collect_x_2layers()
-        
+
         return all_x
-    
+
     def collect_fractions(self) -> dict[str,np.array]:
         """
         This procedure is collecting all the fractions of each outflow of the hydrological production models.
-        
+
         Returns:
             dict[str, np.array]: A dictionary containing the fractions of each outflow.
         """
@@ -3266,14 +3266,14 @@ class SubBasin:
             all_f = self._collect_fractions_GR4(all_x)
         elif self.model == cst.tom_2layers_linIF:
             all_f = self._collect_fractions_2layers(all_x)
-        
+
         return all_f
-    
-    
+
+
     def collect_all_internal_variables(self) -> dict[str,np.array]:
         """
         This procedure is collecting all internal variables of the hydrological production models.
-        
+
         Returns:
             dict[str, np.array]: A dictionary containing the fractions of each outflow.
         """
@@ -3285,10 +3285,10 @@ class SubBasin:
             all_iv = self.collect_iv_GR4()
         elif self.model == cst.tom_2layers_linIF:
             all_iv = self.collect_iv_2layers()
-        
+
         return all_iv
-    
-    
+
+
     def activate_all_internal_variables(self):
         """
         This procedure is activating all internal variables of all the hydrological modules.
@@ -3300,7 +3300,7 @@ class SubBasin:
         # elif self.model == cst.tom_2layers_linIF:
         #     self.activate_all_iv_2layers()
         cur_dir = os.path.join(self.fileNameRead, "Subbasin_"+str(self.iDSorted))
-        
+
         mc.MODELS_VAR[self.model].activate_all(directory=cur_dir, prefix_file='simul', type_of_var=iv.FINAL_OUT_VAR)
         mc.MODELS_VAR[self.model].activate_all(directory=cur_dir, prefix_file='simul', type_of_var=iv.IV_VAR)
 
@@ -3308,7 +3308,7 @@ class SubBasin:
     def collect_x_VHM(self) -> dict[str,np.array]:
         """
         This procedure is collecting all the fractions of each outflow of the VHM model.
-        
+
         Returns:
         - all_x: A dictionary containing the fractions of each outflow of the VHM model.
         """
@@ -3316,17 +3316,17 @@ class SubBasin:
         files_per_keys = [["xbf", "xif", "xof", "xu"],[]]
         group = "Internal variables to save"
         param = "simul_soil"
-        
-        all_x = self.collect_internal_variables(list_keys, files_per_keys, 
+
+        all_x = self.collect_internal_variables(list_keys, files_per_keys,
                             group_name=group, param_name=param)
 
         return all_x
-    
+
 
     def _collect_fractions_VHM(self, all_x:dict[str,np.array]) -> dict[str,np.array]:
         """
         This procedure is collecting all the fractions of each outflow of the VHM model.
-        
+
         Returns:
         - all_f: A dictionary containing the fractions of each outflow of the VHM model.
         """
@@ -3334,21 +3334,21 @@ class SubBasin:
 
         if all_x=={}:
             return all_f
-        
+
         condition = self.myRain > 0.0
 
         all_f["% qof"] = np.where(condition, all_x["xof"] * 100.0, np.nan)
         all_f["% qif"] = np.where(condition, all_x["xif"] * 100.0, np.nan)
         all_f["% qbf"] = np.where(condition, all_x["xbf"] * 100.0, np.nan)
         all_f["% loss"] = np.where(condition, all_x["xu"]  * 100.0, np.nan)
-        
+
         return all_f
-    
-    
+
+
     def collect_iv_VHM(self) -> dict[str,np.array]:
         """
         This procedure is collecting all internal variables of the VHM model in each module.
-        
+
         Returns:
         - all_iv: A dictionary containing all internal variables of the VHM model.
         """
@@ -3356,12 +3356,12 @@ class SubBasin:
         files_per_keys = [[],["U"]]
         group = "Internal variables to save"
         param = "simul_soil"
-        
-        all_iv = self.collect_internal_variables(list_keys, files_per_keys, 
+
+        all_iv = self.collect_internal_variables(list_keys, files_per_keys,
                             group_name=group, param_name=param)
 
         return all_iv
-    
+
 
     def activate_all_iv_VHM(self):
         """
@@ -3370,57 +3370,57 @@ class SubBasin:
         list_keys = ["x", "U"]
         group = "Internal variables to save"
         param = "simul_soil"
-        
+
         self.activate_internal_variables(list_keys, group_name=group, param_name=param)
-    
+
 
     def collect_x_GR4(self) -> dict[str,np.array]:
         """
         This procedure is collecting the fractions of each outflow of the GR4 model.
-        
+
         Returns:
             dict[str, np.array]: A dictionary containing all fractions of each outflow of the GR4 model.
         """
         all_x = {}
-        
+
         return all_x
-    
-    
+
+
     def _collect_fractions_GR4(self, all_x:dict[str,np.array]) -> dict[str,np.array]:
         """
         This procedure is collecting all the fractions of each outflow of the GR4 model.
-        
+
         Returns:
         - all_f: A dictionary containing the fractions of each outflow of the GR4 model.
         """
         all_f = {}
-        
+
         return all_f
-    
+
 
     def collect_iv_GR4(self) -> dict[str,np.array]:
         """
         This procedure is collecting all internal variables of the GR4 model in each module.
-        
+
         Returns:
         - all_iv: A dictionary containing all internal variables of the GR4 model.
         """
         all_iv = {}
-        
+
         return all_iv
-    
+
 
     def activate_all_iv_GR4(self):
         """
         This procedure is activating all internal variables of the GR4 model in each module.
         """
         return
-    
+
 
     def collect_x_2layers(self) -> dict[str,np.array]:
         """
         This procedure is collecting the fractions of each outflow of the 2 layers model.
-        
+
         Returns:
             A dictionary containing the collected fractions of each outflow variables.
         """
@@ -3428,17 +3428,17 @@ class SubBasin:
         files_per_keys = [["xif"], [], ["xp"]]
         group = "Internal variables to save"
         param = "simul_soil"
-        
-        all_x = self.collect_internal_variables(list_keys, files_per_keys, 
+
+        all_x = self.collect_internal_variables(list_keys, files_per_keys,
                                                 group_name=group, param_name=param)
 
         return all_x
-    
+
 
     def _collect_fractions_2layers(self, all_x:dict[str,np.array]) -> dict[str,np.array]:
         """
         This procedure is collecting all the fractions of each outflow of the 2 layers model.
-        
+
         Returns:
         - all_f: A dictionary containing the fractions of each outflow of the 2 layers model.
         """
@@ -3446,22 +3446,22 @@ class SubBasin:
 
         if all_x=={}:
             return all_f
-        
+
         condition = self.myRain > 0.0
-        
+
         f_if = np.where(condition, all_x["xp"] * all_x["xif"], np.nan)
-        
+
         all_f["% qof"] = (all_x["xp"] - f_if) * 100.0
         all_f["% qif"] = f_if * 100.0
         all_f["% loss"] = np.where(condition, (1.0 - all_x["xp"]) * 100.0, np.nan)
-        
+
         return all_f
-    
+
 
     def collect_iv_2layers(self) -> dict[str,np.array]:
         """
         This procedure is collecting all internal variables of the 2 layers model in each module.
-        
+
         Returns:
         - all_iv: A dictionary containing the fractions all internal variables of the 2 layers model.
         """
@@ -3469,12 +3469,12 @@ class SubBasin:
         files_per_keys = [[], ["U"], ["S"]]
         group = "Internal variables to save"
         param = "simul_soil"
-        
-        all_iv = self.collect_internal_variables(list_keys, files_per_keys, 
+
+        all_iv = self.collect_internal_variables(list_keys, files_per_keys,
                                                 group_name=group, param_name=param)
-        
+
         return all_iv
-    
+
 
     def activate_all_iv_2layers(self):
         """
@@ -3483,11 +3483,11 @@ class SubBasin:
         list_keys = ["x", "U", "Reservoir"]
         group = "Internal variables to save"
         param = "simul_soil"
-        
+
         self.activate_internal_variables(list_keys, group_name=group, param_name=param)
 
-    
-    def collect_internal_variables(self, list_keys:list[str], files_per_keys:list[list[str]], 
+
+    def collect_internal_variables(self, list_keys:list[str], files_per_keys:list[list[str]],
                   group_name:str="Internal variables to save", param_name:str="simul_soil"
                 )-> dict[str,np.array]:
         """
@@ -3524,9 +3524,9 @@ class SubBasin:
                     all_iv[curVar] = cur_iv
             else:
                 logging.warning("Please activate the interval variable : " + curKey + "to have access the following fraction of outlets : ")
-        
+
         return all_iv
-    
+
 
     def activate_internal_variables(self, list_keys:list[str], group_name:str="Internal variables to save", param_name:str="simul_soil"):
         """
@@ -3544,13 +3544,13 @@ class SubBasin:
 
         for curKey in list_keys:
             wolf_soil.change_param(group_name, curKey, 1)
-        
+
         wolf_soil.SavetoFile(None)
         wolf_soil.Reload(None)
 
         return
-    
-    def get_summary_fractions(self, summary:str="mean", all_f:dict={}, 
+
+    def get_summary_fractions(self, summary:str="mean", all_f:dict={},
                               interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.array]:
         """
         This procedure is returning a summary of the fractions of the current module.
@@ -3569,7 +3569,7 @@ class SubBasin:
         return self._operation_on_ts(all_f, operation=summary, interval=interval)
 
 
-    def get_volume_fractions(self, all_f:dict={}, 
+    def get_volume_fractions(self, all_f:dict={},
                               interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.array]:
         """
         This procedure is returning a summary of the fractions of the current module.
@@ -3584,9 +3584,9 @@ class SubBasin:
 
         if all_f == {}:
             all_f = self.collect_fractions()
-        
+
         all_v = {key: val/100.0*self.myRain for key, val in all_f.items()}
-        
+
         if interval is not None:
             interv = np.zeros(len(self.time), dtype=bool)
             for el in interval:
@@ -3595,11 +3595,11 @@ class SubBasin:
                 interv += (self.time>=date_i) & (self.time<=date_f)
         else:
             interv = np.ones(len(self.time), dtype=bool)
-        
+
         tot_rain = np.nansum(self.myRain[interv])*self.deltaT/3600
 
         return {key+" volume": (np.nansum(all_v[key][interv])*self.deltaT/3600)/tot_rain*100 for key in all_v}
-        
+
 
     def check_presence_of_iv(self):
         """
@@ -3608,7 +3608,7 @@ class SubBasin:
         # TODO
 
         return
-    
+
 
     def get_all_Qtest(self, nb_atttempts=-1, typeOutFlow:str="Net", unit:str='m3/s', whichOutFlow="", lag:float=0.0) -> np.array:
         """
@@ -3620,11 +3620,11 @@ class SubBasin:
         Returns:
         - np.array: The Qtest hydrograph of the current module.
         """
-        
+
         # FIXME Take into account all the possible types of hydrographs and units
         file_debug_info = "simul_GR4_out_debuginfo.txt"
         prefix = "simul_GR4_out"
-        
+
         working_dir =  os.path.join(self.fileNameRead, 'Subbasin_' + str(self.iDSorted) + '/')
 
         q_test = []
@@ -3639,13 +3639,13 @@ class SubBasin:
             nb_atttempts = nb_max
 
         all_files = [os.path.join(working_dir,"".join([prefix,str(i+1)+".dat"])) for i in range(nb_atttempts)]
-        areOk = [(rd.check_path(file)[0])>=0 
+        areOk = [(rd.check_path(file)[0])>=0
                  for file in all_files]
         max_index = next((i for i, x in enumerate(areOk) if x == False), len(areOk))
-        q_test = [rd.read_hydro_file(working_dir, file_name)[1]*self.surfaceDrained/3.6 
+        q_test = [rd.read_hydro_file(working_dir, file_name)[1]*self.surfaceDrained/3.6
                   for file_name in all_files[:max_index]]
 
-        
+
         # for i in range(nb_atttempts):
         #     file_name = "".join([prefix,str(i+1)+".dat"])
         #     isOk, full_name = rd.check_path(os.path.join(working_dir, file_name))
@@ -3653,10 +3653,10 @@ class SubBasin:
         #         break
         #     t, cur_q = rd.read_hydro_file(working_dir, file_name)
         #     cur_q = cur_q*self.surfaceDrained/3.6
-        #     q_test.append(cur_q)            
+        #     q_test.append(cur_q)
 
         return q_test
-    
+
 
     def plot_all_fractions(self, all_fractions:dict[str:np.array]={},figure=None, to_show:bool=False, writeDir:str="", range_data:list[datetime.datetime]=[]) -> None:
 
@@ -3664,7 +3664,7 @@ class SubBasin:
             writeFile = os.path.join(self.fileNameWrite, "PostProcess", "_".join(["Q_fractions", self.name]))
         else:
             writeFile = os.path.join(writeDir, "_".join(["Q_fractions", self.name]))
-        
+
         if all_fractions == {}:
             all_fractions = self.collect_fractions()
             if all_fractions == {}:
@@ -3702,7 +3702,7 @@ class SubBasin:
         unit='mm/h'
 
         return self.get_outFlow(unit=unit)
-    
+
 
     def get_flow_fractions(self, all_f:dict={}, summary:str=None,
                               interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.ndarray|float]:
@@ -3724,12 +3724,12 @@ class SubBasin:
             all_f = mc.MODELS_VAR[self.model].get_all_iv_timeseries(directory=cur_dir,
                                             prefix_file='simul', type_of_var=iv.DEFAULT_VAR)
             all_f.update(all_qin)
-        
+
         q_simul = self.get_outFlow(unit='mm/h')
         all_r = {"%"+key: val/q_simul * 100.0 for key, val in all_f.items()}
 
         return self._operation_on_ts(all_r, summary=summary, interval=interval)
-    
+
 
     def get_iv(self, all_iv:dict={}, max_params:dict={}, summary:str=None,
                 interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.array]:
@@ -3752,7 +3752,7 @@ class SubBasin:
             out_dict = {key: all_iv[key]/cur_max for key, cur_max in max_params.items()}
         else:
             out_dict = all_iv
-        
+
         return self._operation_on_ts(out_dict, summary=summary, interval=interval)
 
 
@@ -3776,7 +3776,7 @@ class SubBasin:
             return {}
 
         return {"% "+key: val[eval_i] for key, val in all_iv.items()}
-    
+
 
     def import_from_pandas_Series(self, data:pd.Series, which="outFlow"):
         time = data.index.values.astype(np.int64) // 10 ** 9
@@ -3796,7 +3796,7 @@ class SubBasin:
             logging.error("Try the following : 'ouflow', 'outFlowRaw', 'myHydro', 'myRain', 'cumul_rain'")
 
         return
-    
+
     def export_to_pandas_Series(self, which="outFlow"):
         idx = pd.to_datetime(self.time, unit='s', utc=True)
 
@@ -3814,11 +3814,11 @@ class SubBasin:
             logging.error("Not a recognised 'which' argument!")
             logging.error("Try the following : 'ouflow', 'outFlowRaw', 'myHydro', 'myRain', 'cumul_rain'")
             return None
-        
+
         tserie = pd.Series(data, index=idx, copy=True, name=" ".join([self.name,which]))
 
         return tserie
-    
+
 
     def _operation_on_ts(self, ts:dict[str, np.ndarray], summary:str=None, interval:list[tuple[datetime.datetime, datetime.datetime]]=None):
         if interval is not None: