wolfhece 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

wolfhece/wolf_texture.py

@@ -7,7 +7,7 @@ try:
 except:
     msg=_('Error importing OpenGL library')
     msg+=_('   Python version : ' + sys.version)
-    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different fils present on your desktop')
+    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different files present on your desktop')
     raise Exception(msg)
 
 from os.path import exists

wolfhece/wolfresults_2D.py

@@ -18,7 +18,7 @@ try:
 except:
     msg=_('Error importing OpenGL library')
     msg+=_('   Python version : ' + sys.version)
-    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different fils present on your desktop')
+    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different files present on your desktop')
     raise Exception(msg)
 
 from .drawing_obj import Element_To_Draw
@@ -67,6 +67,60 @@ from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfAr
 from .mesh2d import wolf2dprev
 from .PyVertexvectors import vector, zone, Zones
 
+
+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 """
+    prod_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
+        else:
+            return 0.
+    else:
+        if q_left<0.:
+            return 0.
+        elif q_right<0.:
+            return 0.
+        else:
+            return sum_q / 2.
+
+def u_splitting(q_left, q_right, h_left, h_right):
+    """ Splitting of the normal flow velocity between two nodes """
+    prod_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
+        else:
+            return 0.
+    else:
+        if q_left<0.:
+            return 0.
+        elif q_right<0.:
+            return 0.
+        else:
+            return (q_left/h_left + q_right/h_right) / 2.
+
+
 class Props_Res_2D(wx.Frame):
     """
     Fenêtre de propriétésd'un Wolfresults_2D
@@ -1813,6 +1867,8 @@ class Wolfresults_2D(Element_To_Draw):
         self.translx=0.
         self.transly=0.
 
+        self.head_blocks={}
+
         if fname is not None:
 
             if loader is not None:
@@ -1833,7 +1889,6 @@ class Wolfresults_2D(Element_To_Draw):
                         self.transly=float(trl[2])
 
                 self.myblocks={}
-                self.head_blocks={}
                 self.read_param_simul()
 
                 if exists(self.filename+'.head') or exists(join(dirname(self.filename),'bloc1.head')):
@@ -1919,6 +1974,8 @@ class Wolfresults_2D(Element_To_Draw):
                 self.read_ini_mb()
 
                 self.loaded_rough = False
+        else:
+            self.myblocks={}
 
         self.nbx = 1
         self.nby = 1
@@ -2028,8 +2085,6 @@ class Wolfresults_2D(Element_To_Draw):
 
         curhead.head_blocks = self.head_blocks.copy()
 
-        curhead.nbdims = 2
-
         if abs:
             curhead.origx += curhead.translx
             curhead.origy += curhead.transly
@@ -2069,10 +2124,7 @@ class Wolfresults_2D(Element_To_Draw):
             retarray = WolfArrayMB()
             retarray.set_header(self.get_header())
             for i in range(self.nb_blocks):
-                if copyarray :
-                    retarray.add_block(WolfArray(mold=self[i]))
-                else:
-                    retarray.add_block(self[i])
+                retarray.add_block(self[i], copyarray=copyarray)
         else:
             if copyarray :
                 retarray = WolfArray(mold=self[0])
@@ -2498,12 +2550,11 @@ class Wolfresults_2D(Element_To_Draw):
             self.myblocks[getkeyblock(whichblock,False)].k.count()
             self.myblocks[getkeyblock(whichblock,False)].eps.count()
 
-            if self.epsilon > 0.:
-                self.myblocks[getkeyblock(whichblock,False)].waterdepth.set_nullvalue_in_mask()
-                self.myblocks[getkeyblock(whichblock,False)].qx.set_nullvalue_in_mask()
-                self.myblocks[getkeyblock(whichblock,False)].qy.set_nullvalue_in_mask()
-                self.myblocks[getkeyblock(whichblock,False)].k.set_nullvalue_in_mask()
-                self.myblocks[getkeyblock(whichblock,False)].eps.set_nullvalue_in_mask()
+            self.myblocks[getkeyblock(whichblock,False)].waterdepth.set_nullvalue_in_mask()
+            self.myblocks[getkeyblock(whichblock,False)].qx.set_nullvalue_in_mask()
+            self.myblocks[getkeyblock(whichblock,False)].qy.set_nullvalue_in_mask()
+            self.myblocks[getkeyblock(whichblock,False)].k.set_nullvalue_in_mask()
+            self.myblocks[getkeyblock(whichblock,False)].eps.set_nullvalue_in_mask()
 
     def read_oneresult(self, which:int=-1):
         """
@@ -2934,6 +2985,42 @@ class Wolfresults_2D(Element_To_Draw):
         else:
             return q
 
+    def get_q_alongpoly_raster_splitting(self, myvect:vector, to_sum=True):
+        """
+        Récupération du débit sous un vecteur après avoir rasterisé selon les bords et appliqué le splitting WOLF aux flux
+
+        Forcage préalable du vecteur slon la grille de calcul
+
+        to_sum pour sommer les valeurs et multiplier par la taille de maille
+        """
+
+        myhead = self.get_header_block(1)
+        myvect = myhead.rasterize_vector(myvect)
+        mynormals = myvect.get_normal_segments()
+        xy_center = myvect.get_center_segments()
+
+        norm_neigh = mynormals.copy()
+        norm_neigh[:,0] = norm_neigh[:,0] * myhead.dx / 2.
+        norm_neigh[:,1] = norm_neigh[:,1] * myhead.dy / 2.
+        xy_left  = xy_center + norm_neigh
+        xy_right = xy_center - norm_neigh
+        values_left  = [self.get_values_from_xy(x, y, integrate_q=True) for x,y in xy_left]
+        values_right = [self.get_values_from_xy(x, y, integrate_q=True) for x,y in xy_right]
+
+        q=[]
+        for curnorm, val_left, val_right in zip(mynormals, values_left, values_right):
+            if not(outside_domain(val_left) or outside_domain(val_right)):
+                if curnorm[0] != 0.:
+                    q.append(q_splitting(val_left[0][1], val_left[0][1]) * curnorm[0])
+                else:
+                    q.append(q_splitting(val_left[0][2], val_left[0][2]) * curnorm[1])
+
+        q = np.asarray(q)
+        if to_sum:
+            return q.sum()
+        else:
+            return q
+
     def _plot_one_q(self, vect:vector, x_or_y:str = 'x', absolute=True) -> float:
 
         qloc = self.get_q_alongpoly_with_neighbor(vect,x_or_y,True)
@@ -2942,14 +3029,25 @@ class Wolfresults_2D(Element_To_Draw):
 
         return qloc
 
+    def _plot_one_q_raster_splitting(self, vect:vector, absolute=True) -> float:
+
+        qloc = self.get_q_alongpoly_raster_splitting(vect,True)
+        if absolute:
+            qloc = abs(qloc)
+
+        return qloc
+
+    #FIXME : rename 'x_or_y' to be more explicit
     def plot_q(self, vect:Union[vector, list[vector]], x_or_y:Union[str, list[str]] = 'x', toshow=False, absolute=True, figax = None):
         """
         Plot discharge along vector
 
-        vector : wolf polyline -- will be splitted according to spatial step size
-        x_or_y : 'x' for qx, 'y' for qy - integration axis
+        :param vector : wolf polyline -- will be splitted according to spatial step size
+        :param x_or_y : 'x' for qx, 'y' for qy - integration axis or 'border' for q along border
 
         """
+        assert x_or_y in ['x', 'y', 'border'], 'x_or_y must be "x", "y" or "border"'
+
         nb = self.get_nbresults()
         times, steps = self.times, self.steps
 
@@ -2962,13 +3060,16 @@ class Wolfresults_2D(Element_To_Draw):
             q=[]
             for i in range(nb):
                 self.read_oneresult(i)
-                q.append(self._plot_one_q(vect, x_or_y, absolute))
+                if x_or_y in ['x', 'y']:
+                    q.append(self._plot_one_q(vect, x_or_y, absolute))
+                elif x_or_y == 'border':
+                    q.append(self._plot_one_q_raster_splitting(vect, absolute))
 
             ax.plot(times,q, c='blue', label=_('Q vs Time'))
 
         else:
             assert len(vect) == len(x_or_y), 'Exepected same length for vect and x_or_y'
-            q={}
+            q={int:list}
             for i in range(len(vect)):
                 q[i]= []
 
@@ -2976,7 +3077,11 @@ class Wolfresults_2D(Element_To_Draw):
                 self.read_oneresult(i)
 
                 for idx, (curvec, orient) in enumerate(zip(vect, x_or_y)):
-                    q[idx].append(self._plot_one_q(curvec, orient, absolute))
+
+                    if orient in ['x', 'y']:
+                        q[idx].append(self._plot_one_q(curvec, orient, absolute))
+                    elif orient == 'border':
+                        q[idx].append(self._plot_one_q_raster_splitting(curvec, absolute))
 
             for i in range(len(vect)):
                 ax.plot(times,q[i], label=_('Q vs Time - vector {}'.format(i)))

{wolfhece-2.0.4.dist-info → wolfhece-2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.4
+Version: 2.0.6
 Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -47,6 +47,10 @@ Requires-Dist: tifffile
 Requires-Dist: numba
 Requires-Dist: xmltodict
 Requires-Dist: opencv-python
+Requires-Dist: xarray
+Requires-Dist: rasterio
+Requires-Dist: h5py
+Requires-Dist: basemap
 
 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.0.4.dist-info → wolfhece-2.0.6.dist-info}/RECORD

@@ -1,59 +1,60 @@
 wolfhece/CpGrid.py,sha256=TB4nAd7Dmwz6EQHtNTbKeBoLKXeYqt1f4YZgnYszT80,10685
-wolfhece/GraphNotebook.py,sha256=Y_qVPQjuvJo1xXTf17PfphzUburf4-oPNhDhKE3Voro,27687
-wolfhece/GraphProfile.py,sha256=eXgSuUCitORZP7XkKWNkAZ6dLnACd15B_DqNmU8fR7k,69263
-wolfhece/Lidar2002.py,sha256=XnnfV8M3MkAlLq9flF2xQQqW--qiF8iRfI0SMUBVXKU,5793
+wolfhece/GraphNotebook.py,sha256=06u2oiTAfLtwK_mlmyEAKusTdK9jE_LcMrHhUe_YrrE,27658
+wolfhece/GraphProfile.py,sha256=nP8xnwUBw2EIxfI7YysuWbwA7-sTZeONUMPkIVimOyg,68909
+wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/PyConfig.py,sha256=kas6TqHT64g-Cn4-5QqsYHbumwfZtBQ9lo7BUl1C1Ts,7547
-wolfhece/PyCrosssections.py,sha256=782aCKe0ZGMhm6dK-6w_Kr0Eyud5GBQJb-9Y06ytDNo,111142
-wolfhece/PyDraw.py,sha256=XElArpTuPWMuCy9J7aSYeMNrxLVb9jrDS1US-Oo21HE,289229
-wolfhece/PyGui.py,sha256=DtP2JNhHeopSHSFreKoM7UC5WEjovQpHgRGRkVtnR2w,52070
+wolfhece/PyCrosssections.py,sha256=HtvhSracK8Yz6RCNQCfjzflvend_DtybI9mTb9gnTrs,111048
+wolfhece/PyDraw.py,sha256=Tpszynd8zeRPczhVsTZcDh7vkHF58z7FLLmVQj2ZLaY,297378
+wolfhece/PyGui.py,sha256=WWu4CJrmwsih5c6YLoXnxGdtrCi77cefecMaqr_bVzc,52313
 wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
 wolfhece/PyHydrographs.py,sha256=2BqsvZSb8WuH22SYxU_BcakfA43yV_qA0ujWQE4uwQo,3407
-wolfhece/PyPalette.py,sha256=3xMUZLLLZ16EyBKZnLxgq695mYhfJKpFShq7V2SQvf8,21544
-wolfhece/PyParams.py,sha256=djTIM6u3GDHuxLnAA1IsVi0ikW4TXUc_s9_VloVF60s,77473
+wolfhece/PyPalette.py,sha256=Y3GHvP-J56IsBeNsgn_bJR3tQwAISMZ9r-tcGIJ55wk,21544
+wolfhece/PyParams.py,sha256=PzGnWzlo7dyw9yaDZ90eS3HrXrPEukN1BOEtTPsthEU,77473
 wolfhece/PyPictures.py,sha256=wI6t38rmRiNG1pGWTXVW-nWQO2mg8SH7Gf-X2HIi02A,2023
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=aodT6FW3yhSjDHigG9HslXzXPVlRzzSJoPNS_u4lKoE,30511
-wolfhece/PyVertexvectors.py,sha256=0gh24TG24pwvNFttjBrjfNU-JSiGTEEqaaGYHL3H6Es,188482
+wolfhece/PyVertex.py,sha256=nqQhfg4RFn4iGenJf6BMsnPB-fNFjnXqVeUi39BhEWc,30512
+wolfhece/PyVertexvectors.py,sha256=FBTyMzEsQYwI6sk2HVnJKNMFJpyg810sfXSztOVBfJk,189414
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=Psw4OknvqVXOjIomJxCW4hGd_q2HZ4DmcwV-wJXehds,21420
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=iP6hanwG6EzddcWF2zvsuU9JLfrPtq7-AOFwcz2HO8k,24469
 wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,1240
-wolfhece/Results2DGPU.py,sha256=knrIFMOl9rh2ZYiEKiKqNirde3psTTxcl_XVBhHkJsM,15985
+wolfhece/Results2DGPU.py,sha256=JC-bCtBine4i-j9Ab3Hd_xuinuapgxGWRNGU-pchtsI,16016
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/cli.py,sha256=wAR9DvLK_pzeCDN3m-jh1eyVvgjLHFPd2lVaRRo078A,1468
+wolfhece/cli.py,sha256=Xj0yfgs7MnvNCk5Td_Qp_oz4DMI66eBHu2bkVrGW3OU,1828
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/debug.py,sha256=Q6uXHer1fxrVf0UYWUmYmxNt1QRppEHyAEeCO1syhDw,122
 wolfhece/drawing_obj.py,sha256=rHMGdiihIv68WZnWFNdgiA51QhSm8EX-pykdyTSOdoo,3136
-wolfhece/flow_SPWMI.py,sha256=ECpyjpbS9L9royNxDjkbHj7hHVYhPiaLaZa4GNYtrE0,20658
-wolfhece/friction_law.py,sha256=rk6OK1E-ULjMeIRf15-6UuDqwDJXzY7QKgC2_L2lu5U,5419
-wolfhece/gpuview.py,sha256=sKT9AOczcd9tJE03IHhp8z8hXMrAxLVWtBc26M3J2gs,23285
+wolfhece/flow_SPWMI.py,sha256=mdiupyOem6_FZ0OSKn8Vq5Nmr9Av-j83d2YyRPLZFlQ,20658
+wolfhece/friction_law.py,sha256=SiEWSKKR_nhTLGIzrW1hRf2bhoxHdIB2tZIg6RQhfnM,5419
+wolfhece/gpuview.py,sha256=y3xPNWiIxYY01O8W0MAkivPzhnTbfSnXQGg5JI6e3M8,23286
 wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4167
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=Gi2nIb-lR0_8acLi3bHDupZsoV_5aRysYYST07FiYoQ,15388
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=fnv19sDntJFt3fNMre18-Io14MsRazbFIML4MIxuDgU,13895
 wolfhece/pybridges.py,sha256=BVUESKoTdL1i_rdoe_jEsItgjKS0oqLohwrHj8snjxQ,57190
-wolfhece/pydike.py,sha256=h-QdH_tkwPDjw_x875BNUuICIWaU3u-2HDCyX5Epz6M,1941
+wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
 wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
-wolfhece/pyshields.py,sha256=___LP3nK_bxpTwYrNvH29IWFuIH2vIkKhaplmZk-V0Y,22201
+wolfhece/pyshields.py,sha256=OP92McHXqNLJ4CWdj-RA2TGoIgJIO2KDbjF9dCwxtTk,22201
 wolfhece/pyviews.py,sha256=hYdyrEvWF48dGBDOLIwmC28C0L8I28U4ohXk9nltF94,9666
-wolfhece/pywalous.py,sha256=XTqZI-adfw01n71ZtJMTmQZOyXIHi_7A2ar0Ftt9jAk,4474
+wolfhece/pywalous.py,sha256=jwp251AzGBc0VmMzOqA0IJiRRa6yQIfccRM8lVGszIY,4474
 wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/textpillow.py,sha256=YJxF4JzPv3G1oqenJgWVYq3OPZx9iFtrmeIfvBwbJVU,8735
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=a7n3-GX_z8hJBk8iA-qt-owIUlkREHTxbi96-KcCqSw,232696
+wolfhece/wolf_array.py,sha256=c2ut1Y2vPGsGXS7BeHit-iUeOk6nUAp4gJlgGXu7isE,267478
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
-wolfhece/wolf_texture.py,sha256=hHXyftBStFoxtFDQbImSfSvAyE9D_MqDwFCMk5-57m4,14766
+wolfhece/wolf_texture.py,sha256=1E_dI4Y_wyubRQo0y1_zuEH4HFsiFkKRlo04Gs8YSMI,14767
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
-wolfhece/wolfresults_2D.py,sha256=b4iCXAaAcSXhY3QMegTx0T833DeVM2CQNIE_I5uFKAE,138559
+wolfhece/wolfresults_2D.py,sha256=wiHpAQ8W6X3lyE3XkJBMEB198Pbp3i96WslCUXZjI2I,142147
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/apps/ManageParams.py,sha256=its7JhceQiwzQVl95wA51GZs1zjtbpUNvbqvdvDTeyM,316
 wolfhece/apps/Optimisation_hydro.py,sha256=25H5PVN_Gh3mkDQ6BWbJjBqsGCNdGapZOqKECcOGJIQ,398
+wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
 wolfhece/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/apps/curvedigitizer.py,sha256=MwHlcZLrgUtXEndKhxT3ZvJSBTkhp_dsizGpwoxuLOk,4944
 wolfhece/apps/isocurrent.py,sha256=AG29IGdH-MStdg25QbBrMSW_AHOQDEVGLRslOaxWnHM,3868
@@ -64,7 +65,7 @@ wolfhece/apps/wolfBernoulli.py,sha256=hXWcmlOhtBNCiJXTcUXqMV0Jm3HlftBffNHBPqMrsR
 wolfhece/apps/wolfcompare2Darrays.py,sha256=xkhjSFB6ZCeN5Ou0ILsXZa3oBOvwaBADOaOCpKOQTiw,3897
 wolfhece/apps/wolfhydro.py,sha256=XO4x_ieXv_VqOwRkF11greH68FTc8rx4IfFkRGBYiJE,402
 wolfhece/bernoulli/ModelJockgrim.py,sha256=VBxU1Y9w7MdT3puTWPq-cGM_frp-bdwHKiHcqbeDZJs,9547
-wolfhece/bernoulli/NetworkOpenGL.py,sha256=_FnOMQ9uKTNcAi5vBBXGXWxQ0hoWpt8ayOAuY54zJLI,290413
+wolfhece/bernoulli/NetworkOpenGL.py,sha256=pdScrDkik2EKhfUTGjd9W6UU-TOXgDxmxzpw5Dhu-Q0,290414
 wolfhece/bernoulli/ReadNeupotzData.py,sha256=da0dDIVcLb44j4lP4IveueTl3KBQW8XJd83h8n_hObk,9455
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/opti_results_interactive_plot.py,sha256=gWUF6iJYNp_aEXcAfGBQn4CcZPsRbiQN0HbPZDj68v8,6357
@@ -86,7 +87,7 @@ wolfhece/hydrology/Dumping.py,sha256=Vt5WwGW-5rv9j7kg6z-JdI3olO2LY019cAEYyrfey_k
 wolfhece/hydrology/Optimisation.py,sha256=GeIrezh7YxVmP9zqHcZIrSmbp-azmSKFmpp_oEJZZ_A,91096
 wolfhece/hydrology/Outlet.py,sha256=MDcrrRzpoCmReQxaPKjhkXnN01Bqmnm0Kmjf8fdkTFo,9992
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
-wolfhece/hydrology/PyWatershed.py,sha256=K35tekgMQknTTzX6jiSrBKNi53H4R_rIJyRAYcT7GWU,73927
+wolfhece/hydrology/PyWatershed.py,sha256=G_6fqRkWe1KBuHvo7e7QHXpLkF-ORX6Sph1ws4B2UNg,73908
 wolfhece/hydrology/RetentionBasin.py,sha256=jw8xI5i5OmktJKGD9BLfQp_XV2s74j4s-SuehnvPkKE,64164
 wolfhece/hydrology/SubBasin.py,sha256=fht1KHzzs_1bd808PHcMiqph0UGJFUxlj64PGFpSDbY,142018
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -110,12 +111,12 @@ wolfhece/icons/python.png,sha256=nQiK5h92QC85148vFBx58lUmaSzEvwTCgDr-cumju_4,257
 wolfhece/icons/simulation.png,sha256=I48r_TOPqtUA4bsDGlji--9gJjiDaSl2NcVCMf8h9Gk,2094
 wolfhece/lagrangian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lagrangian/advection.py,sha256=mWV7dYtFfS6Ff5J4gmXe2UsLt7TiSCej2sm_Ffxlwu4,8896
-wolfhece/lagrangian/emitter.py,sha256=l-FlOI49enrbHSlX3bpHm6leSIpAT-Yo1IG7l0BjZyM,11564
-wolfhece/lagrangian/example_domain.py,sha256=_IE4_utP_zhLiowI5jIXItwq6jj9G2yelbK92qP-YEA,4473
+wolfhece/lagrangian/emitter.py,sha256=LZAKOYZhZmZ04WIEPimMEdvja0CLw2A9ki7tCCJ8ujA,11564
+wolfhece/lagrangian/example_domain.py,sha256=beyMicWY38DSoxXJB3qVQKfgEEFLGBPP9xBgDWbCcPA,4473
 wolfhece/lagrangian/particle_system.py,sha256=YapBT36CU95xNjkDdUJ-Q8py2lvN-rEQ_L7cb23wyhc,23701
 wolfhece/lagrangian/particle_system_ui.py,sha256=b9g6DBdmZKhxl6AAb-8qWD4t_x3MU3TKml1w1vuFBXE,29304
 wolfhece/lagrangian/particles.py,sha256=ZPkyiNDygXj5TdMeAA6dr6uRj1bLIF4OdudSkCU9dc8,9590
-wolfhece/lagrangian/velocity_field.py,sha256=hbiiMff_fBMy2Gngin17fSbG6PYYYo2IkNG7ETidYpk,10276
+wolfhece/lagrangian/velocity_field.py,sha256=vwGq7fEazib4Or7afVIFMfY_rRemQgKuSZ_4lHHx3wM,10276
 wolfhece/lazviewer/__init__.py,sha256=0SNDEKGad6e2AwxjalcPqb2bdW6crmXQFxWUY13PiVU,223
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
 wolfhece/lazviewer/laz_viewer.py,sha256=7_IrV4smPxmIbhpq9zlX1Lorv-dyf5lwjRVhiSThqzc,42041
@@ -146,8 +147,9 @@ wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=s-Fwboq8EethHHmipZZjdniEQtyqZv6vS-bQRKNTVgs,132915712
-wolfhece/libs/WolfOGL.c,sha256=j8uzY7fxF7piki5Z7dvTFCeacbpeC0s24gBZ9oQ1NMo,1057055
+wolfhece/libs/WolfDll.dll,sha256=QAkGhbfYRZVHy8SZfq1Hi42M_4bmDn3x2ATxYNlCPPU,19238400
+wolfhece/libs/WolfDll_CD.dll,sha256=kC1svCwD1qSmppsiVfHwDkIvoJO_1l6TG1GfIxgiqQQ,131415040
+wolfhece/libs/WolfOGL.c,sha256=tBWGfpFFe8gfRjImUUlqdxhcRpQ6ytEWU7Z6PC0v9as,1085242
 wolfhece/libs/WolfOGL.pyx,sha256=kc1uxbO2wQx0Qoe7BVQnqTJgUWYx_Vtf1wzXMxzf8bI,65911
 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
@@ -189,15 +191,16 @@ wolfhece/links/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/links/link.py,sha256=CoHcZK2wWKzO8QFqtdzw5-Z6_PhxvJ6JqlA3HsHHuf0,445
 wolfhece/locales/base.po,sha256=meU93yWX-AlU13FlIYnuXNnYsxVB9k4O_QoBQ_h2W1I,1026
 wolfhece/locales/base.pot,sha256=laQ4oYGvdH5IaFtgx6TVjnr28_JX9bdSBZFcGndjuGk,1116
+wolfhece/mar/Interface_MAR_WOLF_objet.py,sha256=5M_XFDe_JwLyvzW7uV4pssaya34e6AWX3_gEqQWLeD4,50138
 wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/mar/commontools.py,sha256=mJsNsN8aAUr6xINzbcw1W42XgAdJNb67CFJGEAK6sO0,6303
+wolfhece/mar/commontools.py,sha256=vCmoNI2sMOco6Y4KPpKb7WORq45qFU_lSxbKGV9oZ8A,53824
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/mesh2d/bc_manager.py,sha256=YUmR5yOUdw1OSDgE-RF9nia-7oLy7dAA0b25XHGYoAA,38397
+wolfhece/mesh2d/bc_manager.py,sha256=EMT43F-bjlpc_JBJUqV-Z0iWKT0ztXUK7nhZJIo9nP8,41225
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
 wolfhece/mesh2d/config_manager.py,sha256=0zVoSD4DNsm_180d8ulDLy8EGFBhTUVApBvRpY730Zk,15284
-wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=hBRS37vvyNw2A5hEVyde8F4EdRLebLz3I_em5px395I,2350
-wolfhece/mesh2d/wolf2dprev.py,sha256=l_Fo56gsD0U6c8EjOfh-K1NcqYxWMovUYHbu0cF-4OQ,132671
+wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=BaJeKHyJiKEFWBkTQeYsDBW86703ooj65MFVpPMgjLg,2810
+wolfhece/mesh2d/wolf2dprev.py,sha256=AhLrTUwrZp6LA9-YFIy6qYoyiY0duCxPwG3FIe1O09U,132643
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -217,7 +220,7 @@ wolfhece/rem/RasterViz.py,sha256=TDhWyMppcYBL71HfhpZuMgYKhz7faZg-MEOQJo_3Ivo,291
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=Q0_jA3PYapcbCT881YojTwKoRi_RjZpevHXhtP9VoqE,4619
-wolfhece/scenario/config_manager.py,sha256=XcdxyWiZqNq8TVVpm-1YJRheMzu26QeJp3zQGSiruEk,55021
+wolfhece/scenario/config_manager.py,sha256=mcad9PXsMVYDLCCAYWbun_oercmEpt7pABVW6dfYUCA,55123
 wolfhece/scenario/imposebc_void.py,sha256=59MFld_jJq1m0O8f4Dlh_1wtBlHKNTCEjbEK2A1EaUo,5163
 wolfhece/scenario/update_void.py,sha256=r9ztr9LlJbd6BgOK-KWpYvUAUakZCyze58-olucbVcI,7156
 wolfhece/sounds/son12.wav,sha256=iZJYSrKkE4HLXJwWzszVR07w_3d-WLO8npFlUcxQlrc,12664
@@ -225,9 +228,9 @@ wolfhece/sounds/son6.wav,sha256=v7CFE-PlGvVcRC3oAaWBBGngutCDS_MUiCIhNHkpv2Y,7884
 wolfhece/sounds/sonsw1.wav,sha256=HhuGeZ3iIyJdDALmM-jvGZDkKw3IZ3JXCuQZkN3Zjtc,212550
 wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,110636
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yOrpTWhjGIAw0_ANjTUX7ouzSRL7cp-cncUUp42tbj0,14860
-wolfhece-2.0.4.dist-info/METADATA,sha256=q003hZEdgT4x2faeszcJ10CEpXVFdBMD43IY7lMkMfk,1959
-wolfhece-2.0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wolfhece-2.0.4.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
-wolfhece-2.0.4.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.4.dist-info/RECORD,,
+wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
+wolfhece-2.0.6.dist-info/METADATA,sha256=xhi5W2F_5SyWbEapMbjTMiAz_9XBDIQKSvyHE3dencc,2052
+wolfhece-2.0.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.6.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
+wolfhece-2.0.6.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.6.dist-info/RECORD,,