wolfhece 2.1.101__py3-none-any.whl → 2.1.103__py3-none-any.whl

wolfhece/PyDraw.py

@@ -5722,6 +5722,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active vector !'))
                 return
 
+            if self.active_vector.closed:
+                logging.error(_('The active vector is closed ! - You can only plot Q along a cross section not a polygon !'))
+                return
+
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
                 return
@@ -5748,11 +5752,11 @@ class WolfMapViewer(wx.Frame):
             if self.active_vector is None:
                 logging.warning(_('No active vector !'))
                 return
-            
+
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
                 return
-            
+
             filterArray = ".csv (*.csv)|*.csv|all (*.*)|*.*"
             fdlg = wx.FileDialog(self, "Choose file name : ", wildcard=filterArray,
                                     style=wx.FD_SAVE)
@@ -5764,7 +5768,7 @@ class WolfMapViewer(wx.Frame):
                 hydrographCSVPath = fdlg.GetPath()
 
             fdlg.Destroy()
-        
+
             if hydrographCSVPath is not None:
                 # Create a progress dialog
                 progress_dialog = wx.ProgressDialog(
@@ -5796,18 +5800,18 @@ class WolfMapViewer(wx.Frame):
                     wx.MessageBox(_("Error exporting hydrographs"), _("Export Hydrographs"), wx.OK | wx.ICON_ERROR)
                     logging.error(_('Error exporting hydrographs'))
 
-        
+
         elif itemlabel == _("Export integrated Q along all vectors in active zone..."):
             autoscale = False
 
             if self.active_zone is None:
                 logging.warning(_('No active zone !'))
                 return
-            
+
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
                 return
-            
+
             filterArray = ".csv (*.csv)|*.csv|all (*.*)|*.*"
             fdlg = wx.FileDialog(self, "Choose file name : ", wildcard=filterArray,
                                     style=wx.FD_SAVE)
@@ -5850,7 +5854,7 @@ class WolfMapViewer(wx.Frame):
                 else:
                     wx.MessageBox(_("Error exporting hydrographs"), _("Export Hydrographs"), wx.OK | wx.ICON_ERROR)
                     logging.error(_('Error exporting hydrographs'))
-        
+
 
         elif itemlabel == _("Plot stats unknown (selected nodes)..."):
             autoscale = False
@@ -7638,6 +7642,9 @@ class WolfMapViewer(wx.Frame):
             res = wolfres2DGPU(filename, plotted=False)
 
             tilesmap = res._result_store._tile_packer.tile_indirection_map()
+            if tilesmap is None:
+                logging.warning(_('No tile map found in the simulation'))
+                return
 
             header = header_wolf()
             res_header = res[0].get_header()

wolfhece/PyGui.py

@@ -59,7 +59,7 @@ except ImportError as e:
 try:
     from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
     from .mesh2d.wolf2dprev import *
-    from .Results2DGPU import wolfres2DGPU
+    # from .Results2DGPU import wolfres2DGPU
     from .PyGuiHydrology import GuiHydrology
     from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
     from .hydrology.Catchment import Catchment
@@ -71,6 +71,7 @@ try:
     from .mesh2d.gpu_2d import Sim_2D_GPU
     from .mesh2d.wolf2dprev import prev_sim2D
     from .mesh2d.cst_2D_boundary_conditions import BCType_2D, BCType_2D_OO, BCType_2D_GPU, Direction
+
 except ImportError as e:
     print(f"Import Error: {e} - RatingCurve, mesh2d, Results2DGPU, PyGuiHydrology, RatingCurve, hydrology, PyParams, picc, wolf_zi_db, CpGrid")
     print("Please install the required modules using 'pip install -r requirements.txt'")
@@ -2994,7 +2995,10 @@ class Wolf2DGPUModel(GenMapManager):
 
     def add_boundary_condition(self, i: int, j: int, bc_type:BCType_2D_GPU,  bc_value: float, border:Direction):
         """ alias """
-        from wolfgpu.simple_simulation import BoundaryConditionsTypes, Direction as ss_direction
+        try:
+            from wolfgpu.simple_simulation import BoundaryConditionsTypes, Direction as ss_direction
+        except ImportError:
+            logging.error(_('Cannot import BoundaryConditionsTypes and Direction from wolfgpu.simple_simulation'))
 
         def convert_dirhece2gpu(direction:Direction) -> ss_direction:
             """ Convert the boundary conditions from HECE to GPU """

wolfhece/Results2DGPU.py

@@ -27,7 +27,7 @@ from .PyPalette import wolfpalette
 
 try:
     from wolfgpu.results_store import ResultsStore, ResultType
-except :
+except ImportError:
     logging.debug(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
 
 def _load_res(x) -> tuple[csr_array, csr_array, csr_array]:

wolfhece/apps/check_install.py

@@ -12,6 +12,24 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 def main():
     # Check if installation is complete
     ret = 'Checking installation\n---------------------\n\n'
+
+
+    # Get list of packages
+    import pkg_resources
+    installed_packages = pkg_resources.working_set
+    packages = sorted(["%s==%s" % (i.key, i.version) for i in installed_packages])
+
+    #is osgeo in packages?
+    if 'osgeo' in packages:
+        ret += 'OSGeo seems installed\n\n'
+    else:
+        ret += 'OSGeo not installed\n Please install GDAL from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
+
+    if 'wolfgpu' in packages:
+        ret += 'WolfGPU seems installed\n\n'
+    else:
+        ret += 'WolfGPU not installed\n Please install WolfGPU if needed\n\n'
+
     try:
         from osgeo import ogr, gdal
         ret += 'GDAL/OGR installed\n\n'
@@ -25,7 +43,7 @@ def main():
     except ImportError as e:
         ret += 'Wolfpy not accessible\n\n'
         ret += 'Error : ' + str(e) + '\n\n'
-    
+
     try:
         from ..PyGui import MapManager
         ret += 'Wolfhece installed\n\n'

wolfhece/apps/version.py

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

wolfhece/mesh2d/gpu_2d.py

@@ -8,7 +8,7 @@ from ..wolf_array import WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_FULL_SINGLE, WOLF_A
 from ..wolf_array import WolfArray, header_wolf
 from ..PyTranslate import _
 from ..PyVertexvectors import vector, zone, Zones
-from wolfgpu.simple_simulation import SimpleSimulation
+# from wolfgpu.simple_simulation import SimpleSimulation
 
 class infiltration_GPU():
     def __init__(self, parent:"Sim_2D_GPU") -> None:
@@ -83,7 +83,7 @@ class Sim_2D_GPU():
             logging.error(_("Unable to import wolfgpu.simple_simulation.SimpleSimulation. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
 
         self.dir = Path(directory)
-        self._sim = None
+        self._sim:SimpleSimulation = None
         self._cached_arrays = {}
         self.magnetic_grid:header_wolf = None
 
@@ -100,6 +100,7 @@ class Sim_2D_GPU():
             ('h','Initial water depth [m]',WOLF_ARRAY_FULL_SINGLE),
             ('qx','Initial discharge along X [m^2/s]',WOLF_ARRAY_FULL_SINGLE),
             ('qy','Initial discharge along Y [m^2/s]',WOLF_ARRAY_FULL_SINGLE),
+            ('bridge_roof','Bridge/Culvert (roof el.) [m]',WOLF_ARRAY_FULL_SINGLE),
         ]}
 
         self.files_ic=['Initial water depth [m]','Initial discharge along X [m^2/s]','Initial discharge along Y [m^2/s]']
@@ -126,11 +127,11 @@ class Sim_2D_GPU():
             self._sim = None
 
     @property
-    def sim(self) -> SimpleSimulation:
+    def sim(self):
         return self._sim
 
     @sim.setter
-    def sim(self, value:SimpleSimulation) -> None:
+    def sim(self, value) -> None:
         self._sim = value
 
     def __str__(self) -> str:
@@ -165,11 +166,9 @@ class Sim_2D_GPU():
         else:
             return None
 
-    def __getitem__(self, key:Literal['nap', 'bathymetry', 'manning', 'infiltrations_zones', 'h', 'qx', 'qy']) -> WolfArray:
+    def __getitem__(self, key:Literal['nap', 'bathymetry', 'manning', 'infiltration_zones', 'h', 'qx', 'qy', 'bridge_roof']) -> WolfArray:
         """ Get an array from the simulation """
 
-        nullvalues = {'nap':0, 'bathymetry':99999, 'manning':0, 'infiltration_zones':0, 'h':0, 'qx':0, 'qy':0}
-
         if self.is_loaded:
             if key in self._get_name_arrays():
                 descr = self._get_description_arrays()[self._get_name_arrays().index(key)]
@@ -178,7 +177,7 @@ class Sim_2D_GPU():
                     locarray = WolfArray(srcheader=self.get_header(),
                                          np_source=self.sim.__getattribute__(key),
                                          idx= descr,
-                                         nullvalue=nullvalues[key],
+                                         nullvalue=self.nullvalues[key],
                                          whichtype=self.files_array['Characteristics'][self._get_name_arrays().index(key)][2],
                                          masknull=False)
                     locarray.loaded = True
@@ -212,6 +211,11 @@ class Sim_2D_GPU():
     def create_arrays_from(self, source:WolfArray):
         """ Create arrays from a source """
 
+        try:
+            from wolfgpu.simple_simulation import SimpleSimulation
+        except:
+            logging.error(_("Unable to import wolfgpu.simple_simulation.SimpleSimulation. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
+
         if self.is_loaded:
             logging.error(_("Simulation exists, cannot create arrays from source or delete simulation first !"))
         else:
@@ -346,11 +350,15 @@ class Sim_2D_GPU():
 
         return x,y
 
+    @property
+    def nullvalues(self) -> dict[str,int]:
+        """ Define null values for the arrays """
+
+        return {'nap':0, 'bathymetry':99999., 'manning':0, 'infiltration_zones':0, 'h':0., 'qx':0., 'qy':0., 'bridge_roof':99999.}
+
     def verify_files(self):
         """ Verify the files """
 
-        nullvalues = {'nap':0, 'bathymetry':99999, 'manning':99999, 'infiltration_zones':99999, 'h':99999, 'qx':99999, 'qy':99999}
-
         if self.is_loaded:
             header = self.get_header()
             ref_mask= self.sim.nap == 0
@@ -362,7 +370,7 @@ class Sim_2D_GPU():
                 if tmparray.shape != (header.nbx, header.nby):
                     logging.error(_("Bad shape for array {0}".format(cur[0])))
                     return False
-                if np.any(tmparray[np.logical_not(ref_mask)] == nullvalues[cur[0]]):
+                if np.any(tmparray[np.logical_not(ref_mask)] == self.nullvalues[cur[0]]):
                     logging.error(_("Null value found in array {0}".format(cur[0])))
                     return False
             return True

wolfhece/scenario/check_scenario.py

@@ -123,6 +123,17 @@ def import_files(module_files:Union[list[Path],list[str]]) -> list[types.ModuleT
         sys.path.pop(0)
         os.chdir(olddir)
 
+        # Test if some routines are missing
+        # if "impose_bc" in py_file.name:
+        #     to_test = ['impose_bc']
+
+        # elif "update_void" in py_file.name:
+        #     to_test = ['update_topobathy', 'update_manning', 'update_infiltration', 'update_roof']
+
+        # for routine in to_test:
+        #     if not hasattr(module, routine):
+        #         logging.warning(f'Le module {module} ne contient pas la routine {routine}.')
+
         modules.append(module)
 
     return modules

wolfhece/scenario/config_manager.py

@@ -30,7 +30,7 @@ import types
 
 from ..PyTranslate import _
 from ..wolfresults_2D import Wolfresults_2D
-from ..wolf_array import WolfArray, header_wolf, WOLF_ARRAY_FULL_INTEGER
+from ..wolf_array import WolfArray, header_wolf, WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_SINGLE
 from .check_scenario import check_file_update, check_file_bc, import_files
 from .update_void import create_new_file as update_void
 from .imposebc_void import create_new_file as bc_void
@@ -56,7 +56,7 @@ except:
 # mann_*.tif
 # infil_*.tif
 
-ACCEPTED_PREFIX = ['bath_', 'mann_', 'infil_']
+ACCEPTED_PREFIX = ['bath_', 'mann_', 'infil_', 'roof_']
 
 def delete_folder(pth:Path):
     for sub in pth.iterdir():
@@ -471,7 +471,7 @@ class Config_Manager_2D_GPU:
 
         logging.info(_('Number of tif files : {}'.format(len(list_tif))))
 
-        standard_files = ['bathymetry.tif', 'manning.tif', 'infiltration.tif', 'h.tif', 'qx.tif', 'qy.tif']
+        standard_files = ['bathymetry.tif', 'manning.tif', 'infiltration.tif', 'h.tif', 'qx.tif', 'qy.tif', 'roof.tif']
 
         log = ''
         for curtif in list_tif:
@@ -502,6 +502,12 @@ class Config_Manager_2D_GPU:
                         loclog += _('Did you mean "infil_" ?') + '\n'
                         break
 
+                tests = ['rof_', 'rooof_', 'rofo_', 'oof_', 'roff_']
+                for test in tests:
+                    if curtif.name.lower().startswith(test):
+                        loclog += _('Did you mean "roof_" ?') + '\n'
+                        break
+
                 logging.warning(loclog)
 
                 log += loclog
@@ -612,7 +618,9 @@ class Config_Manager_2D_GPU:
         self._test_is_results(curdict)
 
     def _recursive_find_files(self, wd:Path, curdict:dict, erase_cache:bool = True):
-        """ Recherche récursive des fichiers de simulation/scenario dans les répertoires dont la structure a été traduite en dictionnaire """
+        """ Recherche récursive des fichiers de simulation/scenario dans les
+        répertoires dont la structure a été traduite en dictionnaire """
+
         if len(curdict.keys())>0:
             for k in curdict.keys():
                 self._recursive_find_files(k, curdict[k])
@@ -763,15 +771,19 @@ class Config_Manager_2D_GPU:
 
         return curdict
 
-    def _select_tif_partname(self, curdict:dict, tifstr:Literal['bath_', 'mann_', 'infil_']):
+    def _select_tif_partname(self, curdict:dict, tifstr:Literal['bath_', 'mann_', 'infil_', 'roof_']):
         """ Select tif files with a 'str' as name's prefix """
 
+        assert tifstr in ACCEPTED_PREFIX, _('Bad prefix !')
+
         if tifstr == 'bath_':
             forced_add = ['bathymetry.tif']
         elif tifstr == 'mann_':
             forced_add = ['manning.tif']
         elif tifstr == 'infil_':
             forced_add = ['infiltration.tif']
+        elif tifstr == 'roof_':
+            forced_add = ['roof.tif']
 
         tif_list = [curtif for curtif in curdict[GPU_2D_file_extensions.TIF.value] \
                     if curtif.name.lower().startswith(tifstr) or \
@@ -793,13 +805,15 @@ class Config_Manager_2D_GPU:
         all_tif_bath = [self._select_tif_partname(curdict, 'bath_') for curdict in curdicts]
         all_tif_mann = [self._select_tif_partname(curdict, 'mann_') for curdict in curdicts]
         all_tif_infil = [self._select_tif_partname(curdict, 'infil_') for curdict in curdicts]
+        all_tif_roof = [self._select_tif_partname(curdict, 'roof_') for curdict in curdicts]
 
         # flatten list of lists
         all_tif_bath = [curel for curlist in all_tif_bath if len(curlist)>0 for curel in curlist]
         all_tif_mann = [curel for curlist in all_tif_mann if len(curlist)>0 for curel in curlist]
         all_tif_infil = [curel for curlist in all_tif_infil if len(curlist)>0 for curel in curlist]
+        all_tif_roof = [curel for curlist in all_tif_roof if len(curlist)>0 for curel in curlist]
 
-        for cur_lst in [all_tif_bath, all_tif_mann, all_tif_infil]:
+        for cur_lst in [all_tif_bath, all_tif_mann, all_tif_infil, all_tif_roof]:
             for cur_tif in cur_lst:
                 curarray:WolfArray = WolfArray(cur_tif)
                 if curarray.nullvalue != 99999.:
@@ -824,21 +838,31 @@ class Config_Manager_2D_GPU:
         all_tif_bath = [self._select_tif_partname(curdict, 'bath_') for curdict in curdicts]
         all_tif_mann = [self._select_tif_partname(curdict, 'mann_') for curdict in curdicts]
         all_tif_infil = [self._select_tif_partname(curdict, 'infil_') for curdict in curdicts]
+        all_tif_roof = [self._select_tif_partname(curdict, 'roof_') for curdict in curdicts]
 
         # flatten list of lists
         all_tif_bath = [curel for curlist in all_tif_bath if len(curlist)>0 for curel in curlist]
         all_tif_mann = [curel for curlist in all_tif_mann if len(curlist)>0 for curel in curlist]
         all_tif_infil = [curel for curlist in all_tif_infil if len(curlist)>0 for curel in curlist]
+        all_tif_roof = [curel for curlist in all_tif_roof if len(curlist)>0 for curel in curlist]
 
         # création du fichier vrt
         create_vrt_from_files_first_based(all_tif_bath, from_path / '__bath_assembly.vrt')
         create_vrt_from_files_first_based(all_tif_mann, from_path / '__mann_assembly.vrt')
+
         if len(all_tif_infil)>0:
             create_vrt_from_files_first_based(all_tif_infil, from_path / '__infil_assembly.vrt')
+        else:
+            logging.info(_('No infiltration files found ! -> no __infil_assembly.vrt file created !'))
+
+        if len(all_tif_roof)>0:
+            create_vrt_from_files_first_based(all_tif_roof, from_path / '__roof_assembly.vrt')
+        else:
+            logging.info(_('No roof files found ! -> no __roof_assembly.vrt file created !'))
 
     def create_vec(self,
                    from_path:Path,
-                   which:Literal['bath_', 'mann_', 'infil_'] = 'bath_') -> Zones:
+                   which:Literal['bath_', 'mann_', 'infil_', 'roof_'] = 'bath_') -> Zones:
         """ Create a vec file from a path """
 
         assert which in ACCEPTED_PREFIX, _('Bad prefix !')
@@ -897,17 +921,18 @@ class Config_Manager_2D_GPU:
 
     def translate_vrt2tif(self, from_path:Path):
         """ Translate vrt to tif """
-        vrtin = ['__bath_assembly.vrt', '__mann_assembly.vrt', '__infil_assembly.vrt']
-        fout  = ['__bathymetry.tif'   , '__manning.tif', '__infiltration.tif']
+
+        vrtin = ['__bath_assembly.vrt', '__mann_assembly.vrt', '__infil_assembly.vrt', '__roof_assembly.vrt']
+        fout  = ['__bathymetry.tif'   , '__manning.tif', '__infiltration.tif', '__roof.tif']
 
         for curin, curout in zip(vrtin, fout):
             if (from_path / curin).exists():
                 translate_vrt2tif(from_path / curin, from_path / curout)
 
-    def apply_scripts_bath_mann_inf(self, from_path:Path):
+    def apply_scripts_bath_mann_inf_roof(self, from_path:Path):
         """ Apply all scripts """
 
-        filenames = ['__bathymetry.tif', '__manning.tif', '__infiltration.tif']
+        filenames = ['__bathymetry.tif', '__manning.tif', '__infiltration.tif', '__roof.tif']
 
         # check if present on disk
         if not all([(from_path / curfile).exists() for curfile in filenames]):
@@ -920,12 +945,13 @@ class Config_Manager_2D_GPU:
 
         arrays = [WolfArray(from_path / curfile) for curfile in filenames]
 
-        self._apply_scripts_update_topo_maning_inf(from_path, arrays[0], arrays[1], arrays[2])
+        self._apply_scripts_update_topo_maning_inf_roof(from_path, arrays[0], arrays[1], arrays[2], arrays[3])
 
         # write the files
         arrays[0].write_all(from_path / '__bathymetry_after_scripts.tif')
         arrays[1].write_all(from_path / '__manning_after_scripts.tif')
         arrays[2].write_all(from_path / '__infiltration_after_scripts.tif')
+        arrays[3].write_all(from_path / '__roof_after_scripts.tif')
 
     def _import_scripts(self, from_path:Path, which) -> list[types.ModuleType]:
         """ List all modules in structure and import them.
@@ -967,29 +993,59 @@ class Config_Manager_2D_GPU:
 
         return imported_mod
 
-    def _import_scripts_topo_manning(self, from_path:Path) -> list[types.ModuleType]:
+    def _import_scripts_topo_manning_inf_roof(self, from_path:Path) -> list[types.ModuleType]:
         """ import all topo and manning scripts from a path """
 
         return self._import_scripts(from_path, WOLF_UPDATE)
 
-    def _apply_scripts_update_topo_maning_inf(self,
+    def _apply_scripts_update_topo_maning_inf_roof(self,
                                               modules:list[types.ModuleType] | Path | str,
                                               array_bat:WolfArray,
                                               array_mann:WolfArray,
-                                              array_inf:WolfArray):
+                                              array_inf:WolfArray,
+                                              array_roof:WolfArray):
         """ Apply all scripts from a list of modules """
 
         if isinstance(modules, str):
             modules = Path(modules)
 
         if isinstance(modules, Path):
-            modules = self._import_scripts_topo_manning(modules)
+            modules = self._import_scripts_topo_manning_inf_roof(modules)
 
         for curmod in modules:
             instmod = curmod.Update_Sim_Scenario()
-            instmod.update_topobathy(array_bat)
-            instmod.update_manning(array_mann)
-            instmod.update_infiltration(array_inf)
+            try:
+                if not hasattr(instmod, "update_topobathy"):
+                    logging.info(_('No update_topobathy method found in the script {}!').format(curmod))
+                else:
+                    instmod.update_topobathy(array_bat)
+            except Exception as e:
+                logging.error(_('An error occured during bathymetry script - {}!').format(e))
+
+            try:
+                if not hasattr(instmod, "update_manning"):
+                    logging.info(_('No update_manning method found in the script {}!').format(curmod))
+                else:
+                    instmod.update_manning(array_mann)
+            except Exception as e:
+                logging.error(_('An error occured during manning script - {}!').format(e))
+
+            try:
+                if not hasattr(instmod, "update_infiltration"):
+                    logging.info(_('No update_infiltration method found in the script {}!').format(curmod))
+                else:
+                    instmod.update_infiltration(array_inf)
+            except Exception as e:
+                logging.error(_('An error occured during infiltration script - {}!').format(e))
+
+            try:
+                if not hasattr(instmod, "update_roof"):
+                    logging.info(_('No update_roof method found in the script {}!').format(curmod))
+                else:
+                    instmod.update_roof(array_roof)
+            except Exception as e:
+                logging.error(_('An error occured during roof script - {}!').format(e))
+
 
     def _import_scripts_bc(self, from_path:Path) -> list[types.ModuleType]:
         """ Import all BC's scripts from a path """
@@ -1006,7 +1062,10 @@ class Config_Manager_2D_GPU:
             modules = self._import_scripts_bc(modules)
 
         for curmod in modules:
-            curmod.Impose_BC_Scenario().impose_bc(sim)
+            try:
+                curmod.Impose_BC_Scenario().impose_bc(sim)
+            except Exception as e:
+                logging.error(_('An error occured during BC script - {}!').format(e))
 
 
     def load_hydrograph(self, path:Path, toplot=True) -> tuple[Hydrograph_scenario, plt.Figure, plt.Axes]:
@@ -1088,11 +1147,30 @@ class Config_Manager_2D_GPU:
         else:
             logging.error(_("No 'bathymetry.tif' file found in the root directory !"))
 
+    def create_void_roof(self):
+        """ create void roof file """
+
+        if (self.workingdir / 'bathymetry.tif').exists():
+            locheader = self.get_header()
+            roof = WolfArray(srcheader=locheader, whichtype= WOLF_ARRAY_FULL_SINGLE)
+            roof.array.data[:,:] = 99999.
+            roof.nullvalue = 99999.
+            roof.write_all(str(self.workingdir / 'roof.tif'))
+
+            if (self.workingdir / 'roof.tif').exists():
+                logging.info(_('roof.tif created and set to 99999. ! -- Please edit it !'))
+            else:
+                logging.error(_("roof.tif not created ! --  Does 'bathymetry.tif' or any '.tif' file exist in the root directory ?"))
+        else:
+            logging.error(_("No 'bathymetry.tif' file found in the root directory !"))
+
+
     def create_simulation(self,
                           dir:Path,
                           idx_hydros:list[int] = [-1],
                           delete_existing:bool = False,
-                          preserve_ic:bool=False) -> list[Path]:
+                          preserve_ic:bool=False,
+                          callback = None) -> list[Path]:
         """ Create a simulation from different hydrographs """
 
         if isinstance(dir, str):
@@ -1188,17 +1266,32 @@ class Config_Manager_2D_GPU:
             infiltration = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_INTEGER)
             infiltration.array.data[:,:] = 0
 
+        # check for roof
+        if exists(dir / '__roof.tif'):
+            roof = WolfArray(str(dir / '__roof.tif'))
+            if roof.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                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.
+        else:
+            roof = WolfArray(srcheader=bat.get_header(), whichtype= WOLF_ARRAY_FULL_SINGLE)
+            roof.array.data[:,:] = 99999.
+
         # applying Python scrpitps on ARRAYS
-        self._apply_scripts_update_topo_maning_inf(dir, bat, man, infiltration)
+        self._apply_scripts_update_topo_maning_inf_roof(dir, bat, man, infiltration, roof)
 
         # save arrays on disk
         bat.write_all(str(dir / '__bathymetry_after_scripts.tif'))
         man.write_all(str(dir / '__manning_after_scripts.tif'))
         infiltration.write_all(str(dir / '__infiltration_after_scripts.tif'))
+        roof.write_all(str(dir / '__roof_after_scripts.tif'))
 
         # create simulation
         allsims = []
-        for curdir, curhydro, curic in zip(used_dirs, used_hydros, used_ic):
+        for id_sim, (curdir, curhydro, curic) in enumerate(zip(used_dirs, used_hydros, used_ic)):
+
+            if callback is not None:
+                callback(id_sim)
 
             # instanciation de la simulation
             cursim = SimpleSimulation(self._header.nbx, self._header.nby)
@@ -1260,6 +1353,13 @@ class Config_Manager_2D_GPU:
 
             cursim.infiltration_zones = np.asarray(infiltration.array.data, dtype=np.int32)
 
+            if roof.nbnotnull == 0:
+                cursim.bridge_roof = None
+                logging.info(_("No cells defined as roof ! -- Roof will be ignored !"))
+            else:
+                cursim.bridge_roof = roof.array.data
+                logging.info(_("You have {} cells defined as roof").format(roof.nbnotnull))
+
             # add hydrograph
             for idx, curline in curhydro.data.iterrows():
                 cursim.add_infiltration(float(idx), [float(cur) for cur in curline.values])
@@ -1505,29 +1605,33 @@ class UI_Manager_2D_GPU():
         self._create_void_infil.Bind(wx.EVT_BUTTON,self.oncreate_void_infil)
         self._create_void_infil.SetToolTip(_('Create a void infiltration zones file based on bathymetry.tif'))
 
+        self._create_void_roof = wx.Button(self._frame,label = _('Create .tif bridge/culvert roof elevation'))
+        self._create_void_roof.Bind(wx.EVT_BUTTON,self.oncreate_void_roof)
+        self._create_void_roof.SetToolTip(_('Create a void roof file based on bathymetry.tif'))
+
         self._create_void_scripts = wx.Button(self._frame,label = _('Create void scripts'))
         self._create_void_scripts.Bind(wx.EVT_BUTTON,self.oncreate_void_scripts)
         self._create_void_scripts.SetToolTip(_('Create void script files for topography, manning and infiltration'))
 
         self._create_vrt = wx.Button(self._frame,label = _('Assembly .vrt to current level'))
         self._create_vrt.Bind(wx.EVT_BUTTON,self.oncreatevrt)
-        self._create_vrt.SetToolTip(_('Create a .vrt file from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
+        self._create_vrt.SetToolTip(_('Create a .vrt file from all bathymetry, manning, infiltration and roof .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"\n - roof must contain "roof"'))
 
         self._translate_vrt = wx.Button(self._frame,label = _('Translate .vrt to .tif'))
         self._translate_vrt.Bind(wx.EVT_BUTTON,self.ontranslatevrt2tif)
-        self._translate_vrt.SetToolTip(_('Translate .vrt files to .tif files\n\n - __bath_assembly.vrt -> __bathymetry.tif\n - __mann_assembly.vrt -> __manning.tif\n - __infil_assembly.vrt -> __infiltration.tif'))
+        self._translate_vrt.SetToolTip(_('Translate .vrt files to .tif files\n\n - __bath_assembly.vrt -> __bathymetry.tif\n - __mann_assembly.vrt -> __manning.tif\n - __infil_assembly.vrt -> __infiltration.tif\n - __roof_assembly.vrt -> __roof.tif'))
 
-        self._apply_scripts = wx.Button(self._frame,label = _('Apply scripts on bathymetry, manning and infiltration'))
+        self._apply_scripts = wx.Button(self._frame,label = _('Apply scripts on bathymetry, manning, infiltration and roof elevation'))
         self._apply_scripts.Bind(wx.EVT_BUTTON,self.onapply_scripts)
-        self._apply_scripts.SetToolTip(_('Apply scripts on bathymetry, manning and infiltration\n\n - bathymetry.tif\n - manning.tif\n - infiltration.tif\n\nThe scripts must be in the structure starting with parent directory and descending\n\n - bathymetry.py\n - manning.py\n - infiltration.py'))
+        self._apply_scripts.SetToolTip(_('Apply scripts on bathymetry, manning and infiltration\n\n - bathymetry.tif\n - manning.tif\n - infiltration.tif\n - roof.tif\n\nThe scripts must be in the structure starting with parent directory and descending.'))
 
         self._create_vec = wx.Button(self._frame,label = _('Search spatial coverage from current level'))
         self._create_vec.Bind(wx.EVT_BUTTON,self.oncreatevec)
-        self._create_vec.SetToolTip(_('Create a .vecz file (with contour and global bounds) from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
+        self._create_vec.SetToolTip(_('Create a .vecz file (with contour and global bounds) from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"\n - roof must contain "roof"'))
 
         self._check_prefix = wx.Button(self._frame,label = _('Check prefix (tif files)'))
         self._check_prefix.Bind(wx.EVT_BUTTON,self.oncheck_prefix)
-        self._check_prefix.SetToolTip(_('Check prefix of .tif files\n\n - bath_*.tif\n - mann_*.tif\n - infil_*.tif\n\nThe prefix must be "bath_", "mann_" and "infil_"'))
+        self._check_prefix.SetToolTip(_('Check prefix of .tif files\n\n - bath_*.tif\n - mann_*.tif\n - infil_*.tif\n - roof_*.tif\n\nThe prefix must be "bath_", "mann_", "infil_" and "roof_"'))
 
         self._checkconsistency = wx.Button(self._frame,label = _('Check consistency'))
         self._checkconsistency.Bind(wx.EVT_BUTTON,self.oncheck_consistency)
@@ -1577,6 +1681,7 @@ class UI_Manager_2D_GPU():
         # buttons -> sizer
         sizer_buttons.Add(self._reload,1,wx.EXPAND)
         sizer_buttons.Add(self._create_void_infil,1,wx.EXPAND)
+        sizer_buttons.Add(self._create_void_roof,1,wx.EXPAND)
         sizer_buttons.Add(self._create_void_scripts,1,wx.EXPAND)
         sizer_buttons.Add(self._check_prefix,1,wx.EXPAND)
         sizer_buttons.Add(self._create_vrt,1,wx.EXPAND)
@@ -1645,6 +1750,12 @@ class UI_Manager_2D_GPU():
         self._parent.create_void_infil()
         self.reload()
 
+    def oncreate_void_roof(self, e:wx.MouseEvent):
+        """ Création d'un fichier de toit de pont vide """
+
+        self._parent.create_void_roof()
+        self.reload()
+
     def oncreate_void_scripts(self,e:wx.MouseEvent):
         """ Création d'un script vide """
 
@@ -1701,9 +1812,17 @@ class UI_Manager_2D_GPU():
     def oncreatevrt(self,e:wx.MouseEvent):
         """ Création d'un fichier vrt """
 
+        if self._selected_item is None:
+            logging.error(_('Please select a scenario to analyze by activating an elemnt in the tree list !'))
+            return
+
         logging.info(_('Creating vrt ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
+        if not 'path' in mydata:
+            logging.error(_('Please select a scenario to analyze !'))
+            return
+
         # création du fichier vrt
         self._parent.create_vrt(mydata['path'])
         logging.info(_('... done !'))
@@ -1713,6 +1832,10 @@ class UI_Manager_2D_GPU():
     def oncreatevec(self,e:wx.MouseEvent):
         """ Création d'un fichier vec """
 
+        if self._selected_item is None:
+            logging.error(_('Please select a scenario to analyze by activating an elemnt in the tree list !'))
+            return
+
         logging.info(_('Creating vecz ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
@@ -1783,7 +1906,7 @@ class UI_Manager_2D_GPU():
             return
 
         # application des scripts
-        self._parent.apply_scripts_bath_mann_inf(mydata['path'])
+        self._parent.apply_scripts_bath_mann_inf_roof(mydata['path'])
 
         self.reload()
         logging.info(_('... done !'))
@@ -1794,7 +1917,7 @@ class UI_Manager_2D_GPU():
         logging.info(_('Checking prefix ...'))
         if self._selected_item is None or self._selected_item == self._treelist.GetRootItem():
             logging.info(_('No item selected ! -- using root item'))
-            with wx.MessageDialog(None, _('No item selected ! -- using root item'), _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING) as dlg:
+            with wx.MessageDialog(None, _('No item selected ! -- using root item ?'), _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING) as dlg:
                 ret = dlg.ShowModal()
                 if ret != wx.ID_OK:
                     return
@@ -1805,7 +1928,7 @@ class UI_Manager_2D_GPU():
         # création du fichier vrt
         log = self._parent.check_prefix(mydata['.tif']+mydata['.tiff'])
         if log =='':
-            self._txtctrl.WriteText(_("All is fine !"))
+            self._txtctrl.WriteText("\n".join([_("All is fine !")]))
         else:
             self._txtctrl.WriteText(log)
 
@@ -1816,16 +1939,16 @@ class UI_Manager_2D_GPU():
 
         log = self._parent.check_consistency()
         if log =='':
-            self._txtctrl.WriteText(_("All is fine !\n\n"))
+            self._txtctrl.WriteText("\n\n".join([_("All is fine !")]))
         else:
-            self._txtctrl.WriteText(log +"\n\n")
+            self._txtctrl.WriteText("\n\n".join([log]))
 
         # Info on Python Environment and wolfgpu Path and version
         # -------------------------------------------------------
 
         import sys
         # Python Environment
-        self._txtctrl.write(_('Python Environment\n'))
+        self._txtctrl.write(_('\nPython Environment\n'))
         self._txtctrl.write('-------------------\n')
         self._txtctrl.write('Python version : {}\n'.format(sys.version))
         self._txtctrl.write('Python path : {}\n'.format(sys.executable))
@@ -1948,7 +2071,11 @@ class UI_Manager_2D_GPU():
             preserve_ic = ret == wx.ID_YES
             dlg.Destroy()
 
-        allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists, preserve_ic)
+        pgbar = wx.ProgressDialog(_('Creating simulations ...'), _('Please wait ...'), maximum=len(hydro), parent=self._frame, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+
+        allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists, preserve_ic, callback=pgbar.Update)
+
+        pgbar.Destroy()
 
         self.reload()
 

wolfhece/scenario/update_void.py

@@ -40,7 +40,7 @@ class Update_Sim:
           - topobahty.array.mask[:,:]
           - topobahty.array.data[:,:]
 
-        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
+        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'espace alloué.
 
         EN
 
@@ -71,7 +71,7 @@ class Update_Sim:
           - manning.array.mask[:,:]
           - manning.array.data[:,:]
 
-        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
+        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'espace alloué.
 
         EN
 
@@ -102,7 +102,7 @@ class Update_Sim:
           - infiltration_zones.array.mask[:,:]
           - infiltration_zones.array.data[:,:]
 
-        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'esace alloué.
+        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'espace alloué.
 
         EN
 
@@ -119,6 +119,37 @@ class Update_Sim:
         """
         pass
 
+    def update_roof(self, roof:WolfArray):
+        """
+        FR
+
+        Cette fonction doit être particularisée afin d'appliquer des modifications
+        à l'altimétrie des ponts et ponceaux (toits)'.
+
+        L'information de base se trouve dans le paramètre  'roof' de classe 'WolfArray'.
+
+        La matrice Numpy, en <Float32>, (avec masque - cf np.ma ) est accessible via :
+          - roof.array[:,:]
+          - roof.array.mask[:,:]
+          - roof.array.data[:,:]
+
+        Il n'est pas permis de remplacer la matrice (création d'une nouvelle matrice et/ou pointage d'una autre matrice). Toutes les operations doivent se faire dans l'espace alloué.
+
+        EN
+
+        This function must be customized to apply modifications to the roof elevation of bridges/culverts.
+
+        The basic information is located in the 'roof' parameter ('WolfArray' class).
+
+        The Numpy array, in <Float32>, (with a mask - see np.ma), can be accessed via:
+          - roof.array[:,:]
+          - roof.array.mask[:,:]
+          - roof.array.data[:,:]
+
+        It is not allowed to replace the array (creating a new array and/or pointing an other array). All operations must be performed within the allocated space.
+        """
+        pass
+
 def create_empty_method(method_name, method_signature, docstring, imports):
     # Fonction utilitaire pour créer des méthodes vides avec la même signature, la documentation et les importations
     imports_str = '\n'.join(f'import {module}' for module in imports)

wolfhece/wolf_array.py

@@ -2678,17 +2678,29 @@ class Ops_Array(wx.Frame):
 
         # operator value
         opval = self.opvalue.GetValue()
-        if opval.lower() == 'null' or opval.lower() == 'nan':
+        if opval.lower() == 'null' or opval.lower() == 'nan' or opval.lower() == 'nul':
             curopvalue = self.parentarray.nullvalue
         else:
-            curopvalue = float(opval)
+            try:
+                tmp_float = float(opval)
+            except:
+                logging.error('Error in float conversion - Do you try to set null value ? - Accepted values : "Null" or "NaN"')
+                return
+
+            curopvalue = tmp_float
 
         # condition value
         curcondvalue = self.condvalue.GetValue()
-        if curcondvalue.lower() == 'null' or curcondvalue.lower() == 'nan':
+        if curcondvalue.lower() == 'null' or curcondvalue.lower() == 'nan' or curcondvalue.lower() == 'nul':
             curcondvalue = self.parentarray.nullvalue
         else:
-            curcondvalue = float(curcondvalue)
+            try:
+                tmp_float = float(curcondvalue)
+            except:
+                logging.error('Error in float conversion - Do you try to set null value ? - Accepted values : "Null" or "NaN"')
+                return
+
+            curcondvalue = tmp_float
 
         self.parentarray.SelectionData.treat_select(curop, curcond, curopvalue, curcondvalue)
 
@@ -2698,8 +2710,16 @@ class Ops_Array(wx.Frame):
         curop = self.choiceop.GetSelection()
         curcond = self.condition.GetSelection()
 
-        curopvalue = float(self.opvalue.GetValue())
-        curcondvalue = float(self.condvalue.GetValue())
+        try:
+            curopvalue = float(self.opvalue.GetValue())
+        except:
+            logging.error('Error in float conversion - operator')
+            return
+        try:
+            curcondvalue = float(self.condvalue.GetValue())
+        except:
+            logging.error('Error in float conversion - condition')
+            return
 
         self.parentarray.SelectionData.mask_condition(curop, curcond, curopvalue, curcondvalue)
         self.refresh_array()

{wolfhece-2.1.101.dist-info → wolfhece-2.1.103.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.101
+Version: 2.1.103
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.101.dist-info → wolfhece-2.1.103.dist-info}/RECORD

@@ -7,8 +7,8 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=7EgqbpTex4_SImJhHmTpsVOa6-9Czv9Cy7V7ZWnoqE4,476329
-wolfhece/PyGui.py,sha256=t1JmyLzRzM1aI-TiDmIqPyoN2FLd1j6Y8rl4u-NJVOc,143676
+wolfhece/PyDraw.py,sha256=p1lxn2ScM3f5QI97r80XDg4pgWSc6T-craaPVPfcX2Y,476586
+wolfhece/PyGui.py,sha256=jyeYF7srKH3HLZQGQIqcRW3u308KUDA-oLwzX-jkDzQ,143843
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
 wolfhece/PyPalette.py,sha256=81n1P-olOe4wElTLv-miSDhqvJU_RHcxgfpHt794dSw,31436
@@ -22,7 +22,7 @@ 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=fb_s9w3xvoYQUMHPfC4dfY4xGYrf8kNjzrKr3kgPjmU,24442
+wolfhece/Results2DGPU.py,sha256=dtLGrNe0VOWJHw5moduLBIaXFf2xRkmpKlIfmB2zje0,24453
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
@@ -51,7 +51,7 @@ wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=9cprIFDd1-HnUU2wiXlBwxZTF8j7eMpinwPIuv-y7A0,419498
+wolfhece/wolf_array.py,sha256=ZJ_HvlN2GeuW4lNJ15-HZSOK5iNc_t5eN4YmL3lJYbY,420268
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -73,13 +73,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=Xoi_d8MzKzNAy2xqEpERdsqgRPu0hbBWukI0WkIYzD0,1701
+wolfhece/apps/check_install.py,sha256=kpfBBGjYqu_Ptk2XlQWmiXHxpiWY4ICt3N4B1VsACgs,2299
 wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 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=O6kRLN9ca4T45HDLQqitzmq_yGo7Vf11NVrPuLXreCM,389
+wolfhece/apps/version.py,sha256=JzbTGIrCJEVfos-Oqf4HYsLQF6ZIUulzpzVopj07hdk,389
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -226,7 +226,7 @@ wolfhece/mesh2d/bc_manager.py,sha256=fKED0RhUjCmd0xd0lcOeZqiga5Glqs1ag1boYhXlq0k
 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/gpu_2d.py,sha256=QM1TCOJ0lN1GXvI3Y6v9l5glAodL7EiEUGNHM0KUfO0,23879
+wolfhece/mesh2d/gpu_2d.py,sha256=XeQIYMqdwFsLw-wDE5jbyphhCgta5QfZhE_7lVtNiCE,24260
 wolfhece/mesh2d/simple_2d.py,sha256=mVFbTTG2Ah1idz2aYrxI44mi-Z24nC9Vxw1qP2Oib3Y,111350
 wolfhece/mesh2d/wolf2dprev.py,sha256=D3CmGMYuhOJxQ7AyTSK97gko1ZaIRvO-0RbD2XvHfDM,491600
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
@@ -268,10 +268,10 @@ wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/scenario/check_scenario.py,sha256=VVjtxfcLAgq_Pf8VSqRq6BJ-y4Zi24CntJpZWxAv3n8,5162
-wolfhece/scenario/config_manager.py,sha256=wYwDAryRjF0dZlssTXsO0uPzoUXY71CxSW0QEP47KpI,99478
+wolfhece/scenario/check_scenario.py,sha256=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
+wolfhece/scenario/config_manager.py,sha256=FGhSbiZ6960-aZg1HHl131nnYGVcrE8C1rjGorrHH0E,105867
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
-wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
+wolfhece/scenario/update_void.py,sha256=zb4LBX7uQCJykZWOKPQMTDtzoWkPRJqlx2qWMPvCnw8,8755
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
 wolfhece/shaders/geom_grid.glsl,sha256=7eAkutCrwoeJpIdF69Ar7K18YyClvVG8ArJJARcmC-Q,742
 wolfhece/shaders/quad_frag_shader.glsl,sha256=GYGg9q4vFXiMuLK-pxSLz7crAE3dvlzJ7-e7PMfwSq0,1227
@@ -292,8 +292,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.101.dist-info/METADATA,sha256=yIG3slf37M70RNNQpU4S5csPCRVEh4d_QvspxTCYZCc,2618
-wolfhece-2.1.101.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-wolfhece-2.1.101.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.101.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.101.dist-info/RECORD,,
+wolfhece-2.1.103.dist-info/METADATA,sha256=P_o5O7D46xHTvlo0hbWZ22gjXmXz14bE2xqOjlekwD0,2618
+wolfhece-2.1.103.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+wolfhece-2.1.103.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.103.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.103.dist-info/RECORD,,