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

wolfhece/PyVertexvectors.py

@@ -6917,5 +6917,5 @@ class Grid(Zones):
         contour.add_vertex(newvert)
         newvert=wolfvertex(locox,locey)
         contour.add_vertex(newvert)
-
-        self.find_minmax(True)
+        
+        self.find_minmax(True)

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/Parallels.py

@@ -7,7 +7,7 @@ Copyright (c) 2024 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.
 """
-
+#import _add_path #AP
 from .func import clip_layer, data_modification, vector_to_raster, compute_vulnerability, match_vulnerability2sim, compute_acceptability, shp_to_raster, Accept_Manager
 import geopandas as gpd
 import multiprocessing
@@ -76,7 +76,7 @@ def parallel_v2r(manager:Accept_Manager,
     if number_procs == 1:
         result_list=[]
         for curlayer in layers:
-            result_list.append(vector_to_raster(curlayer, manager, attribute, pixel,convert_to_sparse))
+            result_list.append(vector_to_raster(curlayer, manager, attribute, pixel, convert_to_sparse))
 
     else:
         pool = multiprocessing.Pool(processes=number_procs)

wolfhece/acceptability/_add_path.py

@@ -0,0 +1,23 @@
+import os
+import os.path
+import sys
+import platform
+
+
+def _add_path():
+    _root_dir = os.path.dirname(os.path.realpath(__file__))
+
+    # manual specify list of dll directories, with paths relative to _root_dir
+    _dll_dirs = ['libs', 'shaders']
+
+    if platform.system() == 'Windows':
+        os.environ.setdefault('PATH', '')
+        paths = os.environ['PATH'].split(';')
+        for x in _dll_dirs:
+            x = os.path.join(_root_dir, x)
+            if os.path.isdir(x) and x not in paths:
+                paths = [x] + paths
+        os.environ['PATH'] = ';'.join(paths)
+
+
+_add_path()