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

wolfhece/PyDraw.py

@@ -235,6 +235,9 @@ class WolfMapViewer(wx.Frame):
         compareitem = self.menugltf.Append(wx.ID_ANY, _('Compare...'), _('Create new frames to compare sculpting'))
         updategltf = self.menugltf.Append(wx.ID_ANY, _('Update...'), _('Update data from gltf files'))
 
+        self.filemenu.AppendSeparator()
+        check2D = self.filemenu.Append(wx.ID_ANY, _('Check 2D simulation headers'), _('Check 2D sim'))
+
         self.filemenu.AppendSeparator()
         compareitem = self.filemenu.Append(wx.ID_ANY, _('Set comparison'), _('Set comparison'))
         multiview = self.filemenu.Append(wx.ID_ANY, _('Multiviewer'), _('Multiviewer'))
@@ -478,7 +481,7 @@ class WolfMapViewer(wx.Frame):
         self.cloudmenu=None
         self._configuration = None
 
-        self.compare_results={}
+        self.compare_results = None
 
         self.InitUI()
 
@@ -3192,6 +3195,9 @@ class WolfMapViewer(wx.Frame):
             fig.show()
 
         elif itemlabel == _("Change current view"):
+
+            # Change view for results
+
             autoscale = False
             choices = [cur.value for cur in views_2D]
             dlg = wx.SingleChoiceDialog(None, _("Pick a view"), "Choices", choices)
@@ -3252,11 +3258,15 @@ class WolfMapViewer(wx.Frame):
                         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)
+                if self.active_res2d is not None:
+                    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)
+
+            if self.compare_results is not None:
+                self.compare_results.update_type_result(method)
 
         elif itemlabel == _("Read last result"):
 
@@ -3558,6 +3568,23 @@ class WolfMapViewer(wx.Frame):
 
             pass
 
+        elif itemlabel == _('Check 2D simulation headers'):
+
+            # Check 2D simulation
+            dlg = wx.FileDialog(self, _("Choose 2D simulation file"), wildcard="all (*.*)|*.*", style=wx.FD_OPEN)
+            if dlg.ShowModal() == wx.ID_CANCEL:
+                dlg.Destroy()
+                return
+
+            filename = dlg.GetPath()
+            dlg.Destroy()
+
+            from .mesh2d.wolf2dprev import prev_sim2D
+
+            sim = prev_sim2D(filename)
+            sim.verify_files()
+
+
         elif itemlabel == _('Set comparison'):
 
             self.compare_results = Compare_Arrays_Results(self, True, True)
@@ -7580,13 +7607,36 @@ class Compare_Arrays_Results():
             self.linked_elts.append(curelt.as_WolfArray())
 
             for curelt, curlink in zip(self.elements, self.linked_elts):
-                curlink.idx = curelt.idx
+                curlink.idx = curelt.idx + ' ' + curelt.get_currentview().value
 
         self.set_diff()
 
         if self._initialized_viewers:
             self.update_viewers()
 
+    def update_type_result(self, newtype):
+        """
+        Update the result type for each element
+
+        """
+        assert newtype in views_2D, 'This type is not a 2D result'
+        assert self.type in (Comp_Type.RES2D, Comp_Type.RES2D_GPU), 'This method is only for 2D results'
+
+        for curelt in self.elements:
+            curelt.set_currentview(newtype)
+
+        # remove elements
+        for baselt, curelt, curmap in zip(self.elements, self.linked_elts, self.mapviewers):
+
+            curmap.removeobj_from_id(curelt.idx)
+
+        for curdiff, curmap in zip(self.diff, self.mapviewers_diff):
+
+            curmap.removeobj_from_id(curdiff.idx)
+
+
+        self.update_comp(self.times.get_times_idx())
+
     def set_elements(self):
         """ Set the elements to compare with the right type """
         from .ui.wolf_times_selection_comparison_models import Times_Selection
@@ -7595,6 +7645,7 @@ class Compare_Arrays_Results():
             self.type = self.paths[0][0]
 
             if self.type == Comp_Type.RES2D_GPU:
+                self.parent.menu_wolf2d()
                 self.elements = [wolfres2DGPU(cur[1], plotted=False, idx = cur[1].name + '_' + str(idx)) for idx, cur in enumerate(self.paths)]
 
                 times = [curmod.get_times_steps()[0] for curmod in self.elements]
@@ -7603,6 +7654,7 @@ class Compare_Arrays_Results():
                 self.times.Show()
 
             elif self.type == Comp_Type.RES2D:
+                self.parent.menu_wolf2d()
                 self.elements = [Wolfresults_2D(cur[1], plotted=False, idx = cur[1].name + '_' + str(idx)) for idx, cur in enumerate(self.paths)]
 
                 times = [curmod.get_times_steps()[0] for curmod in self.elements]
@@ -7695,7 +7747,10 @@ class Compare_Arrays_Results():
 
         # on attribue une matrice par interface graphique
         ref = elts[0]
-        for curelt, curmap in zip(elts, self.mapviewers):
+        for baselt, curelt, curmap in zip(self.elements, elts, self.mapviewers):
+
+            # if self.type in (Comp_Type.RES2D, Comp_Type.RES2D_GPU):
+            #     curmap.active_res2d = baselt
 
             curmap.removeobj_from_id(curelt.idx)
 
@@ -7706,7 +7761,7 @@ class Compare_Arrays_Results():
         # diff = self.diff[0]
         for curdiff, curmap in zip(self.diff, self.mapviewers_diff):
 
-            curmap.removeobj_from_id('diff '+ curdiff.idx)
+            curmap.removeobj_from_id(curdiff.idx)
 
             curdiff.change_gui(curmap)
             curmap.active_array = curdiff
@@ -7754,7 +7809,7 @@ class Compare_Arrays_Results():
             curmap.add_object('array', newobj = curelt, ToCheck = True, id = curelt.idx)
 
         for curdiff, curmap in zip(self.diff, self.mapviewers_diff):
-            curmap.add_object('array', newobj = curdiff, ToCheck = True, id = 'diff '+ curdiff.idx)
+            curmap.add_object('array', newobj = curdiff, ToCheck = True, id = curdiff.idx)
 
         if self.independent:
             for curmap in self.mapviewers + self.mapviewers_diff:

wolfhece/apps/version.py

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

wolfhece/mesh2d/wolf2dprev.py

@@ -19,7 +19,8 @@ import logging
 from enum import Enum
 
 from ..wolf_array import WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_SINGLE, WolfArray, WolfArrayMB, WolfArrayMNAP, \
-    header_wolf,WolfArray_Sim2D
+    header_wolf, WolfArray_Sim2D, WolfArrayMNAP, WOLF_ARRAY_MB_SINGLE, WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_FULL_SINGLE, getkeyblock
+
 from ..PyVertexvectors import *
 from ..PyVertex import getIfromRGB
 from ..PyTranslate import _
@@ -2985,3 +2986,91 @@ class xy_file():
                 myvect.add_vertex(curvert)
 
             self.myzones.find_minmax(True)
+
+
+class prev_sim2D():
+
+    def __init__(self, fname:str) -> None:
+
+        from pathlib import Path
+
+        self.filename = fname
+        self.mydir = Path(fname).parent.as_posix()
+        self.filenamegen = self.filename
+        self.myparam = prev_parameters_simul(self)
+        self.myparam.read_file()
+        self.mymnap = WolfArrayMNAP(self.filenamegen)
+
+        self.files_MB_array={'Initial Conditions':[
+            ('.topini','Bed elevation [m]',WOLF_ARRAY_MB_SINGLE),
+            ('.hbinb','Water depth [m]',WOLF_ARRAY_MB_SINGLE),
+            ('.qxbinb','Discharge X [m²/s]',WOLF_ARRAY_MB_SINGLE),
+            ('.qybinb','Discharge Y [m²/s]',WOLF_ARRAY_MB_SINGLE),
+            ('.frotini','Roughness coeff',WOLF_ARRAY_MB_SINGLE)
+        ]}
+
+        self.files_fine_array={'Characteristics':[
+            ('.napbin','Mask [-]',WOLF_ARRAY_FULL_LOGICAL),
+            ('.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),
+            ('.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)
+        ]}
+
+    def get_header(self):
+        curhead = header_wolf()
+
+        curhead.nbx = self.myparam.nxfin
+        curhead.nby = self.myparam.nyfin
+
+        curhead.dx = self.myparam.dxfin
+        curhead.dy = self.myparam.dyfin
+
+        curhead.origx = self.myparam.xminfin
+        curhead.origy = self.myparam.yminfin
+
+        curhead.translx = self.myparam.translx
+        curhead.transly = self.myparam.transly
+
+        return curhead
+
+    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)
+        for curblock in self.mymnap.myblocks.values():
+            myheader.head_blocks[getkeyblock(curblock.blockindex)] = curblock.get_header(abs=abs)
+        return  myheader
+
+    def verify_files(self):
+        """
+        Vérification de la présence des en-têtes dans les différents fichiers
+        """
+
+        fhead = self.get_header()
+        mbhead = self.get_header_MB()
+
+        fine = self.files_fine_array['Characteristics']
+        for curextent,text,wolftype in fine:
+            fname = self.filenamegen + curextent
+            if exists(fname):
+                logging.info(f'Verifying header for {fname}')
+                fname += '.txt'
+                fhead.write_txt_header(fname,wolftype)
+
+        mb = self.files_MB_array['Initial Conditions']
+        for curextent,text,wolftype in mb:
+            fname = self.filenamegen + curextent
+            if exists(fname):
+                logging.info(f'Verifying header for {fname}')
+                fname += '.txt'
+                mbhead.write_txt_header(fname,wolftype)
+
+        fname = self.filenamegen + '.lst'
+        if not exists(fname):
+            logging.warning(f'File {fname} does not exist -- Creating it')
+            with open(fname,'w') as f:
+                f.write('0\n')

wolfhece/ui/wolf_times_selection_comparison_models.py

@@ -142,3 +142,10 @@ class Times_Selection(wx.Dialog):
         self.times = times
         for cur, curlb in zip(self.times, self.lb):
             curlb[1].Set([str(curtime) for curtime in cur])
+
+    def get_times_idx(self):
+        """
+        Retourne les index des temps sélectionnés dans les listes de temps.
+
+        """
+        return [curlb[1].GetSelection() for curlb in self.lb]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.22
+Version: 2.0.23
 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.22.dist-info → wolfhece-2.0.23.dist-info}/RECORD

@@ -5,7 +5,7 @@ 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=JR4Y9Jzd8JZbT6sd7pwMMd0YNLdtRsQCOYy8FkCrUi0,320904
+wolfhece/PyDraw.py,sha256=C501ZkqfL42RBw0ytO7u3amB3bFiz5W4bobqratdt4A,322796
 wolfhece/PyGui.py,sha256=TLhXjfEZhMRucPmtu1ntz-wlvX4phntPHG6jYhGPMUk,52687
 wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
 wolfhece/PyHydrographs.py,sha256=h2OfgmRkKc5XZn0iPFOVy60pGTSa5EFoUOEya0SeG7o,3411
@@ -59,7 +59,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=9BNArfcoRcyWglzFDQdLv2Dlvqz8w5qYKdE5zA66-Kw,2117
-wolfhece/apps/version.py,sha256=1jx_QTbyGIcrkyQcMDkU-l3GQnfA1Q4BUAYhgLZWlNA,388
+wolfhece/apps/version.py,sha256=AR5VuDo0rvldetfOPlc0jtls3HgiewRprm7x_oDnjKM,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
@@ -201,7 +201,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=5im8G1efNXH-7km6JR__lTIKp93L4SlfXbAZwuVzfqs,14407
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=BaJeKHyJiKEFWBkTQeYsDBW86703ooj65MFVpPMgjLg,2810
-wolfhece/mesh2d/wolf2dprev.py,sha256=YOXkKl0qZNkVO6x_-8u5xmL7q_3p29hl2jt0kVFMj_I,132625
+wolfhece/mesh2d/wolf2dprev.py,sha256=TAgIRb8X0-Ktoa5PtZQ8Z_ev99MlDw-VmeJgq8IeRZo,136108
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -245,9 +245,9 @@ wolfhece/sounds/sonsw1.wav,sha256=HhuGeZ3iIyJdDALmM-jvGZDkKw3IZ3JXCuQZkN3Zjtc,21
 wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,110636
 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.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/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
+wolfhece-2.0.23.dist-info/METADATA,sha256=ILTWNh7V6XuNr1w9QKnT4QnoEI10GW-NAZgHg06UJAg,2239
+wolfhece-2.0.23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.23.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.23.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.23.dist-info/RECORD,,