wolfhece 2.2.41__py3-none-any.whl → 2.2.43__py3-none-any.whl

wolfhece/PyDraw.py

@@ -3697,13 +3697,20 @@ class WolfMapViewer(wx.Frame):
             self._uts_menu = wx.Menu()
             self._ocs_menu = wx.Menu()
 
-            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop UTS data (vectorized - shp, gpkg) on the active array extent"))
+            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop UTS data (vectorized - shp, gpkg) on the current screen extent"))
             self._uts_map = self._uts_menu.Append(wx.ID_ANY, _("Map active array (WAL_UTS -> Manning)"), _("Map Walous UTS active array to Manning's n"))
             self._uts_legend = self._uts_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
 
-            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._ocs_crop_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop OCS data (matrix - geotif) on the active array extent"))
+            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop OCS data (matrix - geotif) on the current screen extent"))
+            self._ocs_menu.AppendSeparator()
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Hydrology)"), _("Map Walous OCS active array to Hydrology's landuse classification"))
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Manning)"), _("Map Walous OCS active array to Manning's n"))
             self._ocs_legend = self._ocs_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
@@ -3832,9 +3839,9 @@ class WolfMapViewer(wx.Frame):
 
         itemlabel = item.ItemLabel
 
-        if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
+        if _("Crop on active array") in itemlabel or _("Crop on screen") in itemlabel:
 
-            if itemlabel == _("Crop on screen"):
+            if _("Crop on screen") in itemlabel:
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
 
@@ -3868,14 +3875,24 @@ class WolfMapViewer(wx.Frame):
             from .pywalous import update_palette_walous_ocs
 
             if self._walous_OCS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
-                if dlg.ShowModal() == wx.ID_CANCEL:
-                    dlg.Destroy()
-                    return
 
-                self._walous_OCS_filepath = Path(dlg.GetPath())
-                dlg.Destroy()
+                if itemlabel in [_("Crop on active array (prepared data 10 m - 2023)"), _("Crop on screen (prepared data 10 m - 2023)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2023_lbt72_10m.tif')
+                elif itemlabel in [_("Crop on active array (prepared data 10 m - 2020)"), _("Crop on screen (prepared data 10 m - 2020)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2020_lbt72_10m.tif')
 
+                else:
+                    dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
+                    if dlg.ShowModal() == wx.ID_CANCEL:
+                        dlg.Destroy()
+                        return
+
+                    self._walous_OCS_filepath = Path(dlg.GetPath())
+                    dlg.Destroy()
+
+            if self._walous_OCS_filepath is None or not Path(self._walous_OCS_filepath).exists():
+                logging.error(_('No Walous OCS file -- Please set it'))
+                return
 
             dlg = wx.FileDialog(self, _("Choose the output file"), wildcard="Geotif (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_SAVE, defaultDir=str(def_outdrir))
             if dlg.ShowModal() == wx.ID_CANCEL:
@@ -3885,8 +3902,33 @@ class WolfMapViewer(wx.Frame):
             output = Path(dlg.GetPath())
             dlg.Destroy()
 
+            header_OCS = header_wolf.read_header(self._walous_OCS_filepath)
+            if header_OCS.dx != spatial_res:
+                # Adapt bounds to ensure that the rebin will be correct.
+                # If spatial_res is a multiple of header_OCS.dx, no need to change bounds.
+                # If not, change the bounds to ensure that the crop will include data in all footprints.
+
+                # Convert bvounds to list to be able to modify it
+                bounds = [list(bounds[0]), list(bounds[1])]
+
+                if (bounds[0][0] - header_OCS.origx) % header_OCS.dx != 0:
+                    bounds[0][0] = header_OCS.origx + ((bounds[0][0] - header_OCS.origx) // header_OCS.dx) * header_OCS.dx
+                if (bounds[0][1] - bounds[0][0]) % header_OCS.dx != 0:
+                    bounds[0][1] = bounds[0][0] + ((bounds[0][1] - bounds[0][0]) // header_OCS.dx + 1) * header_OCS.dx
+                if (bounds[1][0] - header_OCS.origy) % header_OCS.dy != 0:
+                    bounds[1][0] = header_OCS.origy + ((bounds[1][0] - header_OCS.origy) // header_OCS.dy) * header_OCS.dy
+                if (bounds[1][1] - bounds[1][0]) % header_OCS.dy != 0:
+                    bounds[1][1] = bounds[1][0] + ((bounds[1][1] - bounds[1][0]) // header_OCS.dy + 1) * header_OCS.dy
+
             locwalous = WolfArray(fname=self._walous_OCS_filepath,
-                                  crop = bounds)
+                                  crop = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]])
+
+            if locwalous.dx != spatial_res:
+                locwalous.rebin(spatial_res / locwalous.dx, operation='min')
+                logging.info(_('Rebin to {} m because original data are {} m').format(spatial_res, locwalous.dx))
+                locwalous = WolfArray(mold=locwalous, crop = self.active_array.get_bounds())
+
+            locwalous.write_all(output)
 
             if Path(output).exists():
                 logging.info(_('File {} created').format(output))
@@ -3904,6 +3946,7 @@ class WolfMapViewer(wx.Frame):
             elif ret == wx.ID_YES:
                 walousarray = WolfArray(fname=output)
                 update_palette_walous_ocs(walousarray.mypal)
+                walousarray.reset_plot()
                 self.add_object('array', newobj=walousarray, id = 'walous_ocs_crop')
                 dlg.Destroy()
 
@@ -3920,6 +3963,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3955,6 +4002,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3995,7 +4046,6 @@ class WolfMapViewer(wx.Frame):
 
         if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
 
-
             if itemlabel == _("Crop on screen"):
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
@@ -4027,10 +4077,10 @@ class WolfMapViewer(wx.Frame):
                 def_outdrir = Path(self.active_array.filename).parent
                 spatial_res = self.active_array.dx
 
-            from .pywalous import Walous_data, WALOUS2MANNING_MAJ_NIV1, WALOUS2MANNING_MAJ_NIV2, update_palette_walous_uts
+            from .pywalous import Walous_data, WALOUS_UTS2MANNING_MAJ_NIV1, WALOUS_UTS2MANNING_MAJ_NIV2, update_palette_walous_uts
 
             if self._walous_UTS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
+                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Geopackage (*.gpkg)|*.gpkg|Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     dlg.Destroy()
                     return
@@ -4054,7 +4104,7 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
                 return
 
-            self._walous_layer = dlg.GetStringSelection()
+            self._walous_layer = 'UTS_' + dlg.GetStringSelection()
 
             locwalous = Walous_data(self._walous_UTS_filepath.parent, self._walous_UTS_filepath.name)
             ret = locwalous.rasterize(bounds=bounds,
@@ -4100,14 +4150,18 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
 
                 if vals[0] > 10:
-                    self._walous_layer = 'MAJ_NIV2'
+                    self._walous_layer = 'UTS_MAJ_NIV2'
                 else:
-                    self._walous_layer = 'MAJ_NIV1'
+                    self._walous_layer = 'UTS_MAJ_NIV1'
 
             dlg = DlgMapWalous2Manning(self, which=self._walous_layer)
 

wolfhece/apps/version.py

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

wolfhece/mesh2d/wolf2dprev.py

@@ -51,6 +51,8 @@ PREV_INFILTRATION_VAR_SIMPLE = -1  #INFILTRATION VARIABLE (RÉPARTITION UNIFORME
 PREV_INFILTRATION_VAR_MOD_MOMENTUM = -2  #INFILTRATION VARIABLE AVEC MOD QT MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
 PREV_INFILTRATION_VAR_LINKED_ZONES = -3  #INFILTRATION/EXFILTRATION "INTERNE" VARIABLE (RÉPARTITION UNIFORME DU DÉBIT SUR BASE DE DEUX ZONES D'INFILTRATION)
 
+PREV_INFILTRATION_MODES = [PREV_INFILTRATION_NULL, PREV_INFILTRATION_SIMPLE, PREV_INFILTRATION_MOD_MOMENTUM, PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED, PREV_INFILTRATION_VAR_SIMPLE, PREV_INFILTRATION_VAR_MOD_MOMENTUM, PREV_INFILTRATION_VAR_LINKED_ZONES]
+
 ##
 PREV_READ_TXT = 1
 PREV_READ_FINE = 2
@@ -968,8 +970,8 @@ class prev_parameters_blocks:
     def get_params_sediment(self) -> dict:
         """ Retourne les paramètres du modèle sédimentaire """
 
-        return {_('Model'): self.get_params_sediment_model(),
-                _('Drifting model'): self.get_params_sediment_drifting_model(),
+        return {_('Model'): self._get_params_sediment_model(),
+                _('Drifting model'): self._get_params_sediment_drifting_model(),
                 _('Porosity'): self._sed_porosity,
                 _('Mean diameter'): self._sed_d_mean,
                 _('Sediment density'): self._sed_s,
@@ -2127,48 +2129,74 @@ class prev_parameters_blocks:
                     'cd_c': self._infil_dev_c,
                     'cd_d': self._infil_dev_d}
 
-        elif self._infiltration_mode == 4:
-            return self.get_infiltration_momentum_correction_params()
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
+            return self.get_params_infiltration_momentum_correction()
 
         else:
             return {}
 
+    def get_infiltration_mode(self) -> int:
+        """ Retourne le mode d'infiltration """
+        return self._infiltration_mode
+
+    def set_infiltration_mode(self, mode:int) -> None:
+        """ Définit le mode d'infiltration
+
+        0 : PREV_INFILTRATION_NULL  - PAS D'INFILTRATION
+        1 : PREV_INFILTRATION_SIMPLE - INFILTRATION SIMPLE (RÉPARTITION UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        2 : PREV_INFILTRATION_MOD_MOMENTUM - INFILTRATION AVEC MODIFICATION DE LA QT DE MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        4 : PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED - INFILTRATION AVEC MODIFICATION IMPOSÉE DE LA QT DE MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        -1 : PREV_INFILTRATION_VAR_SIMPLE - INFILTRATION VARIABLE (RÉPARTITION UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
+        -2 : PREV_INFILTRATION_VAR_MOD_MOMENTUM - INFILTRATION VARIABLE AVEC MOD QT MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
+        -3 : PREV_INFILTRATION_VAR_LINKED_ZONES - INFILTRATION/EXFILTRATION "INTERNE" VARIABLE (RÉPARTITION UNIFORME DU DÉBIT SUR BASE DE DEUX ZONES D'INFILTRATION)
+
+        :param mode: mode d'infiltration
+        """
+        assert isinstance(mode, int), "mode must be an integer"
+        assert mode in PREV_INFILTRATION_MODES, f"mode must be in {PREV_INFILTRATION_MODES}"
+        self._infiltration_mode = mode
+
+    def reset_infiltration_mode(self) -> None:
+        """ Réinitialise le mode d'infiltration """
+        self._infiltration_mode = PREV_INFILTRATION_NULL
+
+
     def check_params_infiltration(self) -> tuple[bool, str]:
         """ Vérifie les paramètres d'infiltration """
 
         ret = '\nInfiltration\n************\n'
         valid = True
 
-        if self._infiltration_mode == 0:
+        if self._infiltration_mode == PREV_INFILTRATION_NULL:
             ret += _('Info: No infiltration\n')
-        elif self._infiltration_mode == 1:
+        elif self._infiltration_mode == PREV_INFILTRATION_SIMPLE:
             ret += _('Info: Simple infiltration\n')
-        elif self._infiltration_mode == 2:
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM:
             ret += _('Info: Infiltration with momentum modification\n')
-        elif self._infiltration_mode == 4:
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             ret += _('Info: Infiltration with imposed momentum modification\n')
-        elif self._infiltration_mode == -1:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_SIMPLE:
             ret += _('Info: Variable infiltration\n')
-        elif self._infiltration_mode == -2:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_MOD_MOMENTUM:
             ret += _('Info: Variable infiltration with momentum modification\n')
-        elif self._infiltration_mode == -3:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES:
             ret += _('Info: Variable infiltration/exfiltration (linked zone)\n')
 
         if self._infiltration_mode < 0:
             ret += _('Info: Coefficients a={self._infil_a}, b={self._infil_b}, c={self._infil_c}\n')
 
-            if self._infiltration_mode != -3 and self._infil_a == 0. and self._infil_b == 0. and self._infil_c == 0.:
+            if self._infiltration_mode != PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_a == 0. and self._infil_b == 0. and self._infil_c == 0.:
                 ret += _('Warning: No polynomial infiltration\n')
 
-            if self._infiltration_mode == -3 and self._infil_a == 0.:
+            if self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_a == 0.:
                 ret += _('Warning: No infiltration/exfiltration under bridge\n')
 
             ret += _('Info: Coefficients Cd={self._infil_dev_cd}, width={self._infil_dev_width}\n, zseuil={self._infil_dev_zseuil}')
 
-            if self._infiltration_mode != -3 and self._infil_dev_cd == 0. or self._infil_dev_width == 0.:
+            if self._infiltration_mode != PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_dev_cd == 0. or self._infil_dev_width == 0.:
                 ret += _('Warning: No weir exfiltration\n')
 
-            if self._infiltration_mode == -3 and (self._infil_dev_cd == 0. or self._infil_dev_width == 0.):
+            if self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES and (self._infil_dev_cd == 0. or self._infil_dev_width == 0.):
                 ret += _('Warning: No weir over bridge\n')
 
             ret += _('Info: Coefficients d={self._infil_var_d}, e={self._infil_var_e}\n')
@@ -2195,7 +2223,7 @@ class prev_parameters_blocks:
         self._infil_correction_ux = ux
         self._infil_correction_vy = vy
 
-        if self._infiltration_mode != 4:
+        if self._infiltration_mode != PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             logging.warning("To apply, you must set ninfil to 4")
         else:
             logging.info("Infiltration momentum correction applied")
@@ -2203,7 +2231,7 @@ class prev_parameters_blocks:
     def get_params_infiltration_momentum_correction(self) -> dict:
         """ Retourne les corrections de moment pour l'infiltration """
 
-        if self._infiltration_mode == 4:
+        if self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             return {'ux': self._infil_correction_ux,
                     'vy': self._infil_correction_vy}
         else:

wolfhece/models/walous_ocs.pal

@@ -0,0 +1,49 @@
+12
+0.0
+229
+234
+63
+1.0
+138
+138
+138
+2.0
+220
+15
+15
+3.0
+78
+78
+78
+4.0
+208
+208
+208
+5.0
+36
+97
+247
+6.0
+255
+255
+115
+7.0
+233
+255
+190
+8.0
+0
+50
+0
+9.0
+40
+200
+40
+80.0
+0
+120
+0
+90.0
+183
+232
+176