wolfhece 2.1.99__py3-none-any.whl → 2.1.100__py3-none-any.whl

wolfhece/wolf_vrt.py

@@ -38,7 +38,24 @@ def create_vrt(wdir:str, fout:str='out.vrt', format:str='tif'):
     myvrt = None
 
     os.chdir(curdir)
-
+def _get_diverged_relative_path(path: Path, base: Path) -> Path:
+    """
+    Get relative path from base to path, even if they only share part of their paths.
+    More general than the next function "_get_relative_path", especially for not "child/parents paths"
+    """
+    
+    # Parts of the paths
+    relative_path_parts = path.parts
+    base_parts = base.parts
+    # Where do they diverge ?
+    i = 0
+    while i < min(len(relative_path_parts), len(base_parts)) and relative_path_parts[i] == base_parts[i]:
+        i += 1
+
+    # Building of the relative path, by adding ".." from the divergence point
+    return Path(*(['..'] * (len(base_parts) - i) + list(relative_path_parts[i:])))
+    
+    
 def _get_relative_path(path:Path, base:Path):
     """
     Get relative path from base to path
@@ -47,7 +64,6 @@ def _get_relative_path(path:Path, base:Path):
     :type path: Path
     :param base: base path
     :type base: Path
-
     """
 
     if base in path.parents:
@@ -79,7 +95,8 @@ def create_vrt_from_files(files:list[Path]=[], fout:Path='assembly.vrt'):
     # change working directory to the parent of the output file
     os.chdir(fout.parent)
     # work with relative paths
-    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_relative_path(file, fout.parent)) for file in files])
+    
+    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_diverged_relative_path(file, fout.parent)) for file in files])
     # close the dataset -- force to write on disk
     myvrt = None
     # restore working directory
@@ -91,7 +108,7 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
 
     Restreint l'emprise et force la résolution sur le premier fichier listé
     """
-
+    
     if isinstance(fout, str):
         fout = Path(fout)
 
@@ -119,6 +136,7 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
 
     locNoData = raster.GetRasterBand(1).GetNoDataValue()
 
+    # options of BuildVRT defined on properties of "files[0]"
     options = gdal.BuildVRTOptions(resolution='user',
                                    xRes=abs(geotr[1]),
                                    yRes=abs(geotr[5]),
@@ -128,11 +146,94 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
 
     # retain current working directory
     oldcwd = os.getcwd()
-    # change working directory to the parent of the output file
-    os.chdir(fout.parent.absolute())
+    # change working directory to the parent of the output file 
+    os.chdir(fout.parent.absolute()) 
+    # work with relative paths 
+    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name),[str(_get_diverged_relative_path(file, fout.parent)) for file in files], options=options) #str(_get_diverged_relative_path(file, fout.parent)) for file in files
+    
+    # close the dataset -- force to write on disk
+    myvrt = None
+    # restore working directory
+    os.chdir(oldcwd)
+    
+    
+def create_vrt_from_diverged_files(files:list[Path]=[], fout:Path='assembly.vrt'):
+    """
+    Agglomération de tous les fichiers énumérés dans files dans un layer virtuel .vrt
 
+    :param files: list of files to process
+    :type files: list[Path]
+    :param fout: output file
+    :type fout: Path
+    """
+
+    if isinstance(fout, str):
+        fout = Path(fout)
+
+    if isinstance(files[0], str):
+        files = [Path(file) for file in files]
+
+    # retain current working directory
+    oldcwd = os.getcwd()
+    # change working directory to the parent of the output file
+    os.chdir(fout.parent)
     # work with relative paths
-    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_relative_path(file, fout.parent)) for file in files], options=options)
+    
+    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_diverged_relative_path(file, fout.parent)) for file in files])
+    # close the dataset -- force to write on disk
+    myvrt = None
+    # restore working directory
+    os.chdir(oldcwd)
+
+def create_vrt_from_diverged_files_first_based(files:list[Path]=[], fout:Path='assembly.vrt', Nodata:float=99999.):
+    """
+    Agglomération de tous les fichiers énumérés dans files dans un layer virtuel .vrt
+
+    Restreint l'emprise et force la résolution sur le premier fichier listé
+    """
+    
+    if isinstance(fout, str):
+        fout = Path(fout)
+
+    if isinstance(files[0], str):
+        files = [Path(file) for file in files]
+
+    first = files[0]
+    raster:gdal.Dataset
+    raster = gdal.Open(str(first))
+    geotr = raster.GetGeoTransform()
+
+    # Dimensions
+    nbx = raster.RasterXSize
+    nby = raster.RasterYSize
+
+    xmin = geotr[0]
+    xmax = geotr[0]+geotr[1]*float(nbx)
+
+    if geotr[5]>0:
+        ymin = geotr[3]
+        ymax = geotr[3]+geotr[5]*float(nby)
+    else:
+        ymin = geotr[3]+geotr[5]*float(nby)
+        ymax = geotr[3]
+
+    locNoData = raster.GetRasterBand(1).GetNoDataValue()
+
+    # options of BuildVRT defined on properties of "files[0]"
+    options = gdal.BuildVRTOptions(resolution='user',
+                                   xRes=abs(geotr[1]),
+                                   yRes=abs(geotr[5]),
+                                   outputBounds=[xmin,ymin,xmax,ymax],
+                                   resampleAlg='bilinear',
+                                   srcNodata=Nodata)
+
+    # retain current working directory
+    oldcwd = os.getcwd()
+    # change working directory to the parent of the output file 
+    os.chdir(fout.parent.absolute()) 
+    # work with relative paths 
+    myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name),[str(_get_diverged_relative_path(file, fout.parent)) for file in files], options=options) #str(_get_diverged_relative_path(file, fout.parent)) for file in files
+    
     # close the dataset -- force to write on disk
     myvrt = None
     # restore working directory

wolfhece/wolfresults_2D.py

@@ -3709,6 +3709,80 @@ class Wolfresults_2D(Element_To_Draw):
         """
         self._cache = None
 
+    def get_hydrographs(self, vect:Union[vector, list[vector], zone]):
+        """ Get hydrograph accross a vector
+
+        :param vect: wolf polyline or list of wolf polylines or zone
+        """
+
+        assert isinstance(vect, vector | list | zone), 'Expected a vector'
+
+        if isinstance(vect, zone):
+            vect = vect.myvectors
+
+        nb = self.get_nbresults()
+        times, steps = self.times, self.timesteps
+
+        if isinstance(vect, vector):
+            q=[]
+            for i in tqdm(range(nb)):
+                if i==0:
+                    myhead = self.get_header_block(1)
+                    vect_raster = myhead.rasterize_vector(vect)
+                self.read_oneresult(i)
+                q.append(self._plot_one_q_raster_splitting(vect_raster, True, to_rasterize = False))
+
+        elif isinstance(vect, list):
+            q={str:list}
+            vect_raster = []
+            myhead = self.get_header_block(1)
+
+            for i in range(len(vect)):
+                q[vect[i].myname]= []
+                vect_raster.append(myhead.rasterize_vector(vect[i]))
+
+            for i in tqdm(range(nb)):
+                self.read_oneresult(i)
+
+                for curvec, cur_vect_raster in zip(vect, vect_raster):
+                    q[curvec.myname].append(self._plot_one_q_raster_splitting(cur_vect_raster, True, to_rasterize = False))
+
+        return times, q
+
+    def export_hydrographs(self, vect:Union[vector, list[vector], zone], filename:str|Path):
+        """ Export hydrograph accross a vector as CSV file
+
+        :param vect: wolf polyline or list of wolf polylines or zone
+        :param filename: output filename
+        """
+
+        assert isinstance(vect, vector | list | zone), 'Expected a vector'
+
+        filename = Path(filename)
+        filename = filename.with_suffix('.csv')
+
+        if isinstance(vect, zone):
+            vect = vect.myvectors
+
+        times, q = self.get_hydrographs(vect)
+
+        with open(filename, 'w') as f:
+            f.write('Time [s],')
+            if isinstance(vect, vector):
+                f.write(vect.myname)
+            elif isinstance(vect, list):
+                f.write(','.join([cur.myname for cur in vect]))
+            f.write('\n')
+
+            for i in range(len(times)):
+                f.write(f'{times[i]},')
+                if isinstance(vect, vector):
+                    f.write(f'{q[i]}')
+                elif isinstance(vect, list):
+                    f.write(','.join([str(q[cur.myname][i]) for cur in vect]))
+                f.write('\n')
+
+
     #FIXME : rename 'x_or_y' to be more explicit
     def plot_q(self,
                vect:Union[vector, list[vector]],

wolfhece/xyz_file.py

@@ -13,106 +13,130 @@ import numpy as np
 import matplotlib.pyplot as plt
 from os.path import normpath,exists,join,basename
 from os import listdir,scandir
+import logging
 
 from .PyTranslate import _
 
 class XYZFile:
     """ Classe pour la gestion des fichiers xyz """
-    nblines:int
     x:np.array
     y:np.array
     z:np.array
     filename:str
 
-    def __init__(self, fname,toread=True):
+    def __init__(self, fname:str, toread:bool= True,
+                 folder:str= None, bounds:list= None,
+                 delimiter:str=','):
         """ Initialisation du nom du fichier """
+
         self.filename = fname
-        self.nblines=0
-        
+
         self.x = None
         self.y = None
         self.z = None
         self.xyz = None
-        
+
         if toread:
-            self.read_from_file()
+            self.read_from_file(folder=folder, bounds=bounds, delimiter=delimiter)
+
+    @property
+    def nblines(self):
+        if self.x is None:
+            return 0
+        else:
+            return len(self.x)
+
+    def reset(self):
+        """ Reset des données """
+        self.x = None
+        self.y = None
+        self.z = None
+        self.xyz = None
 
     def test_bounds(self,bounds):
-        
+
         if bounds is None:
             return True
-        
+
         x1=bounds[0][0]
         x2=bounds[0][1]
         y1=bounds[1][0]
         y2=bounds[1][1]
-        
+
         mybounds = self.get_extent()
 
         test = not(x2 < mybounds[0][0] or x1 > mybounds[0][1] or y2 < mybounds[1][0] or y1 > mybounds[1][1])
-    
+
         return test
 
-    def read_from_file(self):
+    def read_from_file(self, folder:str=None, bounds:list=None, delimiter=','):
         """ Lecture d'un fichier xyz et remplissage de l'objet """
-        
-        self.xyz = np.genfromtxt(self.filename, delimiter=',',dtype=np.float32)
+
+        try:
+            if folder is None:
+                self.xyz = np.genfromtxt(self.filename, delimiter=delimiter, dtype=np.float32)
+            else:
+                if bounds is None:
+                    self.reset()
+                    logging.error(_('Bounds must be defined when reading a directory'))
+                    return
+
+                self.xyz = xyz_scandir(folder,bounds=bounds,delimiter=delimiter)
+                # check if self.xyz is an empty array
+                if len(self.xyz) == 0:
+                    self.xyz = None
+                    return
+        except:
+            self.reset()
+            logging.error(_('Error reading file: {self.filename}'))
+            return
+
         self.x = self.xyz[:,0]
         self.y = self.xyz[:,1]
         self.z = self.xyz[:,2]
-        self.nblines = len(self.xyz)        
-        
-        # with open(self.filename, 'r') as f:
-        #     self.nblines = sum(1 for line in f)
-        #     self.x = np.zeros(self.nblines)
-        #     self.y = np.zeros(self.nblines)
-        #     self.z = np.zeros(self.nblines)
-        #     f.seek(0)
-        #     self.nblines = 0
-        #     for line in f:
-        #         tmp = line.split()
-        #         if tmp:
-        #             if is_float(tmp[0]):
-        #                 self.x[self.nblines] = float(tmp[0])
-        #                 self.y[self.nblines] = float(tmp[1])
-        #                 self.z[self.nblines] = float(tmp[2])
-        #                 self.nblines += 1
 
     def fill_from_wolf_array(self, myarray,nullvalue=0.):
         """ Création d'un fichier xyz depuis les données d'un WOLF array """
-        self.nblines = myarray.nbx * myarray.nby
-        self.x = np.zeros(self.nblines)
-        self.y = np.zeros(self.nblines)
-        self.z = np.zeros(self.nblines)
-        self.nblines = 0
+
+        nbmaxlines = myarray.nbx * myarray.nby
+        self.x = np.zeros(nbmaxlines)
+        self.y = np.zeros(nbmaxlines)
+        self.z = np.zeros(nbmaxlines)
+
+        k=0
         for cury in range(myarray.nby):
             y = cury * myarray.dy + 0.5 * myarray.dy + myarray.origy + myarray.transly
             for curx in range(myarray.nbx):
                 z = myarray.array[curx, cury]
                 if z != nullvalue:
                     x = curx * myarray.dx + 0.5 * myarray.dx + myarray.origx + myarray.translx
-                    self.x[self.nblines] = x
-                    self.y[self.nblines] = y
-                    self.z[self.nblines] = z
-                    self.nblines += 1
+                    self.x[k] = x
+                    self.y[k] = y
+                    self.z[k] = z
+                    k+=1
+
+        # crop the arrays
+        self.x = self.x[:k]
+        self.y = self.y[:k]
+        self.z = self.z[:k]
 
     def write_to_file(self):
         """ Ecriture des informations dans un fichier """
+
         with open(self.filename, 'w') as f:
             for i in range(self.nblines):
                 f.write('{:.3f},{:.3f},{:.3f}\n'.format(self.x[i], self.y[i], self.z[i]))
 
     def get_extent(self):
         """ Retourne les limites du rectangle qui encadre le nuage de points """
+
         xlim = [np.min(self.x), np.max(self.x)]
         ylim = [np.min(self.y), np.max(self.y)]
         return (xlim, ylim)
 
-    def merge(self, xyz_list):
+    def merge(self, xyz_list:list["XYZFile"]):
         """ Merge des fichiers xyz en 1 seul """
-        for cur_xyz in xyz_list:
-            self.nblines += cur_xyz.nblines
-            
+
         newxyz = np.concatenate([cur.xyz for cur in xyz_list])
 
         if self.xyz is not None:
@@ -126,6 +150,7 @@ class XYZFile:
 
     def plot(self):
         """ Représentation graphique des points """
+
         plt.scatter(self.x, self.y, c=self.z, marker='.', cmap='viridis', edgecolors='none')
         plt.xlabel('x [m]')
         plt.ylabel('y [m]')
@@ -137,16 +162,17 @@ class XYZFile:
         plt.pause(0.1)
 
     def find_points(self,bounds):
-        
+
         if bounds is None:
             return self.xyz
-        
+
         xb=bounds[0]
         yb=bounds[1]
+
         # Get arrays which indicate invalid X, Y, or Z values.
         X_valid = (xb[0] <= self.x) & (xb[1] > self.x)
         Y_valid = (yb[0] <= self.y) & (yb[1] > self.y)
-        good_indices = np.where(X_valid & Y_valid)[0]          
+        good_indices = np.where(X_valid & Y_valid)[0]
         return self.xyz[good_indices]
 
 def is_float(s):
@@ -156,19 +182,33 @@ def is_float(s):
     except ValueError:
         return False
 
-def xyz_scandir(mydir,bounds):
-    
+def xyz_scandir(mydir:str, bounds:list, delimiter:str=',') -> np.ndarray:
+    """
+    Function that reads all the xyz files in a directory and its subdirectories
+
+    :param mydir: directory to scan
+    :dtype mydir: str
+    :param bounds: bounds of the area to consider [[x1,x2],[y1,y2]]
+    :dtype bounds: list
+    :return: list of points
+    """
+
     first=[]
     for curfile in listdir(mydir):
         if curfile.endswith('.xyz'):
-            mydata = XYZFile(join(mydir,curfile))
+            mydata = XYZFile(join(mydir,curfile), delimiter=delimiter)
             if mydata.test_bounds(bounds):
-                print(curfile)
+                if isinstance(mydir,str):
+                    logging.info(mydir)
+                else:
+                    logging.info(mydir.path)
+                logging.info(curfile)
                 first.append(mydata.find_points(bounds))
 
+    # if there is a subdirectory, we go deeper
     for entry in scandir(mydir):
         if entry.is_dir():
-            locf=xyz_scandir(entry,bounds)
+            locf=xyz_scandir(entry, bounds, delimiter)
             if len(locf)>0:
                 first.append(locf)
 

{wolfhece-2.1.99.dist-info → wolfhece-2.1.100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.99
+Version: 2.1.100
 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

{wolfhece-2.1.99.dist-info → wolfhece-2.1.100.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=kpxiFIddRJyXcXZraZ1pZnQ3kn95_Oyl-XyZsSvsitg,468509
+wolfhece/PyDraw.py,sha256=MbAHjB9rYWq4IoCD8cYJph3NKlqwUVE5faauv-5YXCk,468676
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=3-1zV8-U8bcf9wUL0mJao54Sf3Ew-wmzxhRWUajnGXM,42210
-wolfhece/PyVertexvectors.py,sha256=qoIbjd-mvxmE-w9FWBlwcI1ewk8crSHTYYCUX8JIIWM,253858
+wolfhece/PyVertexvectors.py,sha256=bwXWtZ9qjrrf94G8n_Ne5qETExB9p4oUR6GDDuCBVH0,253864
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -39,6 +39,7 @@ wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/matplotlib_fig.py,sha256=JM3wmURaBCWXu-pRKzmjCBm05MPYtFqdUdkU3njiLfY,67812
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=oATEiPmj_om7TIOWucNZszIu8K18yq8yKU_GwpGJEMs,8531
+wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=EU_r6yRYDf5zKmwwXEBsGYvTKFbSfE3iTxPwusKR-1I,57398
 wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
@@ -46,24 +47,25 @@ wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=vMfAKXKrW6vKR7l9Fl2hEt-jihLwIiMur7qNTNfwRg4,46101
 wolfhece/pyshields.py,sha256=6YncgmcA6QvbyIl4jbFRf24uJVjhiSplQKWtZH42lXI,24108
 wolfhece/pyviews.py,sha256=5Hqqo9MRw1eiomYkmc7QywNu1KmEkytLJG-wH_aG38Y,13748
-wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
+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=va5Guu8utEFmFbEYZbJdLR2GRGIj8URKpxj1EX_ZA4Q,407883
+wolfhece/wolf_array.py,sha256=H-ol0OtoZKr2I8hyQlEPa5OKWEYVJNKHj3B3HG8WtUk,410054
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
-wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
+wolfhece/wolf_vrt.py,sha256=NcPZYW4bu06IpqQuiutoAhCvDkeZ3TzOVb8z4wTQ1h8,14319
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=7mWWPnKK1HeupkLpSmxd4W6jmzGMTJJSwyMHAESscTc,180803
-wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
-wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
+wolfhece/wolfresults_2D.py,sha256=yssZzi5TN_KSvlqQ8sL5FjMqelfiAVCuPhzLTwWsDQQ,183420
+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
-wolfhece/acceptability/acceptability.py,sha256=9hKkzHG6_eB_IQz4aT5mfd2E0manvpH5LBScaL_3NzA,24038
-wolfhece/acceptability/acceptability_gui.py,sha256=OvJIovypnvWTewESvVxBxskDNNat6kvUiD_UwKSvk4s,12106
-wolfhece/acceptability/cli.py,sha256=WVyEtse0vh6PSCBNhT7x6wwdJI9D5iy5H-AkWov-vxs,7386
-wolfhece/acceptability/func.py,sha256=XxBDs1Gs61ijxVzP-etYU0YFi2rhpWI3_UJdyZp2imU,57984
+wolfhece/acceptability/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
+wolfhece/acceptability/acceptability.py,sha256=TlpvP7EITcRhtDMtQAe32BD-vWdHURf8r9tIF_PZmnc,26668
+wolfhece/acceptability/acceptability_gui.py,sha256=S4tcCfjKlqWph9mukBVx4kPxcs1T07l4Pj9N_sHPaSc,23887
+wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
+wolfhece/acceptability/func.py,sha256=J7EyZXelpJFrOpamsuw9XxYaMC5koyA3f2tA77l4viI,66553
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -77,7 +79,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 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=wOy9EfI2RhpTGw2wYMvqiIf3c4_g2ZhHSnZMHxyyBPo,388
+wolfhece/apps/version.py,sha256=dbPO_X23JyL0yY0CRsgYL2MFlhZ_fYFqTzYKHZORaEw,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
@@ -89,9 +91,10 @@ wolfhece/apps/wolfhydro.py,sha256=EsXTtXhnsQV1j-tiFYcyfMrJpjFv1MrWiftwODdi_8I,81
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/chamber.py,sha256=ZWNjTAmTaH8u8J00n8uEib7dy84mUfHWN43805W_Qsw,2354
 wolfhece/bernoulli/fluids.py,sha256=-mPv3EtCcIEfvTI7oSELtOjUFiKhKANu8w96NnUnrvU,464
-wolfhece/bernoulli/losses.py,sha256=6kXsAspn1Ofqu-kOviMr7dhOplLgishrKOd_cdWgsAc,3656
+wolfhece/bernoulli/losses.py,sha256=dH8iDXkQ4EX990wjz3TnNUAOIbfJ13iF6Qbx-CuXFkA,5277
+wolfhece/bernoulli/losses_jax.py,sha256=Tv1Rem2D--ViyPT7noStXvc9YsZJVkAiSmHwGa7sn9Q,5438
 wolfhece/bernoulli/network.py,sha256=wSiVpPfcXr-KaOx_ZIsPK1DYxklFGShPvX431-Gpdsg,3339
-wolfhece/bernoulli/pipe.py,sha256=f4PPJ_zWwJz2zkuzrUwd3JudO5kFMqVVftD6qpnlFfk,4944
+wolfhece/bernoulli/pipe.py,sha256=_Fq66XC8-BLbZdIjnYf_p7DZdLTS1XPPPGmwif3DdOk,5092
 wolfhece/blender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/blender/array2polygons.py,sha256=UxsVHXqEJexaPXSAm_jEylMiJuvk9dd5RI6rvEPzgvg,8857
 wolfhece/blender/ply.py,sha256=USF3_aaTQNNS90YciQL5LJN3ThKrxtWRyVf21P536F0,853
@@ -216,14 +219,15 @@ wolfhece/mar/Interface_MAR_WOLF_objet.py,sha256=_PNOrZDr-7CR19x_XHqLB5Si2hk8e469
 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
-wolfhece/math_parser/__init__.py,sha256=mrD_uFDDZzvyxQkY8ESqcy1bvM7e3__Gi2b_vijvoo8,27977
-wolfhece/math_parser/calculator.py,sha256=VCXCT5zhyMSgkO5O8dwIhRht9NNBqA0h1QPliOD4N28,6046
+wolfhece/math_parser/__init__.py,sha256=Mi7YTrlJtcflyrRdZHHgE-uNPUFfOWmsf8FsOwKBRPI,27961
+wolfhece/math_parser/calculator.py,sha256=NhyxiQkicuJC2LlekXCiDh-CeWC4t7xsfeNXUDoqSng,7392
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=QTGkb5TR8Y5xVnGUXPXzscGyTEQ6PA8CZPkVNwrlR1Y,53265
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
 wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC9eQ4,14736
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=Y4DF68uAklF3fXJgf05nb_JvJk2pvzcu_wu5nFXpWJo,5008
-wolfhece/mesh2d/wolf2dprev.py,sha256=CvCsutTwLr-BIxzYpzbg3YxIASJtMMtJpuZ77gxCue8,491460
+wolfhece/mesh2d/simple_2d.py,sha256=WbDGScu2PwmhLI-qRv-nEsr7NYc-i1Jgeh-jI0JBKjM,93424
+wolfhece/mesh2d/wolf2dprev.py,sha256=ji34vpE3RUZDyWo0WV-bedofa8J-RY0JCEj2sRyVKZE,491483
 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
@@ -264,7 +268,7 @@ wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=VVjtxfcLAgq_Pf8VSqRq6BJ-y4Zi24CntJpZWxAv3n8,5162
-wolfhece/scenario/config_manager.py,sha256=nLUcfkStqMlNJDiYXmgDkES04AIdTJEzANbVdzEUXlk,96088
+wolfhece/scenario/config_manager.py,sha256=DjDbioxANiMGyC4keIXovTWywNrXavYRh_nhg0yB0kY,96088
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -287,8 +291,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.99.dist-info/METADATA,sha256=Han8pt5GK3ZFy6AxC2GmKM9045RZ4GTnHCJGlh0GcjM,2570
-wolfhece-2.1.99.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-wolfhece-2.1.99.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.99.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.99.dist-info/RECORD,,
+wolfhece-2.1.100.dist-info/METADATA,sha256=z6WVxL_W6QsldMdki33X3NOKxmsa4MsGdJsLLjb6aJw,2571
+wolfhece-2.1.100.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+wolfhece-2.1.100.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.100.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.100.dist-info/RECORD,,

{wolfhece-2.1.99.dist-info → wolfhece-2.1.100.dist-info}/WHEEL

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