wolfhece 2.1.128__py3-none-any.whl → 2.1.129__py3-none-any.whl

wolfhece/radar/wolfradar.py

@@ -19,7 +19,16 @@ from datetime import timezone
 from os import path
 from osgeo import gdal, osr
 from ..drawing_obj import Element_To_Draw
+from tqdm import tqdm
 
+RADQPE = 1
+RADCLIM = 2
+RADFLOOD = 3
+
+FILL_NONE = 0
+FILL_ZERO = 1
+FILL_NAN = 2
+FILL_INTERP = 3
 
 class L08L72:
     epsgL08:osr.SpatialReference
@@ -51,12 +60,13 @@ class RadarIRM(Element_To_Draw):
 
 
     def convert2rain(self, coordMin:tuple, coordMax:tuple, dateBegin:date, dateEnd:date, deltaT:tdelta, 
-                     dirIn:str="", dirOut:str="", 
-                     check_all_polygons:bool=False):
+                     dirIn:str="", dirOut:str="", file_name_conv:str=".radclim.accum", type_rain:int=RADCLIM, recursive_dir="",
+                     check_all_polygons:bool=False, fill_data:int=FILL_NONE):
         
-        from datetime import datetime as date
         # =================
         # ALL VERIFICATIONS :
+        logging.info("Starting the conversion of IRM data to rain data ...")
+        logging.info("Verification ongoing ...")
 
         # Checking the validity of the repository to read and write :
         isOk, dirIn = check_path(dirIn, applyCWD=True)
@@ -74,12 +84,21 @@ class RadarIRM(Element_To_Draw):
         dt = deltaT.total_seconds()
         nb_intervals = floor((dateEnd - dateBegin).total_seconds() / dt)
         time = [dateBegin + tdelta(seconds=dt*i) for i in range(nb_intervals + 1)]
-        # Prefix for dates
-        dt_str = "{:.0f}d".format(deltaT.days)*(deltaT.days>0) \
-                + "{:.0f}h".format(floor(deltaT.seconds)/3600)*(floor(deltaT.seconds/3600)>0) \
-                + "{:.0f}m".format(floor(deltaT.seconds%3600)/60)*(floor(deltaT.seconds%3600)/60>0)
-        suffix = "".join([".radclim.accum", dt_str, ".hdf"])
-        all_files = [os.path.join(dirIn,"".join([t.strftime("%Y%m%d%H%M%S"),suffix])) for t in time]
+        if recursive_dir == "":
+            # Prefix for dates -> only if it's not a recursive directory
+            dt_str = "{:.0f}d".format(deltaT.days)*(deltaT.days>0) \
+                    + "{:.0f}h".format(floor(deltaT.seconds)/3600)*(floor(deltaT.seconds/3600)>0) \
+                    + "{:.0f}m".format(floor(deltaT.seconds%3600)/60)*(floor(deltaT.seconds%3600)/60>0)
+            suffix = "".join([file_name_conv, dt_str, ".hdf"])
+            all_files = [os.path.join(dirIn,"".join([t.strftime("%Y%m%d%H%M%S"),suffix])) for t in time]
+        else:
+            suffix = "".join([file_name_conv, ".hdf"])
+            all_files = [os.path.join(dirIn, 
+                                      t.strftime("%Y"),
+                                      t.strftime("%m"),
+                                      t.strftime("%d"),
+                                      recursive_dir,
+                                      "".join([t.strftime("%Y%m%d%H%M%S"),suffix])) for t in time]
         # are_present = np.all(np.array( \
         #             [os.path.exists(os.path.join(dirIn,"".join([t.strftime("%Y%m%d%H%M%S"),suffix]))) for t in time] \
         #             ))
@@ -90,7 +109,14 @@ class RadarIRM(Element_To_Draw):
         
         if not are_present:
             logging.error("Rain files present in the selected directory are does not contain all the information between the desired interval.")
-            return 
+            i_problem = np.where(np.array([os.path.exists(el) for el in all_files]) == False)[0]
+            logging.error("The following files are missing :")
+            for i in i_problem:
+                logging.error(all_files[i])
+            if fill_data == FILL_NONE:
+                logging.error("The process stops because there are missing files!")
+                logging.error("To make an linear interpolation set to False 'no_missing_files' argument.")
+                return
         
         # Creating the direcory results
         # Directory of the shapefile
@@ -118,12 +144,15 @@ class RadarIRM(Element_To_Draw):
             else:
                 print ("Successfully created the directory %s" % timeSeriesDir)
 
+        logging.info("Verification validated!")
 
         # =================
         # CORE PROCEDURE
         # After all verifications, the core procedure can now start :
         # extract all the points in all the .hdf files and their values -> check whether to crop during this process of after
 
+        logging.info("Creation of the shapefile ongoing ...")
+
         # Definition of the domaine zone
         limits = vector()
         limits.add_vertex(wolfvertex(coordMin[0],coordMin[1]))
@@ -173,27 +202,52 @@ class RadarIRM(Element_To_Draw):
 
         # save the polygons in .shp shapefile
         polygons.export_shape(fileOut)
+        logging.info("Creation of the shapefile finished !")
 
-
+        logging.info("Creation of polygon time series ongoing ...")
         # Create a folder with the time serie for each polygone
         timeStps = [[str(t.day), str(t.month), str(t.year), str(t.hour), str(t.minute), str(t.second)] for t in time]
 
         all_values = np.zeros((len(all_files), polygons.nbvectors))
-        for i in range(len(all_files)):
+        for i in tqdm(range(len(all_files))):
             cur_file = all_files[i]
+            exists = os.path.exists(cur_file)
             try:
-                hdf_ds = gdal.Open(cur_file, gdal.GA_ReadOnly)
-                values, coord, proj = wrl.georef.raster.extract_raster_dataset(hdf_ds, mode="edge", nodata=0.0)
-                vec_values = values.reshape(-1)
-                all_values[i,:] = np.nan_to_num([vec_values[i] for i in zones_indices], copy=False, nan=0.0)
-                # FIXME this following line -> to check !!!! -> Convert [mm/h] to accumulated rain [mm] at each time step
-                all_values[i,:] = all_values[i,:]*(dt/3600.0)
+                if exists:
+                    hdf_ds = gdal.Open(cur_file, gdal.GA_ReadOnly)
+                    values, coord, proj = wrl.georef.raster.extract_raster_dataset(hdf_ds, mode="edge", nodata=0.0)
+                    vec_values = values.reshape(-1)
+                    all_values[i,:] = np.nan_to_num([vec_values[i] for i in zones_indices], copy=False, nan=0.0)
+                    # FIXME this following line -> to check !!!! -> Convert [mm/h] to accumulated rain [mm] at each time step
+                    # radflood
+                    if type_rain == RADFLOOD or type_rain == RADCLIM:
+                        all_values[i,:] = all_values[i,:]
+                    elif type_rain == RADQPE:
+                        # radqpe
+                        # TODO : check the conversion for radclim
+                        all_values[i,:] = all_values[i,:]*(dt/3600.0)
+                    # all_values[i,:] = all_values[i,:]*(dt/3600.0)
+                else:
+                    if fill_data == FILL_ZERO:
+                        all_values[i,:] = 0.0
+                    else:
+                        all_values[i,:] = np.nan
             except:
                 logging.error("".join(["Something bad happened while reading hdf file :", cur_file]))
                 all_values[i,:] = 0.0
-            
+        logging.info("Creation of polygon time series finished !")
+
+        logging.info("Writing polygon time series ongoing ...")
         # Writing the file
-        for iVec in range(polygons.nbvectors):            
+        for iVec in tqdm(range(polygons.nbvectors)):
+            # Clean the nan value with linear interpolation
+            # FIXME : to check the interpolation
+            if(fill_data == FILL_INTERP):
+                logging.warning('Interpolating missing values in the time series -> Still to test!')
+                valid = ~np.isnan(all_values[:,iVec])
+                invalid = np.isnan(all_values[:,iVec])
+                all_values[invalid,iVec] = np.interp(np.flatnonzero(invalid), np.flatnonzero(valid), all_values[valid,iVec])
+            # write in the file
             with open(os.path.join(timeSeriesDir,"".join([str(iVec+1),".rain"])), 'w') as f:
                 f.write("".join([str(iVec+1),"\n"]))
                 f.write("".join([str(1),"\n"]))
@@ -201,11 +255,10 @@ class RadarIRM(Element_To_Draw):
                 f.write("".join([str(len(all_files)),"\n"]))
                 for cur_t in range(len(timeStps)):
                     f.write("\t".join(timeStps[cur_t] + [str(all_values[cur_t,iVec])]) + "\n")
-
+        logging.info("Writing polygon time series finished !")
                 
         print(are_present)
 
-
     # def plot(self):
     #     pass
 

wolfhece/shapes/circle.py

@@ -0,0 +1,335 @@
+import math
+import numpy as np
+from numba import jit
+
+""" JIT is a decorator that tells Numba to compile this function using the Numba JIT compiler. """
+
+@jit(nopython=True)
+def A_from_h(h:float, diameter:float):
+    """ Compute the area of a circular segment from its height """
+    d = diameter / 2.0 - h
+    theta = math.acos(1.0 - 2.0 * h / diameter)
+    chord = math.sqrt(h * (diameter - h))
+    area = theta * diameter**2 / 4.0 - chord * d
+
+    return area
+
+@jit(nopython=True)
+def dichotomy_A2h(f, a:float, b:float, args, tol=1e-10, max_iter=1000):
+    """ Dichotomy algorithm to find the root of a function f between a and b.
+    The function f must be defined as f(x, *args) and must return a scalar.
+    The function must have a single root in the interval [a, b].
+    """
+    def cond_fun(val):
+        a, b, i = val
+        return (b - a) > tol
+
+    def body_fun(val):
+        a, b, i = val
+        c = (a + b) / 2.
+        diameter = args[0]
+        fa = f(a, diameter)
+        fc = f(c, diameter)
+        if fc == 0:
+            return (c, c, i + 1)
+        else:
+            if fa * fc < 0:
+                return (a, c, i + 1)
+            else:
+                return (c, b, i + 1)
+
+    i=0
+    while cond_fun((a, b, i)) and i < max_iter:
+        a, b, i = body_fun((a, b, 0))
+
+    return (a + b) / 2
+
+@jit(nopython=True)
+def segment_of_circle(diameter:float, h:float=None, chord:float=None,
+                      arc_length:float=None, area:float=None,
+                      from_which:int=None, init_val:bool=None,
+                      eps:float=1e-8) -> tuple:
+    """ Calcul des caractristiques d'un segment circulaire
+    plus d'infos sur http://mathworld.wolfram.com/CircularSegment.html.
+
+    :param diameter: diamtre du cercle [m]
+    :param h: hauteur du segment [m]
+    :param chord: longueur de la corde [m]
+    :param arc_length: longueur de l'arc soutenu par la corde [m]
+    :param area: aire du sgment [m]
+    :param from_which: variable de calcul sur base de laquelle les autres grandeurs doivent tre values [index dans l'ordre des paramètres (h = 1, area = 4...)]
+    :param init_val: utilise h comme valeur initiale pour le calcul de h depuis A [booléen]
+    """
+
+    R = diameter / 2.0
+
+    if from_which == 1: # from h
+        # The solution is unique
+
+        d = diameter / 2.0 - h
+        theta = math.acos(1.0 - 2.0 * h / diameter)
+
+        arc_length = theta * diameter
+        chord = math.sqrt(h * (diameter - h))
+        area = theta * diameter**2 / 4.0 - chord * d
+        chord = 2.0 * chord
+
+    elif from_which == 2: # from chord
+        # The solution is not unique --> two possible values for h
+        # Conserve the value of h that is the closest to the previous value of h
+
+        # h1 as root of the quadratic equation
+        h1 = (diameter - math.sqrt(diameter**2 - chord**2)) / 2.0
+
+        if init_val is not None:
+            if init_val:
+                h2 = diameter - h1
+                dh1 = abs(h - h1)
+                dh2 = abs(h + h1 - diameter)
+
+                h = h1 if dh1 < dh2 else h2
+            else:
+                # Conserve the lowest value of h
+                h = h1
+        else:
+            h = h1
+
+        d = diameter / 2.0 - h
+        theta = math.acos(1.0 - 2.0 * h / diameter)
+
+        arc_length = theta * diameter
+        area = theta * diameter**2 / 4.0 - chord /2. * d
+
+    elif from_which == 3: # from arc_length
+        # The solution is unique
+
+        theta = arc_length / diameter
+        h = R * (1.0 - math.cos(theta))
+        d = R - h
+
+        chord = math.sqrt(h * (diameter - h))
+        area = theta * diameter**2 / 4.0 - chord * d
+        chord = 2.0 * chord
+
+    elif from_which in [4,41]: # from area using Newton's method
+        # The solution is unique BUT the calculation is iterative
+
+        cur_error = 1.0
+
+        d2by4 = diameter**2 / 4.0
+        area_max = math.pi * d2by4
+
+        if area == 0.0:
+            h = 0.0
+            chord = 0.0
+            arc_length = 0.0
+
+        elif area_max > area:
+            if init_val is not None:
+                if not init_val or h == 0.0:
+                    h = R
+            else:
+                h = R
+
+            while abs(cur_error) > eps:
+                d = R - h
+                theta = math.acos(1.0 - h / R)
+                chord = math.sqrt(h * (diameter - h))
+                area_loc = theta * d2by4 - chord * d
+                dAdh = chord - ((h - R)**2 - d2by4) / (chord + 1e-200)
+
+                cur_error = (area_loc - area) / dAdh
+                if h - cur_error < 0.0:
+                    h = h / 2.0
+                elif h - cur_error > diameter:
+                    h = (h + diameter) / 2.0
+                else:
+                    h = h - cur_error
+
+            chord = 2.0 * chord
+            arc_length = theta * diameter
+
+        else:
+            h = diameter
+            chord = 0.0
+            arc_length = math.pi * diameter
+
+    elif from_which == 42: # from area but using dichotomy rather than Newton-Raphson
+        # The solution is unique BUT the calculation is iterative
+
+        cur_error = 1.0
+
+        d2by4 = diameter**2 / 4.0
+        area_max = math.pi * d2by4
+
+        if area == 0.0:
+            h = 0.0
+            chord = 0.0
+            arc_length = 0.0
+
+        elif area_max > area:
+            if init_val is not None:
+                if not init_val or h == 0.0:
+                    h = R
+            else:
+                h = R
+
+            h = dichotomy_A2h(f=A_from_h, a=0., b=diameter, args=(diameter,), tol=eps)
+
+            d = diameter / 2.0 - h
+            theta = math.acos(1.0 - 2.0 * h / diameter)
+            arc_length = theta * diameter
+            chord = math.sqrt(h * (diameter - h))
+            chord = 2.0 * chord
+
+        else:
+            h = diameter
+            chord = 0.0
+            arc_length = math.pi * diameter
+
+    return diameter, h, chord, arc_length, area
+
+
+if __name__ == '__main__':
+
+    diameter = 10.0
+    h = 5.0
+    chord = -1.
+    arc_length = -1.
+    area = -1.
+    from_which = 1
+    init_val = None
+
+    res1 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res1
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    from_which = 2
+    res2 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res2
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    from_which = 2
+    res2 = segment_of_circle(diameter, h, chord/2., arc_length, area, from_which, False)
+    diameter, h, chord, arc_length, area = res2
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    from_which = 3
+    res3 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res3
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    from_which = 2
+    res2 = segment_of_circle(diameter, h, chord/2., arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res2
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    diameter = 10.0
+    h = 1.
+    chord = -1.
+    arc_length = -1.
+    area = 10.0
+    from_which = 4
+    init_val = True
+
+    res4 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res4
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    diameter = 10.0
+    h = -1.
+    chord = -1.
+    arc_length = -1.
+    area = 10.0
+    from_which = 4
+    init_val = False
+
+    res5 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res5
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    diameter = 10.0
+    h = 9.
+    chord = -1.
+    arc_length = -1.
+    area = 10.0
+    from_which = 4
+    init_val = True
+
+    res6 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val)
+    diameter, h, chord, arc_length, area = res6
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    diameter = 10.0
+    h = 2.
+    chord = -1.
+    arc_length = -1.
+    area = 10.0
+    from_which = 4 # from area using Newton's method
+    init_val = True
+
+    res7 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val, eps= 1e-12)
+    diameter, h, chord, arc_length, area = res7
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")
+
+    diameter = 10.0
+    h = 2.
+    chord = -1.
+    arc_length = -1.
+    area = 10.0
+    from_which = 42 # from area using dichotomy
+    init_val = True
+
+    res8 = segment_of_circle(diameter, h, chord, arc_length, area, from_which, init_val, eps= 1e-12)
+    diameter, h, chord, arc_length, area = res7
+
+    print(f"diameter = {diameter}")
+    print(f"h = {h}")
+    print(f"chord = {chord}")
+    print(f"arc_length = {arc_length}")
+    print(f"area = {area}")

{wolfhece-2.1.128.dist-info → wolfhece-2.1.129.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.1.128
+Version: 2.1.129
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -39,7 +39,7 @@ Requires-Dist: notebook
 Requires-Dist: matplotlib
 Requires-Dist: mkl
 Requires-Dist: python-gettext
-Requires-Dist: shapely
+Requires-Dist: shapely==2.0.7
 Requires-Dist: openpyxl
 Requires-Dist: xlrd
 Requires-Dist: openkmi
@@ -58,7 +58,7 @@ Requires-Dist: numba==0.58.*
 Requires-Dist: xmltodict
 Requires-Dist: opencv-python
 Requires-Dist: xarray
-Requires-Dist: rasterio
+Requires-Dist: rasterio==1.3.11
 Requires-Dist: h5py
 Requires-Dist: exif
 Requires-Dist: pyglm
@@ -69,6 +69,7 @@ Requires-Dist: autograd
 Requires-Dist: plyfile
 Requires-Dist: tabulate
 Requires-Dist: ipympl
+Requires-Dist: contextily
 
 Ce paquet contient l'interface graphique Python du logiciel WOLF (HECE - ULiège) de même que plusieurs outils de traitements topographique, hydraulique et hydrologique.
 

{wolfhece-2.1.128.dist-info → wolfhece-2.1.129.dist-info}/RECORD

@@ -12,11 +12,11 @@ wolfhece/PyGui.py,sha256=5ANCUmsBwsx_h-GWqV9xwnSQyGJ16mSObOm-h3_7LIQ,144708
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
 wolfhece/PyPalette.py,sha256=cwoiYMQW8SMgtUvQwXhIYKJ2NNhAfiemKE8npIu4eqc,33724
-wolfhece/PyParams.py,sha256=HTVxsJ3_HawBCi_UyCdZAP7u7NbemfYaNwpTW5S6wk0,99386
+wolfhece/PyParams.py,sha256=wVgzJC5Bs8rfx6NdUdcFDtnsaPBYJgRn3A-rROk49MQ,99525
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
-wolfhece/PyVertexvectors.py,sha256=ScepTi9KEwcqx3rrJB-XluIIXCdDv0DfOtZnXojNFN8,323766
+wolfhece/PyVertexvectors.py,sha256=2kjtKwdYiGif-NVok8rS9T7Ok8jYMGN4tzy6zXoTxh8,325764
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -82,7 +82,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=A5vDeIsb8w6E5otXdNRqYbWS9kRMoHW6v4jPU4Jvu8U,389
+wolfhece/apps/version.py,sha256=bTot2RdHq2MShlNmumJbDtXhE0SckmKwrhnLgJVMixc,389
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -118,22 +118,22 @@ wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,
 wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,42696
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
-wolfhece/hydrology/Catchment.py,sha256=eVP8uG_JuulxLVAY5Df3eew6AahCwMPRsmJBgt6JEbg,139148
-wolfhece/hydrology/Comparison.py,sha256=_2YU9P-AHKnP67sVJWCc6HpnZw9cYBHKjuUGULggICo,84277
+wolfhece/hydrology/Catchment.py,sha256=gyj4GtbTbs0L_bBFoQvX1fCdSxfPWBt8hsV46c-lUsM,144461
+wolfhece/hydrology/Comparison.py,sha256=WBG-NbbtNYgNmCCl9SPTcHf-2XtjRVY-9ohpC2XGkaI,84480
 wolfhece/hydrology/Dumping.py,sha256=SHGYXr30nMOGPSLArMvAzVxGyLywLf4i267166oUHhQ,2403
-wolfhece/hydrology/Optimisation.py,sha256=GJj0VfG_AVNmyrzyML-FadQg8GAiCh3Mnm9UQMZI-Mg,142538
+wolfhece/hydrology/Optimisation.py,sha256=soT2TsM443uzqUFYOVDhj2oyLPF6Ob5YhRefSQLKkUM,149243
 wolfhece/hydrology/Outlet.py,sha256=jdjYN2gIolQJ5prf1wVfxm7cp_YguwQ0JMRsC9ks-Tg,10519
-wolfhece/hydrology/PostProcessHydrology.py,sha256=3vXOG4FyVBHCQjgIzMz0vQHbP4jKnAO9J-fAarsoU5g,7262
+wolfhece/hydrology/PostProcessHydrology.py,sha256=GS2dm9ahDb856apXvTM-oyusTn0xj-ySNpKbHa_jQdw,7419
 wolfhece/hydrology/PyWatershed.py,sha256=a26M6tVe4hrQ-a8FyAx7H9-RZcVCU5BBzFff4_YT0UU,97665
-wolfhece/hydrology/RetentionBasin.py,sha256=l73gofdFSdQcGHMM7fkM7e8b9wzd-MnNmVeJDsX21c4,82923
-wolfhece/hydrology/SubBasin.py,sha256=w7xp4lpu5gVX6E873PNtn5zSkGRw2FAJB6-pK3pntfs,171477
+wolfhece/hydrology/RetentionBasin.py,sha256=vFvpnomo5h8ZWq3Hq-YlxRnyqyQqHrojABMKzu3RP6E,83358
+wolfhece/hydrology/SubBasin.py,sha256=wFPehJ0vbZM9nZjEdttuch3Dmt8LzDtRVsF5E8pxM4E,178326
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrology/constant.py,sha256=dFsLm_9k3PLItdzUfbWwEMfJo9Q1wS8-e6_jmfSOZHc,1545
-wolfhece/hydrology/cst_exchanges.py,sha256=tGJTEf2swhrflF4fmopdNyyE3O-K-gsq6-BXBdsW3TQ,17887
+wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
+wolfhece/hydrology/cst_exchanges.py,sha256=w83FyI1gOQ5EjTWb9usLfakQAJwv52u8_Hap2Nih570,39593
 wolfhece/hydrology/data_treatment.py,sha256=vHNtEvXHJOdGHjaNjbTTvVoFQjVee-AdspJEesxVNuQ,34967
 wolfhece/hydrology/forcedexchanges.py,sha256=MrzMqKISX6G6t3XwkyFQa6tVFfTTC8ifm_nSvrOy5-8,2259
-wolfhece/hydrology/plot_hydrology.py,sha256=14XrnJD-2VDfAPRWOrRL88vFyYVQubBaiO5oWv60HcM,34922
-wolfhece/hydrology/read.py,sha256=itMat6MMn4Y14C3SMU_9JMBtpXFjG4mLNMfXXd5U6Ns,9328
+wolfhece/hydrology/plot_hydrology.py,sha256=nIOPPa_91z6wllCRC8BsEijK_4XMzC7lZHy_OvzesNc,35704
+wolfhece/hydrology/read.py,sha256=BaaIp1x44wPQz2LkWtzu7ZNKx3Gw_WDtAw-B4y_C2IU,9553
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -186,7 +186,7 @@ wolfhece/lazviewer/viewer/qt.conf,sha256=uzoy7MmKYo_uTrNsfMuQ84LgBI5pVOeWXK_rXYM
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/lazviewer/viewer/viewer.py,sha256=5igxFDFZMnnnhF3oFbEHKLfgiK4TUgXEZHsgOJbtNY4,25319
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
+wolfhece/libs/WolfDll.dll,sha256=iGTdK8Hb4OKxh3xCOuYrK2KCfDlUJGl50FGUP160ddQ,134159360
 wolfhece/libs/__init__.py,sha256=x7QvPd7hjL-Xl7RjlA8y6rcvKCkYu3JpFE3YnzUJeCY,3326
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
 wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
@@ -265,7 +265,7 @@ wolfhece/pythonfortran/example_makendarray.py,sha256=FNPp6lsU9Mv0O8VLN3JHWk5Qn1z
 wolfhece/pythonfortran/example_numpy_memory.py,sha256=o3hzJDw7YtE4v0FXI3-l2VzupCk5xF7-uqlb_Ay8FUQ,3660
 wolfhece/pythonfortran/tools.py,sha256=oYh9MguRYEGNGKVbHqQW2V9okZJLs3n4Qs-vLWPmBe4,2462
 wolfhece/radar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/radar/wolfradar.py,sha256=mvsVf6-4KCqVF6kWsKfPuM7KPqRdYHuIZAbb8kzXAZU,10032
+wolfhece/radar/wolfradar.py,sha256=LM2jfdlclBN5fycL6i1wI2ipIsTfG6wor1A5IwE7JPs,12983
 wolfhece/rem/REMMaker.py,sha256=zkiAo36MmusPhgv1qJmpDgtoTWbh_eJ6qJqtCfeC1M8,31480
 wolfhece/rem/RasterViz.py,sha256=fnyMfAJZDoS-rjagsNRGLndS-UYNUzMY4DgenjD3Y_4,29068
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
@@ -288,6 +288,8 @@ wolfhece/shaders/simple_vertex_shader.glsl,sha256=crJlvIx-nNcUpKyK4KpJWR789xG-Rq
 wolfhece/shaders/simple_vertex_shader_mvp.glsl,sha256=4uMy9GFutnVkdwrfe9BdoPVAaFjdKwcX4eKVakug3zg,229
 wolfhece/shaders/simple_vertex_shader_wo_mvp.glsl,sha256=CT5dr1s0kdL90MtZi22DelFzFVns-w0XcrVbPan6yOc,122
 wolfhece/shaders/vertex_shader_texture.glsl,sha256=8CmklD7-H57iPWhf5nQpGpqIW1uXvcz2kTBVZh-1F8Q,214
+wolfhece/shapes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/shapes/circle.py,sha256=UNCgSX-Xa_s64gJdWyouaiXCd2q-7WXvL-GbXAIRKQE,10136
 wolfhece/sigmoid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/sigmoid/circle_jax.py,sha256=3CrOViLTvt6ZtQPY_1rOe0Qp_AgwdOKhWwpbG5vBki0,4305
 wolfhece/sigmoid/circle_jax_copilot.py,sha256=fF8vwY_q_i8_u-anGpVXJ5aZEdx3KC3kuYsZZlaGZwE,5952
@@ -301,8 +303,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.128.dist-info/METADATA,sha256=Z8SexVjG-o12r8I7FEqEPvmGXYuzF_kUYyh-17t16w4,2516
-wolfhece-2.1.128.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wolfhece-2.1.128.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.128.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.128.dist-info/RECORD,,
+wolfhece-2.1.129.dist-info/METADATA,sha256=RFHPYSX_-2KsN3-nviEAZbMzvwmC2z1aXOjGR1E24BA,2558
+wolfhece-2.1.129.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+wolfhece-2.1.129.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.129.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.129.dist-info/RECORD,,