wolfhece 2.0.21__py3-none-any.whl → 2.0.22__py3-none-any.whl

wolfhece/PyDraw.py

@@ -392,6 +392,7 @@ class WolfMapViewer(wx.Frame):
         # Help
         self.helpmenu = wx.Menu()
         self.helpmenu.Append(wx.ID_ANY, _('Shortcuts'), _('Shortcuts'))
+        self.helpmenu.Append(wx.ID_ANY, _('About'), _('About'))
 
         self.menubar.Append(self.helpmenu, _('&Help'))
 
@@ -760,7 +761,7 @@ class WolfMapViewer(wx.Frame):
 
                 if 'domain' in ret_dict:
                     if len(ret_dict['domain']) == 1:
-                        domain = self.get_object(draw_type.ARRAYS, ret_dict['domain'][0])
+                        domain = self.getobj_from_id(ret_dict['domain'][0])
                         self.active_particle_system.set_domain(domain)
                 if 'u' in ret_dict and 'v' in ret_dict:
                     if len(ret_dict['u']) >0:
@@ -768,8 +769,8 @@ class WolfMapViewer(wx.Frame):
 
                         time = 0.
                         for u,v in zip(ret_dict['u'], ret_dict['v']):
-                            u = self.get_object(draw_type.ARRAYS, u)
-                            v = self.get_object(draw_type.ARRAYS, v)
+                            u = self.getobj_from_id(u)
+                            v = self.getobj_from_id(v)
                             u:WolfArray
                             v:WolfArray
                             assert u.array.shape == v.array.shape, _('Please select arrays with the same shape')
@@ -782,7 +783,7 @@ class WolfMapViewer(wx.Frame):
 
                 if 'emitters' in ret_dict:
                     if len(ret_dict['emitters'])>0:
-                        emitters = [self.get_object(draw_type.VECTORS, cur) for cur in ret_dict['emitters']]
+                        emitters = [self.getobj_from_id(cur) for cur in ret_dict['emitters']]
                         self.active_particle_system.set_emitters(emitters)
 
                 if self.active_particle_system._ui is not None:
@@ -3027,6 +3028,10 @@ class WolfMapViewer(wx.Frame):
             # show shortcuts in log
             self.print_shortcuts(True)
 
+        elif itemlabel == _('About'):
+            #print About Frame
+            self.print_About()
+
         elif itemlabel == _("Plot active vector..."):
 
 
@@ -3215,6 +3220,18 @@ class WolfMapViewer(wx.Frame):
                     logging.warning(_("Bad value -- Rety"))
                     return
 
+                dlg = wx.TextEntryDialog(None,_("Density grain [-] ?"), value = str(self.active_res2d.sediment_density))
+                ret = dlg.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    dlg.Destroy()
+                    return
+                try:
+                    density = float(dlg.GetValue())
+                except:
+                    dlg.Destroy()
+                    logging.warning(_("Bad value -- Rety"))
+                    return
+
             if len(self.myres2D)>1:
 
                 dlg = wx.MessageDialog(None, _('Apply to all results?'), style=wx.YES_NO)
@@ -3222,6 +3239,7 @@ class WolfMapViewer(wx.Frame):
                 if ret == wx.ID_NO:
                     if diamsize is not None:
                         self.active_res2d.sediment_diameter = diamsize
+                        self.active_res2d.sediment_density = density
                         self.active_res2d.load_default_colormap('shields_cst')
                     self.active_res2d.set_currentview(method, True)
                 else:
@@ -3229,12 +3247,14 @@ class WolfMapViewer(wx.Frame):
                         curarray:Wolfresults_2D
                         if diamsize is not None:
                             curarray.sediment_diameter = diamsize
+                            curarray.sediment_density  = density
                             curarray.load_default_colormap('shields_cst')
                         curarray.set_currentview(method)
 
             else:
                 if diamsize is not None:
                     self.active_res2d.sediment_diameter = diamsize
+                    self.active_res2d.sediment_density = density
                     self.active_res2d.load_default_colormap('shields_cst')
                 self.active_res2d.set_currentview(method, True)
 
@@ -4457,7 +4477,7 @@ class WolfMapViewer(wx.Frame):
 
             if file.ShowModal() == wx.ID_CANCEL:
                 file.Destroy()
-                return
+                return -1
             else:
                 # récuparétaion du nom de fichier avec chemin d'accès
                 filename = file.GetPath()
@@ -4470,7 +4490,7 @@ class WolfMapViewer(wx.Frame):
         if filename != '':
             if (not (os.path.exists(filename))):
                 logging.warning("Warning : the following file is not present here : " + filename)
-                return
+                return -1
 
         if which.lower() == 'array' or which.lower() == 'array_crop':
             curdict = self.myarrays
@@ -4525,7 +4545,7 @@ class WolfMapViewer(wx.Frame):
 
                     logging.info(_('End of importing arrays from npz file'))
                     del wait
-                    return
+                    return -1
                 else:
                     testobj = WolfArray()
                     testobj.filename = filename
@@ -4563,7 +4583,7 @@ class WolfMapViewer(wx.Frame):
                             ret = dlg_pos.ShowModal()
                             if ret == wx.ID_CANCEL:
                                 newcrop.Destroy()
-                                return
+                                return -1
                             else:
                                 cropini = [[float(dlg_pos.ox.Value), float(dlg_pos.ex.Value)],
                                                 [float(dlg_pos.oy.Value), float(dlg_pos.ey.Value)]]
@@ -4623,7 +4643,7 @@ class WolfMapViewer(wx.Frame):
                 file = wx.DirDialog(self, "Choose directory containing data")
                 if file.ShowModal() == wx.ID_CANCEL:
                     file.Destroy()
-                    return
+                    return -1
                 else:
                     # récuparétaion du nom de fichier avec chemin d'accès
                     dirname = file.GetPath()
@@ -4633,7 +4653,7 @@ class WolfMapViewer(wx.Frame):
                     file = wx.DirDialog(self, "Choose directory containing comparison data")
                     if file.ShowModal() == wx.ID_CANCEL:
                         file.Destroy()
-                        return
+                        return -1
                     else:
                         # récuparétaion du nom de fichier avec chemin d'accès
                         dirname_comp = file.GetPath()
@@ -4671,7 +4691,7 @@ class WolfMapViewer(wx.Frame):
                     ret = newcrop.ShowModal()
                     if ret == wx.ID_CANCEL:
                         newcrop.Destroy()
-                        return
+                        return -1
                     else:
                         cropini = [[float(newcrop.ox.Value), float(newcrop.ex.Value)],
                                    [float(newcrop.oy.Value), float(newcrop.ey.Value)]]
@@ -4705,7 +4725,7 @@ class WolfMapViewer(wx.Frame):
                 myhead.nby = int(np.max(myxyz[:, 1]) - myhead.origy) + 1
 
             if len(myxyz) == 0:
-                return
+                return -1
 
             newobj = WolfArray()
 
@@ -4740,7 +4760,7 @@ class WolfMapViewer(wx.Frame):
                 ret = newcrop.ShowModal()
                 if ret == wx.ID_CANCEL:
                     newcrop.Destroy()
-                    return
+                    return -1
                 else:
                     cropini = [[float(newcrop.ox.Value), float(newcrop.ex.Value)],
                                [float(newcrop.oy.Value), float(newcrop.ey.Value)]]
@@ -4753,7 +4773,7 @@ class WolfMapViewer(wx.Frame):
 
             if which.lower() == 'array_lidar_first':
                 if len(first) == 0:
-                    return
+                    return -1
 
                 newobj = Lidar2002.create_wolfarray(first, bounds=cropini)
 
@@ -4769,7 +4789,7 @@ class WolfMapViewer(wx.Frame):
                 id = 'lidar2002_firstecho'
             else:
                 if len(sec) == 0:
-                    return
+                    return -1
                 newobj = Lidar2002.create_wolfarray(sec, bounds=cropini)
                 if min(tmpdx, tmpdy) != 1.:
                     newobj.rebin(min(tmpdx, tmpdy))
@@ -4995,6 +5015,8 @@ class WolfMapViewer(wx.Frame):
             if self.active_cs is None:
                 self.active_cs = self.get_cross_sections()
 
+        return 0
+
     def get_obj_from_treeitem(self, treeitem):
         """ Find the object associated with treeitem """
         return self.treelist.GetItemData(treeitem)
@@ -5164,14 +5186,6 @@ class WolfMapViewer(wx.Frame):
         id = self.treelist.GetItemText(self.selected_treeitem).lower()
 
         self.removeobj_from_id(id)
-        # myobj = self.getobj_from_id(id)
-
-        # if myobj is not None:
-        #     self.treelist.DeleteItem(self.selected_treeitem)
-
-        #     for curlist in self.all_lists:
-        #         if myobj in curlist:
-        #             curlist.pop(curlist.index(myobj))
 
     def removeobj_from_id(self, id:str):
 
@@ -6465,6 +6479,15 @@ class WolfMapViewer(wx.Frame):
         self.Refresh()
         self.mimicme()
 
+    def print_About(self):
+        """ Print the About window """
+        from .apps.version import WolfVersion
+
+        version = WolfVersion()
+        dlg = wx.MessageDialog(None, _('Wolf - Version {}\n\n'.format(str(version))) + _('Developed by : ') + 'HECE ULiège\n' + _('Contact : pierre.archambeau@uliege.be'), _('About'), wx.OK | wx.ICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()
+
     def print_shortcuts(self, inframe:bool = None):
         """ Print the list of shortcuts into logging """
 

wolfhece/PyGui.py

@@ -1,22 +1,16 @@
 from os import scandir, getcwd, makedirs
-import os.path
+from os.path import exists, join, isdir, isfile, dirname, normpath, splitext
 from pathlib import Path
 import numpy.ma as ma
 import wx
 from wx.lib.busy import BusyInfo
+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 .PyTranslate import _
 from .PyDraw import WolfMapViewer,imagetexture
-from .PyParams import Wolf_Param
-from .PyVertexvectors import Grid
-from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
-from .PyGuiHydrology import GuiHydrology
-from .Results2DGPU import wolfres2DGPU
-from .hydrology.Catchment import Catchment
-from .hydrology.forcedexchanges import forced_exchanges
-from .mesh2d.wolf2dprev import *
 
 try:
     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
@@ -27,6 +21,15 @@ except:
 from .PyConfig import WolfConfiguration, ConfigurationKeys
 from .pylogging import create_wxlogwindow
 
+from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
+from .mesh2d.wolf2dprev import *
+from .Results2DGPU import wolfres2DGPU
+from .PyGuiHydrology import GuiHydrology
+from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
+from .hydrology.Catchment import Catchment
+from .hydrology.forcedexchanges import forced_exchanges
+from .PyParams import Wolf_Param
+
 # FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
 #         Is it sufficient to run a wx.App ?
 class GenMapManager(wx.Frame):
@@ -143,7 +146,7 @@ class MapManager(GenMapManager):
 
         self.setup_mapviewer(title = 'Wolf - main data manager', wolfparent=self)
 
-        dir_hydro = path.join(getcwd(),'data\\hydrometry')
+        dir_hydro = join(getcwd(),'data\\hydrometry')
         if not exists(dir_hydro):
             makedirs(dir_hydro, exist_ok=True)
 
@@ -171,11 +174,11 @@ class GPU2DModel(GenMapManager):
                 return
             self.mydir =idir.GetPath()
         else:
-            self.mydir=path.normpath(dir)
+            self.mydir=normpath(dir)
 
         ext=['.top','.frott','.cls_pos','.cls_Z','.hbin','.zbin','.srcq']
         for myext in ext:
-            if path.exists(self.mydir+'//simul'+myext):
+            if exists(self.mydir+'//simul'+myext):
 
                 self.mapviewer.add_object(which='array',
                                           filename=self.mydir+'//simul'+myext,
@@ -240,10 +243,10 @@ class HydrologyModel(GenMapManager):
                 return
             self.mydir =idir.GetPath()
         else:
-            self.mydir=path.normpath(dir)
+            self.mydir=normpath(dir)
 
-        self.mydircharact=path.join(self.mydir,'Characteristic_maps\\Drainage_basin')
-        self.mydirwhole=path.join(self.mydir,'Whole_basin\\')
+        self.mydircharact=join(self.mydir,'Characteristic_maps\\Drainage_basin')
+        self.mydirwhole=join(self.mydir,'Whole_basin\\')
 
         self.mycatchment = Catchment('Mysim',self.mydir,False,True)
         self.myexchanges = forced_exchanges(self.mydir)
@@ -291,7 +294,7 @@ class HydrologyModel(GenMapManager):
         for curfile in self.files_hydrology_vectors['Whole_basin']:
             curext=curfile[0]
             curidx=curfile[1]
-            if path.exists(self.mydirwhole+curext):
+            if exists(self.mydirwhole+curext):
                 self.mapviewer.add_object(which='vector',filename=self.mydirwhole+curext,id=curidx,ToCheck=False)
 
         self.mapviewer.add_object(which='vector',newobj=self.myexchanges.mysegs,id='Forced exchanges',ToCheck=False)
@@ -372,7 +375,7 @@ class Wolf2DModel(GenMapManager):
         @base_file Directroy where the model should reside.
         @myparam The parameters to build the model with.
         """
-        assert os.path.isdir(Path(base_file).parent), \
+        assert isdir(Path(base_file).parent), \
             f"When creating from parameters you must give a path containing the generic final name, prepended by a an existing directory (you gave a directory: {base_file} which doesn't exist)"
 
         self.mydir = Path(base_file).parent.as_posix()
@@ -518,8 +521,7 @@ class Wolf2DModel(GenMapManager):
         if dir != '':
             # Either a directory or a file "/_/_/_/dir/simul" for example.
 
-            assert os.path.exists(dir) or os.path.dirname(dir), f"'{dir}' does nto exists"
-            #assert os.path.isdir(dir), f"'{dir}' is not a directory"
+            assert exists(dir) or dirname(dir), f"'{dir}' does nto exists"
 
         if dir=='':
             if self.wx_exists:
@@ -535,14 +537,14 @@ class Wolf2DModel(GenMapManager):
 
             self.mydir =idir.GetPath()
         else:
-            self.mydir=path.normpath(dir)
+            self.mydir=normpath(dir)
 
         if self.wx_exists:
             wait_dlg, wait_cursor = BusyInfo(_('Opening 2D model')), wx.BusyCursor()
             self.setup_mapviewer(title='2D model : '+self.mydir, wolfparent=self)
 
         try:
-            if os.path.exists(self.mydir) and os.path.isfile(self.mydir): # Either a file or doesn't exist
+            if exists(self.mydir) and isfile(self.mydir): # Either a file or doesn't exist
                 assert not Path(self.mydir).suffix, \
                     "A generic file path should have no extension," \
                     f" we have {self.mydir}"
@@ -554,8 +556,8 @@ class Wolf2DModel(GenMapManager):
                 # or a path to the generic file. Morevoer the
                 # MNAP code confuses the generic name and the
                 # .MNAP name when checking if it can load an array.
-                if not os.path.exists(self.mydir):
-                    self.mydir = os.path.dirname(self.mydir)
+                if not exists(self.mydir):
+                    self.mydir = dirname(self.mydir)
 
                 self.filenamegen=""
                 second_choice = None
@@ -563,9 +565,9 @@ class Wolf2DModel(GenMapManager):
                 scandir_obj = scandir(self.mydir)
                 for curfile in scandir_obj:
                     if curfile.is_file():
-                        ext=path.splitext(curfile)
+                        ext=splitext(curfile)
                         if len(ext[1])==0:
-                            self.filenamegen = path.join(self.mydir,curfile.name)
+                            self.filenamegen = join(self.mydir,curfile.name)
                             break
                         elif ext[1] == ".sux":
                             # Some extension present, we choose .sux because

wolfhece/apps/ManageParams.py

@@ -1,14 +1,15 @@
 import wx
 
-try:
-    from ..PyTranslate import _
-    from ..PyParams import Wolf_Param
-except:
-    from wolfhece.PyTranslate import _
-    from wolfhece.PyParams import Wolf_Param
+from ..PyTranslate import _
 
 def main():
     ex = wx.App()
+
+    from .splashscreen import WolfLauncher
+    first_launch = WolfLauncher(play_sound=False)
+
+    from ..PyParams import Wolf_Param
+
     frame = Wolf_Param(None,"Params")
     ex.MainLoop()
 

wolfhece/apps/Optimisation_hydro.py

@@ -1,14 +1,15 @@
 import wx
 
-try:
-    from ..PyTranslate import _
-    from ..hydrology.Optimisation import Optimisation
-except:
-    from wolfhece.PyTranslate import _
-    from wolfhece.hydrology.Optimisation import Optimisation
+from ..PyTranslate import _
 
 def main():
     app = wx.App()
+
+    from .splashscreen import WolfLauncher
+    first_launch = WolfLauncher(play_sound=False)
+
+    from ..hydrology.Optimisation import Optimisation
+
     myOpti = Optimisation()
     myOpti.Show()
     app.MainLoop()
@@ -16,4 +17,3 @@ def main():
 
 if __name__=='__main__':
     main()
-    

wolfhece/apps/check_install.py

@@ -0,0 +1,20 @@
+
+def main():
+    # Check if installation is complete
+    ret = 'Checking installation\n---------------------\n\n'
+    try:
+        from osgeo import ogr, gdal
+        ret += 'GDAL/OGR installed\n\n'
+    except:
+        ret += 'GDAL/OGR not installed\n Please install GDAL from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
+
+    try:
+        from ..PyGui import MapManager
+        ret += 'Wolfhece installed\n\n'
+    except:
+        ret += 'Wolfhece not installed\n Retry installation : pip install wolfhece or pip install wolfhece --upgrade\n\n'
+
+    print(ret)
+
+if __name__=='__main__':
+    main()

wolfhece/apps/curvedigitizer.py

@@ -1,7 +1,4 @@
-try:
-    from ..PyTranslate import _
-except:
-    from wolfhece.PyTranslate import _
+from ..PyTranslate import _
 
 import wx
 import numpy as np

wolfhece/apps/isocurrent.py

@@ -1,7 +1,5 @@
-try:
-    from ..PyTranslate import _
-except:
-    from wolfhece.PyTranslate import _
+
+from ..PyTranslate import _
 
 
 import numpy as np

wolfhece/apps/version.py

@@ -0,0 +1,20 @@
+
+class WolfVersion():
+
+    def __init__(self):
+
+        self.major = 2
+        self.minor = 0
+        self.patch = 22
+
+    def __str__(self):
+
+        return self.get_version()
+
+    def get_version(self):
+
+        return f'{self.major}.{self.minor}.{self.patch}'
+
+    def print_version(self):
+
+        print(f'WolfHece version {self.major}.{self.minor}.{self.patch}')

wolfhece/apps/wolf.py

@@ -1,17 +1,14 @@
 import wx
-
 from ..PyTranslate import _
-from ..PyGui import MapManager
-
-# try:
-#     from ..PyTranslate import _
-#     from ..PyGui import MapManager
-# except:
-#     from wolfhece.PyTranslate import _
-#     from wolfhece.PyGui import MapManager
 
 def main():
     ex = wx.App()
+
+    from .splashscreen import WolfLauncher
+    first_launch = WolfLauncher(play_sound=False)
+
+    from ..PyGui import MapManager
+
     mywolf=MapManager()
     ex.MainLoop()
 

wolfhece/apps/wolf2D.py

@@ -1,11 +1,15 @@
 import wx
-from wolfhece.PyGui import Wolf2DModel
 
 def main():
     ex = wx.App()
+
+    from .splashscreen import WolfLauncher
+    first_launch = WolfLauncher(play_sound=False)
+
+    from ..PyGui import Wolf2DModel
+
     mydro=Wolf2DModel()
     ex.MainLoop()
 
 if __name__=='__main__':
     main()
-    

wolfhece/apps/wolfcompare2Darrays.py

@@ -6,14 +6,9 @@ from pathlib import Path
 from typing import Union
 
 #Import des modules WOLF
-try:
-    from ..PyTranslate import _
-    from ..PyDraw import WolfMapViewer
-    from ..wolf_array import WolfArray
-except:
-    from wolfhece.PyTranslate import _
-    from wolfhece.PyDraw import WolfMapViewer
-    from wolfhece.wolf_array import WolfArray
+from ..PyTranslate import _
+from ..PyDraw import WolfMapViewer
+from ..wolf_array import WolfArray
 
 def main(mydir:Path=None, ListArrays:list[WolfArray]=None):
     """

wolfhece/apps/wolfhydro.py

@@ -1,14 +1,15 @@
-import os       
 import wx
-try:
-    from ..PyTranslate import _
-    from ..PyGui import HydrologyModel
-except:
-    from wolfhece.PyTranslate import _
-    from wolfhece.PyGui import HydrologyModel
+
+from ..PyTranslate import _
 
 def main(strmydir=''):
     ex = wx.App()
+
+    from .splashscreen import WolfLauncher
+    first_launch = WolfLauncher(play_sound=False)
+
+    from ..PyGui import HydrologyModel
+
     exLocale = wx.Locale()
     exLocale.Init(wx.LANGUAGE_ENGLISH)
     mydro=HydrologyModel()

wolfhece/cli.py

@@ -1,4 +1,9 @@
 
+def check():
+    """ Main wolf application : Check """
+    from .apps.check_install import main
+    main()
+
 def wolf():
     """ Main wolf application : Map Manager"""
     from .apps.wolf import main
@@ -44,7 +49,7 @@ def compare():
     # arguments
     print("Total arguments passed:", n)
     assert n in [2,3], _('Usage : wolfcompare <directory> or wolfcompare <file1> <file2>')
-    
+
     if n==2:
         mydir = Path(sys.argv[1])
         if mydir.exists():

wolfhece/pyshields.py

@@ -503,24 +503,49 @@ def shieldsdia_dim(figax=None) -> tuple[plt.Figure,plt.Axes]:
 
       return fig,ax
 
-def get_Shields_2D_Manning(s:float, d:float, q:float, h:float, K:float) -> float:
+def get_Shields_2D_Manning(s:float, d:float, q:float, h:float, n:float) -> float:
       """
-      Compute Shields dimensionless parameter for 2D flow with Manning friction law
+      Compute Shields dimensionless parameter for 2D flow with Manning/Strickler friction law
 
       :param s : sediment density / water density [-]
       :param d : sediment diameter [m]
       :param q : discharge [m3/s]
       :param h : water depth [m]
-      :param K : Strickler friction coefficient [m1/3/s]
+      :param n : Manning friction coefficient [m-1/3.s]
+
+      See also get_Shields_2D_Strickler
       """
       # calcul de terme de pente de frottement
 
-      j = (q/h)**2.0 / K**2. / h**(4./3.)
+      # j = (q/h)**2.0 / K**2. / h**(4./3.)
+      denom = h**(4./3.)
+      if denom > 0.:
+            j = (q/h * n)**2.0 / denom
+      else:
+            j = 0.
 
       shields = j*h / (d*(s-1))
 
       return shields
 
+def get_Shields_2D_Strickler(s:float, d:float, q:float, h:float, K:float) -> float:
+      """
+      Compute Shields dimensionless parameter for 2D flow with Manning/Strickler friction law
+
+      :param s : sediment density / water density [-]
+      :param d : sediment diameter [m]
+      :param q : discharge [m3/s]
+      :param h : water depth [m]
+      :param K : Strickler friction coefficient [m1/3/s]
+
+      See also get_Shields_2D_Manning
+      """
+      # calcul de terme de pente de frottement
+
+      n = 1./K
+      return get_Shields_2D_Manning(s, d, q, h, n)
+
+
 def izbach_d_cr(q:float, h:float, rhom:float=2650, rho:float=RHO_PUREWATER, method='ridder') -> float:
       """
       https://en.wikipedia.org/wiki/Izbash_formula

wolfhece/wolfresults_2D.py

@@ -1374,7 +1374,7 @@ class OneWolfResult:
         self._min_field_size = .1
 
         self._sedimentdiam = 1e-3
-        self._sedimentdensity = 2.5
+        self._sedimentdensity = 2.65
         self._force_update_shields = True # Force la MAJ du Shields si le diametre ou la densité change
 
     @property
@@ -1735,7 +1735,7 @@ class OneWolfResult:
                                                      self.sediment_diameter,
                                                      qnorm.array[i,j],
                                                      self.waterdepth.array[i,j],
-                                                     1./self.rough_n.array[i,j]) for i,j in ij])
+                                                     self.rough_n.array.data[i,j]) for i,j in ij])
 
             shields.array[ij[:,0],ij[:,1]] = _shields
 

{wolfhece-2.0.21.dist-info → wolfhece-2.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.21
+Version: 2.0.22
 Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.0.21.dist-info → wolfhece-2.0.22.dist-info}/RECORD

@@ -5,8 +5,8 @@ wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=wdq-KYaLDBAa-gu3plWFBJN0Stx-oZX2dxs-iKjGBHo,111109
-wolfhece/PyDraw.py,sha256=f4EYYTAJQ2v5m_7sBkD0LWZYL3XW-XryrQJn6RKvyGI,319917
-wolfhece/PyGui.py,sha256=mzJCRjMHtebFrxmPnwUK6YpQgMf5iiiCTm0hCOuRsOY,52722
+wolfhece/PyDraw.py,sha256=JR4Y9Jzd8JZbT6sd7pwMMd0YNLdtRsQCOYy8FkCrUi0,320904
+wolfhece/PyGui.py,sha256=TLhXjfEZhMRucPmtu1ntz-wlvX4phntPHG6jYhGPMUk,52687
 wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
 wolfhece/PyHydrographs.py,sha256=h2OfgmRkKc5XZn0iPFOVy60pGTSa5EFoUOEya0SeG7o,3411
 wolfhece/PyPalette.py,sha256=nb9oPLZF-xx-yvOWvw2XVVmis6XTmYT2i7hvH3qPwAg,21932
@@ -23,7 +23,7 @@ wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,124
 wolfhece/Results2DGPU.py,sha256=IyBOwA_S72rABMARCJp3xLSv9s8lQgDjWHsvCYwqohM,16579
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
-wolfhece/cli.py,sha256=Xj0yfgs7MnvNCk5Td_Qp_oz4DMI66eBHu2bkVrGW3OU,1828
+wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/drawing_obj.py,sha256=rHMGdiihIv68WZnWFNdgiA51QhSm8EX-pykdyTSOdoo,3136
 wolfhece/flow_SPWMI.py,sha256=mdiupyOem6_FZ0OSKn8Vq5Nmr9Av-j83d2YyRPLZFlQ,20658
@@ -38,7 +38,7 @@ wolfhece/pybridges.py,sha256=BVUESKoTdL1i_rdoe_jEsItgjKS0oqLohwrHj8snjxQ,57190
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
 wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
-wolfhece/pyshields.py,sha256=LlFxcCkWywbsf2_6AaMU0Vgbm5h92AKqb4NyYT6kBYE,22219
+wolfhece/pyshields.py,sha256=YS6VVjjzoA-ZR6YRccqjMcW3McNqNLoQODC6TNNkmPw,22983
 wolfhece/pyviews.py,sha256=hYdyrEvWF48dGBDOLIwmC28C0L8I28U4ohXk9nltF94,9666
 wolfhece/pywalous.py,sha256=jwp251AzGBc0VmMzOqA0IJiRRa6yQIfccRM8lVGszIY,4474
 wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
@@ -49,19 +49,21 @@ wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=quflEvi32lWSvOPa0aDCDl-8Jv-jGtLHbR2rdx67LsI,14883
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
-wolfhece/wolfresults_2D.py,sha256=83bh4EHZZSFVqmme1UWbj5IK4aUiDzjKRDrY18YfWnk,145711
+wolfhece/wolfresults_2D.py,sha256=gGXTg1nKS3lPd8eYUsyUtMuzTcgNy8GpUBw5pbKUKTA,145714
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
-wolfhece/apps/ManageParams.py,sha256=its7JhceQiwzQVl95wA51GZs1zjtbpUNvbqvdvDTeyM,316
-wolfhece/apps/Optimisation_hydro.py,sha256=25H5PVN_Gh3mkDQ6BWbJjBqsGCNdGapZOqKECcOGJIQ,398
+wolfhece/apps/ManageParams.py,sha256=heg5L4fMn0ettR7Bad_Q680o_JWnTbe3WFkL_9IziAk,312
+wolfhece/apps/Optimisation_hydro.py,sha256=mHazBazTUGyxPbHPXhaQim8vqIeOOuKPjH0B48VWduA,374
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
 wolfhece/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/apps/curvedigitizer.py,sha256=JC2SW4n3-QFrnpmm0Zn0Yqog2SW4wvXfpIXuyd9ZifY,4957
-wolfhece/apps/isocurrent.py,sha256=AG29IGdH-MStdg25QbBrMSW_AHOQDEVGLRslOaxWnHM,3868
+wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9o,630
+wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
+wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=9BNArfcoRcyWglzFDQdLv2Dlvqz8w5qYKdE5zA66-Kw,2117
-wolfhece/apps/wolf.py,sha256=H0wdBA3Akg_3UjmprIoUOgkniMO67PhSk-6iMleiQHg,371
-wolfhece/apps/wolf2D.py,sha256=nQ5SbGBJLODmIbqazYR6L0FsXp6K5oIo-hKIxtvqoaA,173
-wolfhece/apps/wolfcompare2Darrays.py,sha256=fbwTAfy2X-yuJlwYlDFuwE7Al53InvUZVJIz1mwfR7I,3904
-wolfhece/apps/wolfhydro.py,sha256=XO4x_ieXv_VqOwRkF11greH68FTc8rx4IfFkRGBYiJE,402
+wolfhece/apps/version.py,sha256=1jx_QTbyGIcrkyQcMDkU-l3GQnfA1Q4BUAYhgLZWlNA,388
+wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
+wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
+wolfhece/apps/wolfcompare2Darrays.py,sha256=MucG5h4sU4jicDVCKohiCDUVUqx_RQ1qKrZKokpnxhQ,3743
+wolfhece/apps/wolfhydro.py,sha256=UK_YtyhsozvHQW_TRNccFHUr_bGOwHONMCqNjqoiqpM,381
 wolfhece/blender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/blender/array2polygons.py,sha256=r7wIAsP2M4qJQqdhIRaLFwyQ8P0b9DeSBorBXG0Lyx8,8559
 wolfhece/blender/ply.py,sha256=jTRUqRGD_XyGdE865Iv214DE8-m_ZscqlfTJP99lUOE,555
@@ -146,7 +148,7 @@ wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=QAkGhbfYRZVHy8SZfq1Hi42M_4bmDn3x2ATxYNlCPPU,19238400
+wolfhece/libs/WolfDll.dll,sha256=s-Fwboq8EethHHmipZZjdniEQtyqZv6vS-bQRKNTVgs,132915712
 wolfhece/libs/WolfDll_CD.dll,sha256=kC1svCwD1qSmppsiVfHwDkIvoJO_1l6TG1GfIxgiqQQ,131415040
 wolfhece/libs/WolfOGL.c,sha256=tBWGfpFFe8gfRjImUUlqdxhcRpQ6ytEWU7Z6PC0v9as,1085242
 wolfhece/libs/WolfOGL.pyx,sha256=kc1uxbO2wQx0Qoe7BVQnqTJgUWYx_Vtf1wzXMxzf8bI,65911
@@ -244,8 +246,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=G3g_t2tz69jU6mxvZ6XrKdIqcs8jZrN4FmXx9GdCoHU,4509
-wolfhece-2.0.21.dist-info/METADATA,sha256=bEiYPFGptkm8DZhgP8F5ojffp1cg-UFURZnsR2Ksudc,2239
-wolfhece-2.0.21.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wolfhece-2.0.21.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
-wolfhece-2.0.21.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.21.dist-info/RECORD,,
+wolfhece-2.0.22.dist-info/METADATA,sha256=aIz0F6vP2sz9Qjhmw7qBpkOtdXtwfY0yUxLKCx_LV1o,2239
+wolfhece-2.0.22.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.22.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.22.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.22.dist-info/RECORD,,

{wolfhece-2.0.21.dist-info → wolfhece-2.0.22.dist-info}/entry_points.txt

@@ -1,6 +1,7 @@
 [gui_scripts]
 wolf = wolfhece.cli:wolf
 wolf2d = wolfhece.cli:wolf2d
+wolfcheck = wolfhece.cli:check
 wolfcompare = wolfhece.cli:compare
 wolfdigitizer = wolfhece.cli:digitizer
 wolfhydro = wolfhece.cli:hydro