wolfhece 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

wolfhece/PyDraw.py

@@ -9704,7 +9704,7 @@ class WolfMapViewer(wx.Frame):
                     with open(filename,'r') as f:
                         text=f.read().splitlines()
                         tmphead=''
-                        for i in range(4):
+                        for i in range(min(4, len(text))):
                             tmphead += text[i].replace('\t','\\t') +'\n'
 
                     dlg = wx.MessageDialog(None,_('Is there a file header (one upper line containing column names)?') + '\n\n' + tmphead,style=wx.YES_NO|wx.NO_DEFAULT)

wolfhece/PyHydrographs.py

@@ -55,14 +55,13 @@ class Hydrograph(pd.Series):
                  dtype=None,
                  name='Discharge',
                  copy=None,
-                 file_path:str ='',
-                 fastpath=False) -> None:
+                 file_path:str ='') -> None:
         if file_path != '':
             data =self.read_from_wolf_file(file_path)
         elif isinstance(data, str):
             data = self.read_from_wolf_file(data)
 
-        super().__init__(data,index,dtype, name, copy, fastpath)
+        super().__init__(data,index,dtype, name, copy)
 
     def write_as_wolf_file(self,
                            file_path:str,

wolfhece/PyParams.py

@@ -721,15 +721,14 @@ class Wolf_Param(wx.Frame):
             #essai pour voir si le groupe existe ou non dans les params actifs
             if not self.is_in_active(groupname):
                 page_active.Append(pg.PropertyCategory(groupname))
+                self.myparams[groupname] = {}
 
             #teste si param existe
             activeprop = self.prop.GetPropertyByName(groupname + paramname)
             if activeprop is None:
                 #si non existant --> on ajoute, si existant --> rien à faire
                 self._insert_elem_to_page(page_active, groupname, param_def)
-            # if not self.is_in_active(groupname, paramname):
-            #     #si non existant --> on ajoute, si existant --> rien à faire
-            #     self._add_elem_to_page(page_active, groupname, param_def)
+                self.myparams[groupname][paramname] = param_def.copy()
 
         else:
             #recopiage de la valeur par défaut

wolfhece/PyVertex.py

@@ -630,12 +630,12 @@ class cloud_vertices(Element_To_Draw):
                 elif ';' in curhead:
                     # séparateur tabulation
                     sep = ';'
-                elif ' ' in curhead:
-                    # séparateur espace
-                    sep = ' '
                 elif ',' in curhead:
                     # séparateur espace
                     sep = ','
+                elif ' ' in curhead:
+                    # séparateur espace
+                    sep = ' '
                 headers = curhead.split(sep)
                 nbcols = len(headers)
             else:
@@ -647,14 +647,14 @@ class cloud_vertices(Element_To_Draw):
                 elif ';' in curline:
                     # séparateur point-virgule
                     sep = ';'
-                elif ' ' in curline:
-                    # séparateur espace
-                    sep = ' '
-                    curline = re.sub(' +', ' ', curline)
                 elif ',' in curline:
                     # séparateur virgule
                     sep = ','
                     curline = re.sub(' +', ' ', curline)
+                elif ' ' in curline:
+                    # séparateur espace
+                    sep = ' '
+                    curline = re.sub(' +', ' ', curline)
 
                 curval = curline.split(sep)
                 nbcols = len(curval)

wolfhece/PyVertexvectors.py

@@ -1229,6 +1229,7 @@ class vector:
 
         if inplace:
             self.import_shapelyobj(buffered)
+            self.reset_linestring()
             return self
         else:
             newvec = vector(fromshapely=buffered, name=self.myname)

wolfhece/acceptability/Parallels.py

@@ -15,14 +15,14 @@ from functools import partial
 import os
 from pathlib import Path
 
-def parallel_gpd_clip(layer:list[str], 
-                      file_path:str, 
-                      Study_Area:str, 
-                      output_dir:str, 
+def parallel_gpd_clip(layer:list[str],
+                      file_path:str,
+                      Study_Area:str,
+                      output_dir:str,
                       number_procs:int = 1):
-    """ 
+    """
     Clip the layers to the study area.
-    
+
     Process the layers in parallel.
 
     FIXME: The GPKG driver is it totally parallel compliant?
@@ -50,13 +50,15 @@ def parallel_gpd_clip(layer:list[str],
                     Study_Area=Study_Area,
                     output_dir=output_dir)
         result_list = pool.map(prod_x, layer)
+        pool.close()
+        pool.join()
 
 def parallel_v2r(manager:Accept_Manager,
-                 attribute:str, 
+                 attribute:str,
                  pixel:float,
                  number_procs:int = 1,
                  convert_to_sparse:bool = False):
-    """ 
+    """
     Convert the vector layers to raster.
 
     Process the layers in parallel.
@@ -69,7 +71,7 @@ def parallel_v2r(manager:Accept_Manager,
     :param number_procs: The number of processors to use
 
     """
-    
+
     attribute = str(attribute)
     layers = manager.get_layers_in_codevulne()
 
@@ -81,18 +83,20 @@ def parallel_v2r(manager:Accept_Manager,
     else:
         pool = multiprocessing.Pool(processes=number_procs)
         prod_x=partial(vector_to_raster,
-                       manager=manager, 
-                       attribute=attribute, 
+                       manager=manager,
+                       attribute=attribute,
                        pixel_size=pixel,
-                       convert_to_sparse=convert_to_sparse) 
-        
+                       convert_to_sparse=convert_to_sparse)
+
         result_list = pool.map(prod_x, layers)
+        pool.close()
+        pool.join()
 
-def parallel_datamod(manager:Accept_Manager, 
+def parallel_datamod(manager:Accept_Manager,
                      picc:gpd.GeoDataFrame,
                      capa:gpd.GeoDataFrame,
                      number_procs:int = 1):
-    """ 
+    """
     Apply the data modification to the layers.
 
     Process the layers in parallel.
@@ -103,7 +107,7 @@ def parallel_datamod(manager:Accept_Manager,
     :param number_procs: The number of processors to use
 
     """
-    
+
     layers = manager.get_layers_in_clipgdb()
 
     if number_procs == 1:
@@ -113,8 +117,10 @@ def parallel_datamod(manager:Accept_Manager,
         pool = multiprocessing.Pool(processes=number_procs)
         prod_x=partial(data_modification,
                           manager=manager,
-                          picc=picc, 
-                          capa=capa) 
-        
+                          picc=picc,
+                          capa=capa)
+
         result_list = pool.map(prod_x, layers)
+        pool.close()
+        pool.join()
 

wolfhece/acceptability/acceptability_gui.py

@@ -60,6 +60,9 @@ def read_export_z_bin(fn_read, fn_write, fn_laststep):
     wd.array = wd.array + top.array
     fn_write = fn_write.with_suffix('.bin')
     wd.write_all(fn_write)
+    fn_write = fn_write.with_suffix('.tif')
+    wd.write_all(fn_write)
+    top.write_all(fn_write.parent / fn_write.stem / "_dem.tif")
     shutil.rmtree(fn_temp)
 
 def riverbed_trace(fn_read_simu, fn_output, threshold):
@@ -964,6 +967,8 @@ class AcceptabilityGui(wx.Frame):
                 logging.error('No hydraulic scenario selected.')
         else:
             logging.error('No folder found / selected. Please try again.')
+            return
+
         self._check_listbox.Clear()
         self.sims = {}
         for subdir in hydraulic_scen.iterdir():
@@ -1077,6 +1082,7 @@ class AcceptabilityGui(wx.Frame):
         LAST_STEP_EXTRACTED using the fast marching
         interpolation routine holes.exe, by creating a batch file
         while performing multiple checks on the required input files."""
+
         if not hasattr(self, 'file_paths'):
             with wx.MessageDialog(self,
                                 f"Please, first load gpu simulations via the previous button.",
@@ -1170,49 +1176,72 @@ class AcceptabilityGui(wx.Frame):
                 os.remove(path_bat_file)
             path_code = os.path.join(self._manager.IN_WATER_DEPTH, "holes.exe")
 
-            A=[]
-            for path in checked_paths:
-                parts = path.name.split("sim_")
-                A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.bin")])
-            B = [os.path.join(path_Interp, os.path.splitext(os.path.basename(f))[0]) for f in A]
-            if not A or not B or not C or not D:
-                logging.info("Missing files.")
-                with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
-                            "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
-                    dlg.ShowModal()
-            with open(path_bat_file, "w") as bat_file:
-                for a, b in zip(A, B):
-                    line = f'"{path_code}" filling in="{a}" out="{b}" mask="{C}" dem="{D} avoid_last=1"\n'
-                    bat_file.write(line)
-            logging.info(message_info)
-
-            empty_folder(self._manager.IN_SA_INTERP)
-            path_bat_file = os.path.join(self._manager.IN_SCEN_DIR, "process_files.bat")
 
+            renamed_files = []
             if True:
+                A=[]
+                for path in checked_paths:
+                    parts = path.name.split("sim_")
+                    A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.bin")])
+                B = [os.path.join(path_Interp, os.path.splitext(os.path.basename(f))[0]) for f in A]
+                if not A or not B or not C or not D:
+                    logging.info("Missing files.")
+                    with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
+                                "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
+                        dlg.ShowModal()
+                with open(path_bat_file, "w") as bat_file:
+                    for a, b in zip(A, B):
+                        line = f'"{path_code}" filling in="{a}" out="{b}" mask="{C}" dem="{D} avoid_last=1"\n'
+                        bat_file.write(line)
+                logging.info(message_info)
+
+                empty_folder(self._manager.IN_SA_INTERP)
+                path_bat_file = os.path.join(self._manager.IN_SCEN_DIR, "process_files.bat")
+
                 # FORTRAN HOLES.EXE
                 subprocess.run([path_bat_file], check=True)
+                path_fichier=self._manager.IN_SA_INTERP
+                for file in path_fichier.glob("*.tif"):
+                    if "_h" in file.name:
+                        new_name = file.stem.split("_h")[0].replace(".bin", "") + ".tif"
+                        file.rename(file.with_name(new_name))
+                        renamed_files.append(new_name)
+                #deleting the other
+                for file in path_fichier.glob("*.tif"):
+                    if "_combl" in file.name or file.name not in renamed_files:
+                        file.unlink()
             else:
                 #Python eikonal model
                 from ..eikonal import inpaint_array, inpaint_waterlevel
-                for a, b in zip(A, B):
+
+                dtm = WolfArray(D)
+
+                A=[]
+                for path in checked_paths:
+                    parts = path.name.split("sim_")
+                    A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.tif")])
+                if not A  or not C or not D:
+                    logging.info("Missing files.")
+                    with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
+                                "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
+                        dlg.ShowModal()
+
+                empty_folder(self._manager.IN_SA_INTERP)
+
+                for a in A:
+                    a = Path(a)
                     in_wa = WolfArray(a)
-                    mask_wa = WolfArray(C)
-                    dem_wa = WolfArray(D)
-                    inpaint_array(in_wa.array, mask_wa.array, dem_wa.array, avoid_last=1)
-                    in_wa.write_all(b)
+                    dem_wa = WolfArray(a.parent / a.stem / "_dem.tif")
+                    _t, _wse, _wd = inpaint_waterlevel(in_wa.array, dem_wa.array.data, dtm.array.data, ignore_last_patches=1)
 
-            renamed_files = []
-            path_fichier=self._manager.IN_SA_INTERP
-            for file in path_fichier.glob("*.tif"):
-                if "_h" in file.name:
-                    new_name = file.stem.split("_h")[0].replace(".bin", "") + ".tif"
-                    file.rename(file.with_name(new_name))
+                    b = os.path.join(path_Interp, os.path.splitext(os.path.basename(a))[0])
+                    new_name = Path(b).with_suffix('.tif')
                     renamed_files.append(new_name)
-            #deleting the other
-            for file in path_fichier.glob("*.tif"):
-                if "_combl" in file.name or file.name not in renamed_files:
-                    file.unlink()
+
+                    in_wa.array.data[:,:] = _wd
+                    in_wa.array.mask[:,:] = _wd == 0.
+                    in_wa.write_all(new_name)
+
             logging.info("Filling completed.")
             with wx.MessageDialog(self, f"Filling completed. Created files : {renamed_files}",
                         "Redirecting", wx.OK | wx.ICON_INFORMATION) as dlg:

wolfhece/acceptability/func.py

@@ -982,14 +982,18 @@ class Accept_Manager():
 
     def check_nodata(self, name, path_baseline):
             """ Check nodata in a path """
+            from ..wolf_array import WOLF_ARRAY_FULL_INTEGER8
             list_tif = Accept_Manager.select_name_tif(self, path_baseline, self.IN_CH_SA_SC, name)
             for cur_lst in list_tif:
                 curarray:WolfArray = WolfArray(cur_lst)
-                if curarray.nullvalue != 99999.:
-                    curarray.nullvalue = 99999.
-                    curarray.set_nullvalue_in_mask()
-                    curarray.write_all()
-                    logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
+                if curarray.wolftype != WOLF_ARRAY_FULL_INTEGER8:
+                    if curarray.nullvalue != 99999.:
+                        curarray.nullvalue = 99999.
+                        curarray.set_nullvalue_in_mask()
+                        curarray.write_all()
+                        logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
+                else:
+                    logging.info(_('nodata value is {} for file {} !'.format(curarray.nullvalue, cur_lst)))
 
     def create_vrtIfExists(self, fn_baseline, fn_scenario, fn_vrt, name):
         """ Create a vrt file from a path """
@@ -1569,6 +1573,8 @@ def compute_acceptability(manager:Accept_Manager,
                       points_accept["h-1"][idx_pts],
                       points_accept["h-2.5"][idx_pts]]
 
+        accept_pts = list(accept_pts).copy()
+
         update_accept(accept, model_h, ij, bounds, accept_pts)
 
     if save_to_file:

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 2
-        self.patch = 1
+        self.patch = 2
 
     def __str__(self):
 

wolfhece/wolf_array.py

@@ -10,13 +10,15 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import os
 import sys
+
+import numpy as np
+import numpy.ma as ma
+
 from typing import Union, Literal
 from matplotlib.axis import Axis
 from matplotlib.figure import Figure
 import matplotlib.pyplot as plt
 from matplotlib.colors import Colormap
-import numpy as np
-import numpy.ma as ma
 import math as m
 import logging
 import json
@@ -40,7 +42,6 @@ import re
 import wx
 from scipy.interpolate import interp2d, griddata
 from scipy.ndimage import laplace, label, sum_labels
-import pygltflib
 from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, MultiPoint
 from shapely.ops import linemerge, substring, polygonize_full
 from shapely import contains, contains_properly, contains_xy, touches, prepare, destroy_prepared, is_prepared
@@ -56,12 +57,6 @@ except ImportError as e:
     print(e)
     raise Exception(_('Error importing modules'))
 
-try:
-    from osgeo import gdal
-except ImportError as e:
-    print(e)
-    raise Exception(_('Error importing GDAL library'))
-
 try:
     from .Coordinates_operations import reproject_and_resample_raster
 except ImportError as e:
@@ -132,6 +127,13 @@ VERSION_RGB = 3
 
 from numba import jit
 
+try:
+    from osgeo import gdal, osr
+    gdal.UseExceptions()
+except ImportError as e:
+    print(e)
+    raise Exception(_('Error importing GDAL library'))
+
 @jit(nopython=True)
 def custom_gradient(array: np.ndarray):
     """ Calculate the gradient manually """
@@ -878,7 +880,7 @@ class header_wolf():
         locpath = Path(filename)
 
         if filename.endswith('.tif') or filename.endswith('.tiff') :
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -932,7 +934,7 @@ class header_wolf():
 
         elif filename.endswith('.vrt'):
             # Virtual raster
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -6099,7 +6101,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param extent: suffix to add to the filename before the extension '.tif' (only if outdir is provided)
         :param EPSG: EPSG code, by default 31370 (Lambert 72)
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         outdir = str(outdir)
         extent = str(extent)
@@ -6378,7 +6380,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param which: band to import
         :param crop: crop the data - [xmin, xmax, ymin, ymax]
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         if fn !='':
             pass
@@ -7831,9 +7833,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array + other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array + other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7860,9 +7862,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array * other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7889,9 +7891,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array - other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array - other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7916,7 +7918,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask)
+        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7943,9 +7945,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array / other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array / other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask)
+            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')

{wolfhece-2.2.1.dist-info → wolfhece-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.1
+Version: 2.2.2
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.1.dist-info → wolfhece-2.2.2.dist-info}/RECORD

@@ -7,16 +7,16 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=sSCWZhBSakxp34ifrSyB_Oz57xCm6b-x6_J1Jd87jtY,603334
+wolfhece/PyDraw.py,sha256=wmBEYPkPiuk5sywCpKS1frEEirHDryVpF8P1G9wwuJA,603350
 wolfhece/PyGui.py,sha256=B7-pAQ0tOkXVIb_3BSjNVROFF9s23lGCSBaQD5NxvOQ,145093
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
-wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
+wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
 wolfhece/PyPalette.py,sha256=mTknZlfioRGX7iJVoKG1Yc0pQooZA_KYyFsAzvLY4Rk,34344
-wolfhece/PyParams.py,sha256=wVgzJC5Bs8rfx6NdUdcFDtnsaPBYJgRn3A-rROk49MQ,99525
+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=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
-wolfhece/PyVertexvectors.py,sha256=2kjtKwdYiGif-NVok8rS9T7Ok8jYMGN4tzy6zXoTxh8,325764
+wolfhece/PyVertex.py,sha256=PDKpLFPqE1ORzfi36xKIjuKsxR8DR0iNMsLhAGw11rY,45205
+wolfhece/PyVertexvectors.py,sha256=0lt0YyHIz_IxgXqdqPlTDruDwjeP6L1Dw6B2Q35a8kQ,325801
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -55,7 +55,7 @@ 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=RcyJHpoTBudR-dkG5NjS4-X0CgyfHVflZACJAXPBOts,485378
+wolfhece/wolf_array.py,sha256=Q5dXKhs3gtQXGHFUaN9AfJnc0FpAUJTLKnpbjB7CcQo,485619
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -63,13 +63,13 @@ wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
 wolfhece/wolfresults_2D.py,sha256=5Ser0lcfoGbsHLASx_1UtxmanYDGSuOCMgaadSNTHzs,218154
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
-wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
+wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
 wolfhece/acceptability/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/acceptability/acceptability.py,sha256=dLsYVwPiYH33M7y2vVzlLVd9q8dLgDIeTuJ8f20L4ig,28006
-wolfhece/acceptability/acceptability_gui.py,sha256=EWM-WfLWKTzMguZHWgRfRQARxb1xINwx0G9VOzmOn5k,74493
+wolfhece/acceptability/acceptability_gui.py,sha256=z_g1Ip7-H67KawR_EA_QeVtFXpMaoGKIKSmujVRz3Q0,75899
 wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
-wolfhece/acceptability/func.py,sha256=Aj85M01b09ENb9vN3q6isnJO5a2wNlNfiwhHbguhg_w,68263
+wolfhece/acceptability/func.py,sha256=NHUoYPxQg-WP6K1uOAoXrwofVZfn4VX-jSl9fHt07qM,68593
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -83,7 +83,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=E_lGl4BWE12swHHPwJTWvzfUAgEj2g4eoDA_PFNSTYA,387
+wolfhece/apps/version.py,sha256=pfJCxRPgSHvPoFtUBh1y_UjYF4wpkW6f7GnMs9a_h9g,387
 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
@@ -305,8 +305,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.1.dist-info/METADATA,sha256=YHBhMrSW-_ghRKpHukFs1j-NKs4iHqfDKgIcjsBhJkA,2694
-wolfhece-2.2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wolfhece-2.2.1.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.1.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.1.dist-info/RECORD,,
+wolfhece-2.2.2.dist-info/METADATA,sha256=rzjoOd8XS0mz80a0NdAokfYYiKOC5R2btg6qXj-4-ZE,2694
+wolfhece-2.2.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+wolfhece-2.2.2.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.2.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.2.dist-info/RECORD,,