wolfhece 2.2.8__py3-none-any.whl → 2.2.10__py3-none-any.whl

wolfhece/hydrology/SubBasin.py

@@ -34,6 +34,8 @@ from . import plot_hydrology as ph
 from . import data_treatment as datt
 from . import read as rd
 from . import constant as cst
+from . import Models_characteristics as mc
+from . import Internal_variables as iv
 
 from ..wolf_array import *
 from ..PyParams import*
@@ -3291,12 +3293,16 @@ class SubBasin:
         """
         This procedure is activating all internal variables of all the hydrological modules.
         """
-        if self.model == cst.tom_VHM:
-            self.activate_all_iv_VHM()
-        elif self.model == cst.tom_GR4:
-            self.activate_all_iv_GR4()
-        elif self.model == cst.tom_2layers_linIF:
-            self.activate_all_iv_2layers()
+        # if self.model == cst.tom_VHM:
+        #     self.activate_all_iv_VHM()
+        # elif self.model == cst.tom_GR4:
+        #     self.activate_all_iv_GR4()
+        # elif self.model == cst.tom_2layers_linIF:
+        #     self.activate_all_iv_2layers()
+        cur_dir = os.path.join(self.fileNameRead, "Subbasin_"+str(self.iDSorted))
+        
+        mc.MODELS_VAR[self.model].activate_all(directory=cur_dir, prefix_file='simul', type_of_var=iv.FINAL_OUT_VAR)
+        mc.MODELS_VAR[self.model].activate_all(directory=cur_dir, prefix_file='simul', type_of_var=iv.IV_VAR)
 
 
     def collect_x_VHM(self) -> dict[str,np.array]:
@@ -3559,29 +3565,8 @@ class SubBasin:
 
         if all_f == {}:
             all_f = self.collect_fractions()
-        
-        if interval is not None:
-            interv = np.zeros(len(self.time), dtype=bool)
-            for el in interval:
-                date_i = datetime.datetime.timestamp(el[0])
-                date_f = datetime.datetime.timestamp(el[1])
-                interv += (self.time>=date_i) & (self.time<=date_f)
-        else:
-            interv = np.ones(len(self.time), dtype=bool)
 
-        if summary == "mean":
-            return {key: np.nanmean(all_f[key], where=interv) for key in all_f}
-        elif summary == "median":
-            return {key: np.nanmedian(all_f[key][interv]) for key in all_f}
-        elif summary == "std":
-            return {key: np.nanstd(all_f[key][interv]) for key in all_f}
-        elif summary == "min":
-            return {key: np.nanmin(all_f[key], where=interv) for key in all_f}
-        elif summary == "max":
-            return {key: np.nanmax(all_f[key], where=interv, initial=0.0) for key in all_f}
-        else:
-            logging.error("The summary type is not recognised!")
-            return []
+        return self._operation_on_ts(all_f, operation=summary, interval=interval)
 
 
     def get_volume_fractions(self, all_f:dict={}, 
@@ -3717,7 +3702,80 @@ class SubBasin:
         unit='mm/h'
 
         return self.get_outFlow(unit=unit)
+    
+
+    def get_flow_fractions(self, all_f:dict={}, summary:str=None,
+                              interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.ndarray|float]:
+        """
+        This procedure is returning a summary of the fractions of the current module.
+
+        Parameters:
+        - summary (str): The type of summary to return.
+        - interval (list[datetime.datetime], optional): The interval of time to consider. Default is None.
+
+        Returns:
+        - dict: A dictionary containing the summary of the fractions of the current module.
+        """
+
+        if all_f == {}:
+            cur_dir = os.path.join(self.fileNameRead, "Subbasin_"+str(self.iDSorted))
+            all_qin = mc.MODELS_VAR[self.model].get_all_iv_timeseries(directory=cur_dir,
+                                            prefix_file='simul', type_of_var=iv.FINAL_OUT_VAR)
+            all_f = mc.MODELS_VAR[self.model].get_all_iv_timeseries(directory=cur_dir,
+                                            prefix_file='simul', type_of_var=iv.DEFAULT_VAR)
+            all_f.update(all_qin)
+        
+        q_simul = self.get_outFlow(unit='mm/h')
+        all_r = {"%"+key: val/q_simul * 100.0 for key, val in all_f.items()}
+
+        return self._operation_on_ts(all_r, summary=summary, interval=interval)
+    
+
+    def get_iv(self, all_iv:dict={}, max_params:dict={}, summary:str=None,
+                interval:list[tuple[datetime.datetime, datetime.datetime]]=None) -> dict[str, np.array]:
+        """
+        This procedure is returning a summary of the fractions of the current module.
+
+        Parameters:
+        - summary (str): The type of summary to return.
+        - interval (list[datetime.datetime], optional): The interval of time to consider. Default is None.
+
+        Returns:
+        - dict: A dictionary containing the summary of the fractions of the current module.
+        """
+
+        if all_iv == {}:
+            cur_dir = os.path.join(self.fileNameRead, "Subbasin_"+str(self.iDSorted))
+            all_iv = mc.MODELS_VAR[self.model].get_all_iv_timeseries(directory=cur_dir,
+                                            prefix_file='simul', type_of_var=iv.IV_VAR)
+        if max_params != {}:
+            out_dict = {key: all_iv[key]/cur_max for key, cur_max in max_params.items()}
+        else:
+            out_dict = all_iv
         
+        return self._operation_on_ts(out_dict, summary=summary, interval=interval)
+
+
+    def get_iv_fractions_one_date(self, all_iv:dict={}, max_params:dict={}, eval_date:datetime.datetime=None) -> dict[str, np.array]:
+        """
+        This procedure is returning a summary of the fractions of the current module.
+
+        Parameters:
+        - summary (str): The type of summary to return.
+        - interval (list[datetime.datetime], optional): The interval of time to consider. Default is None.
+
+        Returns:
+        - dict: A dictionary containing the summary of the fractions of the current module.
+        """
+
+        all_iv = self.get_iv(all_iv=all_iv, max_params=max_params, summary=None)
+        t_eval = datetime.datetime.timestamp(eval_date)
+        eval_i = np.searchsorted(self.time, t_eval)
+        if self.time[eval_i] != t_eval:
+            logging.warning("The date is not in the time series!")
+            return {}
+
+        return {"% "+key: val[eval_i] for key, val in all_iv.items()}
     
 
     def import_from_pandas_Series(self, data:pd.Series, which="outFlow"):
@@ -3760,7 +3818,33 @@ class SubBasin:
         tserie = pd.Series(data, index=idx, copy=True, name=" ".join([self.name,which]))
 
         return tserie
+    
+
+    def _operation_on_ts(self, ts:dict[str, np.ndarray], summary:str=None, interval:list[tuple[datetime.datetime, datetime.datetime]]=None):
+        if interval is not None:
+            interv = np.zeros(len(self.time), dtype=bool)
+            for el in interval:
+                date_i = datetime.datetime.timestamp(el[0])
+                date_f = datetime.datetime.timestamp(el[1])
+                interv += (self.time>=date_i) & (self.time<=date_f)
+        else:
+            interv = np.ones(len(self.time), dtype=bool)
 
+        if summary is None:
+            return {key: ts[key][interv] for key in ts}
+        elif summary == "mean":
+            return {key: np.nanmean(ts[key], where=interv) for key in ts}
+        elif summary == "median":
+            return {key: np.nanmedian(ts[key][interv]) for key in ts}
+        elif summary == "std":
+            return {key: np.nanstd(ts[key][interv]) for key in ts}
+        elif summary == "min":
+            return {key: np.nanmin(ts[key], where=interv) for key in ts}
+        elif summary == "max":
+            return {key: np.nanmax(ts[key], where=interv, initial=0.0) for key in ts}
+        else:
+            logging.error("The summary type is not recognised!")
+            return {}
 
     # def plot_Nash_vs_Qexcess(self, figure:plt.axis=None, toShow:bool=False, writeFile:str=""):
 

wolfhece/hydrology/cst_exchanges.py

@@ -555,6 +555,7 @@ NAM["Parameters"][exchange_parameters_NAM_CK12]["File"] = ["simul_OF.param", "si
 NAM["Parameters"][exchange_parameters_NAM_CK12]["Group"] = ["Time Parameters", "NAM parameters"]
 NAM["Parameters"][exchange_parameters_NAM_CK12]["Key"] = ["Lagtime", "Lagtime"]
 NAM["Parameters"][exchange_parameters_NAM_CK12]["Unit"] = "[h]"
+NAM["Parameters"][exchange_parameters_NAM_CK12]["Convertion Factor"] = [1/3600.0, 1.0]    # [sec] -> [h]
 NAM["Parameters"][exchange_parameters_NAM_CK12]["Range"] = (10.0, 50.0)
 NAM["Parameters"][exchange_parameters_NAM_CAREA] = {}
 NAM["Parameters"][exchange_parameters_NAM_CAREA]["Name"] = "C_area"

wolfhece/hydrometry/kiwis.py

@@ -436,7 +436,7 @@ class hydrometry():
 
         return self.url+'?request='+which.value+'&format='+format + datasource
 
-    def daily_token(self):
+    def daily_token(self, timeout:int =5):
         """
         Get daily token to be identified on hydrometry website
 
@@ -457,7 +457,10 @@ class hydrometry():
             data = {'grant_type' :'client_credentials'}
 
             try:
-                self.token = requests.post(self.urltoken, data=data, headers=headers).json()
+                self.token = requests.post(self.urltoken,
+                                           data=data,
+                                           headers=headers,
+                                           timeout=timeout).json()
 
                 if 'error' in self.token:
                     self.token = None
@@ -468,8 +471,10 @@ class hydrometry():
                     json.dump(self.token, f)
             except:
                 self._header = {'Authorization': 'Bearer '}
+                self.token = {'access_token': 0}
+                with open(today, 'w') as f:
+                    json.dump(self.token, f)
                 return
-                self.token = None
 
         try:
             self._header = {'Authorization': 'Bearer {}'.format(self.token['access_token'])}

wolfhece/lagrangian/particle_system_ui.py

@@ -659,7 +659,7 @@ class Particle_system_to_draw(Element_To_Draw):
                 logging.error(_('Dir {} does not contain particles'.format(fpath.parent)))
 
             self._ps.load(f)
-            # with wx.lib.busy.BusyInfo(_('Importing particle system')):
+            # with wx.BusyInfo(_('Importing particle system')):
                 # wx.Log.FlushActive()
                 # wait = wx.BusyCursor()
                 # self._ps.load(f)

wolfhece/pydike.py

@@ -63,7 +63,7 @@ class Dike(Triangulation,Zones):
         nb = int(self.trace.length3D/ds)
         nb2 = int(max(distup,distdown)/ds)
 
-        mytri = myzone.createmultibin(nb,nb2)
+        mytri = myzone.create_multibin(nb,nb2)
         self.tri = mytri.tri
         self.pts = mytri.pts
         self.nb_pts = mytri.nb_pts

wolfhece/pyviews.py

@@ -44,7 +44,7 @@ class WolfViews(Element_To_Draw):
 
         mykeys = ['cross_sections', 'vector', 'array']
 
-        # with wx.lib.busy.BusyInfo(_('Opening project')):
+        # with wx.BusyInfo(_('Opening project')):
         #     wait = wx.BusyCursor()
 
         #     if 'cross_sections' in myproject.myparams.keys():

wolfhece/wolf_array.py

@@ -10064,7 +10064,8 @@ class WolfArray(Element_To_Draw, header_wolf):
                         vmin:float=None, vmax:float=None,
                         figsize:tuple=None,
                         Walonmap:bool=False,
-                        cat:str='IMAGERIE/ORTHO_2022_ETE'):
+                        cat:str='IMAGERIE/ORTHO_2022_ETE',
+                        first_mask_data:bool=True):
         """
         Plot the array - Matplotlib version
 
@@ -10117,7 +10118,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         :rtype: tuple
         """
 
-        self.mask_data(self.nullvalue)
+        if first_mask_data:
+            self.mask_data(self.nullvalue)
+    
         if update_palette:
             self.updatepalette(0)
 
@@ -10151,7 +10154,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                            extent=(self.origx,
                                    self.origx + self.dx * self.nbx,
                                    self.origy,
-                                   self.origy + self.dy * self.nby))
+                                   self.origy + self.dy * self.nby),
+                            alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                                            [np.zeros(self.shape).T, np.ones(self.shape).T]))
         else:
             im = ax.imshow(self.array.transpose(),
                            origin='lower',
@@ -10160,7 +10165,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                                    self.origx + self.dx * self.nbx,
                                    self.origy,
                                    self.origy + self.dy * self.nby),
-                           vmin=vmin, vmax=vmax)
+                           vmin=vmin, vmax=vmax,
+                           alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                                           [np.zeros(self.shape).T, np.ones(self.shape).T])                           )
         ax.set_aspect('equal')
 
         if getdata_im:
@@ -12083,7 +12090,15 @@ class WolfArrayMB(WolfArray):
 
         return newArray
 
-    def plot_matplotlib(self, figax:tuple=None, getdata_im:bool=False, update_palette:bool=True, vmin:float=None, vmax:float=None, figsize:tuple=None, Walonmap:bool=False, cat:str='IMAGERIE/ORTHO_2022_ETE'):
+    def plot_matplotlib(self, 
+                        figax:tuple=None, 
+                        getdata_im:bool=False, 
+                        update_palette:bool=True, 
+                        vmin:float=None, vmax:float=None, 
+                        figsize:tuple=None, 
+                        Walonmap:bool=False, 
+                        cat:str='IMAGERIE/ORTHO_2022_ETE',
+                        first_mask_data:bool=True):
         """
         Plot the multi-block (MB) array - Matplotlib version
 
@@ -12142,7 +12157,14 @@ class WolfArrayMB(WolfArray):
         # Convert to single block
         single_block = self.as_WolfArray()
 
-        return single_block.plot_matplotlib(figax=figax, getdata_im=getdata_im, update_palette=update_palette, vmin=vmin, vmax=vmax, figsize=figsize, Walonmap=Walonmap, cat=cat)
+        return single_block.plot_matplotlib(figax=figax, 
+                                            getdata_im=getdata_im, 
+                                            update_palette=update_palette, 
+                                            vmin=vmin, vmax=vmax, 
+                                            figsize=figsize, 
+                                            Walonmap=Walonmap, 
+                                            cat=cat,
+                                            first_mask_data=first_mask_data)
 
 
 class WolfArrayMNAP(WolfArrayMB):

wolfhece-2.2.10.dist-info/METADATA

@@ -0,0 +1,90 @@
+Metadata-Version: 2.4
+Name: wolfhece
+Version: 2.2.10
+Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
+Project-URL: Homepage, https://uee.uliege.be/hece
+Project-URL: Issues, https://uee.uliege.be/hece
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Operating System :: Microsoft :: Windows :: Windows 10
+Classifier: Operating System :: Microsoft :: Windows :: Windows 11
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Topic :: Scientific/Engineering :: Physics
+Requires-Python: <3.12,>=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: wxpython==4.2.*
+Requires-Dist: pyogrio
+Requires-Dist: fiona
+Requires-Dist: msvc-runtime
+Requires-Dist: colorlog==6.7.*
+Requires-Dist: intel-fortran-rt
+Requires-Dist: scikit-learn
+Requires-Dist: cryptography
+Requires-Dist: jax==0.5.3
+Requires-Dist: triangle
+Requires-Dist: numpy==2.1.*
+Requires-Dist: pyopengl==3.1.*
+Requires-Dist: pandas
+Requires-Dist: geopandas
+Requires-Dist: scipy
+Requires-Dist: owslib
+Requires-Dist: pillow
+Requires-Dist: cython
+Requires-Dist: pyproj
+Requires-Dist: dbfread
+Requires-Dist: graphviz
+Requires-Dist: owslib
+Requires-Dist: beautifulsoup4
+Requires-Dist: requests
+Requires-Dist: matplotlib==3.10.*
+Requires-Dist: mkl
+Requires-Dist: python-gettext
+Requires-Dist: shapely==2.1.*
+Requires-Dist: openpyxl
+Requires-Dist: xlrd
+Requires-Dist: openkmi
+Requires-Dist: lxml
+Requires-Dist: laspy
+Requires-Dist: laszip
+Requires-Dist: sympy
+Requires-Dist: python-pptx
+Requires-Dist: python-docx
+Requires-Dist: pygltflib
+Requires-Dist: ezdxf
+Requires-Dist: pyvista
+Requires-Dist: tqdm==4.67.*
+Requires-Dist: tifffile
+Requires-Dist: numba==0.61.*
+Requires-Dist: xmltodict
+Requires-Dist: opencv-python
+Requires-Dist: xarray
+Requires-Dist: rasterio==1.4.3
+Requires-Dist: h5py
+Requires-Dist: exif
+Requires-Dist: pyglm
+Requires-Dist: mqtt
+Requires-Dist: wradlib
+Requires-Dist: seaborn
+Requires-Dist: autograd
+Requires-Dist: plyfile
+Requires-Dist: tabulate
+Requires-Dist: ipympl
+Requires-Dist: contextily
+Requires-Dist: pefile
+Requires-Dist: wolfpydike
+
+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.
+
+Les codes de calcul ne sont pas contenus dans ce paquet.
+
+Version 2.1.x compatible Numpy 1.23.5
+Version 2.2.x compatible Numpy 2.1.3
+
+--
+
+
+This package contains the Python graphical interface of the WOLF software (HECE - ULiège), as well as several topographic, hydraulic, and hydrological processing tools.
+
+The numerical codes are not included in this package.
+
+Version 2.1.x compatible Numpy 1.23.5
+Version 2.2.x compatible Numpy 2.1.3

{wolfhece-2.2.8.dist-info → wolfhece-2.2.10.dist-info}/RECORD

@@ -8,23 +8,23 @@ wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=mCIcXgtTT3vvixO_bvo76HlgK9p1MKk1GljGGIuIosw,631732
-wolfhece/PyGui.py,sha256=IU97wVlmer3Q2MpWbJv4MQWH7nYbc5uN4pRzhr4jdlM,145197
+wolfhece/PyDraw.py,sha256=MUxnzykOYLJFkF9tA6nutkasSTyDEuNzbwnfa_vmZF8,635057
+wolfhece/PyGui.py,sha256=jhpOPYRDG3ms1oi7FUs2W80T4SdPssZEnijxqFtn6vA,145199
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
 wolfhece/PyPalette.py,sha256=k9b_95GYD0USQ8DS5zGXeZ577712U6772kmhEbJtlXw,35406
 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=WboSqzI0fYI7wLk-jtgQ0ykX5QBKuVJuoavc8NnjEoo,46593
-wolfhece/PyVertexvectors.py,sha256=0lt0YyHIz_IxgXqdqPlTDruDwjeP6L1Dw6B2Q35a8kQ,325801
+wolfhece/PyVertex.py,sha256=WT2UprotBUEA6rvs8kXfPRscKrhIL4_pya2UylzoBJE,50385
+wolfhece/PyVertexvectors.py,sha256=yPqE1rmqCSAucjNjSo1_srKHMwjqYWe0lx7S2Wbpryw,327905
 wolfhece/PyWMS.py,sha256=LWkQk3R7miiVal-n5K5P5ClSQJA_vi5ImBxYGuxCx9A,9122
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
 wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,1538
 wolfhece/Results2DGPU.py,sha256=45bLAkWvqHcw60QIP7qXyizbmS7buoDC7ndzOVfiWXg,26302
-wolfhece/__init__.py,sha256=kw2zFam1CqCH6CHgRHCZt7YXzsGaOQ-PwNkIi_E2H-Y,272
+wolfhece/__init__.py,sha256=5ijazf1b2m6y5V8VJwbYKh0AVnTSwuwrmSIu7rp21Ds,502
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=U8D7e_OezfrRfgMsa4TyQ7rI4voLKSY3RK-c8fb6rrw,3156
@@ -48,17 +48,17 @@ wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
-wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
+wolfhece/pydike.py,sha256=bKUwVvFMtAI4np4JJAkIa4xBDLw9l4py3l-Mjlfr_rM,2242
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=WubNPQEk4fC--4qIHZK6mJqQnRs4mAWUpmjRL8q33Sw,46069
 wolfhece/pyshields.py,sha256=6YncgmcA6QvbyIl4jbFRf24uJVjhiSplQKWtZH42lXI,24108
-wolfhece/pyviews.py,sha256=5Hqqo9MRw1eiomYkmc7QywNu1KmEkytLJG-wH_aG38Y,13748
+wolfhece/pyviews.py,sha256=zuZjWUptRDm1MTE1PN4Xj_qSITnojgDMG0LlFIBH3SE,13739
 wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=HwOejG8kYTQ1l6c3RX8nuFwMAuySTWfgsxIvZl_Ivcg,496150
+wolfhece/wolf_array.py,sha256=PlImSCX5lUeoqPR7ogqak_Zl6dLyGn5EXUzeD_6-xAU,497218
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -86,7 +86,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=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=VLekoececzg7H4Z0hu97fb37nDVx-7ndJhfqA8urYqc,387
+wolfhece/apps/version.py,sha256=jwKS4e-_4CC0d7QyvFtDWckYcTMVOveGCPocSzztj48,388
 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
@@ -130,15 +130,17 @@ wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,52
 wolfhece/hydrology/Catchment.py,sha256=AKMIkGyMUK1TC_lKNZxFYwPt9bYtLOf0vLXILmZuTas,144465
 wolfhece/hydrology/Comparison.py,sha256=5uHQlKZgNUzpUM0xmLZUePuhq38x7w_hsIPO5Lm8lTE,84244
 wolfhece/hydrology/Dumping.py,sha256=SHGYXr30nMOGPSLArMvAzVxGyLywLf4i267166oUHhQ,2403
-wolfhece/hydrology/Optimisation.py,sha256=soT2TsM443uzqUFYOVDhj2oyLPF6Ob5YhRefSQLKkUM,149243
+wolfhece/hydrology/Internal_variables.py,sha256=F-eLtV3pjzkPkp12qxSDYJsiInvGx-IPqIouTmaQMjg,10141
+wolfhece/hydrology/Models_characteristics.py,sha256=qBvmyjpND_hPybR8M5s-FckUViwGdjxr3vv6PvtdQ-s,12614
+wolfhece/hydrology/Optimisation.py,sha256=6UEeWmNfuuDUnyIVZAkSMy74PCl5nub8Pz4xvCoVDAQ,166919
 wolfhece/hydrology/Outlet.py,sha256=jdjYN2gIolQJ5prf1wVfxm7cp_YguwQ0JMRsC9ks-Tg,10519
 wolfhece/hydrology/PostProcessHydrology.py,sha256=GS2dm9ahDb856apXvTM-oyusTn0xj-ySNpKbHa_jQdw,7419
 wolfhece/hydrology/PyWatershed.py,sha256=a26M6tVe4hrQ-a8FyAx7H9-RZcVCU5BBzFff4_YT0UU,97665
 wolfhece/hydrology/RetentionBasin.py,sha256=vFvpnomo5h8ZWq3Hq-YlxRnyqyQqHrojABMKzu3RP6E,83358
-wolfhece/hydrology/SubBasin.py,sha256=wFPehJ0vbZM9nZjEdttuch3Dmt8LzDtRVsF5E8pxM4E,178326
+wolfhece/hydrology/SubBasin.py,sha256=_grNjUSgFVViH0HDmRKyYt-ag9Y63y9hVOqVXOfk2OQ,182478
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
-wolfhece/hydrology/cst_exchanges.py,sha256=w83FyI1gOQ5EjTWb9usLfakQAJwv52u8_Hap2Nih570,39593
+wolfhece/hydrology/cst_exchanges.py,sha256=yT2cSIXjlfshPkSAdhyBxYwCPZ5L9s75BYM24tEO6_4,39699
 wolfhece/hydrology/data_treatment.py,sha256=vHNtEvXHJOdGHjaNjbTTvVoFQjVee-AdspJEesxVNuQ,34967
 wolfhece/hydrology/forcedexchanges.py,sha256=MrzMqKISX6G6t3XwkyFQa6tVFfTTC8ifm_nSvrOy5-8,2259
 wolfhece/hydrology/plot_hydrology.py,sha256=M1cujLxA03SG8P7CkIPVIsrbfsbCwZPpLHQHN2xxm4w,35708
@@ -146,7 +148,7 @@ wolfhece/hydrology/read.py,sha256=BaaIp1x44wPQz2LkWtzu7ZNKx3Gw_WDtAw-B4y_C2IU,95
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=Y_rAEgnBFwGL7VY2nEAZ2_buoO4gDplMprRaB27-7RE,62665
+wolfhece/hydrometry/kiwis.py,sha256=pCupiQvzOM0vtuN1Iqr7iba2kj-4gtj_-vDE-NWMAew,62936
 wolfhece/hydrometry/kiwis_gui.py,sha256=xubayI3ijq87l47pcVtP-D9mOGurOSu9rKz511oa7n0,24898
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
@@ -160,7 +162,7 @@ wolfhece/lagrangian/advection.py,sha256=_fuDx8AcOVWxY1dYq3no3lSCmLwrw49AAAEr6icE
 wolfhece/lagrangian/emitter.py,sha256=D-94Joy_bJmhwDIomEDVo1q0LsuzrwaSpzSLjCWXSmo,11862
 wolfhece/lagrangian/example_domain.py,sha256=-xDTmo1vZWG3yZt3VdhEiOjvtbm77b_AuGb90Rgq2Rk,4787
 wolfhece/lagrangian/particle_system.py,sha256=ZwlgwH8JuBh3KBzxBZzSZi6ya3ftvk-4P3Lk4s_zh4A,23999
-wolfhece/lagrangian/particle_system_ui.py,sha256=NDQZ1NbwAKiIf5Jvr-oLvWBjJu4BjF_J3kSk1IYZfh4,29601
+wolfhece/lagrangian/particle_system_ui.py,sha256=bW_4_42ghRRcGfErsFNfZDsrPdEmUaBLHmvCAaJsjzs,29592
 wolfhece/lagrangian/particles.py,sha256=sqp-_gfsIt8s3GNcI1eKaeOBMSo2C-wPrL7FpjkEyuw,9953
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
@@ -186,17 +188,20 @@ wolfhece/lazviewer/points/points.py,sha256=9qzCZvHMDL7ZdMc2P0UvljGHcB-L9_BlyR6ML
 wolfhece/lazviewer/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/processing/estimate_normals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/processing/estimate_normals/estimate_normals.cp310-win_amd64.pyd,sha256=zzSNvEeKLnH9Sxx_FsthQvopvB_DX-7Ov9dvkiH7G0w,124928
+wolfhece/lazviewer/processing/estimate_normals/estimate_normals.cp311-win_amd64.pyd,sha256=kpNuajhll1MUuGSRk5_XF8UQ-Sr497dGriAkEhnacpY,124928
 wolfhece/lazviewer/processing/estimate_normals/estimate_normals.cp39-win_amd64.pyd,sha256=NBUTqdyyfQQXf3cBldV349yKJ6Rb7LlZKKg6UXSg2Gk,123392
 wolfhece/lazviewer/vfuncsdir/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/vfuncsdir/vfuncs.cp310-win_amd64.pyd,sha256=zmnMvzBnaZdkQU-ATejht3VBUAWEcxeDmMkMsbeH_SA,136192
+wolfhece/lazviewer/vfuncsdir/vfuncs.cp311-win_amd64.pyd,sha256=tR8zaiHL-MICAFr64i2EBt-SIsgGtaJY41sBzmvFiSs,136192
 wolfhece/lazviewer/vfuncsdir/vfuncs.cp39-win_amd64.pyd,sha256=MzAEyrgnqja-FjHGtL-jbWg9o0f2SWUDVimXBN-8kCA,135168
 wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/viewer/qt.conf,sha256=uzoy7MmKYo_uTrNsfMuQ84LgBI5pVOeWXK_rXYMjsXI,37
-wolfhece/lazviewer/viewer/viewer.exe,sha256=jRy4FhrTa7yN0Cp5dBvCGAL_oBOCqMYbu-dSB9NojAM,177152
+wolfhece/lazviewer/viewer/viewer.exe,sha256=3G2EVR_zecWyFqV4AvOIW_5A8OMb3LDwAKTYFjJwFaU,177152
 wolfhece/lazviewer/viewer/viewer.py,sha256=5igxFDFZMnnnhF3oFbEHKLfgiK4TUgXEZHsgOJbtNY4,25319
+wolfhece/lazviewer/viewer/viewer_310.exe,sha256=jRy4FhrTa7yN0Cp5dBvCGAL_oBOCqMYbu-dSB9NojAM,177152
 wolfhece/lazviewer/viewer/viewer_np1_23_5.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=iGTdK8Hb4OKxh3xCOuYrK2KCfDlUJGl50FGUP160ddQ,134159360
+wolfhece/libs/WolfDll.dll,sha256=DlSlpFVicaGgBImvKSXHExgNNKphDwzCYW_w4EVrl8g,134153216
 wolfhece/libs/Wolf_tools.dll,sha256=HN4spQRt0f2hWm_4FsYdRuBo0hiCKFYnD0rOnJGJcAU,144569856
 wolfhece/libs/__init__.py,sha256=x7QvPd7hjL-Xl7RjlA8y6rcvKCkYu3JpFE3YnzUJeCY,3326
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
@@ -204,6 +209,7 @@ wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY
 wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
 wolfhece/libs/fribidi-0.dll,sha256=MCLSH_tGJXcJdcnUXilGNTVMH6KU8OumYyJX8yN08bQ,111616
 wolfhece/libs/get_infos.cp310-win_amd64.pyd,sha256=teptWpe0zs4P3TSk-FOleP3YqIxxplutuUltMcaFrEs,78336
+wolfhece/libs/get_infos.cp311-win_amd64.pyd,sha256=6-AJl8zY2K6UYsHTEshsKEC2-ggcdmwDRcNsfxzxZcU,78848
 wolfhece/libs/glu32.dll,sha256=gLubeeL9b_RDYTQ2JL0iHzpRMg8uapKCOEpZ15k1SUQ,164352
 wolfhece/libs/hdf5.dll,sha256=quTNP4GZtVNJ6Ptx__ltuGTN0gQ96rvkGL5yBLuUcF4,3129856
 wolfhece/libs/hdf5_hl.dll,sha256=alZLhLXbReBtwbwsariWWRPAlrwzrePr-Mbdgiy922Y,112128
@@ -217,7 +223,9 @@ wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57
 wolfhece/libs/vcruntime140.dll,sha256=gPBsB0DzEBn3b7E5ihESs-AtG4Cu59OnONR1QI17TGA,98720
 wolfhece/libs/vcruntime140_1.dll,sha256=KZJoe26L6i76Krqne_OribgfhN6LxJQEcs0Xn_01hP8,38304
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=HJhG4oSq994IQ_8lg6WTVJmoryc6qUSl-nTXXdEtf0A,128512
+wolfhece/libs/verify_wolf.cp311-win_amd64.pyd,sha256=9WP-FUOKX5V0zuDyoro30rADB1Lbnc3R3a_h4p2GOS0,129536
 wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=8LNrIRLpoaHGjhQTIBDeklawTLCqIXsmgpOkAfCqsmM,458240
+wolfhece/libs/wolfogl.cp311-win_amd64.pyd,sha256=9Zrm_KU_OMy8dRU8w0QrPoxDuwfjtl0QxSCBbdinhaQ,458240
 wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
 wolfhece/libs/GL/glaux.h,sha256=I3vxXdrzVH05TmjEeAOgKn3egbPt34WMjbeKq5LaBvE,7130
@@ -314,8 +322,12 @@ 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.8.dist-info/METADATA,sha256=SZScGuzekEdz_ReMj94rQMIwrfNH3QMhDq0eEb-of9k,2744
-wolfhece-2.2.8.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-wolfhece-2.2.8.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.8.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.8.dist-info/RECORD,,
+wolfhece-2.2.10.dist-info/METADATA,sha256=dZmOaHOR_0IxWFuN5lUKEm4R5MHxY2_U7VSECc8yJBU,2752
+wolfhece-2.2.10.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+wolfhece-2.2.10.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.10.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.3.0.dist-info/METADATA,sha256=8SIgYZchVGjcc4QohW2ZsNn1YK_IFPRU9dBT6fhUAuE,2751
+wolfhece-2.3.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+wolfhece-2.3.0.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.3.0.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.10.dist-info/RECORD,,

{wolfhece-2.2.8.dist-info → wolfhece-2.2.10.dist-info}/WHEEL

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

{wolfhece-2.2.8.dist-info → wolfhece-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.8
+Version: 2.3.0
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -9,9 +9,9 @@ Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 11
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: <3.11,>=3.10
+Requires-Python: <3.12,>=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: wxpython
+Requires-Dist: wxpython==4.2.*
 Requires-Dist: pyogrio
 Requires-Dist: fiona
 Requires-Dist: msvc-runtime

wolfhece-2.3.0.dist-info/WHEEL

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

wolfhece-2.3.0.dist-info/entry_points.txt

@@ -0,0 +1,17 @@
+[console_scripts]
+wolf_accept = wolfhece.cli:accept
+wolf_check = wolfhece.cli:check
+wolf_gui = wolfhece.cli:wolf
+wolf_hydrometry = wolfhece.cli:hydrometry
+wolf_license = wolfhece.cli:license
+
+[gui_scripts]
+wolf = wolfhece.cli:wolf
+wolf2d = wolfhece.cli:wolf2d
+wolfaccept = wolfhece.cli:acceptability_gui
+wolfcompare = wolfhece.cli:compare
+wolfdigitizer = wolfhece.cli:digitizer
+wolfhydro = wolfhece.cli:hydro
+wolfhydrometry = wolfhece.cli:hydrometry
+wolfoptimhydro = wolfhece.cli:optihydro
+wolfparam = wolfhece.cli:params

wolfhece-2.3.0.dist-info/top_level.txt

@@ -0,0 +1 @@
+wolfhece