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

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 = 102
+        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
 
@@ -127,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:
@@ -211,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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.102
+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.102.dist-info → wolfhece-2.1.103.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=p1lxn2ScM3f5QI97r80XDg4pgWSc6T-craaPVPfcX2Y,476586
-wolfhece/PyGui.py,sha256=t1JmyLzRzM1aI-TiDmIqPyoN2FLd1j6Y8rl4u-NJVOc,143676
+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
@@ -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=1RkBxjDf2qXP0hlzEZCjOE_Nvnp4anDlTg-R-yE2vyQ,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=jiLlGSK2Eytv-KsArFSEQHzE5riXrW6X88NVsusTIX8,23986
+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
@@ -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.102.dist-info/METADATA,sha256=rsrN85GPmi47oamf9h1Sbtv4H7J40DMy_fRt2UWkltE,2618
-wolfhece-2.1.102.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-wolfhece-2.1.102.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.102.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.102.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,,