wolfhece 2.1.124__py3-none-any.whl → 2.1.125__py3-none-any.whl

wolfhece/wolfresults_2D.py

@@ -4869,7 +4869,7 @@ class Wolfresults_2D(Element_To_Draw):
         self.get_working_array()
         self.updatepalette(whichpal)
 
-    def danger_map(self, start:int=0, end:int=-1, every:int=1) -> Union[tuple[WolfArray, WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
+    def danger_map(self, start:int=0, end:int=-1, every:int=1, callback=None) -> Union[tuple[WolfArray, WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
         """
         Create Danger Maps
 
@@ -4877,7 +4877,7 @@ class Wolfresults_2D(Element_To_Draw):
         :param end: end time step - 0-based
         :param every: step interval
 
-        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm, Z
+        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm, Z, Head
         """
 
         # Number of  time steps
@@ -4892,8 +4892,9 @@ class Wolfresults_2D(Element_To_Draw):
         danger_map_matrix_v   = self.as_WolfArray(copyarray=True)
         danger_map_matrix_mom = self.as_WolfArray(copyarray=True)
         danger_map_matrix_z   = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_head= self.as_WolfArray(copyarray=True)
 
-        danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z]
+        danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z, danger_map_matrix_head]
 
         for curdanger in danger:
             curdanger.nullvalue = 0.
@@ -4902,6 +4903,9 @@ class Wolfresults_2D(Element_To_Draw):
 
         for time_step in tqdm(range(start, end, every)):
 
+            if callback is not None:
+                callback(time_step, "Step {} / {}".format(time_step+1, end))
+
             self.read_oneresult(time_step+1)
 
             if self.nb_blocks>1:
@@ -4919,13 +4923,15 @@ class Wolfresults_2D(Element_To_Draw):
                     mom = np.zeros_like(wd.array)
                     v   = np.zeros_like(wd.array)
                     z   = np.zeros_like(wd.array)
+                    head = np.zeros_like(wd.array)
 
                     mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
                     v[ij]   = mom[ij]/wd.array[ij]
                     z[ij]   = wd.array[ij] + top.array[ij]
+                    head[ij]= z[ij] + v[ij]**2./2/9.81
 
                     # Comparison
-                    for curdanger, curcomp in zip(danger, [wd.array, v, mom, z]):
+                    for curdanger, curcomp in zip(danger, [wd.array, v, mom, z, head]):
                         ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
                         curdanger.array.data[ij] = curcomp[ij]
                         curdanger.array.mask[ij] = False
@@ -4943,13 +4949,15 @@ class Wolfresults_2D(Element_To_Draw):
                 mom = np.zeros_like(wd.array)
                 v   = np.zeros_like(wd.array)
                 z   = np.zeros_like(wd.array)
+                head= np.zeros_like(wd.array)
 
                 mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
                 v[ij]   = mom[ij]/wd.array[ij]
                 z[ij]   = wd.array[ij] + top.array[ij]
+                head[ij]= z[ij] + v[ij]**2./2/9.81
 
                 # Comparison
-                for curdanger, curcomp in zip(danger, [wd.array, v, mom, z]):
+                for curdanger, curcomp in zip(danger, [wd.array, v, mom, z, head]):
                     ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
                     curdanger.array.data[ij] = curcomp[ij]
                     curdanger.array.mask[ij] = False
@@ -4961,12 +4969,14 @@ class Wolfresults_2D(Element_To_Draw):
                 danger_map_matrix_v[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
                 danger_map_matrix_mom[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
                 danger_map_matrix_z[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_head[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
         else:
             danger_map_matrix_v.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
             danger_map_matrix_mom.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
             danger_map_matrix_z.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_head.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
 
-        return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z)
+        return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z, danger_map_matrix_head)
 
     def danger_map_only_h(self, start:int=0, end:int=-1, every:int=1) -> WolfArray:
         """

{wolfhece-2.1.124.dist-info → wolfhece-2.1.125.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.124
+Version: 2.1.125
 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.124.dist-info → wolfhece-2.1.125.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=d4VmLpDLnbR_jw1Bjp8Hd7GX-0MiABaRFFBZWTX6qhY,568550
+wolfhece/PyDraw.py,sha256=Pe9HJ8prakgeTbKZ1ESbXQ6qYCO7FeVzCeFfRFyFNJo,568879
 wolfhece/PyGui.py,sha256=5ANCUmsBwsx_h-GWqV9xwnSQyGJ16mSObOm-h3_7LIQ,144708
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -58,13 +58,13 @@ wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,1735
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=qCaU9BR_vPmFn_sAPUfiCgrC_Fy-CP9p1RV2HOOuwLc,203341
+wolfhece/wolfresults_2D.py,sha256=R5KyM_m6g3h5mOXo3Fci8jfttSO0tS8oPwk1MiaJaZ0,204004
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
 wolfhece/acceptability/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/acceptability/acceptability.py,sha256=dLsYVwPiYH33M7y2vVzlLVd9q8dLgDIeTuJ8f20L4ig,28006
-wolfhece/acceptability/acceptability_gui.py,sha256=AhIMnVlMPtqycbfeiDonJkjdlFOnvrBzBxXZobSIRJs,75633
+wolfhece/acceptability/acceptability_gui.py,sha256=fK9oRc75NfP1-9q0O4s6LG18L8OQTIyoQPfgv_DWx5k,74030
 wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
 wolfhece/acceptability/func.py,sha256=e-E73GFUAeqUy8j5HaA7GHnx12_gABCj0erWAtOqUfA,68241
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
@@ -80,7 +80,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=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=vKWzYKmXCd1RCcT66fDHO8Udxy0xzt6HlLaQF0NL_2w,389
+wolfhece/apps/version.py,sha256=AY3qhP7RQqVUbOl7Gl9Au7LHdhP91U01IYylqr2uTc8,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
@@ -286,6 +286,10 @@ wolfhece/shaders/simple_vertex_shader.glsl,sha256=crJlvIx-nNcUpKyK4KpJWR789xG-Rq
 wolfhece/shaders/simple_vertex_shader_mvp.glsl,sha256=4uMy9GFutnVkdwrfe9BdoPVAaFjdKwcX4eKVakug3zg,229
 wolfhece/shaders/simple_vertex_shader_wo_mvp.glsl,sha256=CT5dr1s0kdL90MtZi22DelFzFVns-w0XcrVbPan6yOc,122
 wolfhece/shaders/vertex_shader_texture.glsl,sha256=8CmklD7-H57iPWhf5nQpGpqIW1uXvcz2kTBVZh-1F8Q,214
+wolfhece/sigmoid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/sigmoid/circle_jax.py,sha256=3CrOViLTvt6ZtQPY_1rOe0Qp_AgwdOKhWwpbG5vBki0,4305
+wolfhece/sigmoid/circle_jax_copilot.py,sha256=fF8vwY_q_i8_u-anGpVXJ5aZEdx3KC3kuYsZZlaGZwE,5952
+wolfhece/sigmoid/sigmoid.py,sha256=2yCJsmxIlOk9t5xgW03922gtE-B7fWTSyJmVZwbhFn4,30592
 wolfhece/sounds/son12.wav,sha256=iZJYSrKkE4HLXJwWzszVR07w_3d-WLO8npFlUcxQlrc,12664
 wolfhece/sounds/son6.wav,sha256=v7CFE-PlGvVcRC3oAaWBBGngutCDS_MUiCIhNHkpv2Y,7884
 wolfhece/sounds/sonsw1.wav,sha256=HhuGeZ3iIyJdDALmM-jvGZDkKw3IZ3JXCuQZkN3Zjtc,212550
@@ -295,8 +299,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.124.dist-info/METADATA,sha256=jCOH--k0Mh3lNE5lm5hjJkmMzisMo7oVWtFYJm1qw-Q,2587
-wolfhece-2.1.124.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.124.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.124.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.124.dist-info/RECORD,,
+wolfhece-2.1.125.dist-info/METADATA,sha256=gil4SetxFBa_q0FQMurYbdGGZc93DtijADnN4Uw0WPU,2587
+wolfhece-2.1.125.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+wolfhece-2.1.125.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.125.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.125.dist-info/RECORD,,

{wolfhece-2.1.124.dist-info → wolfhece-2.1.125.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any