wolfhece 2.0.53__py3-none-any.whl → 2.0.55__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/mesh2d/wolf2dprev.py

@@ -3040,7 +3040,7 @@ class prev_sim2D():
             ('.top','Bed Elevation [m]',WOLF_ARRAY_FULL_SINGLE),
             ('.topini_fine','Bed Elevation - computed [m]',WOLF_ARRAY_FULL_SINGLE),
             ('.frot','Roughness coefficient [law dependent]',WOLF_ARRAY_FULL_SINGLE),
-            ('.inf','Infiltration zone [-]',WOLF_ARRAY_FULL_SINGLE),
+            ('.inf','Infiltration zone [-]',WOLF_ARRAY_FULL_INTEGER),
             ('.hbin','Initial water depth [m]',WOLF_ARRAY_FULL_SINGLE),
             ('.qxbin','Initial discharge along X [m^2/s]',WOLF_ARRAY_FULL_SINGLE),
             ('.qybin','Initial discharge along Y [m^2/s]',WOLF_ARRAY_FULL_SINGLE)
@@ -3154,13 +3154,17 @@ class prev_sim2D():
     def nb_blocks(self):
         return self.mymnap.nb_blocks
 
-    def read_fine_array(self, which:Literal['.top', '.hbin', '.qxbin', '.qybin', '.napbin', '.topini_fine', '.frot', '.inf']=''):
+    def read_fine_array(self, which:Literal['.top', '.hbin', '.qxbin', '.qybin', '.napbin', '.topini_fine', '.frot', '.inf']='') -> WolfArray:
         """
         Lecture d'une matrice fine
 
-        @param which: suffixe du fichier
-        @type which: str -- extension with point (e.g. '.hbin')
+        :param which: suffixe du fichier
+        :type which: str -- extension with point (e.g. '.hbin')
+        :return: WolfArray
         """
+        which = str(which)
+        if not which.startswith('.'):
+            which = '.' + which
 
         if Path(self.filenamegen + which).exists():
             myarray = WolfArray(fname = self.filenamegen + which)
@@ -3172,14 +3176,19 @@ class prev_sim2D():
 
         return myarray
 
-    def read_MB_array(self, which:Literal['.hbinb', '.qxbinb', '.qybinb', '.frotini', '.topini']=''):
+    def read_MB_array(self, which:Literal['.hbinb', '.qxbinb', '.qybinb', '.frotini', '.topini']='') -> WolfArrayMB:
         """
         Lecture d'une matrice MB
 
-        @param which: suffixe du fichier
-        @type which: str -- extension with point (e.g. '.hbinb')
+        :param which: suffixe du fichier
+        :type which: str -- extension with point (e.g. '.hbinb')
+        :return: WolfArrayMB
         """
 
+        which = str(which)
+        if not which.startswith('.'):
+            which = '.' + which
+
         if Path(self.filenamegen + which).exists():
             myarray =WolfArrayMB()
             myarray.set_header(self.get_header_MB())

wolfhece/wolf_array.py

@@ -5248,6 +5248,11 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER16
             elif locarray.dtype == np.int8:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER8
+            else:
+                logging.error(_('Unsupported type in numpy file -- Abort loading'))
+                return
+
+            tmp_wolftype = self.wolftype
 
             # Il y de fortes chances que cette matrice numpy provienne d'une modélisation GPU
             #  et donc que les coordonnées et la résolution soient disponibles dans un fichier parameters.json
@@ -5270,6 +5275,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             elif (locpath.parent / (locpath.name + '.txt')).exists():
                 self.read_txt_header()
 
+                # Le header contient également un type
+                # Vérification de la cohérence
+                if self.wolftype != tmp_wolftype:
+                    logging.warning(_('Inconsistent type in header and numpy file'))
+                    logging.warning(_('Forcing type from Numpy file'))
+                    self.wolftype = tmp_wolftype
+
             self.mask_data(self.nullvalue)
             self.loaded = True
 
@@ -5296,8 +5308,34 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.filename.endswith('.tif'):
             self.export_geotif()
         elif self.filename.endswith('.npy'):
+            
+            writing_header = True
+            if self.dtype !=  self.array.data.dtype:
+                logging.warning(_('Data type changed -- Force conversion to internal numpy array'))
+                locarray = self.array.data
+                if locarray.dtype == np.float32:
+                    self.wolftype = WOLF_ARRAY_FULL_SINGLE
+                    logging.warning(_('Data type changed to float32'))
+                elif locarray.dtype == np.float64:
+                    self.wolftype = WOLF_ARRAY_FULL_DOUBLE
+                    logging.warning(_('Data type changed to float64'))
+                elif locarray.dtype == np.int32:
+                    self.wolftype = WOLF_ARRAY_FULL_INTEGER
+                    logging.warning(_('Data type changed to int32'))
+                elif locarray.dtype == np.int16:
+                    self.wolftype = WOLF_ARRAY_FULL_INTEGER16
+                    logging.warning(_('Data type changed to int16'))
+                elif locarray.dtype == np.int8:
+                    self.wolftype = WOLF_ARRAY_FULL_INTEGER8
+                    logging.warning(_('Data type changed to int8'))
+                else:
+                    logging.error(_('Unsupported type in numpy file -- Abort wrting header file'))
+                    writing_header = False
+
             np.save(self.filename, self.array.data)
-            self.write_txt_header()
+
+            if writing_header:
+                self.write_txt_header()
         else:
             self.write_txt_header()
             self.write_array()

{wolfhece-2.0.53.dist-info → wolfhece-2.0.55.dist-info}/METADATA

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

{wolfhece-2.0.53.dist-info → wolfhece-2.0.55.dist-info}/RECORD

@@ -48,7 +48,7 @@ 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=GW5XxM-oHgyP-4jRvWEBM4Lw3-_V5jQv7SeLlZ_2rM4,294309
+wolfhece/wolf_array.py,sha256=WMiA4VvBsh_Dcabubs8tpi5hxvhZ9V_0vU1v2JjRmX0,296214
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=tMaJUj2jbKD0yIe4bYrNyC4HSMxcSkmAJChhWsP4nSQ,388
+wolfhece/apps/version.py,sha256=nzym95IBzW11oeKKAZVu2oVnByXAzpA7CWw8xvcfM5Q,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
@@ -211,7 +211,7 @@ wolfhece/mesh2d/bc_manager.py,sha256=vSVogXy1x3A6fZKWA6mPZSGX2e3EAUVmEjD9Bgww_hU
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
 wolfhece/mesh2d/config_manager.py,sha256=vrxLku4isZJTxbHOACEEIEEjQB9pkLpaVPteJz9GhnE,14417
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=BaJeKHyJiKEFWBkTQeYsDBW86703ooj65MFVpPMgjLg,2810
-wolfhece/mesh2d/wolf2dprev.py,sha256=_MnOSYn0OHZav7ikkp-40oIe7LglhKLvwwTBZK0pqow,145333
+wolfhece/mesh2d/wolf2dprev.py,sha256=sLv6Qx__kGGFvV9DecRjkBY-lILR0qJcFK_XrXycptQ,145622
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -256,8 +256,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.0.53.dist-info/METADATA,sha256=CQcXOZCu0QZgwPzlep15lih8X1EL970VHL1ur80ouZM,2233
-wolfhece-2.0.53.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.53.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.53.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.53.dist-info/RECORD,,
+wolfhece-2.0.55.dist-info/METADATA,sha256=l5v7KykbqyDpev8-EywylP8wtb0UiymoC77zNlfvlx8,2233
+wolfhece-2.0.55.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.55.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.55.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.55.dist-info/RECORD,,