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

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]))
@@ -1026,7 +1026,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 +1037,8 @@ class Accept_Manager():
         else :
             logging.error("No Masked_River_extent files. Please provide them.")
         return trace
-        
-        
+
+
 
 
 def clip_layer(layer:str,
@@ -1503,7 +1503,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 +1524,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,
@@ -1666,6 +1666,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 = 1
 
     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 *

wolfhece/hydrology/Comparison.py

@@ -12,8 +12,6 @@ import sys                              # module to stop the program when an err
 import os
 import matplotlib.pyplot as plt
 import numpy as np
-from numpy.__config__ import show
-from numpy.core.arrayprint import set_string_function
 from wx.core import DD_CHANGE_DIR
 
 from ..PyTranslate import _
@@ -587,7 +585,7 @@ class Comparison:
                             #     print("ERROR: the simulation time is not long enough for this subbasin to be taken into account")
                             #     sys.exit()
 
-                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]                            
+                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]
                             tmpHydro = cur_module.get_direct_insideRB_inlets(unit='m3/s')
 
                             y1.append(tmpHydro[:])
@@ -604,7 +602,7 @@ class Comparison:
                             # else:
                             #     print("ERROR: the simulation time is not long enough for this subbasin to be taken into account")
                             #     sys.exit()
-                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]                            
+                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]
                             tmpHydro = cur_module.get_direct_insideRB_inlets(unit='m3/s')
 
                             y1.append(tmpHydro[:])
@@ -1412,13 +1410,13 @@ class Comparison:
     #         graph_title = curCatch.name + " :"
     #         cur_t, curVol = curCatch.get_all_cumulRain(selection_by_iD)
 
-    #     for 
+    #     for
     #         plt.figure()
     #         plt.title(graph_title)
     #         for i in range(len(curVol)):
     #             plt.plot(cur_t, curVol[i])
     #         plt.savefig(os.path.join(writeDir, graph_title))
-        
+
     #     if show : plt.show()
 
 
@@ -1582,34 +1580,34 @@ class Comparison:
         del self.plotDict[stationKey]["Add Data"]
 
 
-    
+
     def plot_Nash_and_peak(self, stationKey:list[str, int], measures:list[SubBasin], intervals:list=[], toShow:bool=True):
         assert len(stationKey) == len(measures)
 
-        all_ns = {stationKey[i]: [ self.myCatchments[el]["Object"].get_sub_Nash(measures[i], stationKey[i], intervals) 
-                    for el in self.myCatchments ] 
+        all_ns = {stationKey[i]: [ self.myCatchments[el]["Object"].get_sub_Nash(measures[i], stationKey[i], intervals)
+                    for el in self.myCatchments ]
                   for i in range(len(stationKey))
                 }
         print(all_ns)
 
-        all_peaks = [ [ self.myCatchments[el]["Object"].get_sub_peak(stationKey[i], intervals) 
-                        for el in self.myCatchments ] 
-                     for i in range(len(stationKey)) 
+        all_peaks = [ [ self.myCatchments[el]["Object"].get_sub_peak(stationKey[i], intervals)
+                        for el in self.myCatchments ]
+                     for i in range(len(stationKey))
                     ]
-        
+
         print(all_peaks)
 
-        meas_peak = [ measures[i].get_peak(intervals) 
+        meas_peak = [ measures[i].get_peak(intervals)
                      for i in range(len(stationKey)) ]
-        
+
         # The following lines is take the peak difference between simulation and measurements -> Display 0.0 if the measurement is 0.0
         isZero = np.array(meas_peak)==0
         notZero = np.array(meas_peak)!=0
-        peak_prop = {stationKey[i]: [ list( (np.array(el)-np.array(meas_peak[i]))/(np.array(meas_peak[i])+isZero[i]) *notZero[i] ) 
-                        for el in all_peaks[i] ] 
+        peak_prop = {stationKey[i]: [ list( (np.array(el)-np.array(meas_peak[i]))/(np.array(meas_peak[i])+isZero[i]) *notZero[i] )
+                        for el in all_peaks[i] ]
                      for i in range(len(stationKey))
                     }
-        
+
         print(meas_peak)
         print(peak_prop)
 
@@ -1637,7 +1635,7 @@ class Comparison:
                         continue
                     else:
                         colors_Nash[key][i_model].append("g")
-        
+
 
         colors_peaks = {}
         for key, value in peak_prop.items():
@@ -1660,15 +1658,15 @@ class Comparison:
         all_names = ["\n - \n".join([cdate[0].strftime("%d/%m/%Y"), cdate[1].strftime("%d/%m/%Y")]) for cdate in intervals]
 
 
-        ## Plot 
+        ## Plot
         nb_stations = len(stationKey)
         type_of_model = [self.myCatchments[el]["Title"] for el in self.myCatchments]
         type_of_data = ["Nash", r"$  \frac{Q^{s}_{max}-Q^{m}_{max}}{Q^{m}_{max}} $ "]
         type_of_data_names = ["Nash", "Exceedance"]
 
-        # ph.bar_Nash_n_other(all_data, all_colors, nb_x=len(intervals), nb_data=len(type_of_model), nb_lines=nb_stations, 
+        # ph.bar_Nash_n_other(all_data, all_colors, nb_x=len(intervals), nb_data=len(type_of_model), nb_lines=nb_stations,
         #                     y_titles=type_of_data, x_titles=all_names, nameModel=type_of_model, line_names=sorted_keys, toShow=False)
-        
+
         # =========
         # =========
         # Plot tables - 2nd version with the table instead of bars
@@ -1680,12 +1678,12 @@ class Comparison:
         all_peaks = {cur_catch["Title"]: np.array([cur_catch["Object"].get_sub_peak(stationKey[i], intervals) for i in range(len(stationKey))])
                      for cur_catch in self.myCatchments.values()
         }
-        
+
         print(all_peaks)
 
-        meas_peak = np.array([ measures[i].get_peak(intervals) 
+        meas_peak = np.array([ measures[i].get_peak(intervals)
                      for i in range(len(stationKey)) ])
-        
+
         # The following lines is take the peak difference between simulation and measurements -> Display 0.0 if the measurement is 0.0
         isZero = (meas_peak==0)
         notZero = (meas_peak!=0)
@@ -1696,13 +1694,13 @@ class Comparison:
 
         # Concatenate all data
         all_data = [all_ns, peak_prop]
-        
+
         for data, name_of_data in zip(all_data, type_of_data_names):
             for cur_model, cur_data in data.items():
                 file_name = os.path.join(self.workingDir, name_of_data+"_"+cur_model)+".png"
                 # cur_title = cur_model + ": " + name_of_data
-                ph.table_Nash_n_other(cur_data, name_of_data, 
-                                    row_names=sorted_keys, column_names=all_names, 
+                ph.table_Nash_n_other(cur_data, name_of_data,
+                                    row_names=sorted_keys, column_names=all_names,
                                     writeFile=file_name, toShow=False)
         if toShow:
             plt.show()

wolfhece/hydrology/plot_hydrology.py

@@ -17,9 +17,9 @@ import math
 import datetime
 import sys
 import logging
-from numpy.core.arrayprint import set_string_function
+# from numpy.core.arrayprint import set_string_function
 
-from numpy.core.defchararray import index
+# from numpy.core.defchararray import index
 
 from ..PyTranslate import _
 

wolfhece/lagrangian/particle_system_ui.py

@@ -397,7 +397,7 @@ class Particle_system_to_draw(Element_To_Draw):
             self._ps.nbx, self._ps.nby = value.array.shape
             self._ps.dx, self._ps.dy = value.dx, value.dy
         else:
-            assert value.dtype == np.bool8, 'Domain must be boolean'
+            assert value.dtype == np.bool, 'Domain must be boolean'
             self._ps.domain = value
             self._ps.nbx, self._ps.nby = value.shape
 

wolfhece/lagrangian/particles.py

@@ -38,7 +38,7 @@ class Particles():
 
         self.start_position = [x0, y0]
         self.end_position   = [x0.copy(), y0.copy()] # copy to define new memory storage
-        self._is_alive      = np.ones_like(x0, dtype=np.bool8)
+        self._is_alive      = np.ones_like(x0, dtype=np.bool)
 
     def copy_prop_from(self, other:'Particles') -> None:
         """