wolfhece 2.2.37__py3-none-any.whl → 2.2.39__py3-none-any.whl

wolfhece/wolf_array.py

@@ -1079,6 +1079,9 @@ class header_wolf():
                     tmp = curline.split(' ')
                     self.nullvalue = float(tmp[-1])
 
+            self.origx -= self.dx*0.5
+            self.origy += self.dy*0.5
+
             if self.flipupd:
                 self.origy -= self.dy*float(self.nby)
 
@@ -1151,6 +1154,8 @@ class header_wolf():
     def read_header(cls, filename:str) -> "header_wolf":
         """
         alias for read_txt_header
+
+        :param filename: path and filename of the basefile
         """
         newhead = cls()
         newhead.read_txt_header(filename)
@@ -6160,7 +6165,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         Constructor of the WolfArray class
 
         :param fname: filename/filepath - if provided, the file will be read on disk
-        :param mold: initialize from a copy a the mold object --> must be a WolArray if not None
+        :param mold: initialize from a copy a the mold object --> must be a WolfArray if not None - Do not impose the type of the array. The source array will be converted if necessary. Change "whichtype" to impose a type.
         :param masknull: mask data based on the nullvalue
         :param crop: crop data based on the spatial extent [[xmin, xmax], [ymin,ymax]]
         :param whichtype: type of the numpy array (float32 as default)
@@ -6252,9 +6257,9 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.dy = header.dy
             self.dz = header.dz
 
-            self.nbx = header.nbx
-            self.nby = header.nby
-            self.nbz = header.nbz
+            self.nbx = int(header.nbx)
+            self.nby = int(header.nby)
+            self.nbz = int(header.nbz)
 
             self.head_blocks = header.head_blocks.copy()
 
@@ -6286,17 +6291,17 @@ class WolfArray(Element_To_Draw, header_wolf):
                     return
 
             self.filename = str(fname)
-            logging.info(_('Loading file : %s') % self.filename)
+            logging.debug(_('Loading file : %s') % self.filename)
             self.read_all()
 
             if mask_source is not None:
-                logging.info(_('Applying mask from source'))
+                logging.debug(_('Applying mask from source'))
                 self.copy_mask_log(mask_source)
-                logging.info(_('Data masked'))
+                logging.debug(_('Data masked'))
             elif masknull and (self.preload or self.loaded):
-                logging.info(_('Masking data with nullvalue'))
+                logging.debug(_('Masking data with nullvalue'))
                 self.mask_data(self.nullvalue)
-                logging.info(_('Data masked'))
+                logging.debug(_('Data masked'))
 
         elif mold is not None:
             if self.cropini is None:
@@ -6455,9 +6460,11 @@ class WolfArray(Element_To_Draw, header_wolf):
                 del self.mypal
             if hasattr(self, 'shaded'):
                 del self.shaded
-            # Perform garbage collection if gc is available
-            import gc
-            gc.collect()
+
+            if sys.meta_path is not None:
+                # Perform garbage collection if gc is available
+                import gc
+                gc.collect()
         except Exception as e:
             print(f"Exception in WolfArray destructor: {e} -- Please report this issue")
 
@@ -6700,7 +6707,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
 
         if self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_SYM_DOUBLE, WOLF_ARRAY_CSR_DOUBLE]:
-            dtype = _('float64 - 8 bytes poer values')
+            dtype = _('float64 - 8 bytes per values')
         elif self.wolftype in [WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_SINGLE_3D, WOLF_ARRAY_MB_SINGLE]:
             dtype = _('float32 - 4 bytes per values')
         elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_MNAP_INTEGER]:
@@ -9913,7 +9920,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         ret = {}
         if isinstance(zones, Zones):
-            out = ret[myzones.myname] = {}
+            out = ret[zones.idx] = {}
             myzones = zones.myzones
         elif isinstance(zones, list):
             myzones = zones
@@ -10086,8 +10093,12 @@ class WolfArray(Element_To_Draw, header_wolf):
         THRESHOLD = 100_000_000
 
         if not os.path.exists(self.filename):
+            logging.error(_('No data file : ')+self.filename)
             if self.wx_exists:
-                logging.warning(_('No data file : ')+self.filename)
+                dlg = wx.MessageDialog(None, _('No data file : ')+self.filename,
+                                        _('Wolf array'), wx.OK | wx.ICON_ERROR)
+                dlg.ShowModal()
+                dlg.Destroy()
             return
 
         def check_threshold(nbx, nby, THRESHOLD) -> bool:
@@ -10310,7 +10321,11 @@ class WolfArray(Element_To_Draw, header_wolf):
             if np.mod(self.nby,factor) !=0:
                 newnby = int(self.nby + factor - np.mod(self.nby,factor))
 
-            newarray = np.ma.ones((newnbx,newnby), dtype = self.dtype) * self.nullvalue
+            # We ensure that the null_value is converted to the type of the array.
+            # Not doing so leads to a change in the array type because
+            # of numpy2 type promotion.
+            newarray = np.ma.masked_array( np.full((newnbx,newnby), self.nullvalue, dtype = self.dtype) )
+            #newarray = np.ma.ones((newnbx,newnby), dtype = self.dtype) * self.nullvalue
             newarray[:self.nbx,:self.nby] = self.array
             newarray.mask[:self.nbx,:self.nby] = self.array.mask
             self.array = newarray
@@ -10354,14 +10369,20 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             self.set_nullvalue_in_mask()
         else:
-            self.array = np.kron(self.array, np.ones((int(1/factor), int(1/factor)), dtype=self.array.dtype))
+
+            if (int(1/factor) - 1/factor) > 1e-6:
+                logging.warning(f"The factor {factor} doesn't lead to an integer dimension for the Kronecker product")
+
+            ones = np.ones( (int(1/factor), int(1/factor)), dtype=int)
+            self.array = np.kron(self.array, ones).astype(self.array.dtype)
+
 
             self.mask_data(self.nullvalue)
 
         self.count()
 
         # rebin must not change the type of the array
-        assert self.array.dtype == self.dtype, _('Bad dtype')
+        assert self.array.dtype == self.dtype, _(f'Bad dtype: {self.array.dtype} != {self.dtype}')
 
     def read_txt_header(self):
         """
@@ -10379,6 +10400,11 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         super().write_txt_header(self.filename+'.txt', self.wolftype, forceupdate=True)
 
+    def _reload(self):
+        """ Reload the data from the file """
+        self.read_all()
+        self.mask_force_null()
+
     def read_data(self):
         """Opération de lecture des données depuis le fichier connu"""
         if not os.path.exists(self.filename):
@@ -10631,23 +10657,35 @@ class WolfArray(Element_To_Draw, header_wolf):
         return Array
 
     def fillin_from_xyz(self, xyz:np.ndarray):
-        """ Remplissage du tableau à partir d'un tableau xyz """
+        """ Remplissage du tableau à partir d'un tableau xyz.
+
+        :param xyz: Numpy array - shape (n, 3)
+        """
+
+        ij = self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])
+        # filter points outside the array
+        filter = (ij[0] >= 0) & (ij[0] < self.nbx) & (ij[1] >= 0) & (ij[1] < self.nby)
+        xyz = xyz[filter]
+        ij = (ij[0][filter], ij[1][filter])
 
         if self.dtype == np.float32:
-            self.array.data[self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])] = np.float32(xyz[:, 2])
+            self.array.data[ij] = np.float32(xyz[:, 2])
         elif self.dtype == np.float64:
-            self.array.data[self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])] = np.float64(xyz[:, 2])
+            self.array.data[ij] = np.float64(xyz[:, 2])
         elif self.dtype == np.int32:
-            self.array.data[self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])] = np.int32(xyz[:, 2])
+            self.array.data[ij] = np.int32(xyz[:, 2])
         elif self.dtype == np.int16:
-            self.array.data[self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])] = np.int16(xyz[:, 2])
+            self.array.data[ij] = np.int16(xyz[:, 2])
         elif self.dtype == np.int8:
-            self.array.data[self.get_ij_from_xy(xyz[:, 0], xyz[:, 1])] = np.int8(xyz[:, 2])
+            self.array.data[ij] = np.int8(xyz[:, 2])
         else:
             logging.warning(_('Type not supported : ')+str(self.dtype))
 
     def fillin_from_ijz(self, ijz:np.ndarray):
-        """ Remplissage du tableau à partir d'un tableau ijz """
+        """ Remplissage du tableau à partir d'un tableau ijz
+
+        :param ijz: Numpy array - shape (n, 3)
+        """
 
         try:
             i = ijz[:, 0].astype(int)

{wolfhece-2.2.37.dist-info → wolfhece-2.2.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.37
+Version: 2.2.39
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -75,6 +75,8 @@ Requires-Dist: contextily
 Requires-Dist: pefile
 Requires-Dist: wolfpydike
 Requires-Dist: PyMuPDF
+Requires-Dist: eccodes
+Requires-Dist: dataframe_image
 
 This package contains the Python graphical interface for the WOLF software (HECE - ULiège), along with several tools for topographic, hydraulic, and hydrological processing.
 

{wolfhece-2.2.37.dist-info → wolfhece-2.2.39.dist-info}/RECORD

@@ -1,24 +1,25 @@
-wolfhece/Coordinates_operations.py,sha256=KaIcP1b0IpKSLaynZgfvwkD6wsMKLmZo-kxeLfv9-8c,8101
+wolfhece/Coordinates_operations.py,sha256=DSkzJ1Rm4y89I9tuyyAA9mp-EHp9vl5w2qGpNJ-e9qs,8215
 wolfhece/CpGrid.py,sha256=_piG1u-ua7NzWh_PHJYTmxuPJ43ZfeYKNEQgZIJwDJ8,10660
-wolfhece/GraphNotebook.py,sha256=2TR8qjEwpMtl34QWgYNVe_PgTnuwhUxT5f9Y2zrmN2U,28257
-wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
+wolfhece/GraphNotebook.py,sha256=_VZfakR5eXBZE-4Ztv2n12ZDO8zESoeDfCz_9k__T20,31509
+wolfhece/GraphProfile.py,sha256=PhdgRIt7jHWEM_msnVysk18-JpS1f55tnfJzq7fDTfM,69676
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
-wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
+wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzxCF0,59572
+wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
-wolfhece/PyCrosssections.py,sha256=2m372NSriH41AcIk723y2i44mwUXodbIMIzqkuVMjUY,127365
-wolfhece/PyDraw.py,sha256=F2zS8Mf8H44JDsV-ZaXaMIGx3lSFDUIyCeoLDQYRAiU,690532
-wolfhece/PyGui.py,sha256=mcLuHT_pGjW1ltJ-kjNFstVXyeBoZRCvM3vHWv5srB8,148594
-wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
+wolfhece/PyCrosssections.py,sha256=6K9xhupnIVXzLdsLTPN9e1v0xck9BdWZd0-EgpWg9us,133277
+wolfhece/PyDraw.py,sha256=XjIi5yDcl56C5fFHQUFdJvyU7r8jJ9z7aRVPOZijQcI,727297
+wolfhece/PyGui.py,sha256=GpVRxNpR8WNDFyHnDvhtHFFsq_cZZlyVgSkFiS-ARYI,185342
+wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
-wolfhece/PyPalette.py,sha256=SiRngKml2EXsq1jwQvqh5pBZiV1yS0CY7QrRJGSZD1s,36281
-wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
-wolfhece/PyPictures.py,sha256=5X2HBkZG1gTaMKMu6UoU-cOY8SRkFyPScJ8bhdoNY7g,18930
+wolfhece/PyPalette.py,sha256=OQHyMSr5XXj_NgxABfhdW20IvAsLsdnmsdtW4rvq5Fo,37218
+wolfhece/PyParams.py,sha256=900BIaS7hzFwddsrpowWshf5kjQJKYVhnFykMVTlRSM,102063
+wolfhece/PyPictures.py,sha256=qcKwyCmZA0V7Kcr1FiLmcMlVhX0BgIZsJawAIKt8qt4,18932
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=a56oY1NB45QnwARg96Tbnq-z-mhZKFkYOkFOO1lNtlk,51056
-wolfhece/PyVertexvectors.py,sha256=LhuvLC-zrCMFmwo9JwxgME_3QnTeZMC0vgo8MHg4miw,374955
-wolfhece/PyWMS.py,sha256=XcSlav5icct2UwV7K2r7vpxa5rKZWiHkp732lI94HFI,31534
+wolfhece/PyVertex.py,sha256=0KUzHc4ozuiZKuej6Xx4lyzE7vFOKeBO5dGk-K5LtHo,51893
+wolfhece/PyVertexvectors.py,sha256=HaOCora21-foEP0qYQbK-GqirYgiql8qd719xL-oilw,378066
+wolfhece/PyWMS.py,sha256=MOOikPo-jZv1oPUruGv6XR_Pn_W3h-eNBeRgi_pRNOc,32031
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
@@ -30,8 +31,9 @@ wolfhece/analyze_poly.py,sha256=LewmoMSCAr_5zTeqKR0C1eWwjWh7zPjsSdsDyAV-yuk,6087
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=h1tSMHALiftktreyugKcjbASXfpJUm9UYMeVxR-MtG4,6424
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
+wolfhece/compare_series.py,sha256=M8Xce8vexq3KyVoN-de7pcgCVW0A16vrvlYZegfbwBM,17674
 wolfhece/dike.py,sha256=eG9EDCRk46Nlzpg5OycUeOag_T8joyJ2wzTkQgAT5F0,30710
-wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
+wolfhece/drawing_obj.py,sha256=O_K9xlsiPn305YS_2oWTlv3-rBuGiCkwWEcYAwlJRGs,4514
 wolfhece/eikonal.py,sha256=iDeDs571sVXGe4IsPSJ1Sa4hX8Ri2jWE7u83xzvA2K8,23189
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=_VrcFm2E--RfOvGjsazL5Zve_p5fIhzsT62AElI5E04,5501
@@ -39,29 +41,33 @@ wolfhece/gpuview.py,sha256=Jql8pLZ0PpvZ_ScT-U4jsXANZ9j4-m_RWhsLA2HISuQ,24544
 wolfhece/images_tiles.py,sha256=w5BX6kRqA0wW9TWyKrJUIRl-XyqHclq_kp5ET2VA0Sg,3227
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
-wolfhece/irm_qdf.py,sha256=doG2Q6PZEXkPVaN9-233qfd4FRCmdRKnrgvxounhasQ,32728
+wolfhece/interpolating_raster.py,sha256=nfDMypEE5uDfdLtTabCw7suPTfDwMZESQNgBLe38mVY,16177
+wolfhece/irm_alaro.py,sha256=_QWdd4zQsXyhYQtidzwPNoKCjNVJ-dsQn-zn0w0H1Is,56555
+wolfhece/irm_qdf.py,sha256=K7zUgK91OqbrxfIBLh4ZTgFwDqRGdQZZt5eJSyi70JU,68457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/lagrange_multiplier.py,sha256=0G-M7b2tGzLx9v0oNYYq4_tLAiHcs_39B4o4W3TUVWM,6567
-wolfhece/lifewatch.py,sha256=Q_Wy6VGkrD-xxY0fv3PKpT8U8oXxNMgiLlrAE3bMheo,16340
+wolfhece/lifewatch.py,sha256=F_Vw5X2Nh0GB9WpAsyRdts3EJ6syaX4vexXN9ePBTqo,16637
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/os_check.py,sha256=SUHyUZ_tuRDvL995LFoJ6ncE91HcYpd9xN8Tfcg4RUA,316
-wolfhece/picc.py,sha256=2haBqyY7tMphyifIPafPjC7ZnxZRcD585DDkgEFLATw,9988
+wolfhece/picc.py,sha256=7_Q2N7rlfkoCW6wPljItSRtANL2suhptTW3xz-DjceU,15612
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
+wolfhece/pyLandUseFlanders.py,sha256=4R4J4BgP1-W0sebnb-TBreStZx3DKOh1zYj_dg23Ac4,8657
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=dRb6qGkqoTXjf107KcajcIk1F_FuMPaOZLSwixT3dgA,11196
-wolfhece/pydownloader.py,sha256=5XzkmakblUmYr025NNZ8Ss7yeWCeNbrRJj1-YoAO10M,10376
+wolfhece/pydownloader.py,sha256=DvWkOWIaIg-qsyzyx-SwP0xc6epUZ-gv2khTJZN8d3U,10393
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
 wolfhece/pyviews.py,sha256=zuZjWUptRDm1MTE1PN4Xj_qSITnojgDMG0LlFIBH3SE,13739
-wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
+wolfhece/pywalous.py,sha256=6FTDh0dzKg7H6F7_YXEKT2gmE0OM_a8hvOLhEu4kRpY,26729
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=8f1cVLe5kTAlFfsWbpNXJXS04FXK0kVxT-YCbvkD2Ow,572989
+wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
+wolfhece/wolf_array.py,sha256=vhsxF79jcdK1tY1GFjCWx8YupC8D9r-C7nZ9Is2pMO4,574421
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -72,10 +78,10 @@ wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 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=pw99h5oanVXIRTWtTcEkW3PcvasuPfpR1rkcGBrLaFI,28120
-wolfhece/acceptability/acceptability_gui.py,sha256=HSNpYnCCP9g4rBzn1rGMjKw1vYxIcdxu-EfzAjDdtGU,75518
+wolfhece/acceptability/acceptability.py,sha256=_A5QOzYb2hPo0QvVZlkD5aoSmuN5ie1peBEVadjuqJE,28505
+wolfhece/acceptability/acceptability_gui.py,sha256=cn_5U4DCH4AgSErDrCDEa7CET7YxRHfTiNQAh-g2_iE,84458
 wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
-wolfhece/acceptability/func.py,sha256=zW87no63HM2ruo3xJtYZxI5_4VjJExmyihH9e5_Z9cw,75772
+wolfhece/acceptability/func.py,sha256=6FCnwDU333T3xcAkDpIsYFsLmuFsTa0152T6lYiMm8E,71866
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -89,7 +95,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=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=UZe3RYrHjNWqrUoSi1X0dcpPsQWu6xdtW_vEQehWduM,388
+wolfhece/apps/version.py,sha256=K0KiOex_hrmAhFyclrpkhVQPRpY51D6WWi2IXhErAlc,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -132,29 +138,31 @@ wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,
 wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,42696
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
-wolfhece/hydrology/Catchment.py,sha256=AKMIkGyMUK1TC_lKNZxFYwPt9bYtLOf0vLXILmZuTas,144465
+wolfhece/hydrology/Catchment.py,sha256=3pna7h2zhNLaShG6AdKB-WcfEQidgq88YAQXScCBUFw,147729
 wolfhece/hydrology/Comparison.py,sha256=5uHQlKZgNUzpUM0xmLZUePuhq38x7w_hsIPO5Lm8lTE,84244
 wolfhece/hydrology/Dumping.py,sha256=SHGYXr30nMOGPSLArMvAzVxGyLywLf4i267166oUHhQ,2403
-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=AVEii9E7Lo84LFaAanrFzOB8pqQ-lTE_tu_svoahHZ8,166915
+wolfhece/hydrology/Internal_variables.py,sha256=SpzA1xGlfRTZRHrdbZtjEn219uk6ulPlkkQu69LDn4E,12094
+wolfhece/hydrology/Models_characteristics.py,sha256=WxrYmVFS8bZgCYL5-tQIn7grGcDDzvetK0w1_PNYhYk,14006
+wolfhece/hydrology/Optimisation.py,sha256=pPq-A4XicueIz31lFtNGk6OKggfkuZnJI7xdhh6yllM,207527
 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/PyWatershed.py,sha256=Q0MTpaU5rkZu3erHPwZTIlsvGrVm8yMvoNh-3ayoesU,102665
 wolfhece/hydrology/RetentionBasin.py,sha256=vFvpnomo5h8ZWq3Hq-YlxRnyqyQqHrojABMKzu3RP6E,83358
-wolfhece/hydrology/SubBasin.py,sha256=ORK1VmvBOfyDjfOTxFQ9bcHe78pAoVcRWwu5Vm-CDHo,181790
+wolfhece/hydrology/SubBasin.py,sha256=WPs6Q_Zza4w9dTMe1UpF3I7SxebW9WOpzUEJyJ-Q96E,184868
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
-wolfhece/hydrology/cst_exchanges.py,sha256=yT2cSIXjlfshPkSAdhyBxYwCPZ5L9s75BYM24tEO6_4,39699
+wolfhece/hydrology/climate_data.py,sha256=CYCs0ViP389-lbYKeOFSYjPdwvKlHWdMs0RePsl6c2w,13418
+wolfhece/hydrology/constant.py,sha256=tP-AHRzXNKLtVI3VuqG8Q_tQ0-P5mrX_zFlznB6OeHo,2526
+wolfhece/hydrology/cst_exchanges.py,sha256=L6VUdxfbMwui93AmMHnyugODjSym8y1p7GZzUKs8WfY,43126
 wolfhece/hydrology/data_treatment.py,sha256=vHNtEvXHJOdGHjaNjbTTvVoFQjVee-AdspJEesxVNuQ,34967
-wolfhece/hydrology/forcedexchanges.py,sha256=MrzMqKISX6G6t3XwkyFQa6tVFfTTC8ifm_nSvrOy5-8,2259
+wolfhece/hydrology/forcedexchanges.py,sha256=rLapzmSyuibP40p4V7pfbrPgoX1KUw-TPn1WG-9TL24,15827
+wolfhece/hydrology/hyetograms.py,sha256=E24e3zDIfzBk0C-djI61pL6D7G3BVGtpXNTP4UqjIXw,83393
 wolfhece/hydrology/plot_hydrology.py,sha256=M1cujLxA03SG8P7CkIPVIsrbfsbCwZPpLHQHN2xxm4w,35708
-wolfhece/hydrology/read.py,sha256=BaaIp1x44wPQz2LkWtzu7ZNKx3Gw_WDtAw-B4y_C2IU,9553
+wolfhece/hydrology/read.py,sha256=H-sK4hU23snrZC3BDLUHJqUTUBwvQ48ZFgxE-6PxDYg,11843
 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=HDsTZenqG5La4t0Rv9iJeScH_j07w2k3J5fMlj74jI8,64491
-wolfhece/hydrometry/kiwis_gui.py,sha256=xubayI3ijq87l47pcVtP-D9mOGurOSu9rKz511oa7n0,24898
+wolfhece/hydrometry/kiwis.py,sha256=rhfvRKlKEKIDiwnGfHnT5oDa-I-RHU2ikPqD25urdHw,65463
+wolfhece/hydrometry/kiwis_gui.py,sha256=s4xCsqkKvI1YcIZ4X2A7hV11zyJFI8Q_4i82jOO6_ys,25060
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
@@ -162,6 +170,9 @@ wolfhece/icons/image.png,sha256=jomOPNO4HBArBZe8Ya189Iar5nzhO8c0S9JW-6iaErk,2684
 wolfhece/icons/multiple_files.png,sha256=qQEZ5740dyYrMGWGop5h0e2Np_bjq3eqg6VC1-7bPm4,1455
 wolfhece/icons/python.png,sha256=nQiK5h92QC85148vFBx58lUmaSzEvwTCgDr-cumju_4,2573
 wolfhece/icons/simulation.png,sha256=I48r_TOPqtUA4bsDGlji--9gJjiDaSl2NcVCMf8h9Gk,2094
+wolfhece/insyde_be/INBE_func.py,sha256=CyqwoPoNl82kU0xpbD_s-omOW7_EJURQ5w7JcbfvkCA,36847
+wolfhece/insyde_be/INBE_gui.py,sha256=ICuv-EVXcb48HWSfLT4jEnezaKv0m3i-IvjX_FyWhMY,89115
+wolfhece/insyde_be/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
 wolfhece/lagrangian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lagrangian/advection.py,sha256=_fuDx8AcOVWxY1dYq3no3lSCmLwrw49AAAEr6icE-6c,9243
 wolfhece/lagrangian/emitter.py,sha256=D-94Joy_bJmhwDIomEDVo1q0LsuzrwaSpzSLjCWXSmo,11862
@@ -308,8 +319,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.37.dist-info/METADATA,sha256=4emqUYlgiP4zz7VHzAxBZXBN8-fklrJF7eqNnV-Na4g,2729
-wolfhece-2.2.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.37.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.37.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.37.dist-info/RECORD,,
+wolfhece-2.2.39.dist-info/METADATA,sha256=PlUu_DvltuzTlOWhl76oPplEuXVSNZWszz1LIxnEPyQ,2785
+wolfhece-2.2.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.39.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.39.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.39.dist-info/RECORD,,