wolfhece 2.2.14__py3-none-any.whl → 2.2.16__py3-none-any.whl

wolfhece/wolfresults_2D.py

@@ -39,7 +39,7 @@ from .drawing_obj import Element_To_Draw
 from .PyPalette import wolfpalette
 from .PyTranslate import _
 from .gpuview import GRID_N, Rectangle, VectorField
-from .pyshields import get_d_cr, get_d_cr_susp, izbach_d_cr, get_Shields_2D_Manning, get_friction_slope_2D_Manning, get_shear_velocity_2D_Manning
+from .pyshields import get_d_cr, get_d_cr_susp, izbach_d_cr, get_Shields_2D_Manning, get_friction_slope_2D_Manning, get_shear_velocity_2D_Manning, get_shear_velocity_2D_Colebrook
 from .pyviews import WolfViews
 from .mesh2d.wolf2dprev import prev_parameters_simul, blocks_file
 from .GraphNotebook import PlotPanel
@@ -76,58 +76,126 @@ from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfAr
 from .mesh2d import wolf2dprev
 from .PyVertexvectors import vector, zone, Zones
 
+from numba import jit, njit
 
 def outside_domain(val):
     """ Test if a value is outside the calculated domain """
     return val[0][0] is np.ma.masked or val[1][0] =='-'
 
-def q_splitting(q_left, q_right):
-    """ Splitting of the normal flow between two nodes """
+@jit(nopython=True, nogil=True, cache=True)
+def splitting_rule(q_left:float, q_right:float) -> float:
+    """ Ponderation factor - Splitting at border between two nodes
+
+    :return: factor of the left node (0.5 = equal splitting)
+    """
+    epsilon = 1.e-100
+    prod_q = q_left * q_right  # product of the two flows
+    sum_q  = q_left + q_right  # sum of the two flows
+    if prod_q > 0.:
+        # The 2 flows are in the same direction
+        if q_left > 0.:
+            # left is the upstream node
+            return 1.
+        else:
+            # right is the upstream node
+            return 0.
+    elif prod_q < 0.:
+        # The 2 flows are in opposite direction
+        if q_left > 0.:
+            if sum_q > 0.:
+                # The sum is positive, the left node is the upstream node
+                return 1.
+            elif sum_q < 0.:
+                # The sum is negative, the right node is the upstream node
+                return 0.
+            else:
+                # The sum is null, the flow is centered between the two nodes
+                return 0.5
+        elif q_left < 0.:
+            # CONFLICTING FLOWS
+            return 0.5
+        else:
+            # should not be possible
+            raise ValueError("Splitting rule: q_left is null but product is negative")
+    else:
+        # One flow is null or the product is so small that it is considered as null.
+        # FYI, in the GPU code, we compare to espilon.
+        if q_left>epsilon:
+            # left is the upstream node
+            return 1.
+        elif q_right<-epsilon:
+            # right is the upstream node
+            return 0.
+        else:
+            # The flow is centered between the two nodes
+            return .5
 
+@jit(nopython=True, nogil=True, cache=True)
+def q_splitting(q_left:float, q_right:float) -> float:
+    """ Splitting of the normal flow between two nodes """
+    #FIXME : use splitting_rule ?
+    epsilon = 1.e-100
     prod_q = q_left * q_right
-    sum_q = q_left + q_right
+    sum_q  = q_left + q_right
     if prod_q > 0.:
         if q_left > 0.:
             return q_left
         else:
             return q_right
     elif prod_q < 0.:
-        if sum_q > 0.:
-            return q_left
-        elif sum_q < 0.:
-            return q_right
+        if q_left > 0.:
+            if sum_q > 0.:
+                return q_left
+            elif sum_q < 0.:
+                return q_right
+            else:
+                return 0.
+        elif q_left < 0.:
+            # CONFLICTING FLOWS
+            return sum_q / 2.
         else:
-            return 0.
+            # should not be possible
+            raise ValueError("Splitting rule: q_left is null but product is negative")
     else:
-        if q_left<0.:
-            return 0.
-        elif q_right<0.:
-            return 0.
+        if q_left>epsilon:
+            # Left is the upstream node
+            return q_left
+        elif q_right<-epsilon:
+            # right is the upstream node
+            return q_right
         else:
             return sum_q / 2.
 
-def u_splitting(q_left, q_right, h_left, h_right):
+@jit(nopython=True, nogil=True, cache=True)
+def u_splitting(q_left:float, q_right:float, h_left:float, h_right:float) -> float:
     """ Splitting of the normal flow velocity between two nodes """
-
+    #FIXME : use splitting_rule ?
+    epsilon = 1.e-100
     prod_q = q_left * q_right
-    sum_q = q_left + q_right
+    sum_q  = q_left + q_right
     if prod_q > 0.:
         if q_left > 0.:
             return q_left/h_left
         else:
             return q_right/h_right
     elif prod_q < 0.:
-        if sum_q > 0.:
-            return q_left/h_left
-        elif sum_q < 0.:
-            return q_right/h_right
+        if q_left > 0.:
+            if sum_q > 0.:
+                return q_left/h_left
+            elif sum_q < 0.:
+                return q_right/h_right
+            else:
+                return 0.
+        elif q_left < 0.:
+            return (q_left/h_left + q_right/h_right) / 2.
         else:
-            return 0.
+            # should not be possible
+            raise ValueError("Splitting rule: q_left is null but product is negative")
     else:
-        if q_left<0.:
-            return 0.
-        elif q_right<0.:
-            return 0.
+        if q_left>epsilon:
+            return q_left / h_left
+        elif q_right<-epsilon:
+            return q_right / h_right
         else:
             return (q_left/h_left + q_right/h_right) / 2.
 
@@ -1507,6 +1575,7 @@ class OneWolfResult:
     """
     def __init__(self, idx:int=0, parent = None):
 
+        self.parent:"Wolfresults_2D"
         self.parent = parent
 
         self.wx_exists = wx.GetApp() is not None
@@ -1539,6 +1608,13 @@ class OneWolfResult:
         self._sedimentdensity = 2.65
         self._force_update_shields = True # Force la MAJ du Shields si le diametre ou la densité change
 
+        self._is_manning_strickler = True
+        self._is_colebrook = False
+
+        self._has_turbulence_model = False
+        self._cmu = 0.09
+        self._cnu = 0.08
+
         # self.mngselection = SelectionData(self.current)
 
     @property
@@ -1658,12 +1734,24 @@ class OneWolfResult:
         elif which==views_2D.HEAD:
             self._current=(self.qx**2.+self.qy**2.)**.5/self.waterdepth/(2.*9.81)+self.waterdepth+self.top
             nullvalue = self.qx.nullvalue
+
         elif which==views_2D.KINETIC_ENERGY:
             self._current=self.k
             nullvalue = self.k.nullvalue
         elif which==views_2D.EPSILON:
             self._current=self.eps
             nullvalue = self.eps.nullvalue
+
+        elif which==views_2D.TURB_VISC_2D:
+
+            self._current = self.k**2./self.eps * self._cmu
+            nullvalue = self.k.nullvalue
+
+        elif which==views_2D.TURB_VISC_3D:
+            self.U_Shear = self.get_u_shear()
+            self._current = self.U_Shear * self.waterdepth * self._cnu
+            nullvalue = self.waterdepth.nullvalue
+
         elif which==views_2D.VECTOR_FIELD_Q:
             self._current=(self.qx**2.+self.qy**2.)**.5
             nullvalue = self.qx.nullvalue
@@ -1966,7 +2054,12 @@ class OneWolfResult:
             qnorm = (self.qx**2.+self.qy**2.)**.5
             qnorm.array.mask=self.waterdepth.array.mask
 
-            _u_shear = np.asarray([get_shear_velocity_2D_Manning(qnorm.array[i,j],
+            if self._is_manning_strickler:
+                _u_shear = np.asarray([get_shear_velocity_2D_Manning(qnorm.array[i,j],
+                                                     self.waterdepth.array[i,j],
+                                                     self.rough_n.array.data[i,j]) for i,j in ij])
+            elif self._is_colebrook:
+                _u_shear = np.asarray([get_shear_velocity_2D_Colebrook(qnorm.array[i,j],
                                                      self.waterdepth.array[i,j],
                                                      self.rough_n.array.data[i,j]) for i,j in ij])
 
@@ -1974,9 +2067,16 @@ class OneWolfResult:
 
             return u_shear
 
+        if not (self._is_manning_strickler or self._is_colebrook):
+            logging.error(_('Surface friction is not Manning-Strickler or Colebrook.'))
+            logging.error(_('Cannot compute shear velocity or Program it... in get_u_shear'))
+            ret = WolfArray(mold=self.waterdepth)
+            ret.array.fill(0.)
+            return ret
+
         logging.info(_('Computing shear velocity'))
         u_shear = compute()
-        logging.info(_('End of computing shear velocity'))
+        # logging.info(_('End of computing shear velocity'))
 
         return u_shear
 
@@ -2207,12 +2307,14 @@ class Wolfresults_2D(Element_To_Draw):
         if fname is not None:
 
             if loader is not None:
+                # Used for GPU results
                 if loader(fname) <0:
                     self.loaded = False
                     logging.error(_('Error while loading results - Abort !'))
                     return
 
             else:
+                # We are here for "classic" CPU results
                 parts=splitext(fname)
                 if len(parts)>1:
                     self.filename = parts[0]
@@ -2253,50 +2355,78 @@ class Wolfresults_2D(Element_To_Draw):
                         curhead.translx = self.translx
                         curhead.transly = self.transly
 
-                        self.myblocks[getkeyblock(i)].waterdepth.dx = dx
-                        self.myblocks[getkeyblock(i)].waterdepth.dy = dy
-                        self.myblocks[getkeyblock(i)].waterdepth.nbx = nbx
-                        self.myblocks[getkeyblock(i)].waterdepth.nby = nby
-                        self.myblocks[getkeyblock(i)].waterdepth.origx = ox
-                        self.myblocks[getkeyblock(i)].waterdepth.origy = oy
-                        self.myblocks[getkeyblock(i)].waterdepth.translx = self.translx
-                        self.myblocks[getkeyblock(i)].waterdepth.transly = self.transly
-
-                        self.myblocks[getkeyblock(i)].top.dx = dx
-                        self.myblocks[getkeyblock(i)].top.dy = dy
-                        self.myblocks[getkeyblock(i)].top.nbx = nbx
-                        self.myblocks[getkeyblock(i)].top.nby = nby
-                        self.myblocks[getkeyblock(i)].top.origx = ox
-                        self.myblocks[getkeyblock(i)].top.origy = oy
-                        self.myblocks[getkeyblock(i)].top.translx = self.translx
-                        self.myblocks[getkeyblock(i)].top.transly = self.transly
-
-                        self.myblocks[getkeyblock(i)].qx.dx = dx
-                        self.myblocks[getkeyblock(i)].qx.dy = dy
-                        self.myblocks[getkeyblock(i)].qx.nbx = nbx
-                        self.myblocks[getkeyblock(i)].qx.nby = nby
-                        self.myblocks[getkeyblock(i)].qx.origx = ox
-                        self.myblocks[getkeyblock(i)].qx.origy = oy
-                        self.myblocks[getkeyblock(i)].qx.translx = self.translx
-                        self.myblocks[getkeyblock(i)].qx.transly = self.transly
-
-                        self.myblocks[getkeyblock(i)].qy.dx = dx
-                        self.myblocks[getkeyblock(i)].qy.dy = dy
-                        self.myblocks[getkeyblock(i)].qy.nbx = nbx
-                        self.myblocks[getkeyblock(i)].qy.nby = nby
-                        self.myblocks[getkeyblock(i)].qy.origx = ox
-                        self.myblocks[getkeyblock(i)].qy.origy = oy
-                        self.myblocks[getkeyblock(i)].qy.translx = self.translx
-                        self.myblocks[getkeyblock(i)].qy.transly = self.transly
-
-                        self.myblocks[getkeyblock(i)].rough_n.dx = dx
-                        self.myblocks[getkeyblock(i)].rough_n.dy = dy
-                        self.myblocks[getkeyblock(i)].rough_n.nbx = nbx
-                        self.myblocks[getkeyblock(i)].rough_n.nby = nby
-                        self.myblocks[getkeyblock(i)].rough_n.origx = ox
-                        self.myblocks[getkeyblock(i)].rough_n.origy = oy
-                        self.myblocks[getkeyblock(i)].rough_n.translx = self.translx
-                        self.myblocks[getkeyblock(i)].rough_n.transly = self.transly
+                        curblock.waterdepth.dx = dx
+                        curblock.waterdepth.dy = dy
+                        curblock.waterdepth.nbx = nbx
+                        curblock.waterdepth.nby = nby
+                        curblock.waterdepth.origx = ox
+                        curblock.waterdepth.origy = oy
+                        curblock.waterdepth.translx = self.translx
+                        curblock.waterdepth.transly = self.transly
+
+                        curblock.top.dx = dx
+                        curblock.top.dy = dy
+                        curblock.top.nbx = nbx
+                        curblock.top.nby = nby
+                        curblock.top.origx = ox
+                        curblock.top.origy = oy
+                        curblock.top.translx = self.translx
+                        curblock.top.transly = self.transly
+
+                        curblock.qx.dx = dx
+                        curblock.qx.dy = dy
+                        curblock.qx.nbx = nbx
+                        curblock.qx.nby = nby
+                        curblock.qx.origx = ox
+                        curblock.qx.origy = oy
+                        curblock.qx.translx = self.translx
+                        curblock.qx.transly = self.transly
+
+                        curblock.qy.dx = dx
+                        curblock.qy.dy = dy
+                        curblock.qy.nbx = nbx
+                        curblock.qy.nby = nby
+                        curblock.qy.origx = ox
+                        curblock.qy.origy = oy
+                        curblock.qy.translx = self.translx
+                        curblock.qy.transly = self.transly
+
+                        curblock.rough_n.dx = dx
+                        curblock.rough_n.dy = dy
+                        curblock.rough_n.nbx = nbx
+                        curblock.rough_n.nby = nby
+                        curblock.rough_n.origx = ox
+                        curblock.rough_n.origy = oy
+                        curblock.rough_n.translx = self.translx
+                        curblock.rough_n.transly = self.transly
+
+                        curblock.eps.dx = dx
+                        curblock.eps.dy = dy
+                        curblock.eps.nbx = nbx
+                        curblock.eps.nby = nby
+                        curblock.eps.origx = ox
+                        curblock.eps.origy = oy
+                        curblock.eps.translx = self.translx
+                        curblock.eps.transly = self.transly
+
+                        curblock.k.dx = dx
+                        curblock.k.dy = dy
+                        curblock.k.nbx = nbx
+                        curblock.k.nby = nby
+                        curblock.k.origx = ox
+                        curblock.k.origy = oy
+                        curblock.k.translx = self.translx
+                        curblock.k.transly = self.transly
+
+                        curblock._is_manning_strickler = self.myparam.blocks[i].is_Manning_surface_friction
+                        curblock._is_colebrook = self.myparam.blocks[i].is_Colebrook_surface_friction
+                        curblock._has_turbulence_model = self.myparam.blocks[i].has_turbulence
+
+                        _param_turb = self.myparam.blocks[i].get_params_turbulence()
+                        if 'cmu' in _param_turb:
+                            curblock._cmu = _param_turb['cmu']
+                        if 'cnu' in _param_turb:
+                            curblock._cnu = _param_turb['cnu']
 
                 else:
                     nb_blocks = self.myblocfile.nb_blocks
@@ -2310,6 +2440,18 @@ class Wolfresults_2D(Element_To_Draw):
                         curblock.qx.set_header(self.mymnap.head_blocks[getkeyblock(i)])
                         curblock.qy.set_header(self.mymnap.head_blocks[getkeyblock(i)])
                         curblock.rough_n.set_header(self.mymnap.head_blocks[getkeyblock(i)])
+                        curblock.eps.set_header(self.mymnap.head_blocks[getkeyblock(i)])
+                        curblock.k.set_header(self.mymnap.head_blocks[getkeyblock(i)])
+
+                        curblock._is_manning_strickler = self.myparam.blocks[i].is_Manning_surface_friction
+                        curblock._is_colebrook = self.myparam.blocks[i].is_Colebrook_surface_friction
+                        curblock._has_turbulence_model = self.myparam.blocks[i].has_turbulence
+
+                        _param_turb = self.myparam.blocks[i].get_params_turbulence()
+                        if 'cmu' in _param_turb:
+                            curblock._cmu = _param_turb['cmu']
+                        if 'cnu' in _param_turb:
+                            curblock._cnu = _param_turb['cnu']
 
                 self.allocate_ressources()
                 self.read_topography()
@@ -2832,7 +2974,6 @@ class Wolfresults_2D(Element_To_Draw):
         self.myparam.read_file(self.filename)
 
         self.myblocfile = blocks_file(self)
-        # self.myblocfile.read_file()
 
         self.mymnap = WolfArrayMNAP(self.filename)
 
@@ -2864,7 +3005,7 @@ class Wolfresults_2D(Element_To_Draw):
         for curblock in self.myblocks.values():
             curblock.filter_independent_zones(n_largest)
 
-    def set_currentview(self, which=None, force_wx=False, force_updatepal:bool=False):
+    def set_currentview(self, which:views_2D = None, force_wx:bool = False, force_updatepal:bool=False):
         """
         Set the current view --> see 'views_2D' for supported values
 
@@ -2895,11 +3036,14 @@ class Wolfresults_2D(Element_To_Draw):
             self.plotting=True
             self.mimic_plotdata()
 
-            if which in VIEWS_SEDIMENTARY:
+            if which in VIEWS_SEDIMENTARY + [views_2D.TURB_VISC_3D, views_2D.U_SHEAR]:
 
                 if not self.loaded_rough:
                     self.read_roughness_param()
 
+            if which in [views_2D.KINETIC_ENERGY, views_2D.TURB_VISC_2D, views_2D.TURB_VISC_3D, views_2D.EPSILON]:
+                self.read_oneresult(self.current_result)
+
             for curblock in self.myblocks.values():
                 curblock.set_current(which)
 
@@ -2933,6 +3077,8 @@ class Wolfresults_2D(Element_To_Draw):
             if self.mapviewer is not None:
                 self.reset_plot()
                 self.mapviewer.Refresh()
+        else:
+            logging.error(_('Unknown view - {}'.format(which)))
 
     def allocate_ressources(self):
         """Allocation de l'espace mémoire utile pour le stockage des résultats de chaque bloc"""

{wolfhece-2.2.14.dist-info → wolfhece-2.2.16.dist-info}/METADATA

@@ -1,18 +1,17 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.14
+Version: 2.2.16
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 11
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: <3.14,>=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython==4.2.*
 Requires-Dist: pyogrio

{wolfhece-2.2.14.dist-info → wolfhece-2.2.16.dist-info}/RECORD

@@ -4,12 +4,12 @@ wolfhece/GraphNotebook.py,sha256=2TR8qjEwpMtl34QWgYNVe_PgTnuwhUxT5f9Y2zrmN2U,282
 wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
-wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
+wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=MUxnzykOYLJFkF9tA6nutkasSTyDEuNzbwnfa_vmZF8,635057
-wolfhece/PyGui.py,sha256=jhpOPYRDG3ms1oi7FUs2W80T4SdPssZEnijxqFtn6vA,145199
+wolfhece/PyDraw.py,sha256=JtBWSceBWlP7oFT6hvPoQ3Oa-4KVZMvq20Ktroae7rY,645008
+wolfhece/PyGui.py,sha256=rOAjxcVuRJ7M76pf5g4o65yxJugVgu9NzWPV3LCn2Ts,145668
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
 wolfhece/PyPalette.py,sha256=k9b_95GYD0USQ8DS5zGXeZ577712U6772kmhEbJtlXw,35406
@@ -17,14 +17,14 @@ wolfhece/PyParams.py,sha256=Dh9C_WYICMjo3m9roRySsu8ZgFzzYhSr6RpbaXZni0M,99423
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=WT2UprotBUEA6rvs8kXfPRscKrhIL4_pya2UylzoBJE,50385
-wolfhece/PyVertexvectors.py,sha256=yPqE1rmqCSAucjNjSo1_srKHMwjqYWe0lx7S2Wbpryw,327905
-wolfhece/PyWMS.py,sha256=e6cMA72xLnpFZQtM99lItTyIfUQKz0f5f1iL_bwJVPQ,9303
+wolfhece/PyVertexvectors.py,sha256=D-7aLqxAcJ39xDx1fwA1zzP1uFR28IiZUjFwpQEcv8E,328102
+wolfhece/PyWMS.py,sha256=-wU-oWS5il1z702gYd90xHx5O7PvGNr9nb693oue_cI,31412
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
 wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,1538
 wolfhece/Results2DGPU.py,sha256=45bLAkWvqHcw60QIP7qXyizbmS7buoDC7ndzOVfiWXg,26302
-wolfhece/__init__.py,sha256=5ijazf1b2m6y5V8VJwbYKh0AVnTSwuwrmSIu7rp21Ds,502
+wolfhece/__init__.py,sha256=ZansIsawdQSEC-xoOW33zVZEWjdljGsIIVVAMJSus08,504
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=U8D7e_OezfrRfgMsa4TyQ7rI4voLKSY3RK-c8fb6rrw,3156
@@ -33,7 +33,7 @@ wolfhece/dike.py,sha256=eG9EDCRk46Nlzpg5OycUeOag_T8joyJ2wzTkQgAT5F0,30710
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/eikonal.py,sha256=iDeDs571sVXGe4IsPSJ1Sa4hX8Ri2jWE7u83xzvA2K8,23189
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
-wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
+wolfhece/friction_law.py,sha256=_VrcFm2E--RfOvGjsazL5Zve_p5fIhzsT62AElI5E04,5501
 wolfhece/gpuview.py,sha256=Jql8pLZ0PpvZ_ScT-U4jsXANZ9j4-m_RWhsLA2HISuQ,24544
 wolfhece/images_tiles.py,sha256=w5BX6kRqA0wW9TWyKrJUIRl-XyqHclq_kp5ET2VA0Sg,3227
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
@@ -51,20 +51,20 @@ wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=bKUwVvFMtAI4np4JJAkIa4xBDLw9l4py3l-Mjlfr_rM,2242
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=WubNPQEk4fC--4qIHZK6mJqQnRs4mAWUpmjRL8q33Sw,46069
-wolfhece/pyshields.py,sha256=6YncgmcA6QvbyIl4jbFRf24uJVjhiSplQKWtZH42lXI,24108
+wolfhece/pyshields.py,sha256=ymH393EQys2aZmh41ccJnWmmlF7dVa-eTY32jFgwK08,25269
 wolfhece/pyviews.py,sha256=zuZjWUptRDm1MTE1PN4Xj_qSITnojgDMG0LlFIBH3SE,13739
 wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=PlImSCX5lUeoqPR7ogqak_Zl6dLyGn5EXUzeD_6-xAU,497218
+wolfhece/wolf_array.py,sha256=COkhCvihqI3OyK_cKWC_NNu9NKjErEbDsC85A1hXQ-8,497389
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
-wolfhece/wolf_texture.py,sha256=KlT8g4dBmH819n8mqQ8pCHLGST1C5bd4OaR_et5wsUM,18092
+wolfhece/wolf_texture.py,sha256=_YMMz3w1re70rrpO_AcFlb7QC4R3_631Hgnl5BRNH1o,20832
 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=N-L9gmurQEMUjrC23HJjWRRaIxvcdhk6R8KKcb94LJw,218231
+wolfhece/wolfresults_2D.py,sha256=33IQUs98-S19aJhWy7TXEFcaNGlKpe4ZqlxOouVOC1Q,224101
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -86,8 +86,8 @@ 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=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=K1wI1QprwJhkLzJfrbY1MD9huUZViybAZpuclY2ssps,388
-wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
+wolfhece/apps/version.py,sha256=ZAjn9R9bjXTgmckSMMojvuK1YxDl0a8--udGIHG3sTk,388
+wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
 wolfhece/apps/wolf_logo2.bmp,sha256=pCJFVDn_-rHru6fumazVNM4BqAaobM0Xg0zI0DFWMSQ,5830
@@ -95,7 +95,8 @@ wolfhece/apps/wolf_logo3.bmp,sha256=AxRvS_uc2MJn_ksMExPhFEDJ0_PmlR3xU13gzfc28xk,
 wolfhece/apps/wolf_logo4.bmp,sha256=N6d_NZ3V2M-qtSdTM0LP3PhU2TtltB_UNW6Z2WiLrvM,5830
 wolfhece/apps/wolfcompare2Darrays.py,sha256=AfEJjku_oSWWqyCIDOqId0quZrS_NpTIFN4fHcVDWb4,4179
 wolfhece/apps/wolfhydro.py,sha256=EsXTtXhnsQV1j-tiFYcyfMrJpjFv1MrWiftwODdi_8I,817
-wolfhece/assets/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
+wolfhece/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/assets/mesh.py,sha256=aO3BWg7f_73bV5yryDdhoIoyWqEQ1UTq2SkQ3y8aZnE,27384
 wolfhece/assets/speedometer.py,sha256=Oqttbw-AB9niaQRNDd0bmyu-ozyOHoYRQd1dApywwdU,5877
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/chamber.py,sha256=ZWNjTAmTaH8u8J00n8uEib7dy84mUfHWN43805W_Qsw,2354
@@ -137,7 +138,7 @@ wolfhece/hydrology/Outlet.py,sha256=jdjYN2gIolQJ5prf1wVfxm7cp_YguwQ0JMRsC9ks-Tg,
 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=_grNjUSgFVViH0HDmRKyYt-ag9Y63y9hVOqVXOfk2OQ,182478
+wolfhece/hydrology/SubBasin.py,sha256=ORK1VmvBOfyDjfOTxFQ9bcHe78pAoVcRWwu5Vm-CDHo,181790
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
 wolfhece/hydrology/cst_exchanges.py,sha256=yT2cSIXjlfshPkSAdhyBxYwCPZ5L9s75BYM24tEO6_4,39699
@@ -148,9 +149,9 @@ wolfhece/hydrology/read.py,sha256=BaaIp1x44wPQz2LkWtzu7ZNKx3Gw_WDtAw-B4y_C2IU,95
 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
-wolfhece/hydrometry/kiwis.py,sha256=pCupiQvzOM0vtuN1Iqr7iba2kj-4gtj_-vDE-NWMAew,62936
+wolfhece/hydrometry/kiwis.py,sha256=HDsTZenqG5La4t0Rv9iJeScH_j07w2k3J5fMlj74jI8,64491
 wolfhece/hydrometry/kiwis_gui.py,sha256=xubayI3ijq87l47pcVtP-D9mOGurOSu9rKz511oa7n0,24898
-wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
+wolfhece/hydrometry/kiwis_wolfgui.py,sha256=uEHArUN_XKs-eX4VLUOBZCJdiFJ3G9qBVs34zqdpH20,4072
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
 wolfhece/icons/image.png,sha256=jomOPNO4HBArBZe8Ya189Iar5nzhO8c0S9JW-6iaErk,2684
@@ -167,7 +168,7 @@ wolfhece/lagrangian/particles.py,sha256=sqp-_gfsIt8s3GNcI1eKaeOBMSo2C-wPrL7FpjkE
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
 wolfhece/lazviewer/_add_path.py,sha256=XgMEXRhFhx9-B1hUsP7Zr199zNljYwT5dGMYSB9jRa4,639
-wolfhece/lazviewer/laz_viewer.py,sha256=IZpNW-rvzn6__YOvhPCJmObQEJsOqgDobUwrX82lmlk,81614
+wolfhece/lazviewer/laz_viewer.py,sha256=QECvVMSshgO4C7ulBTBcB4oPwLCU8WP8x6W026RWf5w,81621
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -262,7 +263,7 @@ wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=Y4DF68uAklF3fXJgf05nb_JvJk2pvzcu_wu5nFXpWJo,5008
 wolfhece/mesh2d/gpu_2d.py,sha256=XeQIYMqdwFsLw-wDE5jbyphhCgta5QfZhE_7lVtNiCE,24260
 wolfhece/mesh2d/simple_2d.py,sha256=mVFbTTG2Ah1idz2aYrxI44mi-Z24nC9Vxw1qP2Oib3Y,111350
-wolfhece/mesh2d/wolf2dprev.py,sha256=D3CmGMYuhOJxQ7AyTSK97gko1ZaIRvO-0RbD2XvHfDM,491600
+wolfhece/mesh2d/wolf2dprev.py,sha256=5ZEl0Dm7CcncVJlF4N0E96MaSa6O8B_nvwUQs8kdoA4,492452
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
@@ -333,8 +334,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.2.14.dist-info/METADATA,sha256=Y7UYL2Y3HjkDspeALQzelJ9yNiWX4bx42gHbYLXjrJA,2731
-wolfhece-2.2.14.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-wolfhece-2.2.14.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.14.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.14.dist-info/RECORD,,
+wolfhece-2.2.16.dist-info/METADATA,sha256=1WRiJ8lFWgUL9HhzwiCI7GNSeQWMjO-1Q_b9m7xF8x8,2679
+wolfhece-2.2.16.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+wolfhece-2.2.16.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.16.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.16.dist-info/RECORD,,

{wolfhece-2.2.14.dist-info → wolfhece-2.2.16.dist-info}/WHEEL

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