wolfhece 2.1.16__py3-none-any.whl → 2.1.18__py3-none-any.whl

wolfhece/wolfresults_2D.py

@@ -2459,14 +2459,14 @@ class Wolfresults_2D(Element_To_Draw):
 
         if self.nb_blocks>1 or force_mb:
 
-            retarray = WolfArrayMB()
+            retarray = WolfArrayMB(nullvalue=self[0].nullvalue)
             retarray.set_header(self.get_header())
             for i in range(self.nb_blocks):
                 retarray.add_block(self[i], copyarray=copyarray)
 
         else:
             if copyarray :
-                retarray = WolfArray(mold=self[0])
+                retarray = WolfArray(mold=self[0], nullvalue=self[0].nullvalue)
             else:
                 retarray = self[0]
 
@@ -2824,6 +2824,24 @@ class Wolfresults_2D(Element_To_Draw):
             block.k.array, block.eps.array = wolfpy.r2d_getturbresults(which_step+1, nbx, nby, whichblock)
             block._force_update_shields = True
 
+    def _read_oneblockresult_withoutmask_only_h(self, which_step:int=-1,whichblock:int=-1):
+        """
+        Lecture d'un résultat pour un bloc spécifique --> utilisation de la librairie Fortran
+
+        :param which_step : timestep ; 0-based; -1 == last one
+        :param whichblock : block index
+        """
+        which_step = self._sanitize_result_step(which_step)
+
+        if whichblock!=-1:
+            block = self.myblocks[getkeyblock(whichblock,False)]
+            nbx = block.waterdepth.nbx
+            nby = block.waterdepth.nby
+
+            # Fortran is 1-based --> which_step+1
+            block.waterdepth.array, block.qx.array, block.qy.array = wolfpy.r2d_getresults(which_step+1, nbx, nby, whichblock)
+            block._force_update_shields = True
+
     def read_oneblockresult(self, which_step:int=-1, whichblock:int=-1):
         """
         Lecture d'un résultat pour un bloc spécifique et application d'un masque sur base d'nu epsilon de hauteur d'eau
@@ -2861,6 +2879,29 @@ class Wolfresults_2D(Element_To_Draw):
             self.myblocks[getkeyblock(whichblock,False)].k.set_nullvalue_in_mask()
             self.myblocks[getkeyblock(whichblock,False)].eps.set_nullvalue_in_mask()
 
+    def _read_oneblockresult_only_h(self, which_step:int=-1, whichblock:int=-1):
+        """
+        Lecture d'un résultat pour un bloc spécifique et application d'un masque sur base d'nu epsilon de hauteur d'eau
+
+        which_step: result number to read ; 0-based; -1 == last one
+        whichblock : block index ; 1-based
+        """
+
+        which_step = self._sanitize_result_step(which_step)
+
+        if whichblock!=-1:
+
+            self._read_oneblockresult_withoutmask_only_h(which_step, whichblock)
+
+            if self.epsilon > 0.:
+                self.myblocks[getkeyblock(whichblock,False)].waterdepth.array=ma.masked_less_equal(self.myblocks[getkeyblock(whichblock,False)].waterdepth.array,self.epsilon)
+            else:
+                self.myblocks[getkeyblock(whichblock,False)].waterdepth.array=ma.masked_equal(self.myblocks[getkeyblock(whichblock,False)].waterdepth.array,0.)
+
+            self.myblocks[getkeyblock(whichblock,False)].waterdepth.count()
+
+            self.myblocks[getkeyblock(whichblock,False)].waterdepth.set_nullvalue_in_mask()
+
     def read_oneresult(self, which:int=-1):
         """
         Lecture d'un pas de sauvegarde
@@ -2884,6 +2925,29 @@ class Wolfresults_2D(Element_To_Draw):
         self.current_result = which
         self.loaded=True
 
+    def _read_oneresult_only_h(self, which:int=-1):
+        """
+        Lecture d'un pas de sauvegarde
+
+        :param which: result number to read; 0-based; -1 == last one
+        """
+
+        which = self._sanitize_result_step(which)
+
+        if exists(self.filename+'.head'):
+            logging.info(_('Reading from results - step :{}'.format(which+1)))
+            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            for i in range(self.nb_blocks):
+                self._read_oneblockresult_only_h(which, i+1)
+        else:
+            logging.info(_('No ".head" file --> Initial Conditions'))
+
+        if self.to_filter_independent:
+            self.filter_independent_zones()
+
+        self.current_result = which
+        self.loaded=True
+
     def read_next(self):
         """
         Lecture du pas suivant
@@ -4055,6 +4119,12 @@ class Wolfresults_2D(Element_To_Draw):
     def danger_map(self, start:int=0, end:int=-1, every:int=1) -> Union[tuple[WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
         """
         Create Danger Maps
+
+        :param start: start time step - 0-based
+        :param end: end time step - 0-based
+        :param every: step interval
+
+        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm
         """
 
         # Number of  time steps
@@ -4069,38 +4139,38 @@ class Wolfresults_2D(Element_To_Draw):
         danger_map_matrix_v = self.as_WolfArray(copyarray=True)
         danger_map_matrix_mom = self.as_WolfArray(copyarray=True)
 
-        # Reset data -> Set null values
-        danger_map_matrix_h.reset()
-        danger_map_matrix_v.reset()
-        danger_map_matrix_mom.reset()
-
-        danger_map_matrix_h.mask_reset()
-        danger_map_matrix_v.mask_reset()
-        danger_map_matrix_mom.mask_reset()
-
         danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom]
 
+        for curdanger in danger:
+            curdanger.nullvalue = 0.
+            curdanger.reset()
+            curdanger.mask_reset()
+
         for time_step in tqdm(range(start, end, every)):
 
             self.read_oneresult(time_step+1)
 
             if self.nb_blocks>1:
                 for curblock in self.myblocks.keys():
+
                     # Get WolfArray
                     wd = self.get_h_for_block(curblock)
                     qx = self.get_qx_for_block(curblock)
                     qy = self.get_qy_for_block(curblock)
 
-                    # Math operations are overloaded
-                    v = (qx**2.+qy**2.)**.5/wd
-                    mom = v*wd
+                    ij = np.where(~wd.array.mask)
 
-                    comp = [wd, v, mom]
+                    # 
+                    mom = np.zeros_like(wd.array)
+                    v   = np.zeros_like(wd.array)
+                    mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
+                    v[ij]   = mom[ij]/wd.array[ij]
 
                     # Comparison
-                    for curdanger, curcomp in zip(danger, comp):
-                        i,j = np.where(curdanger.myblocks[curblock].array < curcomp.array)
-                        curdanger.myblocks[curblock].array.data[i,j] = curcomp.array.data[i,j]
+                    for curdanger, curcomp in zip(danger, [wd.array, v, mom]):
+                        ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
+                        curdanger.array.data[ij] = curcomp[ij]
+                        curdanger.array.mask[ij] = False
 
             else:
                 curblock = getkeyblock(0)
@@ -4108,25 +4178,84 @@ class Wolfresults_2D(Element_To_Draw):
                 qx = self.get_qx_for_block(curblock)
                 qy = self.get_qy_for_block(curblock)
 
-                v = (qx**2.+qy**2.)**.5/wd
-
-                mom = v*wd
+                ij = np.where(~wd.array.mask)
 
-                comp = [wd, v, mom]
+                # 
+                mom = np.zeros_like(wd.array)
+                v   = np.zeros_like(wd.array)
+                mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
+                v[ij]   = mom[ij]/wd.array[ij]
 
                 # Comparison
-                for curdanger, curcomp in zip(danger, comp):
-                    i,j = np.where(curdanger.array < curcomp.array)
-                    curdanger.array.data[i,j] = curcomp.array.data[i,j]
+                for curdanger, curcomp in zip(danger, [wd.array, v, mom]):
+                    ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
+                    curdanger.array.data[ij] = curcomp[ij]
+                    curdanger.array.mask[ij] = False
 
         danger_map_matrix_h.mask_lower(self.epsilon)
+
         if self.nb_blocks>1:
             for i in range(self.nb_blocks):
-                danger_map_matrix_v[i].array.mask = danger_map_matrix_h[i].array.mask.copy()
-                danger_map_matrix_mom[i].array.mask = danger_map_matrix_h[i].array.mask.copy()
+                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[:,:]
         else:
-            danger_map_matrix_v.array.mask = danger_map_matrix_h.array.mask.copy()
-            danger_map_matrix_mom.array.mask = danger_map_matrix_h.array.mask.copy()
+            danger_map_matrix_v.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_mom.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
 
 
         return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom)
+
+    def danger_map_only_h(self, start:int=0, end:int=-1, every:int=1) -> WolfArray:
+        """
+        Create Danger Maps
+
+        :param start: start time step - 0-based
+        :param end: end time step - 0-based
+        :param every: step interval
+
+        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm
+        """
+
+        # Number of  time steps
+        number_of_time_steps = self.get_nbresults()
+        if end ==-1:
+            end = number_of_time_steps
+
+        # Init Danger Maps basde on results type
+        #    If only one block --> WolfArray
+        #    If only multiple blocks --> WolfArrayMB
+        danger_map_matrix_h = self.as_WolfArray(copyarray=True)
+
+        danger_map_matrix_h.nullvalue = 0.
+        danger_map_matrix_h.reset()
+        danger_map_matrix_h.mask_reset()
+
+        for time_step in tqdm(range(start, end, every)):
+
+            self._read_oneresult_only_h(time_step+1)
+
+            if self.nb_blocks>1:
+                for curblock in self.myblocks.keys():
+
+                    # Get WolfArray
+                    wd = self.get_h_for_block(curblock)
+
+                    # Comparison
+                    ij = np.where((danger_map_matrix_h.array < wd.array.data) & (~wd.array.mask))
+                    danger_map_matrix_h.array.data[ij] = wd.array[ij]
+                    danger_map_matrix_h.array.mask[ij] = False
+
+            else:
+                curblock = getkeyblock(0)
+
+                # Get WolfArray
+                wd = self.get_h_for_block(curblock)
+
+                # Comparison
+                ij = np.where((danger_map_matrix_h.array < wd.array.data) & (~wd.array.mask))
+                danger_map_matrix_h.array.data[ij] = wd.array[ij]
+                danger_map_matrix_h.array.mask[ij] = False
+
+        danger_map_matrix_h.mask_lower(self.epsilon)
+
+        return danger_map_matrix_h

{wolfhece-2.1.16.dist-info → wolfhece-2.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.16
+Version: 2.1.18
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.16.dist-info → wolfhece-2.1.18.dist-info}/RECORD

@@ -6,22 +6,22 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=Kfu3uoxwP6ZK9LqE5Br-GBex_bSS6k4F3tfsK-qIZvU,379565
+wolfhece/PyDraw.py,sha256=x-67Ya_kbNyxW_Umv8sZfnDW75-D9-NytO7PfbCqWpY,383809
 wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
-wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
+wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
-wolfhece/PyParams.py,sha256=V1Pe4rsBpWBA5kI5rRG7B5ijPHAdpM1i2uyxhnrwX94,96896
+wolfhece/PyParams.py,sha256=Aj8kcT044abwBYU_OiEcJWcyNVqxYithNfbzdHyI-QA,97072
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
-wolfhece/PyVertexvectors.py,sha256=C0uB7MTUeNB3XNxf1R98epvcqoLJIlExvI1zwom48jA,223945
-wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
-wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
+wolfhece/PyVertexvectors.py,sha256=4K0T74MUH-ycX79hFa2618vKVTu9qOSh49hlbKrydMg,224123
+wolfhece/PyWMS.py,sha256=pV7JdzbreQGXCg3E6PwllchEUYu2YiPZEIua2ppJorA,4304
+wolfhece/RatingCurve.py,sha256=f6IGLS5aJBJD_t_k903m_yRZ60MzKNKanzD6njXZxa8,22200
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=vbLxSWwHPsCAsR13KaG5WVmVn_cha7-6cF4zj7Diiz8,33593
 wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,1240
-wolfhece/Results2DGPU.py,sha256=pC7jHQhzSJPmGiboNNLG619yVYaOUT_O5_yhKMzslxA,20563
+wolfhece/Results2DGPU.py,sha256=-EGeWQcg_XsDh3XOqnuEnFgPSoAD4q0YUjM7u8ESRD8,23038
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
@@ -48,13 +48,13 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=vf3S7vIdN0ziYtpHSyQRCjwneQCKlGOdCYpZE3xQcLk,335853
+wolfhece/wolf_array.py,sha256=F8dUmJfiuAF1wFzDm13spgm3OoyAJKMIBlFdHf8PobY,342827
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=un5CKzAUmzSsjLXK7YLnQEWz8FLoafXJs8oqUvS_-h0,10271
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
-wolfhece/wolfresults_2D.py,sha256=6VbONzD2lMFCnZ2-gyBk7pW9LcBmSWkZxiVLTMKVPIQ,159403
+wolfhece/wolfresults_2D.py,sha256=6CkXD_X4pOBFce0nFZjR6VjKzLKSYqqY4UhXKzzrKuM,164515
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/apps/ManageParams.py,sha256=heg5L4fMn0ettR7Bad_Q680o_JWnTbe3WFkL_9IziAk,312
 wolfhece/apps/Optimisation_hydro.py,sha256=mHazBazTUGyxPbHPXhaQim8vqIeOOuKPjH0B48VWduA,374
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=Au2GSzDykgzYPAppTSSnywndJOLWVYMTR2cNQ5pYAeU,388
+wolfhece/apps/version.py,sha256=_JWrWOrXqm8jB7QRCP1WPFfuVGVCeeUbG1Sn4qROsPs,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -102,7 +102,7 @@ wolfhece/hydrology/Dumping.py,sha256=GKYvkKgCfJQT1XEF1ceh7evdhlpZRPcuf6VlBdH-TaM
 wolfhece/hydrology/Optimisation.py,sha256=JD72GXAWL6fwagCrCVb0qMEFuYvUlO1vDigteV4EIuA,142220
 wolfhece/hydrology/Outlet.py,sha256=fpetH2ZKnTKIBNuVclxrncc5OAxWUGI5_ed9gXh6fD4,10201
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
-wolfhece/hydrology/PyWatershed.py,sha256=NO2f4XVA8JxW06ysUhlAN4VYVlv3oCqhhyQ8BeTC7d4,92823
+wolfhece/hydrology/PyWatershed.py,sha256=VC38Cglf23yD9lz5u5xy5lxYI9c1FW8ZLd2tmKF_d1Y,97928
 wolfhece/hydrology/RetentionBasin.py,sha256=cV-Rn-Ya7vWHnkl6pHcQ8GFx5HX-wM7uHI4_Zry-kks,82605
 wolfhece/hydrology/SubBasin.py,sha256=b5RawgPmfVWUJhkv-nEVSbdN3ytIxpov7kjBSvMrd1c,171159
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -267,8 +267,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.16.dist-info/METADATA,sha256=vRdgkIGgAYvpxLhBEtKJH3C_oax5iHhWg1ryYEr1tC4,2282
-wolfhece-2.1.16.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wolfhece-2.1.16.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.16.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.16.dist-info/RECORD,,
+wolfhece-2.1.18.dist-info/METADATA,sha256=uhKpuFpAos-6qos1yKSRasR1NjD072Y84u9kTVLFxA0,2282
+wolfhece-2.1.18.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.18.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.18.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.18.dist-info/RECORD,,