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

wolfhece/acceptability/Parallels.py

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

wolfhece/acceptability/acceptability_gui.py

@@ -7,34 +7,32 @@ Copyright (c) 2025 University of Liege. All rights reserved.
 This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
-from .acceptability import Base_data_creation, Database_to_raster, Vulnerability, Acceptability
-from .acceptability import steps_base_data_creation, steps_vulnerability, steps_acceptability
-from .func import Accept_Manager
-from ..wolf_array import WolfArray, header_wolf
-from ..scenario.config_manager import Config_Manager_2D_GPU
-from ..PyDraw import WolfMapViewer, draw_type
-from ..Results2DGPU import wolfres2DGPU
-from ..PyGui import MapManager
-
 import wx
-import wx.lib.dialogs
+import numpy as np
 import logging
 import subprocess
-import matplotlib
 import shutil
 import os
 import geopandas as gpd
+import pandas as pd
 import matplotlib.pyplot as plt
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar2Wx
 from pathlib import Path
 from scipy.ndimage import label
-import pandas as pd
 from gettext import gettext as _
 import rasterio
 from shapely.geometry import Polygon
-import numpy as np
+
+from .acceptability import Base_data_creation, Database_to_raster, Vulnerability, Acceptability
+from .acceptability import steps_base_data_creation, steps_vulnerability, steps_acceptability
+from .func import Accept_Manager
+from ..wolf_array import WolfArray, header_wolf
+from ..scenario.config_manager import Config_Manager_2D_GPU
+from ..PyDraw import WolfMapViewer, draw_type
+from ..Results2DGPU import wolfres2DGPU
+from ..PyGui import MapManager
 
 def nullvalue_for_hole(WA):
     """
@@ -62,6 +60,9 @@ def read_export_z_bin(fn_read, fn_write, fn_laststep):
     wd.array = wd.array + top.array
     fn_write = fn_write.with_suffix('.bin')
     wd.write_all(fn_write)
+    fn_write = fn_write.with_suffix('.tif')
+    wd.write_all(fn_write)
+    top.write_all(fn_write.parent / fn_write.stem / "_dem.tif")
     shutil.rmtree(fn_temp)
 
 def riverbed_trace(fn_read_simu, fn_output, threshold):
@@ -710,7 +711,7 @@ class AcceptabilityGui(wx.Frame):
                 dlg.ShowModal()
             return
         else :
-            if (self._manager._study_area == None) or (self._manager._scenario == None):
+            if (self._manager._study_area is None) or (self._manager._scenario is None):
                 logging.error(f"No study area and/or scenario selected, no check of TEMP and OUTPUT.")
                 with wx.MessageDialog(self, f"INPUT is well structured, but TEMP and OUTPUT have not been checked because there is no study area and scenario selected.", "Checking", wx.OK | wx.ICON_INFORMATION) as dlg:
                         dlg.ShowModal()
@@ -966,6 +967,8 @@ class AcceptabilityGui(wx.Frame):
                 logging.error('No hydraulic scenario selected.')
         else:
             logging.error('No folder found / selected. Please try again.')
+            return
+
         self._check_listbox.Clear()
         self.sims = {}
         for subdir in hydraulic_scen.iterdir():
@@ -1075,9 +1078,11 @@ class AcceptabilityGui(wx.Frame):
         return
 
     def OnInterpolation(self,e):
-        """Interpolates the last extracted time steps present in LAST_STEP_EXTRACTED using the fast marching
+        """Interpolates the last extracted time steps present in
+        LAST_STEP_EXTRACTED using the fast marching
         interpolation routine holes.exe, by creating a batch file
         while performing multiple checks on the required input files."""
+
         if not hasattr(self, 'file_paths'):
             with wx.MessageDialog(self,
                                 f"Please, first load gpu simulations via the previous button.",
@@ -1121,7 +1126,7 @@ class AcceptabilityGui(wx.Frame):
                     D = file_path
                 else:
                     C = file_path
-        if D == None:
+        if D is None:
             logging.info("DEM (.bin) not found in DEM_FILES. The file must begins by 'MNT_' and CANNOT include the word 'mask'")
             with wx.MessageDialog(self,
                         f"DEM (.bin) not found in DEM_FILES. The file must begins by 'MNT_' and CANNOT include the word 'mask'",
@@ -1130,7 +1135,7 @@ class AcceptabilityGui(wx.Frame):
                 dlg.ShowModal()
             return
 
-        if C == None:
+        if C is None:
             logging.info("DEM mask (.bin) not found in DEM_FILES. The file must begins by 'MNT_' and MUST include the word 'mask'")
             with wx.MessageDialog(self,
                         f"DEM mask (.bin) not found in DEM_FILES. The file must begins by 'MNT_' and MUST include the word 'mask'",
@@ -1171,37 +1176,72 @@ class AcceptabilityGui(wx.Frame):
                 os.remove(path_bat_file)
             path_code = os.path.join(self._manager.IN_WATER_DEPTH, "holes.exe")
 
-            A=[]
-            for path in checked_paths:
-                parts = path.name.split("sim_")
-                A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.bin")])
-            B = [os.path.join(path_Interp, os.path.splitext(os.path.basename(f))[0]) for f in A]
-            if not A or not B or not C or not D:
-                logging.info("Missing files.")
-                with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
-                            "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
-                    dlg.ShowModal()
-            with open(path_bat_file, "w") as bat_file:
-                for a, b in zip(A, B):
-                    line = f'"{path_code}" filling in="{a}" out="{b}" mask="{C}" dem="{D} avoid_last=1"\n'
-                    bat_file.write(line)
-            logging.info(message_info)
-
-            empty_folder(self._manager.IN_SA_INTERP)
-            path_bat_file = os.path.join(self._manager.IN_SCEN_DIR, "process_files.bat")
-            subprocess.run([path_bat_file], check=True)
 
             renamed_files = []
-            path_fichier=self._manager.IN_SA_INTERP
-            for file in path_fichier.glob("*.tif"):
-                if "_h" in file.name:
-                    new_name = file.stem.split("_h")[0].replace(".bin", "") + ".tif"
-                    file.rename(file.with_name(new_name))
+            if True:
+                A=[]
+                for path in checked_paths:
+                    parts = path.name.split("sim_")
+                    A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.bin")])
+                B = [os.path.join(path_Interp, os.path.splitext(os.path.basename(f))[0]) for f in A]
+                if not A or not B or not C or not D:
+                    logging.info("Missing files.")
+                    with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
+                                "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
+                        dlg.ShowModal()
+                with open(path_bat_file, "w") as bat_file:
+                    for a, b in zip(A, B):
+                        line = f'"{path_code}" filling in="{a}" out="{b}" mask="{C}" dem="{D} avoid_last=1"\n'
+                        bat_file.write(line)
+                logging.info(message_info)
+
+                empty_folder(self._manager.IN_SA_INTERP)
+                path_bat_file = os.path.join(self._manager.IN_SCEN_DIR, "process_files.bat")
+
+                # FORTRAN HOLES.EXE
+                subprocess.run([path_bat_file], check=True)
+                path_fichier=self._manager.IN_SA_INTERP
+                for file in path_fichier.glob("*.tif"):
+                    if "_h" in file.name:
+                        new_name = file.stem.split("_h")[0].replace(".bin", "") + ".tif"
+                        file.rename(file.with_name(new_name))
+                        renamed_files.append(new_name)
+                #deleting the other
+                for file in path_fichier.glob("*.tif"):
+                    if "_combl" in file.name or file.name not in renamed_files:
+                        file.unlink()
+            else:
+                #Python eikonal model
+                from ..eikonal import inpaint_array, inpaint_waterlevel
+
+                dtm = WolfArray(D)
+
+                A=[]
+                for path in checked_paths:
+                    parts = path.name.split("sim_")
+                    A.extend([os.path.join(path_LastSteps, g) for g in os.listdir(path_LastSteps) if g.endswith(f"{parts[1]}.tif")])
+                if not A  or not C or not D:
+                    logging.info("Missing files.")
+                    with wx.MessageDialog(self, f"The interpolation cannot go on, as some files are missing (see logs): please check the DEM_FILES or the EXTRACTED_LAST_STEP_WD folders.",
+                                "Missing files.", wx.OK | wx.ICON_INFORMATION) as dlg:
+                        dlg.ShowModal()
+
+                empty_folder(self._manager.IN_SA_INTERP)
+
+                for a in A:
+                    a = Path(a)
+                    in_wa = WolfArray(a)
+                    dem_wa = WolfArray(a.parent / a.stem / "_dem.tif")
+                    _t, _wse, _wd = inpaint_waterlevel(in_wa.array, dem_wa.array.data, dtm.array.data, ignore_last_patches=1)
+
+                    b = os.path.join(path_Interp, os.path.splitext(os.path.basename(a))[0])
+                    new_name = Path(b).with_suffix('.tif')
                     renamed_files.append(new_name)
-            #deleting the other
-            for file in path_fichier.glob("*.tif"):
-                if "_combl" in file.name or file.name not in renamed_files:
-                    file.unlink()
+
+                    in_wa.array.data[:,:] = _wd
+                    in_wa.array.mask[:,:] = _wd == 0.
+                    in_wa.write_all(new_name)
+
             logging.info("Filling completed.")
             with wx.MessageDialog(self, f"Filling completed. Created files : {renamed_files}",
                         "Redirecting", wx.OK | wx.ICON_INFORMATION) as dlg:

wolfhece/acceptability/func.py

@@ -287,14 +287,14 @@ class Accept_Manager():
 
             self.scenario:str       = str(self._scenario)
 
-            
+
             self.IN_SA_BASE         = self.IN_WATER_DEPTH / self.SA.stem / "Scenario_baseline"
             self.IN_SA_BASE_INTERP  = self.IN_SA_BASE / "INTERP_WD"
-            
+
             self.IN_SCEN_DIR        = self.IN_WATER_DEPTH / self.SA.stem / self.scenario
             self.IN_SA_INTERP       = self.IN_SCEN_DIR / "INTERP_WD"
             self.IN_SA_EXTRACTED    = self.IN_SCEN_DIR / "EXTRACTED_LAST_STEP_WD"
-            self.IN_SA_DEM          = self.IN_SCEN_DIR / "DEM_FILES"            
+            self.IN_SA_DEM          = self.IN_SCEN_DIR / "DEM_FILES"
             self.IN_CH_SA_SC        = self.IN_CH_VULN /self.SA.stem  / self.scenario
             self.IN_CH_SA_SC_MNT_VRT = self.IN_CH_SA_SC / "__MNT_assembly.vrt"
             self.IN_CH_SA_SC_MNT_tif = self.IN_CH_SA_SC / "MNTassembly"
@@ -312,19 +312,19 @@ class Accept_Manager():
 
             self.OUT_WITHVULN       = self.OUT_SCEN_DIR / "vuln_ scenarios"
             self.OUT_VULN_VRT       = self.OUT_WITHVULN / "__vuln_assembly.vrt"
-            self.OUT_VULN_S         = self.OUT_WITHVULN / "Vulnerability_scenarios" 
+            self.OUT_VULN_S         = self.OUT_WITHVULN / "Vulnerability_scenarios"
             self.OUT_VULN_Stif      = self.OUT_WITHVULN / "Vulnerability_scenarios.tif"
             self.OUT_MASKED_RIVER_S = self.OUT_WITHVULN / "Masked_River_extent_scenarios.tiff"
             self.OUT_ACCEPT_Stif           = self.OUT_WITHVULN / "Acceptability_scenarios.tiff"
             self.OUT_ACCEPT_RESAMP_Stif    = self.OUT_WITHVULN / "Acceptability_scenarios_resampled.tiff"
-            
+
             self.OUT_BASELINE       = self.OUT_SCEN_DIR / "baseline"
             self.OUT_VULN           = self.OUT_BASELINE / "Vulnerability_baseline.tiff"
             self.OUT_CODE           = self.OUT_BASELINE / "Vulnerability_Code_baseline.tiff"
             self.OUT_MASKED_RIVER   = self.OUT_BASELINE / "Masked_River_extent_baseline.tiff"
             self.OUT_ACCEPT         = self.OUT_BASELINE / "Acceptability_baseline.tiff"
             self.OUT_ACCEPT_RESAMP  = self.OUT_BASELINE / "Acceptability_baseline_resampled.tiff"
-            
+
         else:
             self.scenario = None
 
@@ -472,7 +472,7 @@ class Accept_Manager():
         sims = self.get_sims_files_for_scenario()
 
         if len(sims)==0:
-            logging.info("No simulations found at this stage") 
+            logging.info("No simulations found at this stage")
             return None
 
         if "_h.tif" in sims[0].name:
@@ -561,7 +561,7 @@ class Accept_Manager():
             os.path.join(os.path.dirname(path), os.path.basename(path).replace("Q", "T"))
             for path in sims
             ]
-        
+
         if len(sims)==0:
             logging.info("No simulations found at this stage.")
             return []
@@ -570,22 +570,22 @@ class Accept_Manager():
         # searching for the position of the return period in the name
         idx_T = [Path(cursim).name.find("T") for cursim in sims_modif]
         idx_h = [Path(cursim).name.find(".tif") for cursim in sims_modif]
-        
+
         # create the list of return periods -- only the numeric part
         sims = [int(Path(cursim).name[idx_T[i]+1:idx_h[i]]) for i, cursim in enumerate(sims_modif)]
         return sorted(sims)
-    
+
     def get_modifiedrasters(self):
         folder = Path(self.IN_CH_SA_SC)
         vuln_tiff_files = [str(file.name) for file in folder.rglob("*.tiff") if file.name.startswith('vuln_')]
         vuln_tif_files = [str(file.name)for file in folder.rglob("*.tif") if file.name.startswith('vuln_')]
-        vuln_files = vuln_tiff_files + vuln_tif_files  
+        vuln_files = vuln_tiff_files + vuln_tif_files
 
         folder = Path(self.IN_CH_SA_SC)
         mnt_tiff_files = [str(file.name) for file in folder.rglob("*.tiff") if file.name.startswith('MNTmodifs_')]
         mnt_tif_files = [str(file.name) for file in folder.rglob("*.tif") if file.name.startswith('MNTmodifs_')]
         mnt_files = mnt_tiff_files + mnt_tif_files
-        
+
         return vuln_files + mnt_files
 
     def get_ponderations(self) -> pd.DataFrame:
@@ -732,7 +732,7 @@ class Accept_Manager():
             self.OUT_SCEN_DIR.mkdir(parents=True, exist_ok=True)
             self.OUT_WITHVULN.mkdir(parents=True, exist_ok=True)
             self.OUT_BASELINE.mkdir(parents=True, exist_ok=True)
-            
+
 
         return True
 
@@ -898,15 +898,15 @@ class Accept_Manager():
 
         if len(code) == 0:
             logging.error("The code rasters do not exist")
-            return False
+            return ["The code rasters do not exist"]
 
         if len(vuln) == 0:
             logging.error("The vulnerability rasters do not exist")
-            return False
+            return ["The vulnerability rasters do not exist"]
 
         if len(code) != len(vuln):
             logging.error("The number of code and vulnerability rasters do not match")
-            return False
+            return ["The number of code and vulnerability rasters do not match"]
 
         # we take a reference raster
         ref = gdal.Open(str(code[0]))
@@ -982,14 +982,18 @@ class Accept_Manager():
 
     def check_nodata(self, name, path_baseline):
             """ Check nodata in a path """
+            from ..wolf_array import WOLF_ARRAY_FULL_INTEGER8
             list_tif = Accept_Manager.select_name_tif(self, path_baseline, self.IN_CH_SA_SC, name)
             for cur_lst in list_tif:
                 curarray:WolfArray = WolfArray(cur_lst)
-                if curarray.nullvalue != 99999.:
-                    curarray.nullvalue = 99999.
-                    curarray.set_nullvalue_in_mask()
-                    curarray.write_all()
-                    logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
+                if curarray.wolftype != WOLF_ARRAY_FULL_INTEGER8:
+                    if curarray.nullvalue != 99999.:
+                        curarray.nullvalue = 99999.
+                        curarray.set_nullvalue_in_mask()
+                        curarray.write_all()
+                        logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
+                else:
+                    logging.info(_('nodata value is {} for file {} !'.format(curarray.nullvalue, cur_lst)))
 
     def create_vrtIfExists(self, fn_baseline, fn_scenario, fn_vrt, name):
         """ Create a vrt file from a path """
@@ -1026,7 +1030,7 @@ class Accept_Manager():
             dataset = None
 
         logging.info("All the existing .tif files have been copied to the destination directory.")
-    
+
     def wich_river_trace(self):
         """ Searches for existing riverbed traces: if none ending with '_scenarios' are found, it selects the baseline trace."""
         trace = None
@@ -1037,8 +1041,8 @@ class Accept_Manager():
         else :
             logging.error("No Masked_River_extent files. Please provide them.")
         return trace
-        
-        
+
+
 
 
 def clip_layer(layer:str,
@@ -1503,7 +1507,7 @@ def match_vulnerability2sim(inRas:Path, outRas:Path, MODREC:Path):
     :param MODREC: the MODREC/simulation extent file
 
     """
-    
+
     inRas  = str(inRas)
     outRas = str(outRas)
     MODREC = str(MODREC)
@@ -1524,7 +1528,7 @@ def update_accept(accept, model_h, ij, bounds, loc_accept):
     for idx in range(len(bounds)):
         for i,j in ij:
             #lit dans wd vs Ti où on est et associe son score d'accept
-            if bounds[idx,0] < model_h[i,j] <= bounds[idx,1]: 
+            if bounds[idx,0] < model_h[i,j] <= bounds[idx,1]:
                 accept[i,j] = loc_accept[idx]
 
 def compute_acceptability(manager:Accept_Manager,
@@ -1569,6 +1573,8 @@ def compute_acceptability(manager:Accept_Manager,
                       points_accept["h-1"][idx_pts],
                       points_accept["h-2.5"][idx_pts]]
 
+        accept_pts = list(accept_pts).copy()
+
         update_accept(accept, model_h, ij, bounds, accept_pts)
 
     if save_to_file:
@@ -1666,6 +1672,8 @@ def shp_to_raster(vector_fn:str | Path, raster_fn:str | Path, pixel_size:float =
                         layer = source_layer,
                         burn_values = [1],
                         options=["ALL_TOUCHED=TRUE"])
+
+    target_ds.FlushCache()
     target_ds = None
     vector_fn = raster_fn = None
 

wolfhece/apps/version.py

@@ -4,8 +4,8 @@ class WolfVersion():
     def __init__(self):
 
         self.major = 2
-        self.minor = 1
-        self.patch = 129
+        self.minor = 2
+        self.patch = 2
 
     def __str__(self):
 

wolfhece/eikonal.py

@@ -78,7 +78,7 @@ def __solve_eikonal_with_data(sources:list[list[int,int]],
     # store the fixed points
     #  - fix sources points
     #  - fix every first element of the heap after pop
-    fixed = np.zeros(speed.shape, dtype = np.bool8)
+    fixed = np.zeros(speed.shape, dtype = np.uint8)
 
     # fix the border
     fixed[:, 0] = True

wolfhece/hydrology/Catchment.py

@@ -33,8 +33,8 @@ else:
     print(_('Note: do not forget to install the graphviz app and add it to the PATH to make it work'))
 # --------------------------------
 
-from ..wolf_texture import genericImagetexture
-from ..PyDraw import WolfMapViewer
+# from ..wolf_texture import genericImagetexture
+# from ..PyDraw import WolfMapViewer
 from .SubBasin import *
 from .RetentionBasin import *
 from .read import *