wolfhece 2.0.46__py3-none-any.whl → 2.0.48__py3-none-any.whl

wolfhece/PyGui.py

@@ -8,7 +8,7 @@ import logging
 from pathlib import Path
 
 from .apps.splashscreen import WolfLauncher
-from .wolf_array import WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_MB_SINGLE, WolfArray,getkeyblock, WolfArray_Sim2D
+from .wolf_array import WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_MB_SINGLE, WolfArray, getkeyblock, WolfArray_Sim2D, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_MB_INTEGER
 from .PyTranslate import _
 from .PyDraw import WolfMapViewer,imagetexture
 
@@ -409,7 +409,7 @@ class Wolf2DModel(GenMapManager):
         self.myparam = myparam
         self.myparam.parent = self
 
-        self.mynap= np.ones([self.myparam.nxfin, self.myparam.nyfin], order='F')
+        self.mynap= np.ones([self.myparam.nxfin, self.myparam.nyfin], order='F', dtype=np.int16)
 
         self.mysuxy = prev_suxsuy(self)
         self.xyfile = xy_file(self)
@@ -643,7 +643,7 @@ class Wolf2DModel(GenMapManager):
                 ('.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)
@@ -1146,7 +1146,7 @@ class Wolf2DModel(GenMapManager):
         self.myblocfile.my_vec_blocks.find_minmax(True)
         self.myblocfile.write_file()
 
-    def get_header_MB(self,abs=False):
+    def get_header_MB(self, abs=False):
         """#> Renvoit un header avec les infos multi-blocs"""
         myheader:header_wolf
         myheader = self.mymnap.get_header(abs=abs)
@@ -1154,8 +1154,15 @@ class Wolf2DModel(GenMapManager):
             myheader.head_blocks[getkeyblock(curblock.blockindex)] = curblock.get_header(abs=abs)
         return  myheader
 
-    def get_header(self,abs=True):
-        """#> Renvoit un header de matrice "fine" non MB"""
+    def get_header(self, abs=False):
+        """
+        Renvoi d'un header de matrice "fine" non MB
+
+        @param abs: If True, the header will be absolute, if False, it will be relative
+        @type abs: bool
+
+        @return: header_wolf
+        """
 
         curhead = header_wolf()
 
@@ -1165,26 +1172,51 @@ class Wolf2DModel(GenMapManager):
         curhead.dx = self.myparam.dxfin
         curhead.dy = self.myparam.dyfin
 
-        curhead.origx = self.myparam.xminfin
-        curhead.origy = self.myparam.yminfin
+        if abs:
+            curhead.origx = self.myparam.xminfin + self.myparam.translx
+            curhead.origy = self.myparam.yminfin + self.myparam.transly
 
-        curhead.translx = self.myparam.translx
-        curhead.transly = self.myparam.transly
+            curhead.translx = 0.
+            curhead.transly = 0.
+
+        else:
+
+            curhead.origx = self.myparam.xminfin
+            curhead.origy = self.myparam.yminfin
+
+            curhead.translx = self.myparam.translx
+            curhead.transly = self.myparam.transly
 
         return curhead
 
-    def read_fine_array(self,which=''):
-        """Lecture d'une matrice fine"""
+    def read_fine_array(self, which:str=''):
+        """
+        Lecture d'une matrice fine
+
+        @param which: suffixe du fichier
+        @type which: str
+        """
 
-        myarray =WolfArray()
-        myarray.set_header(self.get_header())
-        myarray.filename = self.filenamegen+which
-        myarray.read_data()
+        if Path(self.filenamegen + which).exists():
+            myarray = WolfArray(fname = self.filenamegen + which)
+
+        else:
+            logging.error(f"File {self.filenamegen + which} does not exist")
+            myarray = None
+
+        # myarray.set_header(self.get_header())
+        # myarray.filename = self.filenamegen+which
+        # myarray.read_data()
 
         return myarray
 
-    def read_MB_array(self,which=''):
-        """Lecture d'une matrice MB"""
+    def read_MB_array(self, which:str=''):
+        """
+        Lecture d'une matrice MB
+
+        @param which: suffixe du fichier
+        @type which: str
+        """
 
         myarray =WolfArrayMB()
         myarray.set_header(self.get_header_MB())
@@ -1252,3 +1284,159 @@ class Wolf2DModel(GenMapManager):
         logging.info(_('Finished !'))
 
         pass
+
+    @property
+    def is_multiblock(self):
+        return self.myblocfile.nb_blocks>1
+
+    @property
+    def nb_blocks(self):
+        return self.myblocfile.nb_blocks
+
+    def help_files(self):
+
+        ret=  _('Text files\n')
+        ret+=  ('----------\n')
+
+        for key, val in self.files_others['Charachteristics']:
+            ret += f"{val} : {key}\n"
+
+        ret +='\n\n'
+
+        ret += _('Fine array - monoblock\n')
+        ret +=  ('----------------------\n')
+
+        for key, val, dtype in self.files_fine_array['Characteristics']:
+
+            if dtype == WOLF_ARRAY_FULL_LOGICAL:
+                ret += f"{val} : {key} [int16]\n"
+            elif dtype == WOLF_ARRAY_FULL_INTEGER:
+                ret += f"{val} : {key} [int32]\n"
+            elif dtype == WOLF_ARRAY_FULL_SINGLE:
+                ret += f"{val} : {key} [float32]\n"
+            else:
+                ret += f"{val} : {key} error - check code\n"
+
+        ret +='\n\n'
+
+        ret += _('Multiblock arrays\n')
+        ret +=  ('-----------------\n')
+
+        for key, val, dtype in self.files_MB_array['Initial Conditions']:
+
+            if dtype == WOLF_ARRAY_MB_INTEGER:
+                ret += f"{val} : {key} [int32]\n"
+            elif dtype == WOLF_ARRAY_MB_SINGLE:
+                ret += f"{val} : {key} [float32]\n"
+            else:
+                ret += f"{val} : {key} error - check code\n"
+
+        return ret
+
+    def check_infiltration(self):
+
+        ret =  _('inside .inf binary file') + '\n'
+        ret +=  ('-----------------------') + '\n'
+
+        inf = self.read_fine_array('.inf')
+
+        maxinf = inf.array.data.max()
+        ret += _('Maximum infiltration zone : ') + str(maxinf) + '\n'
+        for i in range(1,maxinf+1):
+
+            nb = np.sum(inf.array.data == i)
+            if nb>0:
+                indices = np.where(inf.array.data == i)
+                ret += f"Zone {i} : {nb} cells -- Indices (i,j) of the zone's first cell ({indices[0][0]+1} ; {indices[1][0]+1}) (1-based)\n"
+            else:
+                ret += f"Zone {i} : 0 cells\n"
+
+        ret += '\n'
+
+        ret += _('inside .fil text file') + '\n'
+        ret +=  ('----------------------') + '\n'
+
+        ret += f"Zones {self.myinfil.nb_zones}" + '\n'
+        ret += f"Time steps {self.myinfil.nb_steps}" + '\n'
+
+        if maxinf != self.myinfil.nb_zones:
+            ret += _('Warning : number of zones in .inf and .fil files are different') + '\n'
+
+        return ret
+
+
+    def copy2gpu(self, dirout:str=''):
+        """
+        Copie des matrices pour le code GPU
+        """
+
+        def to_absolute(array:WolfArray):
+            array.origx += array.translx
+            array.origy += array.transly
+            array.translx = 0.
+            array.transly = 0.
+
+        ret = ''
+
+        dirout = Path(dirout)
+        makedirs(dirout, exist_ok=True)
+
+        inf = self.read_fine_array('.inf')
+        to_absolute(inf)
+        inf.write_all(dirout / 'infiltration_zones.npy')
+        del(inf)
+
+        ret += '.inf --> infiltration_zones.npy [np.int32]\n'
+
+        frot = self.read_fine_array('.frot')
+        to_absolute(frot)
+        frot.write_all(dirout / 'manning.npy')
+        del(frot)
+
+        ret += '.frot --> manning.npy [np.float32]\n'
+
+        hbin = self.read_fine_array('.hbin')
+        to_absolute(hbin)
+        hbin.write_all(dirout / 'h.npy')
+        del(hbin)
+
+        ret += '.hbin --> h.npy [np.float32]\n'
+
+        qxbin = self.read_fine_array('.qxbin')
+        to_absolute(qxbin)
+        qxbin.write_all(dirout / 'qx.npy')
+        del(qxbin)
+
+        ret += '.qxbin --> qx.npy [np.float32]\n'
+
+        qybin = self.read_fine_array('.qybin')
+        to_absolute(qybin)
+        qybin.write_all(dirout / 'qy.npy')
+        del(qybin)
+
+        ret += '.qybin --> qy.npy [np.float32]\n'
+
+        nap = self.read_fine_array('.napbin')
+        napgpu = np.zeros_like(nap.array.data, dtype = np.uint8)
+        napgpu[np.where(nap.array.data != 0)] = 1
+        np.save(dirout / 'nap.npy', napgpu)
+
+        ret += '.napbin --> nap.npy [np.uint8]\n'
+
+        top = self.read_fine_array('.top')
+        to_absolute(top)
+        top.array.data[np.where(napgpu != 1)] = 99999.
+        top.nullvalue = 99999.
+        top.write_all(dirout / 'bathymetry.npy')
+
+        ret += '.top --> bathymetry.npy [np.float32]\n'
+        ret += _('Force a value 99999. outside nap')
+
+        nb = np.sum(top.array.data != 99999.)
+        assert  nb == np.sum(napgpu == 1), 'Error in couting active cells'
+
+        ret += f'\n{nb} active cells in bathymetry.npy'
+
+        del(top)
+
+        return ret

wolfhece/apps/version.py

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

wolfhece/eva/pyseries.py

@@ -298,6 +298,8 @@ class EVA_Serie:
         else:
             raise Exception('Format non supported -- Please code your importing filter')
 
+        self.check_dupliactes()
+
         self.nb = self.data.shape[0]
 
         self.index_isnan = np.where(np.isnan(self.data))[0]
@@ -341,6 +343,17 @@ class EVA_Serie:
 
         self.tz_info = self.data.index[0].tz
 
+    def check_dupliactes(self):
+        """
+        Check if there are duplicates in the data
+        """
+        if not self.data.index.is_unique:
+            print('****\n')
+            print('Non unique index detected - removing duplicates - keep first value\n')
+            print(self.data.index[self.data.index.duplicated()])
+            print('****\n\n')
+            self.data = self.data[~self.data.index.duplicated(keep='first')]
+
     def filter(self):
         """
         Set zero, negative, NaN, Nat to np.nan
@@ -349,7 +362,7 @@ class EVA_Serie:
             if len(curindex)>0:
                 self.data.iloc[curindex]=np.nan
 
-    def get_date_max(self, year, seasons=None) -> list():
+    def get_date_max(self, year, seasons=None) -> list:
         """
         Récupère la date du maximum de l'année "year"
         Possibilité de traiter plusieurs saisons
@@ -365,7 +378,7 @@ class EVA_Serie:
             resdates.append((self.maxima[curseason]['date'][idx], curseason))
         return resdates
 
-    def get_one_maxevent(self, year, seasons=None) -> list():
+    def get_one_maxevent(self, year, seasons=None) -> list:
         """
         Récupération de l'événement max pour une année spécifique
         Possibilité de traiter plusieurs saisons
@@ -431,7 +444,6 @@ class EVA_Serie:
     def save_max_events(self, filename, years_bounds:list=None, seasons=None):
         """
         Enregistrement des crues maximales dans un fichier CSV
-        Un onglet par saison
         """
         seasons = sanitize_seasons(seasons)
 
@@ -1238,7 +1250,7 @@ class EVA_Serie:
                           fig:Figure=None,
                           ax:Axes=None,
                           color:str='red',
-                          alpha=1.) -> tuple([Figure,Axes]):
+                          alpha=1.) -> tuple[Figure,Axes]:
         """
         Plot median hydrograph scale by constant
         """
@@ -1265,7 +1277,7 @@ class EVA_Serie:
             k+=1
 
 
-    def plot_classified_flowrate_curve(self, fig:Figure=None, ax:Axes=None, label='', textvalues=True, show=False) -> tuple([Figure,Axes]):
+    def plot_classified_flowrate_curve(self, fig:Figure=None, ax:Axes=None, label='', textvalues=True, show=False) -> tuple[Figure,Axes]:
 
         if ax is None:
             fig,ax = plt.subplots(1,1)
@@ -1367,7 +1379,7 @@ class EVA_Serie:
             if show:
                 plt.show()
 
-    def plot_ci(self, seasons=None, laws=['GEV'], methods=['MLE'], fig:Figure=None, ax:Axes=None, show=False, alpha=.1) -> tuple([Figure,Axes]):
+    def plot_ci(self, seasons=None, laws=['GEV'], methods=['MLE'], fig:Figure=None, ax:Axes=None, show=False, alpha=.1) -> tuple[Figure,Axes]:
         """
         Plotting confidence interval
         """
@@ -1419,7 +1431,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_annual(self, years=None, hydrol=True, fig:Figure=None, ax:Axes=None, show=False, withdatemax=True) -> tuple([Figure,Axes]):
+    def plot_annual(self, years=None, hydrol=True, fig:Figure=None, ax:Axes=None, show=False, withdatemax=True) -> tuple[Figure,Axes]:
         """
         Tracé en superposition des différentes années sur l'emprise d'une année civile ou hydrologique
         """
@@ -1483,7 +1495,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_serie(self, fig:Figure=None, ax:Axes=None, show=False, background=True, backcolor='lemonchiffon') -> tuple([Figure,Axes]):
+    def plot_serie(self, fig:Figure=None, ax:Axes=None, show=False, background=True, backcolor='lemonchiffon') -> tuple[Figure,Axes]:
         """Tracé de l'ensemble de la série pour toutes les années"""
         if fig is None and ax is None:
             fig,ax = plt.subplots(1,1)
@@ -1510,7 +1522,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_cdf(self, seasons=None, fig:Figure=None, ax:Axes=None, show=False, n_bins=100) -> tuple([Figure,Axes]):
+    def plot_cdf(self, seasons=None, fig:Figure=None, ax:Axes=None, show=False, n_bins=100) -> tuple[Figure,Axes]:
         """
         Plotting empirical cdf
         """
@@ -1537,7 +1549,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_T_Qmaxima(self, seasons=None, empirical_func='Cunnane', fig:Figure=None, ax:Axes=None, show=False, alpha=1., color_marker_label=None) -> tuple([Figure,Axes]):
+    def plot_T_Qmaxima(self, seasons=None, empirical_func='Cunnane', fig:Figure=None, ax:Axes=None, show=False, alpha=1., color_marker_label=None) -> tuple[Figure,Axes]:
         """
         Plotting Q vs return period
         """
@@ -1600,7 +1612,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_maxevents(self, seasons=None, before=1, after=2, adim=True, fig:Figure=None, ax:Axes=None, show=False, alpha=.2, nbevents=None) -> tuple([Figure,Axes]):
+    def plot_maxevents(self, seasons=None, before=1, after=2, adim=True, fig:Figure=None, ax:Axes=None, show=False, alpha=.2, nbevents=None) -> tuple[Figure,Axes]:
         """
         Tracé des événements/hydrogrammes associés aux maxima identifiés
         Les ordonnées sont adimensionnaliées sur base de la valeur maximale
@@ -1692,7 +1704,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_comp_maxevents(self, seasons=None, before=1, after=2, fig:Figure=None, ax:Axes=None, show=False, alpha=.2, nbevents=None) -> tuple([Figure,Axes]):
+    def plot_comp_maxevents(self, seasons=None, before=1, after=2, fig:Figure=None, ax:Axes=None, show=False, alpha=.2, nbevents=None) -> tuple[Figure,Axes]:
         """
         Tracé des événements médians
         Les ordonnées sont adimensionnaliées sur base de la valeur maximale
@@ -1781,7 +1793,7 @@ class EVA_Serie:
                        fig:Figure=None,
                        ax:Axes=None,
                        show=False,
-                       alpha=.2) -> tuple([Figure,Axes]):
+                       alpha=.2) -> tuple[Figure,Axes]:
         """
         Tracé d'un événement quelconque autour d'une date
         """
@@ -1825,7 +1837,7 @@ class EVA_Serie:
                            fig:Figure=None,
                            ax:Axes=None,
                            show=False,
-                           alpha=.2) -> tuple([Figure,Axes]):
+                           alpha=.2) -> tuple[Figure,Axes]:
         """
         Tracé d'un événement spécifique associés au maxima identifié
         Les ordonnées sont adimensionnaliées sur base de la valeur maximale
@@ -1875,7 +1887,7 @@ class EVA_Serie:
                  ax:Axes=None,
                  show=False,
                  alpha=1.,
-                 styles:dict=None) -> tuple([Figure,Axes]):
+                 styles:dict=None) -> tuple[Figure,Axes]:
         """
         Plotting fitted models
         """
@@ -1969,7 +1981,7 @@ class EVA_Serie:
 
         return (fig,ax)
 
-    def plot_qq(self, seasons=None, laws=['GEV'], methods=['MLE'], fig:Figure=None, ax:Axes=None) -> tuple([Figure,Axes]):
+    def plot_qq(self, seasons=None, laws=['GEV'], methods=['MLE'], fig:Figure=None, ax:Axes=None) -> tuple[Figure,Axes]:
         """
         Q-Q Plot
 
@@ -2011,7 +2023,7 @@ class EVA_Serie:
                             ax.legend()
         return(fig, ax)
 
-    def plot_summary(self, seasons=None, nb_laws=None, forced_laws=[], sort:typing.Literal['RSS', 'AICc', 'AIC', 'BIC']='RSS', fig:Figure=None, ax:Axes=None, show=False) -> tuple([Figure,Axes]):
+    def plot_summary(self, seasons=None, nb_laws=None, forced_laws=[], sort:typing.Literal['RSS', 'AICc', 'AIC', 'BIC']='RSS', fig:Figure=None, ax:Axes=None, show=False) -> tuple[Figure,Axes]:
         """Plot summary results.
 
         Parameters
@@ -2202,7 +2214,7 @@ class EVA_Series:
                        ax:Axes=None,
                        show=False,
                        alpha=1.,
-                       color_marker_label=None) -> tuple([Figure,Axes]):
+                       color_marker_label=None) -> tuple[Figure,Axes]:
 
         return self._current_serie.plot_T_Qmaxima(seasons, empirical_func, fig, ax, show, alpha, color_marker_label)
 
@@ -2214,7 +2226,7 @@ class EVA_Series:
                  ax:Axes=None,
                  show=False,
                  alpha=1.,
-                 styles:dict=None) -> tuple([Figure,Axes]):
+                 styles:dict=None) -> tuple[Figure,Axes]:
 
         return self._current_serie.plot_fit(seasons, laws, methods, fig, ax, show, alpha, styles)
 
@@ -2437,7 +2449,7 @@ class EVA_Series:
 
         return plots
 
-    def evaluate_ci(self, seasons=None, durations=[1], laws=['GEV'], nboot=100, show=False) -> dict():
+    def evaluate_ci(self, seasons=None, durations=[1], laws=['GEV'], nboot=100, show=False) -> dict:
         """
         Intervalles de confiance
 
@@ -2468,7 +2480,7 @@ class EVA_Series:
 
         return figax
 
-    def evaluate_ic(self, seasons=None, durations=[1], laws=['GEV'], nboot=100, show=False) -> dict():
+    def evaluate_ic(self, seasons=None, durations=[1], laws=['GEV'], nboot=100, show=False) -> dict:
         """ alias evaluate_ci """
         return self.evaluate_ci(seasons, durations, laws, nboot, show)
 
@@ -2561,7 +2573,7 @@ class EVA_Series:
                   ylim=None,
                   before = 1,
                   after = 3,
-                  show=False) -> tuple([Figure, Axes, Axes]):
+                  show=False) -> tuple[Figure, Axes, Axes]:
         """
         ################
         ## GRAPHIQUES ##
@@ -2600,7 +2612,7 @@ class EVA_Series:
                            ylim=None,
                            before = 1,
                            after=2,
-                           show=False) -> tuple([Figure, Axes]):
+                           show=False) -> tuple[Figure, Axes]:
         """
         ################
         ## GRAPHIQUES ##
@@ -2661,7 +2673,7 @@ class EVA_Series:
 
     def plot_one_fit(self, seasons=None, durations=None, laws='popular',
                      split_duration=True, split_season=True, xbounds=None,
-                     ybounds=None, show=False) -> tuple([Figure, Axes]):
+                     ybounds=None, show=False) -> tuple[Figure, Axes]:
 
         seasons = sanitize_seasons(seasons)
 
@@ -2752,7 +2764,7 @@ class EVA_Series:
         return summary
 
     def plot_selected_max(self, seasons=None, durations=None,
-                          split_seasons = False, scaling=False, show=False)-> tuple([Figure, Axes]):
+                          split_seasons = False, scaling=False, show=False)-> tuple[Figure, Axes]:
         """
         Graphique des dates des événements sélectionnés pour chaque durée (par défaut, toutes les durées)
         """

wolfhece/mesh2d/wolf2dprev.py

@@ -3029,6 +3029,25 @@ class prev_sim2D():
             ('.qybin','Initial discharge along Y [m^2/s]',WOLF_ARRAY_FULL_SINGLE)
         ]}
 
+        self.files_others={'Generic file':[
+            ('','First parametric file - historical'),
+            ('.par','Parametric file - multiblocks')],
+                        'Charachteristics':[
+            ('.fil','Infiltration hydrographs [m³/s]'),
+            ('.mnap','Resulting mesh [-]'),
+            ('.trl','Translation to real world [m]')
+            ]}
+
+        self.files_vectors={'Block file':[
+            ('.bloc','Blocks geometry')],
+                            'Borders':[
+            ('.sux','X borders'),
+            ('.suy','Y borders')],
+                            'Contour':[
+            ('.xy','General perimeter')
+        ]}
+
+
     def get_header(self):
         curhead = header_wolf()
 

wolfhece/wolf_array.py

@@ -71,6 +71,7 @@ WOLF_ARRAY_FULL_INTEGER8 = 8
 WOLF_ARRAY_MB_SINGLE = 3
 WOLF_ARRAY_MB_INTEGER = 9
 
+WOLF_ARRAY_FULL_INTEGER16_2 = 0
 WOLF_ARRAY_FULL_INTEGER16 = 11
 WOLF_ARRAY_MNAP_INTEGER = 20
 
@@ -156,7 +157,14 @@ class header_wolf():
         ret += _('   - Origin : ({} ; {}) \n').format(self.origx, self.origy)
         ret += _('   - End : ({} ; {}) \n').format(self.origx + self.nbx * self.dx, self.origy +self.nby * self.dy)
         ret += _('   - Widht x Height : {} x {} \n').format(self.nbx * self.dx, self.nby * self.dy)
-        ret += _('Null value :{}\n'.format(self.nullvalue))
+        ret += _('   - Translation : ({} ; {})\n').format(self.translx, self.transly)
+        ret += _('Null value : {}\n\n'.format(self.nullvalue))
+
+        if len(self.head_blocks) > 0:
+            ret += _('Number of blocks : {}\n\n').format(len(self.head_blocks))
+            for key, value in self.head_blocks.items():
+                ret += _('Block {} : \n\n').format(key)
+                ret += str(value)
 
         return ret
 
@@ -697,7 +705,7 @@ class header_wolf():
         :param forceupdate : if True, the file is rewritten even if it already exists
         """
 
-        assert wolftype in [WOLF_ARRAY_CSR_DOUBLE, WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_SYM_DOUBLE, WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_CSR_DOUBLE, WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_SINGLE_3D, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_MB_SINGLE, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_MNAP_INTEGER]
+        assert wolftype in [WOLF_ARRAY_CSR_DOUBLE, WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_SYM_DOUBLE, WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_CSR_DOUBLE, WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_SINGLE_3D, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_MB_SINGLE, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_MNAP_INTEGER, WOLF_ARRAY_FULL_INTEGER16_2], _('The type of array is not correct')
 
         if not os.path.exists(filename) or forceupdate:
             with open(filename,'w') as f:
@@ -3608,7 +3616,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             dtype = np.float32
         elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_MNAP_INTEGER]:
             dtype = np.int32
-        elif self.wolftype == WOLF_ARRAY_FULL_INTEGER16:
+        elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
             dtype = np.int16
         elif self.wolftype == WOLF_ARRAY_FULL_INTEGER8:
             dtype = np.int8
@@ -4618,7 +4626,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 dtype = np.float32
             elif self.wolftype == WOLF_ARRAY_FULL_INTEGER:
                 dtype = np.int32
-            elif self.wolftype == WOLF_ARRAY_FULL_INTEGER16:
+            elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
                 dtype = np.int16
 
         self.dx = myhead.dx
@@ -5435,7 +5443,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         elif self.wolftype == WOLF_ARRAY_FULL_INTEGER:
             locarray = np.frombuffer(f.read(self.nbx * self.nby * 4), dtype=np.int32)
             self.array = ma.masked_array(locarray.copy(), dtype=np.int32)
-        elif self.wolftype == WOLF_ARRAY_FULL_INTEGER16:
+        elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
             locarray = np.frombuffer(f.read(self.nbx * self.nby * 2), dtype=np.int16)
             self.array = ma.masked_array(locarray.copy(), dtype=np.int16)
 
@@ -5565,7 +5573,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.array is None:
             return
 
-        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16]:
+        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
             value=int(value)
 
         if value is not None:
@@ -6423,7 +6431,7 @@ class WolfArrayMB(WolfArray):
     def mask_data(self, value):
         """ Mask cells where values are equal to `value`"""
 
-        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16]:
+        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
             value=int(value)
 
         if value is not None:

{wolfhece-2.0.46.dist-info → wolfhece-2.0.48.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.46
-Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
+Version: 2.0.48
+Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
+License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 11
 Classifier: Topic :: Scientific/Engineering :: Physics

{wolfhece-2.0.46.dist-info → wolfhece-2.0.48.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=Zz2pcBUGA7s3FURP-4CPdoBqENtSrf-RLH1o-xZ6qrA,343578
-wolfhece/PyGui.py,sha256=UjK8wrBXVh04HlXuaS88K-oyrI4-muaPSmIpHRjGJLk,54136
+wolfhece/PyGui.py,sha256=Dv8i0aMXXGUcTVuav-jedqH4IHVMFnUC_ndeZydETRg,59795
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Yjivc_Z3i6zpyTBM3U1Gd00bOqqM4D3CVkjs-oW3K3Q,22230
@@ -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=9kNIuzJ22mD4SDvhuVqq56i61Uzxw3B-LbXzFE7nGDM,287654
+wolfhece/wolf_array.py,sha256=yklT2lQaBBgnPCh-e3qFBSpKcOSsSPwkG-ECFCLBzXw,288267
 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=QsLUYzYaQBolO00k3IU0uEzj2xzyH1qU_OWnttOzNXY,388
+wolfhece/apps/version.py,sha256=zx6pHDczskz0pAlVKXX5izabGKi7jpL-tk87LMvinSA,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
@@ -83,7 +83,7 @@ wolfhece/eva/bootstrap.py,sha256=xHbIAZzFuaKLwiRpgvsLi5OZYqwaxYACqsAU-FnB6Pc,605
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
 wolfhece/eva/joint_models.py,sha256=KTal-jVJmeEWXPQ5mKyT032q186Drz3IFdc60daz-t0,5565
 wolfhece/eva/mixture_models.py,sha256=WRzGxE2rQ-RkQUskL6IlSeUqEWlAeezJrNhkr0QpeOI,15923
-wolfhece/eva/pyseries.py,sha256=7lboJE3ZGKVmMwBXQow9jTYfneTtsDwXeAPCe4y62QE,118129
+wolfhece/eva/pyseries.py,sha256=Oz2QCPGrbebAwQL1Vl-kc4t1OkzS-pCuj5rZwDGEJ-I,118536
 wolfhece/fonts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/fonts/arial.ttf,sha256=uwYWwXEZKaG6axcVPiDDM0MXLgf40xAQmMwR8BSShSY,37496
 wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,317968
@@ -158,8 +158,6 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=3--r0CVWTsb_st6oMf0AyP6OyTNPj9b4kl0g_-cAwi0,132934144
-wolfhece/libs/WolfDll_CD.dll,sha256=kC1svCwD1qSmppsiVfHwDkIvoJO_1l6TG1GfIxgiqQQ,131415040
-wolfhece/libs/WolfDll_debug.dll,sha256=-vrycGENtxj_GxX1n1vWBoamAfVCicPETKovk1LrIbU,74528256
 wolfhece/libs/WolfOGL.c,sha256=tBWGfpFFe8gfRjImUUlqdxhcRpQ6ytEWU7Z6PC0v9as,1085242
 wolfhece/libs/WolfOGL.pyx,sha256=kc1uxbO2wQx0Qoe7BVQnqTJgUWYx_Vtf1wzXMxzf8bI,65911
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
@@ -213,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=DEoWWHjBdAMQQWMwTSk88QMgjnN-X4ZZCmOV5p0XNOM,136438
+wolfhece/mesh2d/wolf2dprev.py,sha256=q-5dwegcBjNy2IAn511Uuktnl8zt3cTtSowardpml2g,137113
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -258,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.46.dist-info/METADATA,sha256=1cj4L7ekVgOuquxz0Y7p_8gAiGs1upPDNK5s0sWTb30,2262
-wolfhece-2.0.46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.46.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.46.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.46.dist-info/RECORD,,
+wolfhece-2.0.48.dist-info/METADATA,sha256=lKkb-xiticGSdZUyiECndzvwo3_x_X9KoVVfGEFSbXQ,2233
+wolfhece-2.0.48.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.48.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.48.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.48.dist-info/RECORD,,