wolfhece 2.1.40__py3-none-any.whl → 2.1.42__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/gpuview.py

@@ -24,7 +24,6 @@ from math import sqrt,floor
 from .drawing_obj import Element_To_Draw
 import logging
 
-GPU_SHADER_PROGRAM_REF = 1
 _global_gpu_state = dict()
 
 GRID_N=100
@@ -278,8 +277,14 @@ class VectorField(Element_To_Draw):
 
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
-        if GPU_SHADER_PROGRAM_REF not in _global_gpu_state:
-            _global_gpu_state[GPU_SHADER_PROGRAM_REF] = _load_program(
+        self.mapviewer.SetCurrentContext()
+
+        self._gpu_program_ref = 1
+        while self._gpu_program_ref in _global_gpu_state:
+            self._gpu_program_ref +=1
+
+        if self._gpu_program_ref not in _global_gpu_state:
+            _global_gpu_state[self._gpu_program_ref] = _load_program(
                 VECFIELD_VTX_SHADER,
                 VECFIELD_GEOM_SHADER,
                 VECFIELD_FRAG_SHADER)
@@ -314,9 +319,15 @@ class VectorField(Element_To_Draw):
         self._set_data(x_extent, y_extent)
 
     def __del__(self):
+
+        self.mapviewer.SetCurrentContext()
+
         if self._gl_texture is not None:
             glDeleteTextures(1,[self._gl_texture])
 
+        if self._gpu_program_ref in _global_gpu_state:
+            glDeleteProgram(_global_gpu_state[self._gpu_program_ref])
+
 
     def update_zoom_factor(self, newfactor):
 
@@ -417,7 +428,7 @@ class VectorField(Element_To_Draw):
             # We clear the projection matrix because we will handle
             # the transformation ourselves.
             glMatrixMode(GL_PROJECTION)
-            glPushMatrix()
+            # glPushMatrix()
 
             glLoadIdentity()
             zmin, zmax = -99999, 99999
@@ -510,17 +521,18 @@ class VectorField(Element_To_Draw):
             # Restore the matrix so that next OpenGL programming in the caller is not
             # broken.
             glMatrixMode(GL_PROJECTION)
-            glPopMatrix()
+            # glPopMatrix()
 
     def _plot(self, projection_matrix):
         assert self._gl_texture is not None, "Did you set the data ?"
         if self._gl_buffer == []:
             return
 
+        self.mapviewer.SetCurrentContext()
         # We reuse the current model transformation matrix
         # as well the current viewport.
 
-        program = _global_gpu_state[GPU_SHADER_PROGRAM_REF]
+        program = _global_gpu_state[self._gpu_program_ref]
         glUseProgram(program)
         glBindTexture(GL_TEXTURE_2D, self._gl_texture)
         glActiveTexture(GL_TEXTURE0)

wolfhece/models/5_coul.pal

@@ -0,0 +1,21 @@
+5
+4.75767580792308E-03
+0
+255
+255
+1.41948455371485
+0
+0
+255
+3.26088282814249
+106
+242
+113
+7.26363540394232
+255
+255
+0
+15.5594959259033
+255
+0
+0

wolfhece/models/6_coul.pal

@@ -0,0 +1,25 @@
+6
+5.96524381637573
+0
+255
+255
+5.99077210167587
+0
+0
+255
+6.05
+106
+242
+113
+6.1
+255
+255
+0
+6.33
+255
+0
+0
+6.77020025253296
+196
+0
+0

wolfhece/models/7_coul.pal

@@ -0,0 +1,29 @@
+7
+4.75767580792308E-03
+0
+255
+255
+2.6706313965066
+0
+0
+255
+5.33650511720528
+255
+255
+255
+8.00237883790396
+0
+255
+0
+10.6682525586026
+255
+255
+0
+13.3341262793013
+255
+128
+0
+16
+255
+0
+0

wolfhece/models/Froude.pal

@@ -0,0 +1,33 @@
+7
+0
+175
+175
+175
+.5
+0
+0
+255
+.8
+128
+128
+255
+1
+255
+0
+0
+1.4
+255
+255
+0
+2
+0
+255
+64
+2.5
+0
+128
+64
+0
+16777215
+0
+1

wolfhece/models/Risque_TAF.pal

@@ -0,0 +1,31 @@
+6
+0
+255
+0
+0
+120
+255
+128
+0
+240
+255
+255
+0
+360
+0
+255
+0
+3600
+0
+0
+255
+7200
+0
+255
+255
+0
+120
+240
+360
+3600
+7200

wolfhece/models/classes.pal

@@ -0,0 +1,66 @@
+13
+0
+128
+255
+255
+.1
+89
+172
+255
+.2
+72
+72
+255
+.3
+0
+0
+255
+.4
+0
+128
+0
+.5
+0
+221
+55
+.6
+128
+255
+128
+.7
+255
+255
+0
+.8
+255
+128
+0
+.9
+255
+0
+0
+1
+128
+0
+0
+1.5
+192
+192
+192
+3
+143
+143
+143
+0
+.1
+.2
+.3
+.4
+.5
+.6
+.7
+.8
+.9
+1
+1.5
+3

wolfhece/models/haut_coul.pal

@@ -0,0 +1,65 @@
+16
+218.289993286133
+128
+255
+255
+220.168574888374
+89
+172
+255
+220.23739486608
+72
+72
+255
+220.283471411618
+0
+0
+255
+220.328414957446
+0
+128
+0
+220.415893035239
+0
+221
+55
+220.491201809562
+128
+255
+128
+220.569688769798
+255
+255
+0
+220.858442290845
+255
+128
+0
+221.012174740145
+255
+128
+0
+221.23051386826
+255
+0
+0
+221.659336829079
+209
+71
+12
+222.780627152613
+128
+0
+0
+224.601654811244
+128
+0
+0
+228.620829812251
+111
+111
+111
+244.470001220703
+143
+143
+143

wolfhece/models/reg_20cm.pal

@@ -0,0 +1,65 @@
+16
+0.0
+128
+255
+255
+0.2
+89
+172
+255
+0.4
+72
+72
+255
+0.6000000000000001
+0
+0
+255
+0.8
+0
+128
+0
+1.0
+0
+221
+55
+1.2000000000000002
+128
+255
+128
+1.4000000000000001
+255
+255
+0
+1.6
+255
+128
+0
+1.8
+235
+174
+63
+2.0
+255
+0
+0
+2.2
+209
+71
+12
+2.4000000000000004
+128
+0
+0
+2.6
+185
+0
+0
+2.8000000000000003
+111
+111
+111
+3.0
+192
+192
+192

wolfhece/scenario/config_manager.py

@@ -72,6 +72,7 @@ class IC_scenario(Enum):
     WATERDEPTH  = "h.npy"
     DISCHARGE_X = 'qx.npy'
     DISCHARGE_Y = 'qy.npy'
+    BATHYMETRY  = 'bathymetry.npy'
 
 ALL_EXTENSIONS = [cur.value for cur in GPU_2D_file_extensions]
 
@@ -134,11 +135,13 @@ class Hydrograph_scenario():
 
 class InitialConditions_scenario():
     """ Initial conditions for a scenario """
+
     def __init__(self, dir:Path) -> None:
 
-        self.h = None
-        self.qx = None
-        self.qy = None
+        self.h: np.ndarray     = None
+        self.qx: np.ndarray    = None
+        self.qy: np.ndarray    = None
+        self.bathy: np.ndarray = None
 
         if (dir / IC_scenario.WATERDEPTH.value).exists():
             self.h = np.load(dir / IC_scenario.WATERDEPTH.value)
@@ -146,7 +149,37 @@ class InitialConditions_scenario():
             self.qx = np.load(dir / IC_scenario.DISCHARGE_X.value)
         if (dir / IC_scenario.DISCHARGE_Y.value).exists():
             self.qy = np.load(dir / IC_scenario.DISCHARGE_Y.value)
+        if (dir /IC_scenario.BATHYMETRY.value).exists():
+            self.bathy = np.load(dir / IC_scenario.BATHYMETRY.value)
+
+    @property
+    def z_elevation(self) -> np.ndarray:
+        """ Return the elevation of the water surface """
+
+        return self.bathy + self.h
+
+    def set_h_from_z(self, z: np.ndarray):
+        """ Set the water depth from the elevation of the water surface """
+
+        assert z.shape == self.bathy.shape, _('Bad shape for z !')
 
+        self.h = z - self.bathy
+
+        self.h[self.h < 0.] = 0.
+        self.qx[self.h < 0.] = 0.
+        self.qy[self.h < 0.] = 0.
+
+    def save(self, dir:Path):
+        """ Save the initial conditions """
+
+        if self.h is not None:
+            np.save(dir / IC_scenario.WATERDEPTH.value, self.h)
+        if self.qx is not None:
+            np.save(dir / IC_scenario.DISCHARGE_X.value, self.qx)
+        if self.qy is not None:
+            np.save(dir / IC_scenario.DISCHARGE_Y.value, self.qy)
+        if self.bathy is not None:
+            np.save(dir / IC_scenario.BATHYMETRY.value, self.bathy)
 
 class Config_Manager_2D_GPU:
     """
@@ -814,6 +847,7 @@ class Config_Manager_2D_GPU:
 
     def load_ic(self, path:Path) -> InitialConditions_scenario:
         """ Load initial conditions from a path """
+
         low_keys = [Path(curkey).name.lower() for curkey in self.configs.keys()]
         if INITIAL_CONDITIONS in low_keys:
             return InitialConditions_scenario(self.workingdir / INITIAL_CONDITIONS / path)
@@ -878,10 +912,10 @@ 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, 
+    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 """
 
@@ -1139,6 +1173,31 @@ class Config_Manager_2D_GPU:
 
         return self.mapviewer
 
+    def transfer_ic(self, dir1: Path, dir2: Path):
+        """ Transfer IC from one sim to another """
+
+        ic1 = self.load_ic(dir1)
+        ic2 = self.load_ic(dir2)
+
+        ic2.qx = ic1.qx
+        ic2.qy = ic1.qy
+        ic2.set_h_from_z(ic1.z_elevation)
+
+        ic2.save(dir2)
+
+    def extract_tif(self, from_path:Path, to_path:Path):
+        """ Extract tif files from IC """
+
+        from_path = Path(from_path)
+        to_path = Path(to_path)
+
+        prefix = from_path.parent.parent.parent.name + '_' + from_path.parent.parent.name + '_' + from_path.name
+
+        ext = ['h.npy', 'qx.npy', 'qy.npy', 'bathymetry.npy']
+
+        for curext in ext:
+            tmp_array = WolfArray(from_path / curext)
+            tmp_array.write_all((to_path / (prefix + '_' + curext)).with_suffix('.tif'))
 
 class UI_Manager_2D_GPU():
     """ User Interface for scenario 2D GPU """
@@ -1247,17 +1306,25 @@ class UI_Manager_2D_GPU():
         self._create_vec.Bind(wx.EVT_BUTTON,self.oncreatevec)
         self._create_vec.SetToolTip(_('Create a .vecz file (with contour and global bounds) from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
 
-        self.checkconsistency = wx.Button(self._frame,label = _('Check consistency'))
-        self.checkconsistency.Bind(wx.EVT_BUTTON,self.oncheck_consistency)
-        self.checkconsistency.SetToolTip(_('Check consistency of the scenario\n\n - bathymetry.tif\n - manning.tif\n - infiltration.tif\n - hydrographs\n - initial conditions\n - boundary conditions\n - scripts'))
+        self._checkconsistency = wx.Button(self._frame,label = _('Check consistency'))
+        self._checkconsistency.Bind(wx.EVT_BUTTON,self.oncheck_consistency)
+        self._checkconsistency.SetToolTip(_('Check consistency of the scenario\n\n - bathymetry.tif\n - manning.tif\n - infiltration.tif\n - hydrographs\n - initial conditions\n - boundary conditions\n - scripts'))
+
+        self._createsim = wx.Button(self._frame,label = _('Create simulation(s)'))
+        self._createsim.Bind(wx.EVT_BUTTON,self.oncreate_simulation)
+        self._createsim.SetToolTip(_('Create simulation(s) from selected hydrographs'))
+
+        self._transfer_ic = wx.Button(self._frame,label = _('Transfer initial conditions'))
+        self._transfer_ic.Bind(wx.EVT_BUTTON,self.ontransfer_ic)
+        self._transfer_ic.SetToolTip(_('Transfer initial conditions from a simulation to another'))
 
-        self.createsim = wx.Button(self._frame,label = _('Create simulation(s)'))
-        self.createsim.Bind(wx.EVT_BUTTON,self.oncreate_simulation)
-        self.createsim.SetToolTip(_('Create simulation(s) from selected hydrographs'))
+        self._extract_tif = wx.Button(self._frame,label = _('Extract .tif files for all selected scenarios'))
+        self._extract_tif.Bind(wx.EVT_BUTTON,self.onextract_tif)
+        self._extract_tif.SetToolTip(_('Extract .tif files for all selected scenarios'))
 
-        self.runbatch = wx.Button(self._frame,label = _('Run batch file !'))
-        self.runbatch.Bind(wx.EVT_BUTTON,self.onrun_batch)
-        self.runbatch.SetToolTip(_('Run the batch file on local machine\n\n - The batch file must be created before\n - The batch file must be a .bat file'))
+        self._runbatch = wx.Button(self._frame,label = _('Run batch file !'))
+        self._runbatch.Bind(wx.EVT_BUTTON,self.onrun_batch)
+        self._runbatch.SetToolTip(_('Run the batch file on local machine\n\n - The batch file must be created before\n - The batch file must be a .bat file'))
 
         self.listsims = wx.Button(self._frame,label = _('List simulation(s)'))
         self.listsims.Bind(wx.EVT_BUTTON,self.onlist_simulation)
@@ -1290,11 +1357,13 @@ class UI_Manager_2D_GPU():
         sizer_buttons.Add(self._create_void_scripts,1,wx.EXPAND)
         sizer_buttons.Add(self._create_vrt,1,wx.EXPAND)
         sizer_buttons.Add(self._translate_vrt,1,wx.EXPAND)
-        sizer_buttons.Add(self.checkconsistency,1,wx.EXPAND)
+        sizer_buttons.Add(self._checkconsistency,1,wx.EXPAND)
         sizer_buttons.Add(self._create_vec,1,wx.EXPAND)
         sizer_buttons.Add(self.listsims,1,wx.EXPAND)
-        sizer_buttons.Add(self.createsim,1,wx.EXPAND)
-        sizer_buttons.Add(self.runbatch,1,wx.EXPAND)
+        sizer_buttons.Add(self._createsim,1,wx.EXPAND)
+        sizer_buttons.Add(self._runbatch,1,wx.EXPAND)
+        sizer_buttons.Add(self._transfer_ic,1,wx.EXPAND)
+        sizer_buttons.Add(self._extract_tif,1,wx.EXPAND)
         sizer_buttons.Add(sizer_txt_ckd,1,wx.EXPAND)
 
         # tree, buttons -> horizontal sizer
@@ -1467,7 +1536,48 @@ class UI_Manager_2D_GPU():
 
         return idx
 
-    def oncreate_simulation(self,e:wx.MouseEvent):
+    def onextract_tif(self, e:wx.MouseEvent):
+        """ Extraction des fichiers tif """
+
+        logging.info(_('Extracting tif files ...'))
+
+        sims = self.get_sims_only()
+
+        with wx.DirDialog(None, _('Choose a directory to store tif files'), style = wx.DD_DIR_MUST_EXIST) as dlg:
+            ret = dlg.ShowModal()
+            if ret != wx.ID_OK:
+                return
+
+            wdir = dlg.GetPath()
+
+        for cursim in sims:
+            self._parent.extract_tif(cursim['path'], wdir)
+
+        logging.info(_('... done !'))
+
+    def ontransfer_ic(self, e:wx.MouseEvent):
+        """ Transfert des conditions initiales """
+
+        logging.info(_('Transferring initial conditions ...'))
+
+        with wx.DirDialog(None, _('Choose the source scenario directory'), style = wx.DD_DIR_MUST_EXIST) as dlg:
+            ret = dlg.ShowModal()
+            if ret != wx.ID_OK:
+                return
+
+            wdir = dlg.GetPath()
+
+        with wx.DirDialog(None, _('Choose the destination scenario directory'), style = wx.DD_DIR_MUST_EXIST) as dlg:
+            ret = dlg.ShowModal()
+            if ret != wx.ID_OK:
+                return
+
+            wdir2 = dlg.GetPath()
+
+        self._parent.transfer_ic(Path(wdir), Path(wdir2))
+
+
+    def oncreate_simulation(self, e:wx.MouseEvent):
         """ Creation d'une simulation """
 
         logging.info(_('Creating simulation ...'))
@@ -1584,9 +1694,10 @@ class UI_Manager_2D_GPU():
             checked = self._treelist.GetCheckedState(curitem) == wx.CHK_CHECKED
 
             if isinstance(mydata, dict):
-                if mydata[IS_SIMUL]:
-                    if checked or force:
-                        sims += [mydata]
+                if IS_SIMUL in mydata:
+                    if mydata[IS_SIMUL]:
+                        if checked or force:
+                            sims += [mydata]
 
             curitem = self._treelist.GetNextItem(curitem)
             # curitem = self._treelist.GetItemParent(curitem)
@@ -1867,7 +1978,7 @@ class UI_Manager_2D_GPU():
                     newid = str(mydata.name)
                     while newid in ids:
                         newid = newid + '_'
-                    
+
                     self._parent.mapviewer.add_object('array', newobj=myarray, id=newid)
 
             elif mydata.name.endswith(GPU_2D_file_extensions.TXT.value):

wolfhece/wolf_array.py

@@ -4010,25 +4010,36 @@ class SelectionDataMB(SelectionData):
             curblock.SelectionData.select_underpoly(myvect)
 
     def update_nb_nodes_selection(self):
+        """ Update the number of nodes selected """
 
+        # Get infos from all blocks
         ret = []
         for curblock in self.parent.active_blocks:
             ret.append(curblock.SelectionData.update_nb_nodes_selection())
 
+        # sum all the nodes
         nb = np.sum([cur[0] for cur in ret])
-        xmin = np.min([cur[1] for cur in ret if cur[1] != -99999.])
-        ymin = np.min([cur[3] for cur in ret if cur[3] != -99999.])
-        xmax = np.max([cur[2] for cur in ret if cur[2] != -99999.])
-        ymax = np.max([cur[4] for cur in ret if cur[4] != -99999.])
+
+        if nb > 0 :
+            xmin = np.min([cur[1] for cur in ret if cur[1] != -99999.])
+            ymin = np.min([cur[3] for cur in ret if cur[3] != -99999.])
+            xmax = np.max([cur[2] for cur in ret if cur[2] != -99999.])
+            ymax = np.max([cur[4] for cur in ret if cur[4] != -99999.])
 
         if self.parent.myops is not None:
 
             self.parent.myops.nbselect.SetLabelText(str(nb))
+
             if nb>0:
                 self.parent.myops.minx.SetLabelText('{:.3f}'.format(xmin))
                 self.parent.myops.miny.SetLabelText('{:.3f}'.format(ymin))
                 self.parent.myops.maxx.SetLabelText('{:.3f}'.format(xmax))
                 self.parent.myops.maxy.SetLabelText('{:.3f}'.format(ymax))
+            else:
+                self.parent.myops.minx.SetLabelText('')
+                self.parent.myops.miny.SetLabelText('')
+                self.parent.myops.maxx.SetLabelText('')
+                self.parent.myops.maxy.SetLabelText('')
 
 
     def condition_select(self, cond, condval, condval2=0, usemask=False):

wolfhece/wolfresults_2D.py

@@ -1566,12 +1566,12 @@ class OneWolfResult:
         elif which==views_2D.VECTOR_FIELD_Q:
             self._current=(self.qx**2.+self.qy**2.)**.5
             nullvalue = self.qx.nullvalue
-            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
         elif which==views_2D.VECTOR_FIELD_U:
             ux = self.qx/self.waterdepth
             uy = self.qy/self.waterdepth
             self._current=(ux**2.+uy**2.)**.5
-            self._vec_field = VectorField(ux.array, uy.array, ux.get_bounds(), ux.dx, ux.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(ux.array, uy.array, ux.get_bounds(), ux.dx, ux.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
 
             nullvalue = self.qx.nullvalue
 
@@ -1580,7 +1580,7 @@ class OneWolfResult:
             self._current = (self.qx**2.+self.qy**2.)**.5
             self._view = WolfViews()
 
-            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self._current, self._vec_field])
 
             nullvalue = self.qx.nullvalue
@@ -1593,7 +1593,7 @@ class OneWolfResult:
             ux = self.qx/self.waterdepth
             uy = self.qy/self.waterdepth
 
-            self._vec_field = VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self._current, self._vec_field])
 
             nullvalue = self.qx.nullvalue
@@ -1606,7 +1606,7 @@ class OneWolfResult:
             ux = self.qx/self.waterdepth
             uy = self.qy/self.waterdepth
 
-            self._vec_field = VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self._current, self._vec_field])
 
             nullvalue = self.waterdepth.nullvalue
@@ -1616,7 +1616,7 @@ class OneWolfResult:
             self._current = self.waterdepth+self.top
             self._view = WolfViews()
 
-            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field = VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
 
             self._view.add_elemts([self._current, self._vec_field])
 
@@ -1626,7 +1626,7 @@ class OneWolfResult:
 
             self._current = self.waterdepth
             self._view = WolfViews()
-            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self._current, self._vec_field])
 
             nullvalue = self.waterdepth.nullvalue
@@ -1639,7 +1639,7 @@ class OneWolfResult:
             ux = self.qx/self.waterdepth
             uy = self.qy/self.waterdepth
 
-            self._vec_field =VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field =VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self._current, self._vec_field])
 
             nullvalue = self.waterdepth.nullvalue
@@ -1649,7 +1649,7 @@ class OneWolfResult:
             self._current = self.waterdepth+self.top
             self._view = WolfViews()
 
-            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self.top, self._current, self._vec_field])
 
             nullvalue = self.waterdepth.nullvalue
@@ -1660,7 +1660,7 @@ class OneWolfResult:
             self.waterdepth.mypal.defaultblue_minmax(self.waterdepth.array)
             self._view = WolfViews()
 
-            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field =VectorField(self.qx.array, self.qy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self.top, self._current, self._vec_field])
 
             nullvalue = self.waterdepth.nullvalue
@@ -1674,7 +1674,7 @@ class OneWolfResult:
             ux = self.qx/self.waterdepth
             uy = self.qy/self.waterdepth
 
-            self._vec_field =VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size)
+            self._vec_field =VectorField(ux.array, uy.array, self.qx.get_bounds(), self.qx.dx, self.qy.dy, minsize=self._min_field_size, mapviewer=self.parent.mapviewer)
             self._view.add_elemts([self.top, self._current, self._vec_field ])
 
             nullvalue = self.waterdepth.nullvalue

{wolfhece-2.1.40.dist-info → wolfhece-2.1.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.40
+Version: 2.1.42
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.40.dist-info → wolfhece-2.1.42.dist-info}/RECORD

@@ -29,7 +29,7 @@ wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,3
 wolfhece/drawing_obj.py,sha256=znIQY8dkYhnmoq3mEsVkVzd-hSKDbFY6i8TV-Tf37jM,4040
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
-wolfhece/gpuview.py,sha256=mOCKVtehWhvFpvQfqrmnF4F7uE6jyxkllUPMVW1PiB0,23735
+wolfhece/gpuview.py,sha256=0Ld8glEijx5OhMEfcwqvUFEQ5ryRXLnzey3Dff_sn-k,24110
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=gDuM9sEowQndLTL8vzbZW879M1go2xiKeE4EAJD2bA4,16532
@@ -47,13 +47,13 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=7-5l96kuQdTE3CStLyf8PkyRD3QX1Us7DOTbF7INepY,356721
+wolfhece/wolf_array.py,sha256=AUSGolqu-YfyQ2SJp5WCMVD1gppvddHULJ3GrUpBjB4,357128
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=EqZI6qCR6ouT3wEtnG_NkVLdvUhfY65JVTj5b6o4lXI,16576
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
 wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=REuQy3fFiEUXt9lNZk0gOg7FbcDEjzAfFNa5H3JqOzg,165764
+wolfhece/wolfresults_2D.py,sha256=f6ezVnKw9LFjh1ynYkga-llDIsDF3BPpR-GYX38-YfE,166127
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -71,7 +71,7 @@ wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=9XDKRloyrzZNK6z5DhCF-kSsL5NjAunRSHtKAYMCOGo,388
+wolfhece/apps/version.py,sha256=5tAn4TD3B3ZvMTbRidl5mbAMwtVox0WQcCeb4SeaUG4,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -169,10 +169,29 @@ wolfhece/lazviewer/vfuncsdir/vfuncs.cp39-win_amd64.pyd,sha256=MzAEyrgnqja-FjHGtL
 wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
+wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
+wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
+wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
+wolfhece/libs/fribidi-0.dll,sha256=MCLSH_tGJXcJdcnUXilGNTVMH6KU8OumYyJX8yN08bQ,111616
 wolfhece/libs/get_infos.cp310-win_amd64.pyd,sha256=45b6uo0r2zPD4KbpHR8QZC0TwQHDb9S0It7-kv0GWTA,77824
+wolfhece/libs/glu32.dll,sha256=gLubeeL9b_RDYTQ2JL0iHzpRMg8uapKCOEpZ15k1SUQ,164352
+wolfhece/libs/hdf5.dll,sha256=quTNP4GZtVNJ6Ptx__ltuGTN0gQ96rvkGL5yBLuUcF4,3129856
+wolfhece/libs/hdf5_hl.dll,sha256=alZLhLXbReBtwbwsariWWRPAlrwzrePr-Mbdgiy922Y,112128
+wolfhece/libs/libcurl.dll,sha256=xYNKOWwPynyHNEwgN61GRHHMqjFyBxu4GWemFe89Ipc,311296
+wolfhece/libs/libpardiso600-WIN-X86-64.dll,sha256=4UsSdj3TWf0IR4Peac05mLXCuZvzazix5_KGfurTRKE,16288256
+wolfhece/libs/libraqm.dll,sha256=p48j-ZNSQJRqrh8NHez7wdxZCKItW4DNSmWd082o60Y,1304064
+wolfhece/libs/msvcr100.dll,sha256=rjy2xq-6mkqlyF9mAjw1M4ylebMDJt0CkY-dVSWVA9U,829264
+wolfhece/libs/netcdf.dll,sha256=6u6oyapv6lRB1KlDeEB1For0JjMYHtVYUYkH_ht_ICY,958976
+wolfhece/libs/paho-mqtt3cs.dll,sha256=i1v0CSIWEGPIlJrEEcmXDLXO2D1bCOQNIDPiWzIpMbI,134656
+wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57168
+wolfhece/libs/vcruntime140.dll,sha256=gPBsB0DzEBn3b7E5ihESs-AtG4Cu59OnONR1QI17TGA,98720
+wolfhece/libs/vcruntime140_1.dll,sha256=KZJoe26L6i76Krqne_OribgfhN6LxJQEcs0Xn_01hP8,38304
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=ceWkovmTDfQcIzlxOBjUUDoHu6ZglOlUFADaRuAe3WM,127488
 wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=e27Epa44wBSrXiwzeUpl2ud8oCPJpFbfWd_5P5l6sAo,294912
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
+wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
 wolfhece/libs/GL/glaux.h,sha256=I3vxXdrzVH05TmjEeAOgKn3egbPt34WMjbeKq5LaBvE,7130
 wolfhece/libs/GL/glcorearb.h,sha256=wfbeOYhbDpIowerrO50sOT2ZKRy5TIhiw6CbNw77m8c,243226
@@ -196,11 +215,19 @@ wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7
 wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC9eQ4,14736
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=Y4DF68uAklF3fXJgf05nb_JvJk2pvzcu_wu5nFXpWJo,5008
 wolfhece/mesh2d/wolf2dprev.py,sha256=9TUFcxWWbzQB4TbZgevMW6UF167r_cnT8AHwQIQeB6s,491489
+wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
+wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
+wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
+wolfhece/models/Froude.pal,sha256=FmrvUI01fv4k0ygqDJEYdC1M9Fn72Sr6Sn2IlZAm0KA,138
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
+wolfhece/models/Risque_TAF.pal,sha256=Tnbx-_gIyCszzwmwo0I9vvFfVVKmATjFXS89AoZwTOs,135
 wolfhece/models/blue.pal,sha256=s9-wEPzSiKMMHuKofUB2FPjmyO7HfGM2xWaUJwsKAY8,39
+wolfhece/models/classes.pal,sha256=3gbCVboKhCYJZYOZVHeIco1kJJuSg0VE8BvX5JK6fTU,273
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
 wolfhece/models/diff3.pal,sha256=qk-yGgJr_FHdW7p7i93GFsH9ClT0dl5nqa9G1lLh7Z0,50
+wolfhece/models/haut_coul.pal,sha256=eEwfZ-noqp09YvH3uvElLRgf4xcgaZIfyk4ntqlVTss,496
 wolfhece/models/red.pal,sha256=W6oeIjDCoGCsJDZPH2K4jfyfPmCMlH9rfRi4PTs-n28,33
+wolfhece/models/reg_20cm.pal,sha256=S_lFMUkc_L9ih0k0XnOG7W9_PCg9J2Lm9ZMS-nloJ1E,366
 wolfhece/models/shields.pal,sha256=TwPhfaly2j3ZRM5ahlz7xH19NArZlalxYNy1L_UnJoA,166
 wolfhece/models/shields_cst.pal,sha256=zUGFI6HiL0bsHeOzcWNih3F9cxXKXLLZYA5rtqRbzcs,90
 wolfhece/models/vulnerability.pal,sha256=Fevrc_9owywLhbPMBunXDcrGXPJhARo9iSV1eOq3roA,106
@@ -226,7 +253,7 @@ wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,
 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=w7_SST4n_uec-MUBK36gbJzz2KC8qT_bVJ_VNyp7cMo,4917
-wolfhece/scenario/config_manager.py,sha256=V7uTr6bxFdgY1dk2YirefaK3Wht4ACcw4aNkr6lvhro,81231
+wolfhece/scenario/config_manager.py,sha256=hw9NfD75sttg-BJfyclXqZUsJwzlqUwE0bQUnzX7IiM,85258
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -249,8 +276,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.40.dist-info/METADATA,sha256=6rjW5iWLs6aXBGRGKa5nQ04PDAos4TOPGh8e0et5qhI,2463
-wolfhece-2.1.40.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.40.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.40.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.40.dist-info/RECORD,,
+wolfhece-2.1.42.dist-info/METADATA,sha256=V--NZVlOcEtf7kFxAX0Lfeu2RqN4BYyCZGmnd12pKnA,2463
+wolfhece-2.1.42.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
+wolfhece-2.1.42.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
+wolfhece-2.1.42.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.42.dist-info/RECORD,,

{wolfhece-2.1.40.dist-info → wolfhece-2.1.42.dist-info}/WHEEL

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