wolfhece 2.2.18__py3-none-any.whl → 2.2.23__py3-none-any.whl

wolfhece/scenario/config_manager.py

@@ -1272,6 +1272,11 @@ class Config_Manager_2D_GPU:
         if ret != '':
             logging.warning(ret)
 
+        bridge_deck.nullvalue = 99999.
+        bridge_roof.nullvalue = 99999.
+        bridge_deck.mask_data(99999.)
+        bridge_roof.mask_data(99999.)
+
         return ret
 
     def create_simulation(self,
@@ -1389,9 +1394,13 @@ class Config_Manager_2D_GPU:
                 logging.error(_('Roof .tif must be a full single array ! -- The array will be ignored !'))
                 roof = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_SINGLE)
                 roof.array.data[:,:] = 99999.
+                roof.nullvalue = 99999.
+                roof.nbnotnull = 0
         else:
             roof = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_SINGLE)
             roof.array.data[:,:] = 99999.
+            roof.nullvalue = 99999.
+            roof.nbnotnull = 0
 
         # check for deck
         if exists(dir / '__deck.tif'):
@@ -1400,9 +1409,13 @@ class Config_Manager_2D_GPU:
                 logging.error(_('Deck .tif must be a full single array ! -- The array will be ignored !'))
                 deck = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_SINGLE)
                 deck.array.data[:,:] = 99999.
+                deck.nullvalue = 99999.
+                deck.nbnotnull = 0
         else:
             deck = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_SINGLE)
             deck.array.data[:,:] = 99999.
+            deck.nullvalue = 99999.
+            deck.nbnotnull = 0
 
         # applying Python scrpitps on ARRAYS
         self._apply_scripts_update_topo_maning_inf_roof_deck(dir, bat, man, infiltration, roof, deck)

wolfhece/tools2d_dll.py

@@ -3,6 +3,7 @@ import numpy as np
 import ctypes as ct
 import logging
 
+import wolf_libs
 from .wolf_array import header_wolf, getkeyblock
 
 from .os_check import isWindows
@@ -29,12 +30,16 @@ class Tools2DFortran:
 
         if debugmode:
             if path_to_dll is None:
-                self.dll_file = Path(__file__).parent / "libs" / "Wolf_tools_debug.dll"
+                # wolflibs directory
+                self.dll_file = Path(wolf_libs.__path__[0]) / "Wolf_tools_debug.dll"
+                # self.dll_file = Path(__file__).parent / "libs" / "Wolf_tools_debug.dll"
             else:
                 self.dll_file = path_to_dll / "Wolf_tools_debug.dll"
         else:
             if path_to_dll is None:
-                self.dll_file = Path(__file__).parent / "libs" / "Wolf_tools.dll"
+                # wolflibs directory
+                self.dll_file = Path(wolf_libs.__path__[0]) / "Wolf_tools.dll"
+                # self.dll_file = Path(__file__).parent / "libs" / "Wolf_tools.dll"
             else:
                 self.dll_file = path_to_dll / "Wolf_tools.dll"
 

wolfhece/wolf_array.py

@@ -89,7 +89,8 @@ except ImportError as e:
     raise Exception(_('Error importing modules'))
 
 try:
-    from .libs import wolfogl
+    from wolf_libs import wolfogl
+
 except ImportError as e:
     msg=_('Error importing wolfogl.pyd')
     msg+=_('   Python version : ' + sys.version)
@@ -5640,6 +5641,24 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+    def __getstate__(self):
+        """ Récupération de l'état de l'objet pour la sérialisation """
+        state = self.__dict__.copy()
+
+        # Remove the OpenGL reference to avoid bad references
+        if 'mygrid' in state:
+            state['mygrid'] = {}
+            """ If not empty, the OpenGL list is not properly serialized.
+            During "delete_lists" routine, tghe OpenGL can produce an error.
+            """
+        if 'shaded' in state:
+            state['shaded'] = None  # Avoid serializing the shaded WolfArray
+        return state
+
+    def __setstate__(self, state):
+        """ Récupération de l'état de l'objet pour la désérialisation """
+        self.__dict__.update(state)
+
     def set_opacity(self, alpha:float):
         """ Set the transparency of the array """
 
@@ -10371,7 +10390,12 @@ class WolfArray(Element_To_Draw, header_wolf):
             nbx = curlist['nbx']
             nby = curlist['nby']
             first = curlist['firstlist']
-            glDeleteLists(first, nbx * nby)
+
+            try:
+                glDeleteLists(first, nbx * nby)
+            except Exception as e:
+                logging.error(_('OpenGL error in WolfArray.delete_lists -- Please report this case with the data file and the context in which the error occured'))
+                logging.error(e)
 
             logging.debug(str(first)+'  '+str(nbx * nby))
 
@@ -10459,11 +10483,26 @@ class WolfArray(Element_To_Draw, header_wolf):
             from PIL import Image
 
             try:
-                IO_image = getWalonmap(cat, self.origx, self.origy, self.origx + self.nbx * self.dx, self.origy +self.nby * self.dy, w=1000, tofile=False) # w=self.nbx, h=self.nby
+                bounds = self.get_bounds()
+
+                scale_xovery = (bounds[0][1] - bounds[0][0]) / (bounds[1][1] - bounds[1][0])
+
+                if scale_xovery > 1.:
+                    # x is larger than y
+                    w = 2000
+                    h = int(2000 / scale_xovery)
+                else:
+                    # y is larger than x
+                    h = 2000
+                    w = int(2000 * scale_xovery)
+
+                IO_image = getWalonmap(cat, bounds[0][0], bounds[1][0],
+                                       bounds[0][1], bounds[1][1],
+                                       w=w, h=h, tofile=False) # w=self.nbx, h=self.nby
 
                 image = Image.open(IO_image)
 
-                ax.imshow(image.transpose(Image.Transpose.FLIP_TOP_BOTTOM), extent=(self.origx, self.origx + self.dx * self.nbx, self.origy, self.origy + self.dy * self.nby), alpha=1, origin='lower')
+                ax.imshow(image.transpose(Image.Transpose.FLIP_TOP_BOTTOM), extent=(bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]), alpha=1, origin='lower')
             except Exception as e:
                 logging.error(_('Error while fetching the map image from WalOnMap'))
                 logging.error(e)
@@ -10495,7 +10534,10 @@ class WolfArray(Element_To_Draw, header_wolf):
                 from matplotlib import colors
                 cbar = ColorbarBase(ax_leg, cmap=self.mypal.cmap, norm=self.mypal.norm, orientation='vertical')
                 cbar.set_ticks(self.mypal.values)
-                cbar.set_ticklabels(self.mypal.values)
+
+                # ticks labels with 3 decimal places
+                labels = [f"{val:.3f}" for val in self.mypal.values]
+                cbar.set_ticklabels(labels)
                 cbar.ax.tick_params(labelsize=8)
                 cbar.ax.yaxis.set_label_position('left')
                 cbar.ax.yaxis.set_ticks_position('right')
@@ -10533,7 +10575,6 @@ class WolfArray(Element_To_Draw, header_wolf):
                 cbar.ax.yaxis.set_tick_params(width=0.5, size=2, direction='in', color='black')
 
         ax.set_aspect('equal')
-        fig.tight_layout()
 
         if getdata_im:
             return fig, ax, im

wolfhece/wolf_hist.py

@@ -20,7 +20,7 @@ except:
     from wolfhece.PyTranslate import _
 
 try:
-    from .libs import wolfpy
+    from .tools2d_dll import Tools2DFortran
 except Exception as ex:
     pass
 
@@ -30,10 +30,13 @@ class Hist_file():
 
         self._times = np.void(0)
         self._q = np.void(0)
+        self._toolsDll = None
 
         if fn is None:
             return
- 
+        else:
+            self.readfile(fn)
+
     def readfile(self, fn):
         if not exists(fn):
             logging.warning(_('File {} does not exist'.format(fn)))
@@ -45,11 +48,11 @@ class Hist_file():
             array = array.reshape(nblines, int(len(array)/nblines))
         self._times = array[:,0]
         self._q = array[:,1:]
-    
-    def create_from_sim(self, sim:str='', vec:str='', 
-                        simtype:int=0, res:str='', 
+
+    def create_from_sim(self, sim:str='', vec:str='',
+                        simtype:int=0, res:str='',
                         cutcell:str=''):
-        
+
         if not(exists(sim) and exists(vec)):
             logging.warning(_('Check your files'))
             return
@@ -58,12 +61,14 @@ class Hist_file():
             if not exists(cutcell):
                 logging.warning(_('Check your cutcell file'))
                 return
-                        
-        wolfpy.get_conv_border(sim.ljust(255).encode('ansi'), 
-                                vec.ljust(255).encode('ansi'), 
-                                simtype, 
-                                res.ljust(255).encode('ansi'), 
-                                cutcell.ljust(255).encode('ansi'))
+
+        try:
+            self._toolsDll = Tools2DFortran(fn_simul=sim)
+        except Exception as ex:
+            logging.error(_('Error loading tools2d_dll: {}').format(ex))
+            return
+
+        self._toolsDll.r2D_create_convergence_border(vec, simtype, res, cutcell)
 
         self.readfile(res)
 
@@ -71,10 +76,10 @@ class Hist_file():
     @property
     def nb(self):
         return self._q.shape[1]
-        
+
     def __getitem__(self,id)-> np.ndarray:
         return self._times, self._q[:,id]
-        
+
     def plot(self, id=None, absolute=True, figax=None, toshow=False):
         if figax is None:
             fig,ax = plt.subplots()
@@ -112,9 +117,9 @@ class Hist_file():
 if __name__=='__main__':
 
     wdir = r'data\sim_example\wolf_sim_ke'
-    
+
     myhist = Hist_file(join(wdir,"out.hist"))
-    
+
     myhist.plot()
     myhist.plot([1,3,5])
     myhist.plot(0)

wolfhece/wolfresults_2D.py

@@ -54,30 +54,6 @@ except ImportError as ex:
     msg += _("   The actual error was: {}").format(str(ex))
     logging.error(msg)
 
-# try:
-#     from .libs import wolfpy
-# except Exception as ex:
-#     # This convoluted error handling is here to catch an issue
-#     # which was difficult to track down: wolfpy was there
-#     # but its DLL were not available.
-
-#     from importlib.util import find_spec
-#     s = find_spec('wolfhece.libs.wolfpy')
-
-#     # Not too sure about this find_spec. If the root
-#     # directory is not the good one, the import search may
-#     # end up in the site packages, loading the wrong wolfpy.
-
-#     base = Path(__file__).parent.parts
-#     package = Path(s.origin).parent.parts
-#     is_submodule = (len(base) <= len(package)) and all(i==j for i, j in zip(base, package))
-
-#     if is_submodule:
-#         msg = _("wolfpy was found but we were not able to load it. It may be an issue with its DLL dependencies")
-#         msg += _("The actual error was: {}").format(str(ex))
-
-#     raise Exception(msg)
-
 from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfArrayMNAP, header_wolf, SelectionData, SelectionDataMB, VERSION_RGB
 from .mesh2d import wolf2dprev
 from .PyVertexvectors import vector, zone, Zones
@@ -2712,6 +2688,14 @@ class Wolfresults_2D(Element_To_Draw):
             self._post_loader()
             self._dll_tools = Tools2DFortran(self.filenamegen)
 
+            if len(state["myblocks"])>0:
+                # Reinitialize the blocks
+                self.myblocks = state["myblocks"]
+                self.head_blocks = state['head_blocks']
+                self.loaded_rough = state['loaded_rough']
+                self.current_result = state['current_result']
+                self.loaded = state['loaded']
+
     @property
     def all_dt(self):
         #FIXME : defined in GPU version --> to be implemented for CPU version

{wolfhece-2.2.18.dist-info → wolfhece-2.2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.18
+Version: 2.2.23
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -13,6 +13,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
+Requires-Dist: wolf-libs
 Requires-Dist: wxpython==4.2.*
 Requires-Dist: pyogrio
 Requires-Dist: fiona
@@ -73,6 +74,7 @@ Requires-Dist: ipympl
 Requires-Dist: contextily
 Requires-Dist: pefile
 Requires-Dist: wolfpydike
+Requires-Dist: PyMuPDF
 
 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.18.dist-info → wolfhece-2.2.23.dist-info}/RECORD

@@ -8,7 +8,7 @@ wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
 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=pmHk3RiuQ0BMI-OKDO3lqxadW8yTxC2pRwqvAkhlx1w,649407
+wolfhece/PyDraw.py,sha256=Okx2Uv4zOeCxtYYAGx6T7SGZh4taamdCMvZ6QqruLxE,655901
 wolfhece/PyGui.py,sha256=DqMTDsC9GthnMdYOXvkMKfl5pNciExVzxG4ogptWf6g,146010
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -17,18 +17,18 @@ wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=WT2UprotBUEA6rvs8kXfPRscKrhIL4_pya2UylzoBJE,50385
-wolfhece/PyVertexvectors.py,sha256=XYfFVboT2QwLnDRf9v3zfR4tFok5e08PSr0SZjwtFMo,334563
+wolfhece/PyVertexvectors.py,sha256=lAJCjDgQNt7-3Lj2Z1LvNhNZ76Vp0f14GgDTXzdzpAA,336548
 wolfhece/PyWMS.py,sha256=-wU-oWS5il1z702gYd90xHx5O7PvGNr9nb693oue_cI,31412
 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=5jDKqIHUF_FUsvbrssTKGp-WMN9n8INAt3I8H_ErXes,26483
-wolfhece/__init__.py,sha256=ZansIsawdQSEC-xoOW33zVZEWjdljGsIIVVAMJSus08,504
-wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
+wolfhece/Results2DGPU.py,sha256=kVEbP61PfcsMwyJT1pvXgUxpPfVVxlP_8saXWzsYAbg,27021
+wolfhece/__init__.py,sha256=Gd96hBcXEFUUssyRgJAGC1vCmNR30S66m_80KjcXzGA,946
+wolfhece/_add_path.py,sha256=mAyu85CQHk0KgUI6ZizweeQiw1Gdyea9OEjGLC6lLA4,916
 wolfhece/analyze_poly.py,sha256=jsCUsd0ZJtTwSk5hekcXj8i0tGhH-WCfNkrBtPRJpCc,12715
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
-wolfhece/cli.py,sha256=U8D7e_OezfrRfgMsa4TyQ7rI4voLKSY3RK-c8fb6rrw,3156
+wolfhece/cli.py,sha256=h1tSMHALiftktreyugKcjbASXfpJUm9UYMeVxR-MtG4,6424
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/dike.py,sha256=eG9EDCRk46Nlzpg5OycUeOag_T8joyJ2wzTkQgAT5F0,30710
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
@@ -58,15 +58,15 @@ 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=PymIBKI2-nxNUHxjS44fG_n4zwY9puUA3LVI4-REWxU,13286
+wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=KpHVMPlbIJeRzRsDrPOWWikCHAGu_ptWlxrL4ghhL2U,516029
-wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
+wolfhece/wolf_array.py,sha256=avAoanXV6vcbOH4j2RjZuRmjarvbLE6MlXtKqHCWirs,517578
+wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=8BcVSezLEogTHYmtA4yfSPzaw6UpAeYYySVaAowIKtQ,20858
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=uSxU7KIhUOxBDDAu4Q6Lw8VMUBdAFUG0w0wjiq76mps,240672
+wolfhece/wolfresults_2D.py,sha256=iRTrukQntMfy2XUc2v4deNNJTZdboqEb_QvSjsu6bjM,240103
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -82,13 +82,13 @@ wolfhece/apps/WolfPython2.png,sha256=VMPV-M-3BCOg8zOJss8bXwPmzRYZy8Fo-XtnVYNgbaw
 wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE,403298
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/acceptability.py,sha256=hMIxTRNQARTTWJJaakb6kEK9udNh-w64VDgxxezVk3k,790
-wolfhece/apps/check_install.py,sha256=ULUN2frWsMK2a-aKu5an6qx7JBJ9JJWGK9sWWTqYpYA,4001
+wolfhece/apps/check_install.py,sha256=-lDn9mVS9Pq9b2jWT0uo-hqM6_IXwr0UrW0rWIEMJ9E,3992
 wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
 wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVzzA,9106
 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=OgyXsbWRhfvcbgcF6J0aK4mZYZPw2bKsuSV8Q5dKTOI,388
+wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
+wolfhece/apps/version.py,sha256=geYky3SvOR_9WIk1PDzpLRmFH1-xzccADG2iDWg8JCc,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
@@ -100,6 +100,7 @@ wolfhece/apps/wolfhydro.py,sha256=EsXTtXhnsQV1j-tiFYcyfMrJpjFv1MrWiftwODdi_8I,81
 wolfhece/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/assets/mesh.py,sha256=usX9UiF7DSRBN9GTRawYuLSI2Jt1EsQfnqRNhj3ZVJg,31576
 wolfhece/assets/speedometer.py,sha256=Oqttbw-AB9niaQRNDd0bmyu-ozyOHoYRQd1dApywwdU,5877
+wolfhece/assets/tree.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/chamber.py,sha256=ZWNjTAmTaH8u8J00n8uEib7dy84mUfHWN43805W_Qsw,2354
 wolfhece/bernoulli/fluids.py,sha256=-mPv3EtCcIEfvTI7oSELtOjUFiKhKANu8w96NnUnrvU,464
@@ -135,7 +136,7 @@ wolfhece/hydrology/Comparison.py,sha256=5uHQlKZgNUzpUM0xmLZUePuhq38x7w_hsIPO5Lm8
 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=6UEeWmNfuuDUnyIVZAkSMy74PCl5nub8Pz4xvCoVDAQ,166919
+wolfhece/hydrology/Optimisation.py,sha256=AVEii9E7Lo84LFaAanrFzOB8pqQ-lTE_tu_svoahHZ8,166915
 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
@@ -208,46 +209,7 @@ wolfhece/lazviewer/viewer/viewer_310.exe,sha256=jRy4FhrTa7yN0Cp5dBvCGAL_oBOCqMYb
 wolfhece/lazviewer/viewer/viewer_311.exe,sha256=fzgBu38zzB_dGaGdD_GciICSEh6ZMZHjsE5VSm6se-A,179200
 wolfhece/lazviewer/viewer/viewer_312.exe,sha256=MlXllgQK4IyUc7Y7b0pecdy3tT0Rt9fGxfrDUTU4RN0,179200
 wolfhece/lazviewer/viewer/viewer_313.exe,sha256=6YqzRkqd_blMZeZe0ubzJJxHc3ueLjAoe2qHeCK4_F8,179200
-wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-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
-wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
-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/get_infos.cp312-win_amd64.pyd,sha256=NwGfQ38WtFFhIBrFQU8WYTWReaC6mcetd7cbLeCi6q0,78848
-wolfhece/libs/get_infos.cp313-win_amd64.pyd,sha256=EdpkHgJJPoUtnGiu_8NV7ALHhts9lKthFIgAPOG39wA,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
-wolfhece/libs/libcurl.dll,sha256=xYNKOWwPynyHNEwgN61GRHHMqjFyBxu4GWemFe89Ipc,311296
-wolfhece/libs/libpardiso600-WIN-X86-64.dll,sha256=4UsSdj3TWf0IR4Peac05mLXCuZvzazix5_KGfurTRKE,16288256
-wolfhece/libs/libraqm.dll,sha256=p48j-ZNSQJRqrh8NHez7wdxZCKItW4DNSmWd082o60Y,1304064
-wolfhece/libs/msvcr100.dll,sha256=rjy2xq-6mkqlyF9mAjw1M4ylebMDJt0CkY-dVSWVA9U,829264
-wolfhece/libs/netcdf.dll,sha256=6u6oyapv6lRB1KlDeEB1For0JjMYHtVYUYkH_ht_ICY,958976
-wolfhece/libs/paho-mqtt3cs.dll,sha256=i1v0CSIWEGPIlJrEEcmXDLXO2D1bCOQNIDPiWzIpMbI,134656
-wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57168
-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/verify_wolf.cp312-win_amd64.pyd,sha256=FvkBkU3P4lrype1zRqjw2Ncx119gPzpCwIeQaraOlTg,130048
-wolfhece/libs/verify_wolf.cp313-win_amd64.pyd,sha256=AGH_2hjbI44rKCFZh3MkR_KPOogChuHHF6f3CY98z0A,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/wolfogl.cp312-win_amd64.pyd,sha256=DdeSnOShl9xXWUkOivhzaldsKYujs_dHGmhi-cqxy74,470528
-wolfhece/libs/wolfogl.cp313-win_amd64.pyd,sha256=T1zWzsR5L-YdtYRp2Spkrsp9W5ekVtPzvCtRYBaLbCk,470016
-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
-wolfhece/libs/GL/glcorearb.h,sha256=wfbeOYhbDpIowerrO50sOT2ZKRy5TIhiw6CbNw77m8c,243226
-wolfhece/libs/GL/glext.h,sha256=d1WQSbc0WUb_CUqSsqXv92kFcWkYyOoZyQoYV41R5Ok,791334
-wolfhece/libs/GL/glu.h,sha256=vnnMbXslQgCP__wXOUhln9xO3_IBgdk8VPXTLK6Un1Y,10565
-wolfhece/libs/GL/glxext.h,sha256=jnfGukPrzy_kgR0PakWcNDqpicdkKfA48-Y-CHSQPCE,48113
-wolfhece/libs/GL/wglext.h,sha256=x0o9xe6SUhC97ZucqIWTWdwu6UfBZGbCoCHOurXDPBU,44095
 wolfhece/links/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/links/link.py,sha256=CoHcZK2wWKzO8QFqtdzw5-Z6_PhxvJ6JqlA3HsHHuf0,445
 wolfhece/locales/base.po,sha256=meU93yWX-AlU13FlIYnuXNnYsxVB9k4O_QoBQ_h2W1I,1026
@@ -262,9 +224,9 @@ wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=BmNT-M0uWe5--AhxiS4EWziHad4RL-D7wUySqXTICsY,54237
 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/cst_2D_boundary_conditions.py,sha256=r43pHHdCtmNp5R2zh1Ckb7EzwQDf6C4YMLwRFTl4KMc,5006
 wolfhece/mesh2d/gpu_2d.py,sha256=GGOAW3c3c2CKtDyxSJJdX_1A1QfMFC5CU4MjzhAbR5o,25551
-wolfhece/mesh2d/simple_2d.py,sha256=mVFbTTG2Ah1idz2aYrxI44mi-Z24nC9Vxw1qP2Oib3Y,111350
+wolfhece/mesh2d/simple_2d.py,sha256=wqENJwpUPxKQcpGIcymQXUj2KgkGWCVH6cs4Os9h9Gs,112581
 wolfhece/mesh2d/wolf2dprev.py,sha256=N50tmed97OgNATEp9DPEXQlcbqy3fjWkvAvyhmTsWmI,493023
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
@@ -303,11 +265,13 @@ wolfhece/rem/REMMaker.py,sha256=zkiAo36MmusPhgv1qJmpDgtoTWbh_eJ6qJqtCfeC1M8,3148
 wolfhece/rem/RasterViz.py,sha256=fnyMfAJZDoS-rjagsNRGLndS-UYNUzMY4DgenjD3Y_4,29068
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/report/pdf.py,sha256=zrSSY1JPk59FxK9pFWQfhVKIQAoc_wjeTrXO3tSiEHo,1959
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
+wolfhece/report/simplesimgpu.py,sha256=kx9IMCr9afPwv9B3G5ADQfaIuHXuqTkgSjg-5bXVuqo,60738
 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=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
-wolfhece/scenario/config_manager.py,sha256=5_USTuhaAYDNQaqDt2VA0wssv2f53rgjGnMt1vkoc48,113836
+wolfhece/scenario/config_manager.py,sha256=6ZYyCdhjcQ9H-CCCm072vYzMHFifeIFo_R3Ht3dJaiU,114288
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=Yb7TMIUx9Gzm9_6qRMJnF39Uqi17dIkMmscSXo2WaTs,10033
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -336,8 +300,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.18.dist-info/METADATA,sha256=7WPgtGeneXnMAVQ-0lIrVvDHUJkGHeXW0KQz869wBbg,2679
-wolfhece-2.2.18.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-wolfhece-2.2.18.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.18.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.18.dist-info/RECORD,,
+wolfhece-2.2.23.dist-info/METADATA,sha256=Rol51FGEuEGXU8Pxmu4d5jXHO5uH1jOg_WrBNa3jNzU,2729
+wolfhece-2.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.23.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.23.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.23.dist-info/RECORD,,

{wolfhece-2.2.18.dist-info → wolfhece-2.2.23.dist-info}/WHEEL

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

{wolfhece-2.2.18.dist-info → wolfhece-2.2.23.dist-info}/entry_points.txt

@@ -4,6 +4,9 @@ wolf_check = wolfhece.cli:check
 wolf_gui = wolfhece.cli:wolf
 wolf_hydrometry = wolfhece.cli:hydrometry
 wolf_license = wolfhece.cli:license
+wolf_report_compare = wolfhece.cli:report_compare
+wolf_report_gpu = wolfhece.cli:report_gpu
+wolf_reports_gpu = wolfhece.cli:reports_gpu
 
 [gui_scripts]
 wolf = wolfhece.cli:wolf