wolfhece 2.1.100__py3-none-any.whl → 2.1.102__py3-none-any.whl

wolfhece/Results2DGPU.py

@@ -622,21 +622,45 @@ class wolfres2DGPU(Wolfresults_2D):
 
 
         self.mapviewer.add_object('vector', newobj = grid_tiles, id = 'Tiles')
-class Sim_2D_GPU():
-    """ Simulation 2D GPU -- Interface """
 
-    def __init__(self, fname:Union[str,Path] = '') -> None:
+    def set_hqxqy_as_initial_conditions(self, idx:int = None, as_multiblocks:bool = False):
+        """
+        Set the result as IC
+
+        :param idx : 0-based index
+        """
+
+        if idx is not None:
+            if idx>=0 and idx<self.get_nbresults():
+                self.read_oneresult(idx)
+            elif idx ==-1:
+                self.read_oneresult(-1) # last one
+            else:
+                logging.error(_('Bad index for initial conditions'))
+                return
+
+        self.set_currentview(views_2D.WATERDEPTH)
 
-        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"))
+        hini = self.as_WolfArray()
 
-        self.filename = Path(fname)
-        self.loaded = False
+        self.set_currentview(views_2D.QX)
 
-        if self.filename.exists():
-            self.sim = SimpleSimulation.load(self.filename)
-            self.loaded = True
+        qxini = self.as_WolfArray()
 
-        pass
+        self.set_currentview(views_2D.QY)
+
+        qyini = self.as_WolfArray()
+
+        if (hini is not None) and (qxini is not None) and (qyini is not None):
+
+            # hini = hini.as_WolfArray()
+            # qxini = qxini.as_WolfArray()
+            # qyini = qyini.as_WolfArray()
+
+            hini.write_all(self.filename.parent  / 'h.npy')
+            qxini.write_all(self.filename.parent / 'qx.npy')
+            qyini.write_all(self.filename.parent / 'qy.npy')
+
+            logging.info(_('Initial conditions saved as Numpy files'))
+        else:
+            logging.error(_('No initial conditions saved'))

wolfhece/acceptability/func.py

@@ -51,8 +51,8 @@ class GPU_2D_file_extensions(Enum):
     BIN  = '.bin'  # WOLF binary file
     JSON = '.json' # json file
     TXT  = '.txt'  # hydrographs
-    
-    
+
+
 class Vulnerability_csv():
 
     def __init__(self, file:Path) -> None:
@@ -241,8 +241,8 @@ class Accept_Manager():
 
             self.TMP_VULN_DIR       = self.TMP_STUDYAREA / "VULNERABILITY"
             self.TMP_SA_SC          = self.TMP_VULN_DIR / str(self._scenario)
-            
-            
+
+
             self.TMP_RASTERS        = self.TMP_VULN_DIR / "RASTERS"
             self.TMP_RASTERS_CODE   = self.TMP_RASTERS / "Code"
             self.TMP_RASTERS_VULNE  = self.TMP_RASTERS / "Vulne"
@@ -295,7 +295,7 @@ class Accept_Manager():
             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_RM_BUILD_DIR    = self.IN_SCEN_DIR / "REMOVED_BUILDINGS"
 
             self.TMP_SCEN_DIR       = self.TMP_VULN_DIR / self.scenario
@@ -306,7 +306,7 @@ class Accept_Manager():
             self.TMP_CODE           = self.TMP_SCEN_DIR / "Vulnerability_Code.tiff"
 
             self.OUT_SCEN_DIR       = self.OUT_STUDY_AREA / self.scenario
-            
+
             self.OUT_VULN           = self.OUT_SCEN_DIR / "Vulnerability.tiff"
             self.OUT_VULN_VRT       = self.OUT_SCEN_DIR / "__vuln_assembly.vrt"
             self.OUT_VULN_S         = self.OUT_SCEN_DIR / "Vulnerability_scenarios" #no .tif because wolf_vrt add it itself (see create_vrtIfExists below)
@@ -392,7 +392,7 @@ class Accept_Manager():
 
     def get_files_in_rm_buildings(self) -> list[Path]:
         return [Path(a) for a in glob.glob(str(self.IN_RM_BUILD_DIR / ("*"+ EXTENT)))]
-    
+
     def get_files_in_CHANGE_VULNE(self) -> list[Path]:
         return [Path(a) for a in glob.glob(str(self.IN_CH_VULN / "*.tiff"))]
 
@@ -421,8 +421,8 @@ class Accept_Manager():
         return [Path(a) for a in glob.glob(str(self.TMP_QFILES / "*.tif"))]
 
     def get_list_scenarios(self) -> list[str]:
-        
-        list_sc = [Path(a).stem for a in glob.glob(str(self.IN_WATER_DEPTH / self.SA.stem / "Scenario*"))]               
+
+        list_sc = [Path(a).stem for a in glob.glob(str(self.IN_WATER_DEPTH / self.SA.stem / "Scenario*"))]
         return list_sc
 
     def get_list_studyareas(self, with_suffix:bool = False) -> list[str]:
@@ -439,7 +439,7 @@ class Accept_Manager():
         else :
             logging.error("No _baseline")
         return files
-    
+
     def get_sims_files_for_baseline(self) -> list[Path]:
         files = [] #to avoid NoneType
         if self.IN_SA_INTERP.exists() :
@@ -448,7 +448,7 @@ class Accept_Manager():
             files = [Path(a) for a in glob.glob(str(track))]
         else :
             logging.error("No _baseline WATER_DEPTHS files")
-        
+
         return files
 
     def get_sim_file_for_return_period(self, return_period:int) -> Path:
@@ -593,7 +593,7 @@ class Accept_Manager():
         if len(rt)<2:
             logging.info("Need for more simulations")
             return None
-        
+
         else :
             pond = []
 
@@ -624,7 +624,7 @@ class Accept_Manager():
     def check_inputs(self) -> bool:
         """
         Check if the input directories exist.
-        
+
         Inputs can not be created automatically. The user must provide them.
         """
 
@@ -677,7 +677,7 @@ class Accept_Manager():
                 logging.error("The wd scenario directory does not exist")
                 err = True
 
-        return not err   
+        return not err
 
     def check_temporary(self) -> bool:
         """
@@ -774,7 +774,7 @@ class Accept_Manager():
             return False
 
         return True
-    
+
     def check_vuln_code_sa(self) -> bool:
 
         if not self.SA_VULN.exists():#SA_VULN
@@ -926,26 +926,26 @@ class Accept_Manager():
                 logging.error("The dimensions do not match {}".format(cur))
                 diff.append(cur)
 
-        return diff   
-    
-    
-    
-    
+        return diff
+
+
+
+
     # Assembly (FR : agglomération)
     # -----------------------------
     """Basically the same operations as in the config manager to agglomerate several rasters
     The class Config_Manager_2D_GPU is called, however some functions were rewritten to allow
     the search of a more specific word ('vuln', and not 'bath', 'mann', or 'inf').
     """
-    
+
     def tree_vuln_tif(folder_path):
         """Find all .tiff files starting with 'vuln' in the directory and return paths"""
         folder = Path(folder_path)
         vuln_tiff_files = {file for file in folder.rglob("*.tiff") if file.name.startswith("vuln")}
         vuln_tif_files = {file for file in folder.rglob("*.tif") if file.name.startswith("vuln")}
-        
+
         vuln_files = vuln_tiff_files.union(vuln_tif_files)
-        
+
         tiff_trees = []
         if len(vuln_files) !=0:
             for tiff in vuln_files:
@@ -954,7 +954,7 @@ class Accept_Manager():
                         tiff = tiff.parent
                         curtree.insert(0, tiff)
                     tiff_trees.append(curtree)
-        return tiff_trees    
+        return tiff_trees
 
     def select_vuln_tif(self, path_baseline: Path, folder_path: Path) -> list[Path]:
         """
@@ -964,12 +964,12 @@ class Accept_Manager():
         #first element must be vulnerability_baseline
         files.append(path_baseline.as_posix())
         tiff_trees = Accept_Manager.tree_vuln_tif(folder_path)
-        
+
         #only the 'final' path of the tree
         for tree in tiff_trees:
             files.append(tree[-1].as_posix())
-        return files    
-    
+        return files
+
     def check_nodata(self):
             """ Check nodata in a path """
 
@@ -982,7 +982,7 @@ class Accept_Manager():
                         curarray.set_nullvalue_in_mask()
                         curarray.write_all()
                         logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
-                    
+
     def create_vrtIfExists(self):
         """ Create a vrt file from a path """
         logging.info(_('Checking nodata values...'))
@@ -1001,7 +1001,7 @@ class Accept_Manager():
         """ Translate vrt from OUTPUT > ... > Scenario to tif saved in the same folder """
         if (self.OUT_VULN_VRT).exists():
             translate_vrt2tif(self.OUT_VULN_VRT, self.OUT_VULN_S)
-            
+
     def copy_tif_files(self, files: list[Path], destination_dir: Path) -> None:
         destination_dir.mkdir(parents=True, exist_ok=True)
 
@@ -1013,7 +1013,7 @@ class Accept_Manager():
                 continue
             gdal_driver = gdal.GetDriverByName('GTiff')
             gdal_driver.CreateCopy(str(destination_file), dataset, strict=0)
-            
+
             dataset = None
 
         logging.info("All .tif files have been copied to the destination directory.")
@@ -1379,7 +1379,7 @@ def compute_code(manager:Accept_Manager):
 
     for i in tqdm(range(len(rasters_code)), 'Computing Code : '):
         logging.info("Computing layer {} / {}".format(i, len(rasters_code)))
-        
+
         loccode = vuln_csv.get_vulnerability_code(rasters_code[i].stem.removesuffix("_CODE"))
 
         if rasters_code[i].with_suffix('.npz').exists():
@@ -1570,7 +1570,7 @@ def compute_acceptability(manager:Accept_Manager,
 
     return accept
 
-def shp_to_raster(vector_fn:str, raster_fn:str, pixel_size:float = 1., manager:Accept_Manager = None):
+def shp_to_raster(vector_fn:str | Path, raster_fn:str | Path, pixel_size:float = 1., manager:Accept_Manager = None):
     """
     Convert a vector layer to a raster tiff file.
 
@@ -1584,6 +1584,16 @@ def shp_to_raster(vector_fn:str, raster_fn:str, pixel_size:float = 1., manager:A
     :param pixel_size: the pixel size of the raster
     """
 
+    vector_path = Path(vector_fn)
+    raster_path = Path(raster_fn)
+
+    if not vector_path.exists():
+        logging.error(f"The vector file {vector_path} does not exist")
+        return
+
+    if raster_path.exists():
+        os.remove(raster_path)
+
     # Force the input to be a string
     vector_fn = str(vector_fn)
     raster_fn = str(raster_fn)
@@ -1665,6 +1675,7 @@ def vector_to_raster(layer:str,
         out_file = manager.TMP_RASTERS / attribute / (layer + "_CODE.tiff")
     else :
         out_file = manager.TMP_RASTERS / attribute / (layer + ".tiff")
+
     if out_file.exists():
         os.remove(out_file)
 

wolfhece/apps/version.py

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

wolfhece/bernoulli/losses.py

@@ -17,7 +17,7 @@ from numba import jit
 from jax.scipy.optimize import minimize
 import timeit
 
-@jit
+@jit(nopython=True)
 def _colebrook_white(f:float, k:float, diameter:float, reynolds:float) -> float:
     """
     Colebrook-White equation for friction factor
@@ -30,7 +30,7 @@ def _colebrook_white(f:float, k:float, diameter:float, reynolds:float) -> float:
     ret = 1. / np.sqrt(f) + 2. * np.log10(k / (3.7 * diameter) + 2.51 / (reynolds * np.sqrt(f)))
     return ret
 
-@jit
+@jit(nopython=True)
 def _grad_colebrook_white(f, k, diameter, reynolds):
 
     term1 = -0.5 * f**(-1.5)
@@ -98,7 +98,7 @@ def test_colebrook_newton():
     f_sol = newton(_colebrook_white, f_guess, _grad_colebrook_white, args=(k, diam, reynolds), rtol=1e-6)
     return f_sol.item()
 
-@jit
+@jit(nopython=True)
 def dichotomy(f, a:float, b:float, args, tol=1e-10, max_iter=1000):
     def cond_fun(val):
         a, b, i = val

wolfhece/gpuview.py

@@ -376,7 +376,10 @@ class VectorField(Element_To_Draw):
         y[mask] *= newnorms
 
         # recherche du maximum
-        self.max_norm = np.max(newnorms)
+        if newnorms.size > 0:
+            self.max_norm = np.max(newnorms)
+        else:
+            self.max_norm = 0
 
         # x[mask] += np.sign(x[mask])*self.min_size*(1.-norms[mask])
         # y[mask] += np.sign(y[mask])*self.min_size*(1.-norms[mask])

wolfhece/libs/__init__.py

@@ -2,6 +2,7 @@ from pathlib import Path
 import sys
 import os
 import shutil
+import logging
 
 """
 Mandatory DLLs for MKL and Fortran.
@@ -39,26 +40,26 @@ def find_Librarybin(which, test):
     sites = sys.path
 
     candidate = interpreter_path / 'Library/bin'
-    print(f'Searching {which} in {candidate}')
+    logging.debug(f'Searching {which} in {candidate}')
     if candidate.exists():
         if (candidate/test).exists():
-            print(f"Found {which} in {candidate}")
+            logging.debug(f"Found {which} in {candidate}")
             return candidate
 
     candidate = interpreter_path.parent / 'Library/bin'
-    print(f'Searching {which} in {candidate}')
+    logging.debug(f'Searching {which} in {candidate}')
     if candidate.exists():
         if (candidate/test).exists():
-            print(f"Found {which} in {candidate}")
+            logging.debug(f"Found {which} in {candidate}")
             return candidate
 
     for cursite in sites:
         if 'site-packages' in cursite:
             candidate = Path(cursite).parent.parent / 'Library/bin'
-            print(f'Searching {which} in {candidate}')
+            logging.debug(f'Searching {which} in {candidate}')
             if candidate.exists():
                 if (candidate/test).exists():
-                    print(f"Found {which} in {candidate}")
+                    logging.debug(f"Found {which} in {candidate}")
                     return candidate
 
     return None
@@ -67,9 +68,9 @@ mkl_path = find_Librarybin('MKL', MKL_DLLS[0])
 fortran_path = find_Librarybin('FORTRAN', FORTRAN_DLLS[0])
 
 if mkl_path is None:
-    print("MKL package not found -- Please install MKL with 'pip install mkl'")
+    logging.error("MKL package not found -- Please install MKL with 'pip install mkl'")
 if fortran_path is None:
-    print("Fortran package not found -- Please install Intel Fortran RunTime with 'pip install intel_fortran_rt'")
+    logging.error("Fortran package not found -- Please install Intel Fortran RunTime with 'pip install intel_fortran_rt'")
 
 if mkl_path is None or fortran_path is None:
     raise FileNotFoundError("Missing MKL or Fortran package. Please check the output above.")
@@ -82,7 +83,7 @@ if mkl_path.exists():
         dll_path = mkl_path / dll
         if not dll_path.exists():
             error = True
-            print(f"Missing DLL: {dll} in {mkl_path}")
+            logging.error(f"Missing DLL: {dll} in {mkl_path}")
         else:
             if not (mydir / dll).exists():
                 shutil.copy(dll_path, mydir / dll)
@@ -91,7 +92,7 @@ for dll in FORTRAN_DLLS:
     dll_path = fortran_path / dll
     if not dll_path.exists():
         error = True
-        print(f"Missing DLL: {dll} in {fortran_path}")
+        logging.error(f"Missing DLL: {dll} in {fortran_path}")
     else:
         if not (mydir / dll).exists():
             shutil.copy(dll_path, mydir / dll)

wolfhece/math_parser/calculator.py

@@ -112,10 +112,11 @@ class Calculator(wx.Frame):
         self.reset_memory()
         self._memory.clear()
 
-        from ..PyDraw import draw_type
-        ids = self._mapviewer.get_list_keys(drawing_type=draw_type.ARRAYS, checked_state=None)
-        for id in ids:
-            self.memory_txt += id
+        if self._mapviewer is not None:
+            from ..PyDraw import draw_type
+            ids = self._mapviewer.get_list_keys(drawing_type=draw_type.ARRAYS, checked_state=None)
+            for id in ids:
+                self.memory_txt += id
 
     def memory_clear_event(self, e):
         self.memory_clear()

wolfhece/mesh2d/bc_manager.py

@@ -17,7 +17,7 @@ from typing import Union,Literal
 from os.path import exists
 from pathlib import Path
 
-from .cst_2D_boundary_conditions import BCType_2D_OO, BCType_2D, ColorsNb, choose_bc_type, Direction
+from .cst_2D_boundary_conditions import BCType_2D_OO, BCType_2D, ColorsNb, choose_bc_type, Direction, BCType_2D_GPU
 from ..PyTranslate import _
 from ..wolf_array import WolfArray
 from .wolf2dprev import prev_boundary_conditions, boundary_condition_2D, prev_parameters_simul
@@ -749,7 +749,7 @@ class BcManager(wx.Frame):
         """
         Send BC to parent
         """
-        from ..PyGui import Wolf2DModel
+        from ..PyGui import Wolf2DModel, Wolf2DGPUModel
 
         if self.wolfparent is not None:
 
@@ -779,6 +779,29 @@ class BcManager(wx.Frame):
 
                 self.wolfparent._show_glob_properties()
 
+            elif isinstance(self.wolfparent, Wolf2DGPUModel):
+                self.wolfparent.reset_boundary_conditions()
+
+                for orient in range(1,3):
+                    if orient==1:
+                        curlist=self.bordersX['bc']
+                        direction=Direction.LEFT
+                    else:
+                        curlist=self.bordersY['bc']
+                        direction=Direction.BOTTOM
+
+                    curlist:dict
+                    ij:str
+                    allbc:dict
+
+                    for ij, allbc in curlist.items():
+                        for tbc, val in allbc.items():
+                            i,j=ij.split('-')
+                            namebc=self._find_Enum_TypeBC(tbc)
+
+                            if(str(val)!='99999.0'):
+                                self.wolfparent.add_boundary_condition(int(i), int(j), namebc, float(val), direction)
+
     def parse(self, text:str):
         """
         Parse text and fill bordersX and bordersY