wolfhece 2.1.30__py3-none-any.whl → 2.1.32__py3-none-any.whl

wolfhece/PyPalette.py

@@ -329,7 +329,7 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
                 nbl=i-1
                 break
 
-        if i < self.nb-1:
+        if i < self.nb:
             self.nb = i
             self.values=self.values[0:i]
             self.colors=self.colors[0:i,:]

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -868,7 +868,11 @@ class Config_Manager_2D_GPU:
         else:
             logging.error(_("No 'bathymetry.tif' file found in the root directory !"))
 
-    def create_simulation(self, dir:Path, idx_hydros:list[int] = [-1], delete_existing:bool = False) -> list[Path]:
+    def create_simulation(self, 
+                          dir:Path, 
+                          idx_hydros:list[int] = [-1], 
+                          delete_existing:bool = False, 
+                          preserve_ic:bool=False) -> list[Path]:
         """ Create a simulation from different hydrographs """
 
         if isinstance(dir, str):
@@ -996,9 +1000,23 @@ class Config_Manager_2D_GPU:
             cursim.nap[cursim.bathymetry != 99999.] = 1
 
             if curic is None:
-                cursim.h          = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
-                cursim.qx         = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
-                cursim.qy         = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                if not preserve_ic:
+                    cursim.h          = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                    cursim.qx         = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                    cursim.qy         = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                else:
+                    if (curdir / 'h.npy').exists():
+                        cursim.h = np.load(curdir / 'h.npy')
+                    else:
+                        cursim.h = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                    if (curdir / 'qx.npy').exists():
+                        cursim.qx = np.load(curdir / 'qx.npy')
+                    else:
+                        cursim.qx = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
+                    if (curdir / 'qy.npy').exists():
+                        cursim.qy = np.load(curdir / 'qy.npy')
+                    else:
+                        cursim.qy = np.zeros((self._header.nbx, self._header.nby), dtype=np.float32)
             else:
                 if curic.h is not None:
                     cursim.h = curic.h
@@ -1466,7 +1484,13 @@ class UI_Manager_2D_GPU():
         destroy_if_exists = ret == wx.ID_YES
         dlg.Destroy()
 
-        allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists)
+        if not destroy_if_exists:
+            dlg = wx.MessageDialog(None, _('Do you want to preserve initial conditions ?'), _('Warning'), wx.YES_NO)
+            ret = dlg.ShowModal()
+            preserve_ic = ret == wx.ID_YES
+            dlg.Destroy()
+
+        allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists, preserve_ic)
 
         self._parent.load_data()
 
@@ -1561,10 +1585,31 @@ class UI_Manager_2D_GPU():
 
     def _callbackwp(self):
         """ Callback for wolfparam """
-        for cursim, curwp in self._wp.items():
-            if curwp.Shown:
-                cursim.from_wolfparam(curwp)
-                cursim.save_json()
+        for cursim in self._wp:
+            curwp = self._wp[cursim]
+            if curwp is not None:
+                try:
+                    if curwp.Shown:
+                        cursim.from_wolfparam(curwp)
+                        cursim.save_json()
+                except Exception as e:
+                    self._wp[cursim] = None
+                    logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
+                    logging.debug(str(e))
+
+    def _callbackwp_destroy(self):
+        """ Callback for wolfparam """
+        for cursim in self._wp:
+            curwp = self._wp[cursim]
+            if curwp is not None:
+                try:
+                    if curwp.Shown:
+                        cursim.from_wolfparam(curwp)
+                        cursim.save_json()
+                except Exception as e:
+                    self._wp[cursim] = None
+                    logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
+                    logging.debug(str(e))
 
     def OnActivateTreeElem(self, e):
         """
@@ -1707,7 +1752,7 @@ class UI_Manager_2D_GPU():
 
                     wp = sim.to_wolfparam()
                     self._wp[sim] = wp
-                    wp.set_callbacks(self._callbackwp, self._callbackwp)
+                    wp.set_callbacks(self._callbackwp, self._callbackwp_destroy)
                     wp._set_gui(title='Parameters for simulation {}'.format(mydata['path'].name), toShow=False)
                     wp.hide_selected_buttons()
                     wp.Show()

wolfhece/wolf_array.py

@@ -6544,7 +6544,7 @@ class WolfArray(Element_To_Draw, header_wolf):
     def read_all(self, which_band = None):
         """ Lecture d'un Wolf aray depuis le nom de fichier """
 
-        THRESHOLD = 20_000_000
+        THRESHOLD = 100_000_000
 
         if not os.path.exists(self.filename):
             if self.wx_exists:

wolfhece/wolfresults_2D.py

@@ -1779,8 +1779,9 @@ class OneWolfResult:
 
         self._current.mypal = curpal
         self._current.mypal.interval_cst = curpal.interval_cst
-        if VERSION_RGB==1 : self._current.rgb = curpal.get_rgba(self._current.array)
-        self._current.rgb[self._current.array.mask] = [1., 1., 1., 1.]
+        if VERSION_RGB==1 : 
+            self._current.rgb = curpal.get_rgba(self._current.array)
+            self._current.rgb[self._current.array.mask] = [1., 1., 1., 1.]
 
         if which == 'wd_u':
             self._view.pals = [bluepal,curpal]

{wolfhece-2.1.30.dist-info → wolfhece-2.1.32.dist-info}/METADATA

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

{wolfhece-2.1.30.dist-info → wolfhece-2.1.32.dist-info}/RECORD

@@ -10,7 +10,7 @@ wolfhece/PyDraw.py,sha256=rF_TaicOrLMk122Mflc82kyz0DoJ-ldWgeYrMkjNIOY,390213
 wolfhece/PyGui.py,sha256=8UWyaYwiHD9juDbPs__pmCXIDoM8r9_bGKLf29xVGZI,103140
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
-wolfhece/PyPalette.py,sha256=-F3E2dyGNMHCZa3xTd_StNYOQZv9fPGO051Z0TtvEqo,25885
+wolfhece/PyPalette.py,sha256=3NK2bvFNmBTjnghTEKMSVQdNRWW3CATMrIGA1DwaajU,25883
 wolfhece/PyParams.py,sha256=R3AWcb7Mhixwnw4iONSN4gk1DOXKcJR2lj7jaIml4B8,97085
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -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=lgo1SQaiEZe7yF1vUuH1SyKsK6lT2ccT0WM7cGTxhDg,355711
+wolfhece/wolf_array.py,sha256=7TOryanTy1kyO480VJ6zBjaTRXxcUu7c9TeDAKT-76c,355712
 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=wF-wIyqpTrUJX_fT-QCVuNxLZCgUsqK9ptGz8izpyIQ,165590
+wolfhece/wolfresults_2D.py,sha256=fhRRfz6Lb_lkr4YldLuCWS_bboljVfKS90pCI3ZArT0,165608
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/acceptability/Parallels.py,sha256=wpCdwkqR6PAFeRkV5TvSSL33Vf368j-bvYcl7D1Y-sc,3695
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -72,7 +72,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=EjEjZGuWV-8ZfHhnFH4XLrrtB-YpzPDVhFzRrjgFUzI,2624
-wolfhece/apps/version.py,sha256=DOnhV0acM8wlohylXhs6wwbgGzeJWQwuSC3SgXqFsRg,388
+wolfhece/apps/version.py,sha256=P4inP6CexgdmRIkkT_nMwMYPjOHtwIwHikcTMnJuoTk,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
@@ -257,7 +257,7 @@ wolfhece/report/reporting.py,sha256=LrOUI7j1vPefsGhqag1f2KpKRXR-5cH7SyGIsf6nOG0,
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=nFiCscEGHyz1YvjmZoKlYrfmW03-nLiDTDdRoeE6MUs,4619
-wolfhece/scenario/config_manager.py,sha256=r3E7ZyOewoB_0M-ox3rIZ3-cO_JIbE1zD4b87pPXn6c,77957
+wolfhece/scenario/config_manager.py,sha256=OnQPPJwd70-N93gGGVwr16qAQZq1MPvWV2I9KV-lhkc,80113
 wolfhece/scenario/imposebc_void.py,sha256=pl7c99HQQMQT7i15fDlOOFYCdOtR5c_XIBOveOTOaLc,5273
 wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTAraE,7176
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -280,8 +280,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.30.dist-info/METADATA,sha256=3IcGhCz-MaGj4jP2HATNkudS-Ae869L61Ec7nyjt5rE,2356
-wolfhece-2.1.30.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-wolfhece-2.1.30.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
-wolfhece-2.1.30.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.30.dist-info/RECORD,,
+wolfhece-2.1.32.dist-info/METADATA,sha256=WC53YHFEL1sGIHLobwvzv65N9zIFDqSRBLKmVHrMdpk,2356
+wolfhece-2.1.32.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+wolfhece-2.1.32.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
+wolfhece-2.1.32.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.32.dist-info/RECORD,,

{wolfhece-2.1.30.dist-info → wolfhece-2.1.32.dist-info}/WHEEL

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