wolfhece 2.2.44__py3-none-any.whl → 2.2.45__py3-none-any.whl

wolfhece/PyCrosssections.py

@@ -728,9 +728,9 @@ class profile(vector):
 
         myxyz = self.parent.gridlaz.scan(mybounds)
 
-        prep_poly = prepare(mypoly)
-        mytests = [prep_poly.contains(Point(cur[:3])) for cur in myxyz]
-        destroy_prepared(prep_poly)
+        prepare(mypoly)
+        mytests = [mypoly.contains(Point(cur[:3])) for cur in myxyz]
+        destroy_prepared(mypoly)
 
         self.usedlaz = np.asarray(myxyz[mytests])
 
@@ -3012,13 +3012,13 @@ class crosssections(Element_To_Draw):
                     curlinkprop = myvec.myname
 
                 myvecls = myvec.asshapely_ls()
-                prepls=prepare(myvecls)
+                prepare(myvecls)
 
                 for cursname in self.myprofiles.values():
                     curs:profile
                     curs=cursname['cs']
                     cursls = curs.asshapely_ls()
-                    if prepls.intersects(cursls):
+                    if myvecls.intersects(cursls):
                         pt = myvecls.intersection(cursls)
 
                         if pt.geom_type=='MultiPoint':
@@ -3041,7 +3041,7 @@ class crosssections(Element_To_Draw):
                             curs.refpoints[curlinkprop]=myvert
 
                         cursname[curlinkprop]=myvert
-                destroy_prepared(prepls)
+                destroy_prepared(myvecls)
 
         self.update_cloud()
 
@@ -3438,14 +3438,14 @@ class crosssections(Element_To_Draw):
         mysorted = curdict['sorted']  = []
         length = vecsupport.length
 
-        prepsup=prepare(vecsupport) #Prepare le vecteur support aux opérations récurrentes
+        prepare(vecsupport) #Prepare le vecteur support aux opérations récurrentes
         curvect:profile
         for idx,curv in self.myprofiles.items():
             #bouclage sur les sections
             curvect=curv['cs']
             #obtention de la section sous forme d'un objet Shapely
             myline = curvect.asshapely_ls()
-            if prepsup.intersects(myline):
+            if vecsupport.intersects(myline):
                 #le vecteur intersecte --> on calcule le point d'intersection
                 myintersect = vecsupport.intersection(myline)
                 #on projette l'intersection sur le support pour trouver l'abscisse curvi
@@ -3456,7 +3456,7 @@ class crosssections(Element_To_Draw):
                     curvect.s = length - mydist
                 else:
                     curvect.s = mydist
-        destroy_prepared(prepsup)
+        destroy_prepared(vecsupport)
 
         #on trie le résultat en place
         mysorted.sort(key=lambda x:x.s)

wolfhece/apps/version.py

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

wolfhece/dike.py

@@ -32,10 +32,12 @@ from wolfhece.wolf_array import WolfArray
 from wolfhece.matplotlib_fig import Matplotlib_Figure
 from wolfhece.PyTranslate import _
 
-from wolfgpu.SimulationRunner import SimulationRunner, SimulationInjector, SimulationProxy
-from wolfgpu.simple_simulation import SimulationDuration, SimpleSimulation
-from wolfgpu.results_store import ResultsStore
-
+try:
+    from wolfgpu.SimulationRunner import SimulationRunner, SimulationInjector, SimulationProxy
+    from wolfgpu.simple_simulation import SimulationDuration, SimpleSimulation
+    from wolfgpu.results_store import ResultsStore
+except ImportError:
+    logging.warning(_("Warning: wolfgpu module not found. Coupled WOLF-pydike simulations will not be available."))
 class CoupledSimulation():
     """
     Class for the coupled simulation between WOLF and pydike.

wolfhece/wolf_array.py

@@ -6497,10 +6497,15 @@ class WolfArray(Element_To_Draw, header_wolf):
             if hasattr(self, 'shaded'):
                 del self.shaded
 
-            if sys.meta_path is not None:
-                # Perform garbage collection if gc is available
-                import gc
-                gc.collect()
+            try:
+                if sys.meta_path is not None:
+                    # Perform garbage collection if gc is available
+                    import gc
+                    gc.collect()
+            except Exception:
+                # Try/except to avoid issues during interpreter shutdown
+                pass
+
         except Exception as e:
             print(f"Exception in WolfArray destructor: {e} -- Please report this issue")
 

{wolfhece-2.2.44.dist-info → wolfhece-2.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.44
+Version: 2.2.45
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.44.dist-info → wolfhece-2.2.45.dist-info}/RECORD

@@ -9,7 +9,7 @@ wolfhece/Model1D.py,sha256=-2ibQLscVUsXlcnJWixCIScrBPqJ9BTirmwtGXEKI-4,571155
 wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzxCF0,59572
 wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
-wolfhece/PyCrosssections.py,sha256=nHBxyhw0TB0ZKzEEfvJRrR7Hwtig1ijQhxFkRLDD7dM,176455
+wolfhece/PyCrosssections.py,sha256=tVAlYJjCjmaVzP2YFSmWX_0aJ3v9O2sh2O6NBgmUaww,176430
 wolfhece/PyDraw.py,sha256=a94Y827cyvjfDX76-k6qnITHVUVGqJ65jHD3z6qetm0,744062
 wolfhece/PyGui.py,sha256=GpVRxNpR8WNDFyHnDvhtHFFsq_cZZlyVgSkFiS-ARYI,185342
 wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
@@ -33,7 +33,7 @@ wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=h1tSMHALiftktreyugKcjbASXfpJUm9UYMeVxR-MtG4,6424
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/compare_series.py,sha256=M8Xce8vexq3KyVoN-de7pcgCVW0A16vrvlYZegfbwBM,17674
-wolfhece/dike.py,sha256=X20SEUC4UBQWo2spiBThnEj3pLWDuqcfgI2R8Ag_5D4,42210
+wolfhece/dike.py,sha256=virm26hYnamBOWtFPSBrO2n1z6TmjN5aTTC9te24Pc8,42364
 wolfhece/drawing_obj.py,sha256=O_K9xlsiPn305YS_2oWTlv3-rBuGiCkwWEcYAwlJRGs,4514
 wolfhece/eikonal.py,sha256=mxFHJIVJq4pLCI5q1_NaX7Y56ZYk7BN5aqx4xtVsxvc,23291
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
@@ -68,7 +68,7 @@ wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
-wolfhece/wolf_array.py,sha256=Q_OPy_vtb_lawVXFHiY81tzBQwuPfmD5RegvsCVJjBw,588068
+wolfhece/wolf_array.py,sha256=Vd_9Sp6wjTF9diu9NUOeVymjZNfTnuymYWx280Nx210,588231
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -96,7 +96,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=Qx9g-FVehpFmCw8uyQLrxRAHomvPUqqtQDLcaG-NVoU,388
+wolfhece/apps/version.py,sha256=VmZdb3DGqah-YZlqUibhAku2wmsYYuTt_7l5Hcf0xf0,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -321,8 +321,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.2.44.dist-info/METADATA,sha256=jMQUN8upqwAcfiLIAfwzauCVMPf1qRZ-rIr4E4HE-58,2792
-wolfhece-2.2.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.44.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.44.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.44.dist-info/RECORD,,
+wolfhece-2.2.45.dist-info/METADATA,sha256=eV92Icaf_qIZmocjxaECy1zeighi9PKM0imSWbAUXDM,2792
+wolfhece-2.2.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.45.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.45.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.45.dist-info/RECORD,,