wolfhece 2.1.12__py3-none-any.whl → 2.1.14__py3-none-any.whl

wolfhece/PyDraw.py

@@ -191,7 +191,7 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = Zones(filename=name)
+                    newobj = Zones(filename=name, parent=self.window)
                     self.window.add_object('vector', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading vector : ') + name)
@@ -203,7 +203,7 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = cloud_vertices(fname=name)
+                    newobj = cloud_vertices(fname=name, mapviewer=self.window)
                     self.window.add_object('cloud', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading cloud : ') + name)
@@ -380,6 +380,12 @@ class WolfMapViewer(wx.Frame):
 
         self.filemenu.AppendSeparator()
 
+        # SIMULATION Hydrologique
+
+        hydrol = self.filemenu.Append(wx.ID_ANY, _('Open hydrological model'), _('Hydrological simulation'))
+
+        self.filemenu.AppendSeparator()
+
         # MULTIVIEWER
 
         compareitem = self.filemenu.Append(wx.ID_ANY, _('Set comparison'), _('Set comparison'))
@@ -665,6 +671,13 @@ class WolfMapViewer(wx.Frame):
         self._wxlogging = value
 
 
+    def open_hydrological_model(self):
+        """ Open a hydrological model """
+
+        from .PyGui import HydrologyModel
+
+        newview = HydrologyModel(splash = False)
+
     def create_2D_MB_model(self):
         """ Create a 2D model """
 
@@ -1168,6 +1181,76 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel ==_("Create video..."):
             if self.active_res2d is not None:
                 self.create_video()
+                
+        elif itemlabel == _("Setup cache..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            dlg = wx.MessageDialog(None, _('Cache only water depth results ?'), style=wx.YES_NO)
+            ret = dlg.ShowModal()
+            if ret == wx.ID_NO:
+                only_h = False
+            else:
+                only_h = True
+            dlg.Destroy()
+
+            dlg = wx.MessageDialog(None, _('Cache all results ?'), style=wx.YES_NO)
+            ret = dlg.ShowModal()
+            if ret == wx.ID_NO:
+
+                dlg_start = wx.SingleChoiceDialog(None, _('Choosing the start index'),
+                                                  _('Choices'),
+                                                  [str(cur) for cur in range(1,self.active_res2d.get_nbresults()+1)])
+                ret = dlg_start.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    dlg_start.Destroy()
+                    return
+
+                start_idx = int(dlg_start.GetStringSelection())
+                dlg_start.Destroy()
+
+                dlg_end   = wx.SingleChoiceDialog(None, _('Choosing the end index'),
+                                                  _('Choices'),
+                                                  [str(cur) for cur in range(start_idx + 1,self.active_res2d.get_nbresults()+1)])
+
+                ret = dlg_end.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    dlg_end.Destroy()
+                    return
+
+                dlg_end.Destroy()
+
+                end_idx = int(dlg_end.GetStringSelection())
+
+                logging.info(_('Caching from {} to {} - Be patient !').format(start_idx, end_idx))
+                self.active_res2d.setup_cache(start_idx = start_idx-1, end_idx = end_idx-1, only_h=only_h)
+                logging.info(_('Caching done !'))
+            else:
+                logging.info(_('Caching all results - Be patient !'))
+                self.active_res2d.setup_cache(only_h=only_h)
+                logging.info(_('Caching done !'))
+
+            dlg.Destroy()
+
+        elif itemlabel == _("Clear cache..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            self.active_res2d.clear_cache()
+            logging.info(_('Cache cleared !'))
+
+        elif itemlabel == _("Show tiles..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            self.active_res2d.show_tiles()
+
 
     def menu_2dgpu(self):
 
@@ -2094,8 +2177,8 @@ class WolfMapViewer(wx.Frame):
             return
 
         if fn=='':
-            dlg = wx.FileDialog(patent   = None,
-                                messaghe = _('Choose file name'),
+            dlg = wx.FileDialog(parent   = None,
+                                message  = _('Choose file name'),
                                 wildcard = 'AVI video file (*.avi)|*.avi',
                                 style    = wx.FD_SAVE)
             ret = dlg.ShowModal()
@@ -2175,6 +2258,12 @@ class WolfMapViewer(wx.Frame):
             interval = int(dlg.GetValue())
             dlg.Destroy()
 
+        self.read_one_result(start_step)
+
+        for curmodel in self.iterator_over_objects(draw_type.RES2D):
+            curmodel: Wolfresults_2D
+            curmodel.step_interval_results = interval
+
         for idx in tqdm(range(start_step, end_step, interval)):
 
             image = Image.frombytes('RGB', fig.canvas.get_width_height(),fig.canvas.tostring_rgb())
@@ -2189,6 +2278,11 @@ class WolfMapViewer(wx.Frame):
                                    ax=ax[0],
                                    title=_('Current time {:0>8} s'.format(el_time)))
 
+        for curmodel in self.iterator_over_objects(draw_type.RES2D):
+            curmodel: Wolfresults_2D
+            curmodel.step_interval_results = 1
+
+
     def get_canvas_as_image(self) -> Image.Image:
         """
         Récupère la fenêtre OpenGL sous forme d'image
@@ -4008,8 +4102,15 @@ class WolfMapViewer(wx.Frame):
             elif unknown == _('Head'):
                 unknown = 'head'
 
-            fig, ax = self.active_res2d.plot_h(self.active_res2d.SelectionData.myselection,
-                                               unknown, toshow=True)
+            figax = None
+            for curblock in self.active_res2d.myblocks.values():
+                if curblock.SelectionData.nb > 0:
+
+                    figax = self.active_res2d.plot_h(curblock.SelectionData.myselection,
+                                                   unknown, toshow=False, figax=figax)
+            if figax is not None:   
+                fig, ax = figax
+                fig.show()
 
         elif itemlabel == _("Plot stats unknown (inside active vector)..."):
 
@@ -4379,75 +4480,6 @@ class WolfMapViewer(wx.Frame):
         #     if self.active_res2d is not None:
         #         self.create_video()
 
-        elif itemlabel == _("Setup cache..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            dlg = wx.MessageDialog(None, _('Cache only water depth results ?'), style=wx.YES_NO)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_NO:
-                only_h = False
-            else:
-                only_h = True
-            dlg.Destroy()
-
-            dlg = wx.MessageDialog(None, _('Cache all results ?'), style=wx.YES_NO)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_NO:
-
-                dlg_start = wx.SingleChoiceDialog(None, _('Choosing the start index'),
-                                                  _('Choices'),
-                                                  [str(cur) for cur in range(1,self.active_res2d.get_nbresults()+1)])
-                ret = dlg_start.ShowModal()
-                if ret == wx.ID_CANCEL:
-                    dlg_start.Destroy()
-                    return
-
-                start_idx = int(dlg_start.GetStringSelection())
-                dlg_start.Destroy()
-
-                dlg_end   = wx.SingleChoiceDialog(None, _('Choosing the end index'),
-                                                  _('Choices'),
-                                                  [str(cur) for cur in range(start_idx + 1,self.active_res2d.get_nbresults()+1)])
-
-                ret = dlg_end.ShowModal()
-                if ret == wx.ID_CANCEL:
-                    dlg_end.Destroy()
-                    return
-
-                dlg_end.Destroy()
-
-                end_idx = int(dlg_end.GetStringSelection())
-
-                logging.info(_('Caching from {} to {} - Be patient !').format(start_idx, end_idx))
-                self.active_res2d.setup_cache(start_idx = start_idx-1, end_idx = end_idx-1, only_h=only_h)
-                logging.info(_('Caching done !'))
-            else:
-                logging.info(_('Caching all results - Be patient !'))
-                self.active_res2d.setup_cache(only_h=only_h)
-                logging.info(_('Caching done !'))
-
-            dlg.Destroy()
-
-        elif itemlabel == _("Clear cache..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            self.active_res2d.clear_cache()
-            logging.info(_('Cache cleared !'))
-
-        elif itemlabel == _("Show tiles..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            self.active_res2d.show_tiles()
-
         elif itemlabel == _("Manage banks..."):
             if self.active_vector is None:
                 msg = _('Active vector is None\nPlease activate the one desired')
@@ -4712,6 +4744,10 @@ class WolfMapViewer(wx.Frame):
 
             self.create_2D_MB_model()
 
+        elif itemlabel == _('Open hydrological model'):
+
+            self.open_hydrological_model()
+
         elif itemlabel == _('Check headers'):
 
             self.check_2D_MB_headers()

wolfhece/PyGui.py

@@ -276,19 +276,32 @@ class HydrologyModel(GenMapManager):
                 ('_encode.sub','Coded index SubB [-]')]}
 
 
-            self.files_hydrology_vectors={'Characteristic_maps':[('.delimit.vec','Watershed')],
+            self.files_hydrology_vectors={'Characteristic_vectors':[('.delimit.vec','Watershed')],
                                         'Whole_basin':[('Rain_basin_geom.vec','Rain geom'),
                                                         ('Evap_basin_geom.vec','Evapotranspiration geom')]}
 
             for curfile in self.files_hydrology_array['Characteristic_maps']:
                 curext=curfile[0]
-                curidx=curfile[1]
+                curidx=curfile[1]                
                 self.mapviewer.add_object(which='array',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
 
-            for curfile in self.files_hydrology_vectors['Characteristic_maps']:
+
+            for curfile in self.files_hydrology_vectors['Characteristic_vectors']:
                 curext=curfile[0]
                 curidx=curfile[1]
-                self.mapviewer.add_object(which='vector',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
+
+                delimit = Zones(filename=self.mydircharact+curext, mapviewer=self.mapviewer, parent = self.mapviewer)
+
+                for idx, cur_zone in enumerate(delimit.myzones):
+                    cur_sub = self.mycatchment.get_subBasin(idx+1)
+                    cur_zone.myname = cur_sub.name
+                    cur_vect = cur_zone.myvectors[0]
+                    cur_vect.set_legend_to_centroid(cur_sub.name + ' - ' + str(cur_sub.iDSorted), visible=True)
+                    cur_vect.myprop.legendfontsize = 12
+                
+                delimit.reset_listogl()
+
+                self.mapviewer.add_object(which='vector',newobj = delimit, id=curidx, ToCheck=True)
 
             for curfile in self.files_hydrology_vectors['Whole_basin']:
                 curext=curfile[0]
@@ -297,7 +310,17 @@ class HydrologyModel(GenMapManager):
                     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)
+
+            zones_RT = self.mycatchment.get_retentionbasin_zones()
+            zones_RT.parent = self
+            self.mapviewer.add_object(which='vector',newobj=zones_RT,id='Anthropic links',ToCheck=False)
+
             self.mapviewer.add_object(which='cloud',newobj=self.mycatchment.subBasinCloud,id='Local outlets',ToCheck=False)
+            self.mapviewer.add_object(which='cloud',newobj=self.mycatchment.retentionBasinCloud,id='Anthropic inlets/outlets',ToCheck=False)
+
+            self.mycatchment.subBasinCloud.set_mapviewer(self.mapviewer)
+            self.mycatchment.retentionBasinCloud.set_mapviewer(self.mapviewer)
+
             self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.mycloudup,id='Up nodes',ToCheck=False)
             self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.myclouddown,id='Down nodes',ToCheck=False)
 

wolfhece/PyParams.py

@@ -1064,7 +1064,7 @@ class Wolf_Param(wx.Frame):
                         logging.debug("String type will be conserved! -- {}".format(value_param))
 
                 if type(value_param) != int:
-                    logging.warning("Parameters -- EnumProperty -- Value {} is not an integer".format(value_param))
+                    logging.warning("Parameters -- EnumProperty -- Value {} is not an integer in file : {}".format(value_param, self.filename))
                     logging.debug("EnumProperty value must be an integer")
 
                 page.Append(pg.EnumProperty(label= param_name, name= locname, labels= list_keys, values= list_values, value= int(value_param)))

wolfhece/PyVertexvectors.py

@@ -2523,7 +2523,12 @@ class zone:
 
         :param prep: True = préparation des listes OpenGL ; False = affichage direct
         """
+
         if prep:
+            if len(self.myvectors) == 0:
+                logging.warning(_('No vector in zone -- {}').format(self.myname))
+                return
+            
             try:
                 if self.idgllist==-99999:
                     self.idgllist = glGenLists(1)
@@ -2540,6 +2545,10 @@ class zone:
             except:
                 logging.error(_('OpenGL error in zone.plot'))
         else:
+            if len(self.myvectors) == 0:
+                logging.warning(_('No vector in zone -- {}').format(self.myname))
+                return
+
             if self.idgllist!=-99999:
                 glCallList(self.idgllist)
             else:
@@ -4811,6 +4820,10 @@ class Zones(wx.Frame, Element_To_Draw):
             return expended_items
 
         def restore_tree_state(tree:TreeListCtrl, expended_items):
+            
+            if len(expanded)==0:
+                # Nothing to do
+                return
 
             root = tree.GetRootItem()
 
@@ -5837,6 +5850,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
         Pousse la même information dans l'objet parent s'il existe
         """
+        
         if self.wx_exists:
             self.active_zone = object
 

wolfhece/Results2DGPU.py

@@ -237,6 +237,10 @@ class wolfres2DGPU(Wolfresults_2D):
                     try:
                         curblock.top.dx = params["parameters"]["dx"]
                         curblock.top.dy = params["parameters"]["dy"]
+
+                        curblock.dx = curblock.top.dx
+                        curblock.dy = curblock.top.dy
+
                     except:
                         logging.error(_('No spatial resolution (dx,dy) in parameters.json -- Results will not be shown in viewer'))
                         return -1
@@ -244,6 +248,10 @@ class wolfres2DGPU(Wolfresults_2D):
                     try:
                         curblock.top.origx = params["parameters"]["base_coord_x"]
                         curblock.top.origy = params["parameters"]["base_coord_y"]
+
+                        curblock.origx = curblock.top.origx
+                        curblock.origy = curblock.top.origy
+                        
                     except:
                         logging.error(_('No spatial position (base_coord_x,base_coord_y) in parameters.json -- Results will not be spatially based'))
                         return -2
@@ -406,12 +414,12 @@ class wolfres2DGPU(Wolfresults_2D):
         self.current_result = self._sanitize_result_step(self.current_result)
         self.read_oneresult(self.current_result)
 
-    def read_next(self):
-        """
-        Lecture du pas suivant
-        """
-        self.current_result+=1
-        self._update_result_view()
+    # def read_next(self):
+    #     """
+    #     Lecture du pas suivant
+    #     """
+    #     self.current_result+= self._step_interval
+    #     self._update_result_view()
 
     def get_times_steps(self, nb:int = None):
         """
@@ -441,12 +449,12 @@ class wolfres2DGPU(Wolfresults_2D):
             else:
                 return self.times, self.timesteps
 
-    def read_previous(self):
-        """
-        Lecture du pas suivant
-        """
-        self.current_result -= 1
-        self._update_result_view()
+    # def read_previous(self):
+    #     """
+    #     Lecture du pas suivant
+    #     """
+    #     self.current_result -= self._step_interval
+    #     self._update_result_view()
 
     def get_cached_h(self, idx):
         """ Return cached water depth according to WOLF convention """

wolfhece/apps/version.py

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

wolfhece/hydrology/Catchment.py

@@ -53,10 +53,9 @@ class Catchment:
     _version:float                                                          # version of the wolfHydro python code. Useful for identifying the file versions to read and how to interpret them
     charact_watrshd:Watershed                                               # Watershed object containing the most useful properties of the arrays in Characteristics maps
     subBasinCloud:cloud_vertices                                            # cloud of points containing the true coordinates (used in simulation) of all subbasin outlets
+    retentionBasinCloud:cloud_vertices                                      # cloud of points containing the true coordinates (used in simulation) of all retention basins
     iP_Cloud:cloud_vertices                                                 # cloud of points containing the given coordinates (given in param files) of all subbasin outlets
 
-    subBasinDict:dict[int:SubBasin]
-
     catchmentDict:dict[Union[str, int], Union[SubBasin, RetentionBasin]]    # dictionnary containing all the elements of the catchment
     subBasinDict:dict[int, SubBasin]                                        # dictionnary containing all the subbasins
 
@@ -85,6 +84,10 @@ class Catchment:
         self.subBasinCloud.myprop.color=getIfromRGB((255,131,250))
         self.subBasinCloud.myprop.filled=True
 
+        self.retentionBasinCloud=cloud_vertices()
+        self.retentionBasinCloud.myprop.color=getIfromRGB((0,131,255))
+        self.retentionBasinCloud.myprop.filled=True
+
         self.iP_Cloud=cloud_vertices()
         self.iP_Cloud.myprop.color=getIfromRGB((255,131,250))
         self.iP_Cloud.myprop.filled=True
@@ -194,7 +197,7 @@ class Catchment:
         # self.topo_wolf_array = WolfArray(self.workingDir + "Characteristic_maps/Drainage_basin.b")
         # self.topo_wolf_array = WolfArray(self.workingDir + "Characteristic_maps/Drainage_basin.b2")
         self.time_wolf_array = WolfArray(os.path.join(self.workingDir,"Characteristic_maps/Drainage_basin.time"))
-        self.charact_watrshd = Watershed(self.workingDir)
+        self.charact_watrshd = Watershed(self.workingDir, dir_mnt_subpixels=self.paramsInput[('Sub-pixeling', 'Directory')])
         self.set_eff_outlet_coord()
 
         # time array:
@@ -221,6 +224,8 @@ class Catchment:
         # Iterate through the Input params dictionnary
         self.create_ObjectsInCatchment()
 
+        self.charact_watrshd.set_names_subbasins([(cur.iDSorted, cur.name) for cur in self.subBasinDict.values()])
+
         # self.add_hyetoToDict()
 
 
@@ -323,8 +328,27 @@ class Catchment:
         if(self.plotAllSub):
             self.plot_allSub()
 
+        # self.charact_watrshd.impose_sorted_index_subbasins([cur.iDSorted for cur in self.subBasinDict.values()])
 
+        self._fill_cloud_retentionbasin()
+
+    def get_subBasin(self, id_sorted_or_name:int | str) -> SubBasin:
+        """ 
+        This method returns the subbasin object associated with the sorted id or name given in argument.
+
+        The sorted id is the one given by the Fortran code.
+        """
 
+        if isinstance(id_sorted_or_name, str):
+            for cursub in self.subBasinDict.values():
+                if(cursub.name.lower() == id_sorted_or_name.lower()):
+                    return cursub
+
+        elif isinstance(id_sorted_or_name, int):
+            for cursub in self.subBasinDict.values():
+                if(cursub.iDSorted == id_sorted_or_name):
+                    return cursub
+        return None
 
 
     def get_time(self):
@@ -565,6 +589,7 @@ class Catchment:
                     self.junctionNamesDict[self.paramsTopology.myparams[element]["outlet "+str(iOutlet+1)][key_Param.VALUE]] = element
 
                 self.retentionBasinDict[element] = RetentionBasin(self.dateBegin, self.dateEnd, self.deltaT, self.time, idBasin, nameBasin, typeOfRB, self.paramsRB.myparams, _tz=self.tz, _outletNames=myOutletsNames, _workingDir=self.workingDir)
+
                 # Save the RB in the RB dictionnary into the global Catchment dictionnary
                 self.catchmentDict[element] = self.retentionBasinDict[element]
 
@@ -573,6 +598,25 @@ class Catchment:
                 print("ERROR: This type of junction is unknown. Please check the topo postprocess file")
                 sys.exit()
 
+    def _fill_cloud_retentionbasin(self):
+        """ This procedure fills the cloud of the retention basin with the vertices of the retention basin and its inlets. """
+
+        for curRT in self.retentionBasinDict.values():
+            curRT:RetentionBasin
+            self.retentionBasinCloud.add_vertex(wolfvertex(curRT.x,curRT.y))
+            inlet_coords = curRT.get_inletCoords()
+            for cur_inlet in inlet_coords:
+                self.retentionBasinCloud.add_vertex(wolfvertex(cur_inlet[0],cur_inlet[1]))
+
+    def get_retentionbasin_zones(self)-> Zones:
+        """ This method returns a Zones instance of the retention basins. """
+        
+        zones = Zones()
+        for curRB in self.retentionBasinDict.values():
+            curRB:RetentionBasin
+            zones.add_zone(curRB.get_zone(), forceparent=True)
+
+        return zones
 
 
     def link_objects(self):
@@ -1367,7 +1411,7 @@ class Catchment:
                 excelData[0].append(self.topologyDict[level][curBasin].x)
                 excelData[1].append(self.topologyDict[level][curBasin].y)
                 for curChar in self.topologyDict[level][curBasin].mainCharactDict:
-                    excelData[iChar].append(self.topologyDict[level][curBasin].mainCharactDict[curChar][key_Param.VALUE])
+                    excelData[iChar].append(self.topologyDict[level][curBasin].mainCharactDict[curChar]["value"])
                     iChar += 1
                 iBasin += 1
 
@@ -1416,10 +1460,10 @@ class Catchment:
             endFileName = "rain.hyeto"
             for element in self.hyetoDict['Ordered To Nb']:
                 nbToRead = self.hyetoDict['Ordered To Nb'][element]
-                fileName = os.path.join(beginFileName, nbToRead, endFileName)
+                fileName = os.path.join(beginFileName, nbToRead+ endFileName)
                 isOk, fileName = check_path(fileName, applyCWD=True)
                 if isOk<0:
-                    print("WARNING: could not find any dbf file! ")
+                    # print("WARNING: could not find any dbf file! ")
                     time_mod.sleep(.5)
                     return
                 [time, rain] = self.get_hyeto(fileName)
@@ -1803,6 +1847,46 @@ class Catchment:
                 # paramsInput.ApplytoMemory(None)
                 paramsInput.SavetoFile(None)
 
+    
+    def _correct_Umax_from_old_model(self, adapt_with_rain:bool=True):
+        fileName = "simul_soil.param"
+        which="Umax"
+
+        for iBasin in range(1,len(self.subBasinDict)+1):
+            myBasin = self.subBasinDict[iBasin]
+            dirID = myBasin.iDSorted
+
+            fileToModif = os.path.join(self.workingDir, "Subbasin_" + str(dirID), fileName)
+
+            paramsInput = Wolf_Param(to_read=False,toShow=False)
+            paramsInput.ReadFile(fileToModif)
+            
+            if adapt_with_rain:
+                myInterval = paramsInput.get_param("Distributed production model parameters", "Time span soil", default_value=0.0)
+                if myInterval==0.0:
+                    nbIntervals = len(myBasin.myRain)-1
+                else:
+                    nbIntervals = math.floor(myInterval/myBasin.deltaT)
+                kernel = np.ones(nbIntervals)
+                volRain = np.convolve(myBasin.myRain, kernel)*myBasin.deltaT/3600.0
+                maxRain = np.max(volRain)
+            else:
+                maxRain = paramsInput.get_param("Distributed production model parameters", "Umax")
+                if maxRain==0.0:
+                    logging.warning("The Umax is not adapted with the rain and its value is 0.0. It might be better to put 'adapt_with_rain' to True.")
+
+            k = paramsInput.get_param("Horton parameters", "k", default_value=0.0)
+            if k==0.0:
+                continue
+            
+            U_max = maxRain/k
+
+            paramsInput.change_param("Distributed production model parameters", which, U_max)
+            paramsInput.change_param("Horton parameters", "k", 0.0)
+
+            # paramsInput.ApplytoMemory(None)
+            paramsInput.SavetoFile(None)
+
 
 
     def plot_all_diff_cumulRain_with_lagtime(self, interval, lagTime, selection_by_iD=[], graph_title="", show=True, writeDir="", lawNetRain=0, netRainParams={}):
@@ -1856,7 +1940,7 @@ class Catchment:
             directory = self.paramsInput.get_param("Measuring stations SPW", "Directory")
             isOk, directory = check_path(directory, self.workingDir)
             if isOk<0:
-                print("ERROR : measuring station data path not present! ")
+                logging.error(_("ERROR : measuring station data path not present! "))
             fileName = os.path.join(directory, self.paramsInput.get_param("Measuring stations SPW", "Filename")) 
 
 
@@ -1869,7 +1953,7 @@ class Catchment:
                 for raw in data_reader:
                     list_data.append(raw)
         else:
-            print("ERROR : measuring station data file not present! ")
+            logging.error(_("ERROR : measuring station data file not present! "))
             return
 
         # Building dictionnary