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

wolfhece/wolfresults_2D.py

@@ -24,6 +24,9 @@ import logging
 from tqdm import tqdm
 from datetime import datetime as dt, timedelta
 
+from shapely import contains, contains_xy, prepare, destroy_prepared, is_prepared
+from shapely.geometry import Point, Polygon
+
 try:
     from OpenGL.GL import *
 except:
@@ -3401,7 +3404,7 @@ class Wolfresults_2D(Element_To_Draw):
 
         return self.head_blocks[getkeyblock(which_block,False)]
 
-    def get_xy_infootprint_vect(self, myvect: vector, which_block=1) -> tuple[np.ndarray,np.ndarray]:
+    def get_xy_infootprint_vect(self, myvect: vector | Polygon, which_block=1) -> tuple[np.ndarray,np.ndarray]:
 
         """
         :return numpy array content les coordonnées (x,y) des mailles dans l'empreinte du vecteur
@@ -3417,19 +3420,27 @@ class Wolfresults_2D(Element_To_Draw):
 
         return mypts,myptsij
 
-    def get_ij_infootprint_vect(self, myvect: vector, which_block=1) -> np.ndarray:
+    def get_ij_infootprint_vect(self, myvect: vector | Polygon, which_block=1) -> np.ndarray:
 
         """
         Returns:
             numpy array content les indices ij des mailles dans l'empreinte du vecteur
         """
 
+        if isinstance(myvect, Polygon):
+            xmin, ymin, xmax, ymax = myvect.bounds
+        elif isinstance(myvect, vector):
+            xmin, ymin, xmax, ymax = myvect.xmin, myvect.ymin, myvect.xmax, myvect.ymax
+        else:
+            logging.error(_('The object must be a vector or a Polygon'))
+            return np.array([])
+
         lochead = self.get_header_block(which_block)
         nbx = lochead.nbx
         nby = lochead.nby
 
-        i1, j1 = self.get_ij_from_xy(myvect.xmin, myvect.ymin, which_block)
-        i2, j2 = self.get_ij_from_xy(myvect.xmax, myvect.ymax, which_block)
+        i1, j1 = self.get_ij_from_xy(xmin, ymin, which_block)
+        i2, j2 = self.get_ij_from_xy(xmax, ymax, which_block)
         i1 = max(i1,0)
         j1 = max(j1,0)
         i2 = min(i2,nbx-1)
@@ -3439,17 +3450,39 @@ class Wolfresults_2D(Element_To_Draw):
 
         return mypts
 
-    def get_xy_inside_polygon(self, myvect: vector, usemask=True):
+    def get_xy_inside_polygon(self, myvect: vector | Polygon,
+                              usemask:bool=True, method:Literal['mpl','shapely']='shapely'):
         """
         Obtention des coordonnées contenues dans un polygone
-         usemask = restreint les éléments aux éléments non masqués de la matrice
+
+        :param myvect: polygone
+        :param usemask: restreint les éléments aux éléments non masqués de la matrice
+        :param method: méthode de calcul ('mpl' == Matplotlib ou 'shapely')
         """
 
-        myvect.find_minmax()
+        if method=='mpl':
+            return self.get_xy_inside_polygon_mpl(myvect, usemask)
+        elif method=='shapely':
+            return self.get_xy_inside_polygon_shapely(myvect, usemask)
+
+
+    def get_xy_inside_polygon_mpl(self, myvect: vector | Polygon, usemask:bool=True):
+        """
+        Obtention des coordonnées contenues dans un polygone
+
+        :param myvect: polygone
+        :param usemask: restreint les éléments aux éléments non masqués de la matrice
+        """
+
+        if isinstance(myvect, vector):
+            # force la mise à jour des min/max
+            myvect.find_minmax()
+            myvert = myvect.asnparray()
+        elif isinstance(myvect, Polygon):
+            myvert = myvect.exterior.coords
 
         mypointsxy={}
 
-        myvert = myvect.asnparray()
         path = mpltPath.Path(myvert)
 
         for curblock in range(self.nb_blocks):
@@ -3467,6 +3500,56 @@ class Wolfresults_2D(Element_To_Draw):
 
         return mypointsxy
 
+    def get_xy_inside_polygon_shapely(self, myvect: vector | Polygon,
+                                      usemask:bool=True, strictly:bool=False):
+        """
+        Obtention des coordonnées contenues dans un polygone
+
+        :param usemask: restreint les éléments aux éléments non masqués de la matrice
+        :param strictly: si True, les points sur le bord du polygone ne sont pas considérés comme à l'intérieur
+        """
+
+        if isinstance(myvect, vector):
+            # force la mise à jour des min/max
+            myvect.find_minmax()
+            polygon = myvect.polygon
+        elif isinstance(myvect, Polygon):
+            polygon = myvect
+
+        mypointsxy={}
+
+        if not is_prepared(polygon):
+            prepare(polygon) # Prepare the polygon for **faster** contains check -- VERY IMPORTANT
+            to_destroy = True
+        else:
+            to_destroy = False
+
+        for curblock in range(self.nb_blocks):
+            locpointsxy,locpointsij = self.get_xy_infootprint_vect(myvect,curblock+1)
+
+            if strictly:
+                inside = contains_xy(polygon, mypointsxy[:,0], mypointsxy[:,1])
+            else:
+                points= np.array([Point(x,y) for x,y in mypointsxy])
+                boundary = polygon.boundary
+                inside = contains(polygon, points)
+                on_border = list(map(lambda point: boundary.contains(point), points))
+                inside = np.logical_or(inside, on_border)
+
+            if usemask and len(locpointsxy)>0:
+                locpointsij = locpointsij[np.where(inside)]
+                mymask = np.logical_not(self.myblocks[getkeyblock(curblock)].current.array.mask[locpointsij[:, 0], locpointsij[:, 1]])
+                locpointsxy = locpointsxy[np.where(mymask)]
+
+            locpointsxy = locpointsxy[np.where(inside)]
+            mypointsxy[getkeyblock(curblock)]=locpointsxy
+
+        if to_destroy:
+            destroy_prepared(polygon) # Release the prepared polygon
+
+        return mypointsxy
+
+
     def get_xy_under_polyline(self, myvect: vector) -> dict[str, (int,int)]:
         """
         Obtention des coordonnées (x,y) sous une polyligne avec séparation des points par bloc
@@ -3487,7 +3570,9 @@ class Wolfresults_2D(Element_To_Draw):
 
         return mypoints
 
-    def get_values_insidepoly(self, myvect:vector, usemask:bool=True, agglo:bool=True, getxy:bool=False):
+    def get_values_insidepoly(self, myvect:vector | Polygon,
+                              usemask:bool=True, agglo:bool=True, getxy:bool=False,
+                              method:Literal['mpl','shapely']='mpl'):
         """
         Retourne les valeurs des mailles contenues dans un polygone
         Traite la matrice courante et l'altitude de fond si on est en vue 'views_2D.WATERLEVEL'
@@ -3502,7 +3587,7 @@ class Wolfresults_2D(Element_To_Draw):
         """
         myvalues={}
         myvaluesel={}
-        mypoints = self.get_xy_inside_polygon(myvect, usemask)
+        mypoints = self.get_xy_inside_polygon(myvect, usemask, method=method)
 
         for curblock in range(self.nb_blocks):
             curkey = getkeyblock(curblock)
@@ -3535,7 +3620,9 @@ class Wolfresults_2D(Element_To_Draw):
             else:
                 return myvalues,None
 
-    def get_all_values_insidepoly(self, myvect:vector, usemask:bool= True, agglo:bool= True, getxy:bool= False):
+    def get_all_values_insidepoly(self, myvect:vector, usemask:bool= True,
+                                  agglo:bool= True, getxy:bool= False,
+                                  method:Literal['mpl','shapely']='mpl'):
         """
         Récupération de toutes les valeurs dans un polygone
 
@@ -3548,7 +3635,7 @@ class Wolfresults_2D(Element_To_Draw):
         """
 
         myvalues={}
-        mypoints = self.get_xy_inside_polygon(myvect, usemask)
+        mypoints = self.get_xy_inside_polygon(myvect, usemask, method=method)
 
         for curblock in range(self.nb_blocks):
             if len(mypoints[getkeyblock(curblock)])>0:
@@ -4876,6 +4963,7 @@ class Wolfresults_2D(Element_To_Draw):
         :param start: start time step - 0-based
         :param end: end time step - 0-based
         :param every: step interval
+        :param callback: optional callback to update progress
 
         :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm, Z, Head
         """
@@ -5296,4 +5384,107 @@ class Wolfresults_2D(Element_To_Draw):
                 band.WriteArray(arr.array.transpose())
                 band.FlushCache()
                 band.ComputeStatistics(True)
-                out_ds = None
+                out_ds = None
+
+    def get_time_averaged_results(self, start:int=0, end:int=-1, every:int=1, time_averaging:bool=True, callback=None) -> Union[tuple[WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
+        """
+        Get time averaged results (or simply, average over all saved indicies)
+
+        :param start: start time step - 0-based
+        :param end: end time step - 0-based
+        :param every: step interval
+        :param time_averaging: True -> Time-averaging, False -> Average over all saved indicies
+        :param callback: optional callback to update progress
+
+        :return : WolfArray - h, qx, qy
+        """
+
+        number_of_time_steps = self.get_nbresults()
+        if end ==-1:
+            end = number_of_time_steps
+
+        assert start>=0, 'Start index must be greater or equal to 0'
+        assert end>0, 'End index must be greater than 0 (or -1 to use all time steps)'
+        assert every>0, 'Step interval must be greater than 0'
+        assert start<end, 'Start index must be less than end index'
+
+        if (end-start)%every != 0:
+            logging.warning('The difference between start and end indices is not a multiple of the step interval. The last time step will not be included in the averaging.')
+
+        if time_averaging:
+            deltaTot = self.times[end-1] - self.times[start]
+        else:
+            deltaTot = (end - start)//every
+
+        # Initialise time-averaged matrices based on results type
+        #    If only one block --> WolfArray
+        #    If only multiple blocks --> WolfArrayMB
+        h_avg  = self.as_WolfArray(copyarray=True)
+        qx_avg = self.as_WolfArray(copyarray=True)
+        qy_avg = self.as_WolfArray(copyarray=True)
+
+        averaged = [h_avg, qx_avg, qy_avg]
+
+        for curavg in averaged:
+            curavg.nullvalue = 0.
+            curavg.reset()
+            curavg.mask_reset()
+
+        for time_step in tqdm(range(start, end, every)):
+            
+            if callback is not None:
+                callback(time_step, "Step {} / {}".format(time_step+1, end))
+
+            self.read_oneresult(time_step+1)
+
+            if time_averaging:
+                # Weight for time averaging. At the last time step, the weight is the same as the previous one.
+                if time_step<end-every:
+                    delta = self.times[time_step+every] - self.times[time_step]
+            else:
+                delta = 1
+
+            if self.nb_blocks>1:
+                for curblock in self.myblocks.keys():
+
+                    # Get WolfArray
+                    wd = self.get_h_for_block(curblock)
+                    qx = self.get_qx_for_block(curblock)
+                    qy = self.get_qy_for_block(curblock)
+
+                    # Add the values to the corresponding block in the time-averaged matrix
+                    h_avg[curblock].array += wd.array * delta
+                    qx_avg[curblock].array += qx.array * delta
+                    qy_avg[curblock].array += qy.array * delta
+
+            else:
+                curblock = getkeyblock(0)
+
+                # Get WolfArray
+                wd = self.get_h_for_block(curblock)
+                qx = self.get_qx_for_block(curblock)
+                qy = self.get_qy_for_block(curblock)
+
+                # Add the values to the corresponding block in the time-averaged matrix
+                h_avg[curblock].array += wd.array * delta
+                qx_avg[curblock].array += qx.array * delta
+                qy_avg[curblock].array += qy.array * delta
+
+        # Calculate the average
+        for curavg in averaged:
+            if self.nb_blocks>1:
+                for i in range(self.nb_blocks):
+                    curavg[i].array /= deltaTot
+            else:
+                curblock = getkeyblock(0)
+                curavg[curblock].array /= deltaTot
+
+        if self.nb_blocks>1:
+            for i in range(self.nb_blocks):
+                qx_avg[i].array.mask[:,:] = h_avg[i].array.mask[:,:]
+                qy_avg[i].array.mask[:,:] = h_avg[i].array.mask[:,:]
+        else:
+            qx_avg.array.mask[:,:] = h_avg.array.mask[:,:]
+            qy_avg.array.mask[:,:] = h_avg.array.mask[:,:]
+
+        return h_avg, qx_avg, qy_avg

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

@@ -1,8 +1,7 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.1.127
+Version: 2.1.129
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
-License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
 Classifier: Programming Language :: Python :: 3.10
@@ -40,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
@@ -59,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
@@ -70,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.127.dist-info → wolfhece-2.1.129.dist-info}/RECORD

@@ -7,16 +7,16 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=hh_iBS9lNtJrNNwrLcL7mgFIvfzVFEt2XP7ekaFNU04,597283
+wolfhece/PyDraw.py,sha256=igUjT6PZfXW0PpZti-Xo4S2vDnIyFxab-jpVdkmrX9c,600006
 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=Ayz0lqOPfUgjPpqvxragBSd7v47Z79roEy7thwVlH7M,32370
-wolfhece/PyParams.py,sha256=u_yGvrUqgLLkytZ7lGCIFi-7rQC0H2vRDw-MtmdvKPQ,99394
+wolfhece/PyPalette.py,sha256=cwoiYMQW8SMgtUvQwXhIYKJ2NNhAfiemKE8npIu4eqc,33724
+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=-12nKF7OZxMbwzilr0thhZiCsq0xjgn2MfkVe2gXq0M,307022
+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
@@ -29,7 +29,7 @@ wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=U8D7e_OezfrRfgMsa4TyQ7rI4voLKSY3RK-c8fb6rrw,3156
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
-wolfhece/eikonal.py,sha256=5UuCtzcLb3oIhBzuTYxQ6z2qo8iL8xMG1m2J-r-PukI,22891
+wolfhece/eikonal.py,sha256=bIlLBJkE3fYGRwDDO6OV9Zjmi2-O3Z6oTSqTOjfm0VU,23189
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
 wolfhece/gpuview.py,sha256=Jql8pLZ0PpvZ_ScT-U4jsXANZ9j4-m_RWhsLA2HISuQ,24544
@@ -38,28 +38,29 @@ wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
+wolfhece/lagrange_multiplier.py,sha256=0G-M7b2tGzLx9v0oNYYq4_tLAiHcs_39B4o4W3TUVWM,6567
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
-wolfhece/pybridges.py,sha256=rundKU9sMiPNeBAPg9LqU_L5BW8gwyXwyu7KVVThDiA,65964
+wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
-wolfhece/pypolygons_scen.py,sha256=vMfAKXKrW6vKR7l9Fl2hEt-jihLwIiMur7qNTNfwRg4,46101
+wolfhece/pypolygons_scen.py,sha256=WubNPQEk4fC--4qIHZK6mJqQnRs4mAWUpmjRL8q33Sw,46069
 wolfhece/pyshields.py,sha256=6YncgmcA6QvbyIl4jbFRf24uJVjhiSplQKWtZH42lXI,24108
 wolfhece/pyviews.py,sha256=5Hqqo9MRw1eiomYkmc7QywNu1KmEkytLJG-wH_aG38Y,13748
 wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=_Bim7x1c9kg9MBVuabCCYfq2azduJ3DNeYt5iaJRnGQ,449995
+wolfhece/wolf_array.py,sha256=R8P1xlVFR2D9DG_5TGZcsC_gEwVM_9vmeWfKwQ2aFG0,485301
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=R5KyM_m6g3h5mOXo3Fci8jfttSO0tS8oPwk1MiaJaZ0,204004
+wolfhece/wolfresults_2D.py,sha256=X8Dsu9FTqKwgnYOQPD95XDLfRzr4a4uFQ9XKGALew5E,212066
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -81,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=TteRO85B5WMJKYbXiSKkK2SnPGY1celHFBzcAcXnb-A,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
@@ -104,7 +105,7 @@ wolfhece/blender/quads.py,sha256=2XwQqm-K2tvekP1qpYOMi2yz7IThU0CZnn0UaTwDJv0,120
 wolfhece/clientserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/clientserver/clientserver.py,sha256=sNJ8STw0kqUjCB4AerqZNbzCtl5WRe_JRvhe7whNoSE,2798
 wolfhece/coupling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/coupling/hydrology_2d.py,sha256=0zonCPwOLbC1Zs9koKqueEo4InIq5VWlNIb24rLzfXM,48561
+wolfhece/coupling/hydrology_2d.py,sha256=QBIcgujfOX1xX3ARF2PQz6Uqwu3j6EaRw0QlGjG_H7k,53090
 wolfhece/eva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/eva/bootstrap.py,sha256=Ys4xTDIvG_QtxCKWLYzb3_XAZU441jGX7fHIbd9Mvr0,840
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
@@ -117,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=uBNzw2Um3_2TZTo2nlMeKmq50IVTf5GPt-SLwRaEOpA,139369
-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/PyWatershed.py,sha256=Sloe_shGw0IuEfg18Z3gyy3k3a7N-CJSYhHKtbewdDE,98246
-wolfhece/hydrology/RetentionBasin.py,sha256=l73gofdFSdQcGHMM7fkM7e8b9wzd-MnNmVeJDsX21c4,82923
-wolfhece/hydrology/SubBasin.py,sha256=w7xp4lpu5gVX6E873PNtn5zSkGRw2FAJB6-pK3pntfs,171477
+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=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
@@ -185,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
@@ -224,7 +225,7 @@ wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mar/commontools.py,sha256=SiSxpv5BFYEBCEydsE4ZmBuot3KTy0UYMx2aa-4fbuQ,52549
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/math_parser/__init__.py,sha256=Mi7YTrlJtcflyrRdZHHgE-uNPUFfOWmsf8FsOwKBRPI,27961
-wolfhece/math_parser/calculator.py,sha256=e9KVemvVqYofWYEwu_wgMhu4EhmcL6dY790DOwDdxTs,7448
+wolfhece/math_parser/calculator.py,sha256=Avyx-ikIwsficqd-Q4erX6U0zGQ3cAWfADyq6_uHpB0,7493
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=fKED0RhUjCmd0xd0lcOeZqiga5Glqs1ag1boYhXlq0k,54232
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
@@ -264,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
@@ -287,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
@@ -300,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.127.dist-info/METADATA,sha256=-Jot_0JOTpm62mVxzR7ly0uucGGknPoR5CfbEF1DfOQ,2587
-wolfhece-2.1.127.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-wolfhece-2.1.127.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.127.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.127.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,,

{wolfhece-2.1.127.dist-info → wolfhece-2.1.129.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any