wolfhece 2.0.16__py3-none-any.whl → 2.0.18__py3-none-any.whl

wolfhece/pythonfortran/example_numpy_memory.py

@@ -2,117 +2,121 @@ import numpy as np
 import ctypes as ct
 from tools import make_nd_array
 
-"""
-Les matrices Numpy gardent-elles le même espace mémoire (buffer) lors des opérations méthématiques ??
-Une tentative d'analyse sur base de quelques exemples simples ...
+def main():
+    """
+    Les matrices Numpy gardent-elles le même espace mémoire (buffer) lors des opérations méthématiques ??
+    Une tentative d'analyse sur base de quelques exemples simples ...
 
-ATTENTION notammment à :
-   - la diférence de comportement entre "a += 3" et "a = a + 3"
-   - la diférence de comportement entre "a[:,:] = a[:,:] + 3" et "a = a + 3"
+    ATTENTION notammment à :
+    - la diférence de comportement entre "a += 3" et "a = a + 3"
+    - la diférence de comportement entre "a[:,:] = a[:,:] + 3" et "a = a + 3"
 
-Lire : https://numpy.org/doc/stable/reference/ufuncs.html
-"""
-a = np.zeros((10,10))
-b = a # b is an alias --> share memory
-c = a.copy() # c is a copy --> not share memory
+    Lire : https://numpy.org/doc/stable/reference/ufuncs.html
+    """
+    a = np.zeros((10,10))
+    b = a # b is an alias --> share memory
+    c = a.copy() # c is a copy --> not share memory
 
-id_a = id(a) # memory address
-id_b = id(b) # memory address
-id_c = id(c) # memory address
+    id_a = id(a) # memory address
+    id_b = id(b) # memory address
+    id_c = id(c) # memory address
 
-if id(b) == id(a):
-    print('1) a vs b - egalize -- Same memory address')
+    if id(b) == id(a):
+        print('1) a vs b - egalize -- Same memory address')
 
-if id(c) != id(a):
-    print('2) a vs c - egalize copy -- Not the same memory address')
+    if id(c) != id(a):
+        print('2) a vs c - egalize copy -- Not the same memory address')
 
-c+=4
-a=c.copy()
-if id_a != id(c):
-    print('3) a vs a (from c) - egalize copy -- Not the same memory address')
+    c+=4
+    a=c.copy()
+    if id_a != id(c):
+        print('3) a vs a (from c) - egalize copy -- Not the same memory address')
 
-# reset
-a=b
+    # reset
+    a=b
 
-a += 3
-id_newa = id(a) # memory address
-if id_newa == id_a:
-    print('4) a vs a - += 3 -- Same memory address')
+    a += 3
+    id_newa = id(a) # memory address
+    if id_newa == id_a:
+        print('4) a vs a - += 3 -- Same memory address')
 
-a[:,:] = a[:,:] + 3
-id_newa = id(a) # memory address
+    a[:,:] = a[:,:] + 3
+    id_newa = id(a) # memory address
 
-if id_newa == id_a:
-    print('5) a vs a - [:,:] + 3 -- Same memory address')
+    if id_newa == id_a:
+        print('5) a vs a - [:,:] + 3 -- Same memory address')
 
-a = a + 3
-id_newa2 = id(a) # memory address
-if id_newa2 != id_a:
-    print('6) a vs new_a_2 - = +3 -- Not the same memory address')
+    a = a + 3
+    id_newa2 = id(a) # memory address
+    if id_newa2 != id_a:
+        print('6) a vs new_a_2 - = +3 -- Not the same memory address')
 
-b = a + 3
-if id(b) != id(a):
-    print('7) a vs b - addition -- Not the same memory address')
+    b = a + 3
+    if id(b) != id(a):
+        print('7) a vs b - addition -- Not the same memory address')
 
-# Adresse mémoire
+    # Adresse mémoire
 
-a = np.zeros((10,10), dtype=np.float64)
-mem_a = a.ctypes.data
-a[:,1:]=3.
-assert mem_a == a.ctypes.data
+    a = np.zeros((10,10), dtype=np.float64)
+    mem_a = a.ctypes.data
+    a[:,1:]=3.
+    assert mem_a == a.ctypes.data
 
 
-# Créez deux matrices numpy distinctes avec des buffers mémoire séparés
-matrix1 = np.array([[1, 2], [3, 4]])
-matrix2 = np.array([[5, 6], [7, 8]])
+    # Créez deux matrices numpy distinctes avec des buffers mémoire séparés
+    matrix1 = np.array([[1, 2], [3, 4]])
+    matrix2 = np.array([[5, 6], [7, 8]])
 
-buf_m1 = matrix1.ctypes.data
-buf_m2 = matrix2.ctypes.data
+    buf_m1 = matrix1.ctypes.data
+    buf_m2 = matrix2.ctypes.data
 
-# Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 ne sont pas affectés)
-matrix2[:] = matrix1
+    # Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 ne sont pas affectés)
+    matrix2[:] = matrix1
 
-assert buf_m1 == matrix1.ctypes.data
-assert buf_m2 == matrix2.ctypes.data
-assert (matrix1 ==matrix2).all()
+    assert buf_m1 == matrix1.ctypes.data
+    assert buf_m2 == matrix2.ctypes.data
+    assert (matrix1 ==matrix2).all()
 
-matrix1 = np.array([[1, 2], [3, 4]])
-matrix2 = np.array([[5, 6], [7, 8]])
+    matrix1 = np.array([[1, 2], [3, 4]])
+    matrix2 = np.array([[5, 6], [7, 8]])
 
-buf_m1 = matrix1.ctypes.data
-buf_m2 = matrix2.ctypes.data
+    buf_m1 = matrix1.ctypes.data
+    buf_m2 = matrix2.ctypes.data
 
-# Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 ne sont pas affectés)
-matrix2[:] = matrix1.copy()
+    # Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 ne sont pas affectés)
+    matrix2[:] = matrix1.copy()
 
-assert buf_m1 == matrix1.ctypes.data
-assert buf_m2 == matrix2.ctypes.data
-assert (matrix1 ==matrix2).all()
+    assert buf_m1 == matrix1.ctypes.data
+    assert buf_m2 == matrix2.ctypes.data
+    assert (matrix1 ==matrix2).all()
 
-matrix1 = np.array([[1, 2], [3, 4]])
-matrix2 = np.array([[5, 6], [7, 8]])
+    matrix1 = np.array([[1, 2], [3, 4]])
+    matrix2 = np.array([[5, 6], [7, 8]])
 
-buf_m1 = matrix1.ctypes.data
-buf_m2 = matrix2.ctypes.data
+    buf_m1 = matrix1.ctypes.data
+    buf_m2 = matrix2.ctypes.data
 
-# Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 SONT affectés)
-matrix2 = matrix1.copy()
+    # Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 SONT affectés)
+    matrix2 = matrix1.copy()
 
-assert buf_m1 == matrix1.ctypes.data
-assert buf_m2 != matrix2.ctypes.data
-assert matrix2.ctypes.data != matrix1.ctypes.data
-assert (matrix1 ==matrix2).all()
+    assert buf_m1 == matrix1.ctypes.data
+    assert buf_m2 != matrix2.ctypes.data
+    assert matrix2.ctypes.data != matrix1.ctypes.data
+    assert (matrix1 ==matrix2).all()
 
-matrix1 = np.array([[1, 2], [3, 4]])
-matrix2 = np.array([[5, 6], [7, 8]])
+    matrix1 = np.array([[1, 2], [3, 4]])
+    matrix2 = np.array([[5, 6], [7, 8]])
 
-buf_m1 = matrix1.ctypes.data
-buf_m2 = matrix2.ctypes.data
+    buf_m1 = matrix1.ctypes.data
+    buf_m2 = matrix2.ctypes.data
 
-# Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 SONT affectés)
-matrix2 = matrix1
+    # Copiez le contenu de matrix1 dans matrix2 (les buffers de matrix2 SONT affectés)
+    matrix2 = matrix1
 
-assert buf_m1 == matrix1.ctypes.data
-assert buf_m2 != matrix2.ctypes.data
-assert matrix2.ctypes.data == matrix1.ctypes.data
-assert (matrix1 ==matrix2).all()
+    assert buf_m1 == matrix1.ctypes.data
+    assert buf_m2 != matrix2.ctypes.data
+    assert matrix2.ctypes.data == matrix1.ctypes.data
+    assert (matrix1 ==matrix2).all()
+
+if __name__ == "__main__":
+    main()

wolfhece/pythonfortran/tools.py

@@ -1,4 +1,4 @@
-⁶import numpy as np
+import numpy as np
 import ctypes as ct
 
 

wolfhece/scenario/imposebc_void.py

@@ -24,7 +24,7 @@ class Impose_Boundary_Conditions:
     def impose_bc(self, simul:SimpleSimulation):
         """
         FR
-        --
+
         Cette fonction doit être particularisée afin d'appliquer des conditions aux limites à la simulation.
         L'instance de simulation est passée en argument et ne doit pas être créee/modifiée.
 
@@ -37,7 +37,7 @@ class Impose_Boundary_Conditions:
         Les directions sont soit "LEFT" ou "BOTTOM". L'énumération d'une cellule (i,j) permet donc d'imposer la condition sur le bord gauche de la cellule (i-1/2,j) et sur le bord bas de la cellule (i,j-1/2).
 
         EN
-        --
+
         This function must be specialized in order to apply boundary conditions to the simulation.
         The simulation is passed as an argument and must not be created/modified.
 
@@ -50,7 +50,6 @@ class Impose_Boundary_Conditions:
         The directions are either "LEFT" or "BOTTOM." Enumerating a cell (i, j) thus imposes the condition on the left edge of cell (i-1/2, j) and on the bottom edge of cell (i, j-1/2).
 
         Exemple :
-        -------
 
         # Weak Normal Froude condition (value 0.3) on the left edge of the cell (3,997) -> (3,1002)
         for j in range(997,1003):

wolfhece/scenario/update_void.py

@@ -19,7 +19,7 @@ class Update_Sim:
     def update_topobathy(self, topobahty:WolfArray):
         """
         FR
-        --
+
         Cette fonction doit être particularisée afin d'appliquer des modifications
         à la topographie du lit majeur ou à la bathymétrie du lit mineur.
 
@@ -33,7 +33,7 @@ class Update_Sim:
         Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
 
         EN
-        --
+
         This function must be customized to apply modifications to the topography of the main bed or the bathymetry of the minor bed.
 
         The basic information is located in the 'topobahty' parameter ('WolfArray' class).
@@ -50,7 +50,7 @@ class Update_Sim:
     def update_manning(self, manning:WolfArray):
         """
         FR
-        --
+
         Cette fonction doit être particularisée afin d'appliquer des modifications
         à la distribution du coefficient de Manning.
 
@@ -64,7 +64,7 @@ class Update_Sim:
         Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
 
         EN
-        --
+
         This function must be customized to apply modifications to the Manning roughness parameter.
 
         The basic information is located in the 'manning' parameter ('WolfArray' class).
@@ -81,7 +81,7 @@ class Update_Sim:
     def update_infiltration(self, infiltration_zones:WolfArray):
         """
         FR
-        --
+
         Cette fonction doit être particularisée afin d'appliquer des modifications
         à la distribution des zones d'infiltration (matrice en Int32)
 
@@ -95,7 +95,7 @@ class Update_Sim:
         Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
 
         EN
-        --
+
         This function must be customized to apply modifications to the Infiltration zones parameter.
 
         The basic information is located in the 'infiltration_zones' parameter ('WolfArray' class).

wolfhece/wolf_array.py

@@ -4825,8 +4825,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Return the coordinates inside a polygon
 
-        :param myvect = target vector
-        :param usemask = limit potential nodes to unmaksed nodes
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
         """
 
         myvect.find_minmax()
@@ -4848,8 +4848,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Return the coordinates along a polyline
 
-        :param myvect = target vector
-        :param usemask = limit potential nodes to unmaksed nodes
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
         """
 
         allij = self.get_ij_under_polyline(myvect, usemask)
@@ -4861,8 +4861,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Return the indices inside a polygon
 
-        :param myvect = target vector
-        :param usemask = limit potential nodes to unmaksed nodes
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
         """
 
         myvect.find_minmax()
@@ -4905,8 +4905,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Récupération des valeurs contenues dans un polygone
 
-        usemask (optional) restreint les éléments aux éléments non masqués de la matrice
-        getxy (optional) retourne en plus les coordonnées des points
+        :param usemask : (optional) restreint les éléments aux éléments non masqués de la matrice
+        :param getxy : (optional) retourne en plus les coordonnées des points
         """
         mypoints = self.get_xy_inside_polygon(myvect, usemask)
         myvalues = np.asarray([self.get_value(cur[0], cur[1]) for cur in mypoints])
@@ -4920,8 +4920,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Récupération des valeurs contenues sous une polyligne
 
-        usemask (optional) restreint les éléments aux éléments non masqués de la matrice
-        getxy (optional) retourne en plus les coordonnées des points
+        :param usemask : (optional) restreint les éléments aux éléments non masqués de la matrice
+        :param getxy : (optional) retourne en plus les coordonnées des points
         """
         mypoints = self.get_xy_under_polyline(myvect, usemask)
 
@@ -4936,8 +4936,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Récupération de toutes les valeurs contenues dans un polygone
 
-        usemask (optional) restreint les éléments aux éléments non masqués de la matrice
-        getxy (optional) retourne en plus les coordonnées des points
+        :param usemask : (optional) restreint les éléments aux éléments non masqués de la matrice
+        :param getxy : (optional) retourne en plus les coordonnées des points
 
         ICI on retourne le résultat de get_values_insidepoly, car une seule matrice, mais une autre classe pourrait vouloir faure autre chose
           C'est le cas notamment de Wolfresults_2D
@@ -4949,8 +4949,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
         Récupération de toutes les valeurs sous la polyligne
 
-        usemask (optional) restreint les éléments aux éléments non masqués de la matrice
-        getxy (optional) retourne en plus les coordonnées des points
+        :param usemask : (optional) restreint les éléments aux éléments non masqués de la matrice
+        :param getxy : (optional) retourne en plus les coordonnées des points
 
         ICI on retourne le résultat de get_values_underpoly, car une seule matrice, mais une autre classe pourrait vouloir faure autre chose
           C'est le cas notamment de Wolfresults_2D
@@ -6931,8 +6931,9 @@ class WolfArrayMNAP(WolfArrayMB):
 class WolfArray_Sim2D(WolfArray):
     """
     Surcharge de WolfArray pour les matrices fines de simulation
-    Objectif :
-        - lier la matrice de mask à une source commune
+
+    Objectif : lier la matrice de mask à une source commune
+
     """
     def __init__(self,
                  fname:str=None,

wolfhece/wolfresults_2D.py

@@ -2723,10 +2723,8 @@ class Wolfresults_2D(Element_To_Draw):
 
         which_block : numéro du bloc; 1-based;
 
-        ***
-        ATTENTION :
-            Les indices sont passés comme WOLF --> en numérottaion Fortran (démarrage à 1 et non à 0)
-        ***
+        ATTENTION : Les indices sont passés comme WOLF --> en numérottaion Fortran (démarrage à 1 et non à 0)
+
         """
         k=-1
         e=-1

{wolfhece-2.0.16.dist-info → wolfhece-2.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.16
+Version: 2.0.18
 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
@@ -53,6 +53,12 @@ Requires-Dist: h5py
 Requires-Dist: basemap
 Requires-Dist: exif
 Requires-Dist: pyglm
+Requires-Dist: mqtt
+Requires-Dist: wradlib
+Requires-Dist: seaborn
+Requires-Dist: autograd
+Requires-Dist: plyfile
+Requires-Dist: tabulate
 
 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.16.dist-info → wolfhece-2.0.18.dist-info}/RECORD

@@ -1,20 +1,20 @@
-wolfhece/CpGrid.py,sha256=TB4nAd7Dmwz6EQHtNTbKeBoLKXeYqt1f4YZgnYszT80,10685
+wolfhece/CpGrid.py,sha256=ke4n1khTUoed2asJl1GR25PsEkI4TpiBDCo4u0aSo9M,10658
 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=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
-wolfhece/PyCrosssections.py,sha256=HtvhSracK8Yz6RCNQCfjzflvend_DtybI9mTb9gnTrs,111048
+wolfhece/PyCrosssections.py,sha256=wdq-KYaLDBAa-gu3plWFBJN0Stx-oZX2dxs-iKjGBHo,111109
 wolfhece/PyDraw.py,sha256=DYiV9eUq6bXPpqQEl8w-WH45pAqLY5U2Hl0XZW9T7Zk,300264
 wolfhece/PyGui.py,sha256=mzJCRjMHtebFrxmPnwUK6YpQgMf5iiiCTm0hCOuRsOY,52722
 wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
-wolfhece/PyHydrographs.py,sha256=2BqsvZSb8WuH22SYxU_BcakfA43yV_qA0ujWQE4uwQo,3407
+wolfhece/PyHydrographs.py,sha256=h2OfgmRkKc5XZn0iPFOVy60pGTSa5EFoUOEya0SeG7o,3411
 wolfhece/PyPalette.py,sha256=nb9oPLZF-xx-yvOWvw2XVVmis6XTmYT2i7hvH3qPwAg,21932
-wolfhece/PyParams.py,sha256=PzGnWzlo7dyw9yaDZ90eS3HrXrPEukN1BOEtTPsthEU,77473
-wolfhece/PyPictures.py,sha256=wI6t38rmRiNG1pGWTXVW-nWQO2mg8SH7Gf-X2HIi02A,2023
+wolfhece/PyParams.py,sha256=RqeIWvvKZ6LK5q6QK4k6SIRci4qVgLejnVR45sDS9iw,77211
+wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=nqQhfg4RFn4iGenJf6BMsnPB-fNFjnXqVeUi39BhEWc,30512
-wolfhece/PyVertexvectors.py,sha256=Q32a7hhMh93d1PoCM9iFCTBK9JLCWrHvOwZnUrAaTDw,189684
+wolfhece/PyVertexvectors.py,sha256=T5or2zgEy1Z6-DsrwJmRvsHo_fmcCiqNHAtrBBaV0wk,189557
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=Psw4OknvqVXOjIomJxCW4hGd_q2HZ4DmcwV-wJXehds,21420
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -25,54 +25,49 @@ wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 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=mdiupyOem6_FZ0OSKn8Vq5Nmr9Av-j83d2YyRPLZFlQ,20658
-wolfhece/friction_law.py,sha256=SiEWSKKR_nhTLGIzrW1hRf2bhoxHdIB2tZIg6RQhfnM,5419
-wolfhece/gpuview.py,sha256=it4vciZ7ikdZXiK6N6xOkWK5DnHhJsFoJfiQCsTPB7I,23440
+wolfhece/friction_law.py,sha256=vMr6BgVVV2JqhPDjBtZBtosDIZcbykZxw-fKxiJzd4M,5200
+wolfhece/gpuview.py,sha256=Lq17jV2ytQShUuvi1UE_A1-6Q0IojsKxrKhkYHRf_8w,23437
 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/irm_qdf.py,sha256=0nOU_usEZuWMwYOPV9qtZoWsQTn2x2DxOuk7VlYMkbo,15419
 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=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
 wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
-wolfhece/pyshields.py,sha256=OP92McHXqNLJ4CWdj-RA2TGoIgJIO2KDbjF9dCwxtTk,22201
+wolfhece/pyshields.py,sha256=LlFxcCkWywbsf2_6AaMU0Vgbm5h92AKqb4NyYT6kBYE,22219
 wolfhece/pyviews.py,sha256=hYdyrEvWF48dGBDOLIwmC28C0L8I28U4ohXk9nltF94,9666
 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=HaANsjC-0NTaGpgTpplGhROEPEh_-ePqiiSWutKGIIo,280130
+wolfhece/wolf_array.py,sha256=BAdO9j_ilDbzJ_Awrqnxz0kKL3zML0Z8eCSkY_M8IQM,280195
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=quflEvi32lWSvOPa0aDCDl-8Jv-jGtLHbR2rdx67LsI,14883
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
-wolfhece/wolfresults_2D.py,sha256=Y76Xqupn8XHW41TfUX1H8OVYVLLBm5divXCDYdyJa4s,144206
+wolfhece/wolfresults_2D.py,sha256=atr207mDneggZDG4D_eWKnsSDZ2i8rWOGBv9ECQ487I,144169
 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/curvedigitizer.py,sha256=JC2SW4n3-QFrnpmm0Zn0Yqog2SW4wvXfpIXuyd9ZifY,4957
 wolfhece/apps/isocurrent.py,sha256=AG29IGdH-MStdg25QbBrMSW_AHOQDEVGLRslOaxWnHM,3868
 wolfhece/apps/splashscreen.py,sha256=9BNArfcoRcyWglzFDQdLv2Dlvqz8w5qYKdE5zA66-Kw,2117
 wolfhece/apps/wolf.py,sha256=pyfVq7H-iz1IPRjm7OHsNMvkpGKZdNSIPpVyZEbxeZo,294
 wolfhece/apps/wolf2D.py,sha256=nQ5SbGBJLODmIbqazYR6L0FsXp6K5oIo-hKIxtvqoaA,173
-wolfhece/apps/wolfBernoulli.py,sha256=hXWcmlOhtBNCiJXTcUXqMV0Jm3HlftBffNHBPqMrsRg,380
-wolfhece/apps/wolfcompare2Darrays.py,sha256=xkhjSFB6ZCeN5Ou0ILsXZa3oBOvwaBADOaOCpKOQTiw,3897
+wolfhece/apps/wolfcompare2Darrays.py,sha256=fbwTAfy2X-yuJlwYlDFuwE7Al53InvUZVJIz1mwfR7I,3904
 wolfhece/apps/wolfhydro.py,sha256=XO4x_ieXv_VqOwRkF11greH68FTc8rx4IfFkRGBYiJE,402
-wolfhece/bernoulli/ModelJockgrim.py,sha256=VBxU1Y9w7MdT3puTWPq-cGM_frp-bdwHKiHcqbeDZJs,9547
-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
 wolfhece/blender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/blender/array2polygons.py,sha256=r7wIAsP2M4qJQqdhIRaLFwyQ8P0b9DeSBorBXG0Lyx8,8559
 wolfhece/blender/ply.py,sha256=jTRUqRGD_XyGdE865Iv214DE8-m_ZscqlfTJP99lUOE,555
 wolfhece/blender/quads.py,sha256=gBoXN-BASPivcGhCIlWgsELCaEO-NH0rhywA7BXY_1Q,11704
+wolfhece/clientserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/clientserver/clientserver.py,sha256=xXKc8gKjEYilIK8o_xeslbVu9Ouklmk4vkR8Ppy3HYM,2500
 wolfhece/eva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/eva/bootstrap.py,sha256=xHbIAZzFuaKLwiRpgvsLi5OZYqwaxYACqsAU-FnB6Pc,605
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
@@ -84,16 +79,16 @@ wolfhece/fonts/arial.ttf,sha256=uwYWwXEZKaG6axcVPiDDM0MXLgf40xAQmMwR8BSShSY,3749
 wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,317968
 wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,42696
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/ftp/downloader.py,sha256=39KKk_3s8FbMyyONZddfuQ1gzACeXi3kWbkzUAc2Yog,5270
-wolfhece/hydrology/Catchment.py,sha256=QGNvVfaKR14VCCLTo2AMCfUhxuVDipeB9dsdwQs6Z7g,120541
+wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
+wolfhece/hydrology/Catchment.py,sha256=x_9Z4dCg08f1SyRi2pFlaYKgT9kAXQC-2PiG7VnRl_8,120545
 wolfhece/hydrology/Comparison.py,sha256=fWmuR3YlpOEMTnjb6uIyXppCp_iWA0A5hRIPO-WXhYs,81534
 wolfhece/hydrology/Dumping.py,sha256=Vt5WwGW-5rv9j7kg6z-JdI3olO2LY019cAEYyrfey_k,2011
 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=G_6fqRkWe1KBuHvo7e7QHXpLkF-ORX6Sph1ws4B2UNg,73908
+wolfhece/hydrology/PyWatershed.py,sha256=K6yz8UquJi51v2nGqWmeo8qs82-QHoa2LYaxwoUBTxM,73914
 wolfhece/hydrology/RetentionBasin.py,sha256=jw8xI5i5OmktJKGD9BLfQp_XV2s74j4s-SuehnvPkKE,64164
-wolfhece/hydrology/SubBasin.py,sha256=fht1KHzzs_1bd808PHcMiqph0UGJFUxlj64PGFpSDbY,142018
+wolfhece/hydrology/SubBasin.py,sha256=OPdhwBnwU-kFtHRNvUAxiCzPSZlC3XpiEMlEa5UgRRI,142004
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=W04wikEJHDQaY0bR8ddU1b_OAuwX1VjNTnXRROwZzug,1231
 wolfhece/hydrology/cst_exchanges.py,sha256=Bzpebw47Q0o2-UUzKZ3fndFLOv-PfLUQM7jgQkYTJf4,14851
@@ -105,7 +100,7 @@ wolfhece/hydrology/slope_manager.py,sha256=uZzq7Ba3RMbZL5LPaxdCpkgTVNBAUJs1X_d2s
 wolfhece/hydrology/wolfMap_treatment.py,sha256=5LO49yj1M-s9sGaK0hVgMtuT3t1yPJq9wd6LDh-GXaA,10288
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrometry/kiwis.py,sha256=dYu8rp0iZeSLqUfMSb4x4uks4o_wV4K1uNZTNqd2a58,33587
-wolfhece/hydrometry/kiwis_gui.py,sha256=mQw-kYRIeXhX_v7t3DCRoqZogSYMacbuxxZvldCcVgk,22847
+wolfhece/hydrometry/kiwis_gui.py,sha256=odgN70PqTLU1ejDzxj92kEN736Yr9-Bpq4-Sn3AmoM0,22865
 wolfhece/hydrometry/kiwispie.py,sha256=gz9AbiLV2akFwt2s7OipWt_K7TnWun-vXCsSiFYRXJ0,13245
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
@@ -195,7 +190,7 @@ 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/Interface_MAR_WOLF_objet.py,sha256=_PNOrZDr-7CR19x_XHqLB5Si2hk8e469sYCgv3sTJmk,53791
 wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mar/commontools.py,sha256=vCmoNI2sMOco6Y4KPpKb7WORq45qFU_lSxbKGV9oZ8A,53824
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
@@ -215,12 +210,12 @@ wolfhece/models/shields_cst.pal,sha256=zUGFI6HiL0bsHeOzcWNih3F9cxXKXLLZYA5rtqRbz
 wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUgIY,136
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/opengl/gl_utils.py,sha256=-eH2WAWdLFr6mzEwN8XdfJfM8U2rgvRryCAqjH-zeys,66136
-wolfhece/opengl/py3d.py,sha256=vN9U2m4HcyPXEZYUfscrzCgb3nwOVogILGBflAo2C4A,57098
+wolfhece/opengl/py3d.py,sha256=Ws2VM8TNHR4Tx_Ud14c38FEco3LZWevH7UvtSUt6osw,66451
 wolfhece/opengl/tile_packer.py,sha256=0B1-Q-Jm-lKIXrw2lFbrrVL9gbtbl50jeWl67ymYbsc,15841
 wolfhece/pythonfortran/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/pythonfortran/example_makendarray.py,sha256=v6ROG14yMyDdaUD2rETa_jd3zodP78KMHMdUtkUlpGs,2499
-wolfhece/pythonfortran/example_numpy_memory.py,sha256=mNU7Xu5o4AokAaj8tNAdgBF5fql7V9uSm0bqmTEaKuQ,3281
-wolfhece/pythonfortran/tools.py,sha256=ccFPWa0gQA3SnTbNwUxwEKS1VmVGzsfXbx5WWaJshSU,2465
+wolfhece/pythonfortran/example_makendarray.py,sha256=FNPp6lsU9Mv0O8VLN3JHWk5Qn1zZxUSCPeDyUI1-x48,2718
+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=ylyz8hNAGq92WXnMO8hVe6Nk-a7g--fL-xOcjfhFEtk,9714
 wolfhece/rem/REMMaker.py,sha256=kffClHHpf8P4ruZpEb9EB__HBzg9rFAkiVCh-GFtIHU,30790
@@ -229,8 +224,8 @@ 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=kYN2V82B8nwUUBmhPzoTATAPVncSg1s7pf4Inp_8WcU,55245
-wolfhece/scenario/imposebc_void.py,sha256=1dP-pvejYsVLwlrcRuRfQiVFvZhhBuR5AENLzf_6bdQ,5310
-wolfhece/scenario/update_void.py,sha256=beLSuC6iqtXzULw1M1-gNrkqpYYK6b6Q7gEWb4PhJNA,7236
+wolfhece/scenario/imposebc_void.py,sha256=pl7c99HQQMQT7i15fDlOOFYCdOtR5c_XIBOveOTOaLc,5273
+wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTAraE,7176
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
 wolfhece/shaders/geom_grid.glsl,sha256=7eAkutCrwoeJpIdF69Ar7K18YyClvVG8ArJJARcmC-Q,742
 wolfhece/shaders/quad_frag_shader.glsl,sha256=GYGg9q4vFXiMuLK-pxSLz7crAE3dvlzJ7-e7PMfwSq0,1227
@@ -248,8 +243,8 @@ wolfhece/sounds/sonsw1.wav,sha256=HhuGeZ3iIyJdDALmM-jvGZDkKw3IZ3JXCuQZkN3Zjtc,21
 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=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
-wolfhece-2.0.16.dist-info/METADATA,sha256=LXOeXNFSuwh9IpBYpBDuxKwjZC6MDJ_9s_mOj_uPxIg,2096
-wolfhece-2.0.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wolfhece-2.0.16.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
-wolfhece-2.0.16.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.16.dist-info/RECORD,,
+wolfhece-2.0.18.dist-info/METADATA,sha256=_Qnbh7lus3Ln44kYSd_UjvnovEnBd38bWRq4nIHSMPw,2239
+wolfhece-2.0.18.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.18.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
+wolfhece-2.0.18.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.18.dist-info/RECORD,,

wolfhece/apps/wolfBernoulli.py

@@ -1,18 +0,0 @@
-
-import wx
-try:
-    from ..PyTranslate import _
-    from ..bernoulli.NetworkOpenGL import Bernoulli_Window
-except:
-    from wolfhece.PyTranslate import _
-    from wolfhece.bernoulli.NetworkOpenGL import Bernoulli_Frame
-import wx
-
-def main():
-    app = wx.App()
-    ex = Bernoulli_Frame(None)
-    ex.Show()
-    app.MainLoop()
-
-if __name__=='__main__':
-    main()