wolfhece 1.8.12__py3-none-any.whl → 2.0.0__py3-none-any.whl

wolfhece/drawing_obj.py

@@ -1,4 +1,5 @@
 from wx import App
+import logging
 
 from .PyTranslate import _
 
@@ -21,9 +22,26 @@ class Element_To_Draw:
         self.mapviewer = mapviewer  # WolfMapViewer instance attached to the object
         self.wx_exists = App.Get() is not None  # test if wx App is running
 
+        self._filename:str = ''
+
         if need_for_wx and (not self.wx_exists):
             raise NameError(_('wx App is not running or you need it --> check your code and retry !'))
 
+    #FIXME : checked and plotted are the same thing ??
+    @property
+    def checked(self) -> bool:
+        """
+        Return the checked status.
+        """
+        return self.plotted
+
+    @checked.setter
+    def checked(self, value:bool) -> None:
+        """
+        Set the checked status.
+        """
+        self.plotted = value
+
     def get_mapviewer(self):
         """
         Return the mapviewer
@@ -48,6 +66,13 @@ class Element_To_Draw:
         """
         self.plotted = False
 
+    def show_properties(self):
+        """
+        Generic function to show properties of the object
+        """
+        logging.warning('No properties to show for this object !')
+        pass
+
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
         Plot data in OpenGL context

wolfhece/hydrology/Catchment.py

@@ -176,9 +176,9 @@ class Catchment:
 
         # Get the number of subbasins
         try:
-            self.nbSubBasin = int(self.paramsInput.myparams['Semi distributed model']['How many?']['value']) + 1 # +1 because the outlet is also counted
+            self.nbSubBasin = int(self.paramsInput.myparams['Semi distributed model']['How many?'][key_Param.VALUE]) + 1 # +1 because the outlet is also counted
         except:
-            self.nbSubBasin = int(self.paramsInput.myparams_default['Semi distributed model']['How many?']['value']) + 1 # +1 because the outlet is also counted
+            self.nbSubBasin = int(self.paramsInput.myparams_default['Semi distributed model']['How many?'][key_Param.VALUE]) + 1 # +1 because the outlet is also counted
 
         # Fill the dictionary containing the id of the sorted subbasin returned by the Fortran code
         self.init_dictIdConversion(self.workingDir)
@@ -199,7 +199,7 @@ class Catchment:
         # TO DO: Check how the rain is read for the first time
 
         # Get the hydrology model used (1-linear reservoir, 2-VHM, 3-Unit Hydrograph)
-        self.myModel = int(self.paramsInput.myparams['Model Type']['Type of hydrological model']['value'])
+        self.myModel = int(self.paramsInput.myparams['Model Type']['Type of hydrological model'][key_Param.VALUE])
 
         # Save the stations SPW characteristics in a dictionnary
         self.read_measuring_stations_SPW()
@@ -333,8 +333,8 @@ class Catchment:
             NB : If any change in the convention is mentionned in the comment following the dates the code will return an error
                 Otherwise, no procedure will warn the user that a converntion is modified.
         """
-        commentRead1 = self.paramsInput.myparams_default['Temporal Parameters']['Start date time']['comment']
-        commentRead2 = self.paramsInput.myparams_default['Temporal Parameters']['End date time']['comment']
+        commentRead1 = self.paramsInput.myparams_default['Temporal Parameters']['Start date time'][key_Param.COMMENT]
+        commentRead2 = self.paramsInput.myparams_default['Temporal Parameters']['End date time'][key_Param.COMMENT]
         if (commentRead1.replace(' ', '') != 'Startdate[YYYYMMDD-HHMMSS]'):
             print("ERROR: The convention in the start date is different from the one treated in this code. Please change it or modify the function get_time().")
             sys.exit()
@@ -342,16 +342,16 @@ class Catchment:
             print("ERROR:The convention in the end date is different from the one treated in this code. Please change it or modify the function get_time().")
             sys.out()
         try:
-            dateRead1 = self.paramsInput.myparams['Temporal Parameters']['Start date time']['value']
+            dateRead1 = self.paramsInput.myparams['Temporal Parameters']['Start date time'][key_Param.VALUE]
         except:
-            dateRead1 = self.paramsInput.myparams_default['Temporal Parameters']['Start date time']['value']
+            dateRead1 = self.paramsInput.myparams_default['Temporal Parameters']['Start date time'][key_Param.VALUE]
 
         try:
-            dateRead2 = self.paramsInput.myparams['Temporal Parameters']['End date time']['value']
+            dateRead2 = self.paramsInput.myparams['Temporal Parameters']['End date time'][key_Param.VALUE]
         except:
-            dateRead2 = self.paramsInput.myparams_default['Temporal Parameters']['End date time']['value']
+            dateRead2 = self.paramsInput.myparams_default['Temporal Parameters']['End date time'][key_Param.VALUE]
         tzDelta = datetime.timedelta(hours=self.tz)
-        self.deltaT = float(self.paramsInput.myparams['Temporal Parameters']['Time step']['value'])
+        self.deltaT = float(self.paramsInput.myparams['Temporal Parameters']['Time step'][key_Param.VALUE])
         self.dateBegin = datetime.datetime(year=int(dateRead1[0:4]), month=int(dateRead1[4:6]), day=int(dateRead1[6:8]), hour=int(dateRead1[9:11]), minute=int(dateRead1[11:13]), second=int(dateRead1[13:15]),  microsecond=0, tzinfo=datetime.timezone.utc)
         self.dateBegin -= tzDelta
         self.dateEnd = datetime.datetime(year=int(dateRead2[0:4]), month=int(dateRead2[4:6]), day=int(dateRead2[6:8]), hour=int(dateRead2[9:11]), minute=int(dateRead2[11:13]), second=int(dateRead2[13:15]),  microsecond=0, tzinfo=datetime.timezone.utc)
@@ -461,20 +461,20 @@ class Catchment:
         for counter in range(1, self.nbSubBasin):
             tmpNameParam = 'Interior point '+ str(counter)
             if('X' in self.paramsInput.myparams[tmpNameParam] and 'Y' in self.paramsInput.myparams[tmpNameParam]):
-                x = float(self.paramsInput.myparams[tmpNameParam]['X']['value'])
-                y = float(self.paramsInput.myparams[tmpNameParam]['Y']['value'])
+                x = float(self.paramsInput.myparams[tmpNameParam]['X'][key_Param.VALUE])
+                y = float(self.paramsInput.myparams[tmpNameParam]['Y'][key_Param.VALUE])
             elif("Station Code" in self.paramsInput.myparams[tmpNameParam]):
-                stationCode = self.paramsInput.myparams[tmpNameParam]["Station Code"]['value']
+                stationCode = self.paramsInput.myparams[tmpNameParam]["Station Code"][key_Param.VALUE]
                 x = self.myStationsDict[int(stationCode)]["X"]
                 y = self.myStationsDict[int(stationCode)]["Y"]
             elif("Station Name" in self.paramsInput.myparams[tmpNameParam]):
-                stationName = self.paramsInput.myparams[tmpNameParam]["Station Name"]['value']
+                stationName = self.paramsInput.myparams[tmpNameParam]["Station Name"][key_Param.VALUE]
                 x = self.myStationsDict[stationName]["X"]
                 y = self.myStationsDict[stationName]["Y"]
             else:
                 print("ERROR: Impossible to indentify the position of the interior points! Please check your param file!")
                 sys.exit()
-            
+
             mysubxy=wolfvertex(x,y)
             self.iP_Cloud.add_vertex(mysubxy)
 
@@ -491,21 +491,21 @@ class Catchment:
         counter += 1
         tmpNameParam = 'Outlet Coordinates'
         if('X' in self.paramsInput.myparams[tmpNameParam] and 'Y' in self.paramsInput.myparams[tmpNameParam]):
-            x = float(self.paramsInput.myparams[tmpNameParam]['X']['value'])
-            y = float(self.paramsInput.myparams[tmpNameParam]['Y']['value'])
+            x = float(self.paramsInput.myparams[tmpNameParam]['X'][key_Param.VALUE])
+            y = float(self.paramsInput.myparams[tmpNameParam]['Y'][key_Param.VALUE])
         elif("Station Code" in self.paramsInput.myparams[tmpNameParam]):
-            stationCode = self.paramsInput.myparams[tmpNameParam]["Station Code"]['value']
+            stationCode = self.paramsInput.myparams[tmpNameParam]["Station Code"][key_Param.VALUE]
             x = self.myStationsDict[int(stationCode)]["X"]
             y = self.myStationsDict[int(stationCode)]["Y"]
         elif("Station Name" in self.paramsInput.myparams[tmpNameParam]):
-            stationName = self.paramsInput.myparams[tmpNameParam]["Station Name"]['value']
+            stationName = self.paramsInput.myparams[tmpNameParam]["Station Name"][key_Param.VALUE]
             x = self.myStationsDict[stationName]["X"]
             y = self.myStationsDict[stationName]["Y"]
         else:
             print("ERROR: Impossible to indentify the position of the interior points! Please check your param file!")
             sys.exit()
-        # x = float(self.paramsInput.myparams[tmpNameParam]['X']['value'])
-        # y = float(self.paramsInput.myparams[tmpNameParam]['Y']['value'])
+        # x = float(self.paramsInput.myparams[tmpNameParam]['X'][key_Param.VALUE])
+        # y = float(self.paramsInput.myparams[tmpNameParam]['Y'][key_Param.VALUE])
         idSorted = self.catchmentDict['dictIdConversion'][counter]
         cur_outlet:wolfvertex = self.subBasinCloud.myvertices[idSorted-1]["vertex"]
         # self.subBasinDict[counter] = SubBasin(counter, self.time, self.workingDir, self.hyeto, x, y, idSorted)
@@ -523,10 +523,10 @@ class Catchment:
         # Creates RB and checking if the topo file contains only these types of junction
         for element in self.paramsTopology.myparams:
             # If Subbasin:
-            if(self.paramsTopology.myparams[element]['type']['value'] == 'Subbasin'):
-                idBasin = int(self.paramsTopology.myparams[element]['number']['value'].replace('ss', ''))
-                nameBasin = self.paramsTopology.myparams[element]['name']['value']
-                inletsString = self.paramsTopology.myparams[element]['inlets']['value'].strip()
+            if(self.paramsTopology.myparams[element]['type'][key_Param.VALUE] == 'Subbasin'):
+                idBasin = int(self.paramsTopology.myparams[element]['number'][key_Param.VALUE].replace('ss', ''))
+                nameBasin = self.paramsTopology.myparams[element]['name'][key_Param.VALUE]
+                inletsString = self.paramsTopology.myparams[element]['inlets'][key_Param.VALUE].strip()
                 # Save the name of the basin
                 self.subBasinDict[idBasin].add_name(nameBasin)
                 # Check if the subbasin have inlets or not => if not can be on the first layer of the topology tree.
@@ -537,28 +537,28 @@ class Catchment:
                 # Save the element of the subbasin dictionnary also in the global Cachment dictionnary with 'ss' prefix
                 # -> First free the object aleady created with the 'ss' prefix
                 # Therefore a subbasin with several inputs can be called in the Catchment dictionnary with prefix 'J' or 'ss' or the name of the station
-                self.catchmentDict[self.paramsTopology.myparams[element]['number']['value']] = None
-                self.catchmentDict[self.paramsTopology.myparams[element]['number']['value']] = self.subBasinDict[idBasin]
-                self.junctionNamesDict[self.paramsTopology.myparams[element]['name']['value']] = element
+                self.catchmentDict[self.paramsTopology.myparams[element]['number'][key_Param.VALUE]] = None
+                self.catchmentDict[self.paramsTopology.myparams[element]['number'][key_Param.VALUE]] = self.subBasinDict[idBasin]
+                self.junctionNamesDict[self.paramsTopology.myparams[element]['name'][key_Param.VALUE]] = element
             # If RB:
-            elif(self.paramsTopology.myparams[element]['type']['value'] == 'RB'):
+            elif(self.paramsTopology.myparams[element]['type'][key_Param.VALUE] == 'RB'):
                 idBasin = element
                 # Save the name of the RB
-                nameBasin = self.paramsTopology.myparams[element]['name']['value']
+                nameBasin = self.paramsTopology.myparams[element]['name'][key_Param.VALUE]
                 # Create the RB object
-                typeOfRB = self.paramsTopology.myparams[element]['type of RB']['value']
+                typeOfRB = self.paramsTopology.myparams[element]['type of RB'][key_Param.VALUE]
                 # Outlet names if present
                 myOutletsNames = []
-                self.junctionNamesDict[self.paramsTopology.myparams[element]['name']['value']] = element
+                self.junctionNamesDict[self.paramsTopology.myparams[element]['name'][key_Param.VALUE]] = element
                 try:
-                    nbOutlets = int(self.paramsTopology.myparams[element]['nb outlets']['value'])
+                    nbOutlets = int(self.paramsTopology.myparams[element]['nb outlets'][key_Param.VALUE])
                 except:
                     nbOutlets = 0
                     myOutletsNames.append(element)
 
                 for iOutlet in range(nbOutlets):
-                    myOutletsNames.append(self.paramsTopology.myparams[element]["outlet "+str(iOutlet+1)]['value'])
-                    self.junctionNamesDict[self.paramsTopology.myparams[element]["outlet "+str(iOutlet+1)]['value']] = element
+                    myOutletsNames.append(self.paramsTopology.myparams[element]["outlet "+str(iOutlet+1)][key_Param.VALUE])
+                    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
@@ -589,11 +589,11 @@ class Catchment:
 
 
         for element in self.paramsTopology.myparams:
-            if(self.paramsTopology.myparams[element]['type']['value'] == 'RB'):
+            if(self.paramsTopology.myparams[element]['type'][key_Param.VALUE] == 'RB'):
                 # Case 1) inlets
                 if('inlets' in self.paramsTopology.myparams[element]):
                     # Split the string at each ',' in several smaller strings
-                    tmpString = self.paramsTopology.myparams[element]['inlets']['value'].split(',')
+                    tmpString = self.paramsTopology.myparams[element]['inlets'][key_Param.VALUE].split(',')
                     # Loop on the strings representing the inlets
                     for i in range(len(tmpString)):
                         # Remove leading and trailing white spaces
@@ -626,9 +626,9 @@ class Catchment:
                             # This variable count the number of iteration to see if all are used.
                             nbInter += 1
                             # if the inlet is a subbasin:
-                            if(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'Subbasin'):
+                            if(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'Subbasin'):
                                 nbSub += 1
-                                iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number']['value'].replace('ss', ''))
+                                iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number'][key_Param.VALUE].replace('ss', ''))
                                 # A same subbasin cannot be used twice
                                 if(self.subBasinDict[iDSub].alreadyUsed):
                                     print("ERROR: a subbasin has already been used. Please check the topology file!")
@@ -643,7 +643,7 @@ class Catchment:
                                 else:
                                     self.subBasinDict[iDSub].increment_level()
                             # if the inlet is a RB:
-                            elif(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'RB'):
+                            elif(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'RB'):
                                 # A RB can be used used twice
                                 if(self.retentionBasinDict[tmpString[i]].alreadyUsed):
                                     # print("ERROR: this RB was already used! Please check the topo file.")
@@ -660,9 +660,9 @@ class Catchment:
                             # This variable count the number of iteration to see if all are used.
                             nbInter += 1
                             # if the inlet is a subbasin:
-                            if(self.paramsTopology.myparams[junctionName]['type']['value'] == 'Subbasin'):
+                            if(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'Subbasin'):
                                 nbSub += 1
-                                iDSub = int(self.paramsTopology.myparams[junctionName]['number']['value'].replace('ss', ''))
+                                iDSub = int(self.paramsTopology.myparams[junctionName]['number'][key_Param.VALUE].replace('ss', ''))
                                 # A same subbasin cannot be used twice
                                 if(self.subBasinDict[iDSub].alreadyUsed):
                                     print("ERROR: a subbasin has already been used. Please check the topology file!")
@@ -677,22 +677,22 @@ class Catchment:
                                 else:
                                     self.subBasinDict[iDSub].increment_level()
                             # if the inlet is a RB:
-                            elif(self.paramsTopology.myparams[junctionName]['type']['value'] == 'RB'):
+                            elif(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'RB'):
                                 # Check delta time applied to all exits
                                 tmpNbOutlets = 1
                                 deltaTime = 0.0
                                 if('nb outlets' in self.paramsTopology.myparams[junctionName]):
-                                    tmpNbOutlets = int(self.paramsTopology.myparams[junctionName]['nb outlets']['value'])
+                                    tmpNbOutlets = int(self.paramsTopology.myparams[junctionName]['nb outlets'][key_Param.VALUE])
                                     if(tmpNbOutlets>1):
                                         for iOutlets in range(tmpNbOutlets):
-                                            if(self.paramsTopology.myparams[junctionName]['outlet '+str(iOutlets+1)]['value']==tmpString[i]):
+                                            if(self.paramsTopology.myparams[junctionName]['outlet '+str(iOutlets+1)][key_Param.VALUE]==tmpString[i]):
                                                 try:
-                                                    deltaTime = float(self.paramsTopology.myparams[junctionName]['delta time '+str(iOutlets+1)]['value'])
+                                                    deltaTime = float(self.paramsTopology.myparams[junctionName]['delta time '+str(iOutlets+1)][key_Param.VALUE])
                                                 except:
                                                     deltaTime = 0.0
 
                                     elif('delta time 1' in self.paramsTopology.myparams[junctionName]):
-                                        deltaTime = float(self.paramsTopology.myparams[junctionName]['delta time 1']['value'])
+                                        deltaTime = float(self.paramsTopology.myparams[junctionName]['delta time 1'][key_Param.VALUE])
 
                                 # A RB can be used used twice
                                 if(self.retentionBasinDict[junctionName].alreadyUsed):
@@ -709,7 +709,7 @@ class Catchment:
                             sys.exit()
                 # Case 2 : same procedure but for the flux entering the directly in RB
                 if('direct inside RB' in self.paramsTopology.myparams[element]):
-                    tmpString = self.paramsTopology.myparams[element]['direct inside RB']['value'].split(',')
+                    tmpString = self.paramsTopology.myparams[element]['direct inside RB'][key_Param.VALUE].split(',')
                     for i in range(len(tmpString)):
                         tmpString[i]= tmpString[i].strip()
                         # Save the dowstream link of each element in the dictionnary
@@ -730,9 +730,9 @@ class Catchment:
                                 self.subBasinDict[iDSub].increment_level()
                         elif(tmpString[i][0] == 'J' and (tmpString[i] in self.paramsTopology.myparams)):
                             nbInter += 1
-                            if(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'Subbasin'):
+                            if(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'Subbasin'):
                                 nbSub += 1
-                                iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number']['value'].replace('ss', ''))
+                                iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number'][key_Param.VALUE].replace('ss', ''))
                                 if(self.subBasinDict[iDSub].alreadyUsed):
                                     print("ERROR: a subbasin has already been used. Please check the topology file!")
                                     sys.exit()
@@ -744,7 +744,7 @@ class Catchment:
                                 else:
                                     self.subBasinDict[iDSub].increment_level()
 
-                            elif(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'RB'):
+                            elif(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'RB'):
                                 if(self.retentionBasinDict[tmpString[i]].alreadyUsed):
                                     # print("ERROR: a RB has aleady been used! Please check your topo file.")
                                     # sys.exit()
@@ -760,9 +760,9 @@ class Catchment:
                             junctionName = self.junctionNamesDict[tmpString[i]]
 
                             nbInter += 1
-                            if(self.paramsTopology.myparams[junctionName]['type']['value'] == 'Subbasin'):
+                            if(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'Subbasin'):
                                 nbSub += 1
-                                iDSub = int(self.paramsTopology.myparams[junctionName]['number']['value'].replace('ss', ''))
+                                iDSub = int(self.paramsTopology.myparams[junctionName]['number'][key_Param.VALUE].replace('ss', ''))
                                 if(self.subBasinDict[iDSub].alreadyUsed):
                                     print("ERROR: a subbasin has already been used. Please check the topology file!")
                                     sys.exit()
@@ -774,7 +774,7 @@ class Catchment:
                                 else:
                                     self.subBasinDict[iDSub].increment_level()
 
-                            elif(self.paramsTopology.myparams[junctionName]['type']['value'] == 'RB'):
+                            elif(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'RB'):
                                 if(self.retentionBasinDict[junctionName].alreadyUsed):
                                     # print("ERROR: a RB has aleady been used! Please check your topo file.")
                                     # sys.exit()
@@ -787,9 +787,9 @@ class Catchment:
                             sys.exit()
             # If the intersection is a subbasin, same procedure as for the RB, exept that no direct flux
             # are considered anymore.
-            elif(self.paramsTopology.myparams[element]['type']['value'] == 'Subbasin'):
-                elementId =  int(self.paramsTopology.myparams[element]['number']['value'].replace('ss', ''))
-                tmpString = self.paramsTopology.myparams[element]['inlets']['value'].split(',')
+            elif(self.paramsTopology.myparams[element]['type'][key_Param.VALUE] == 'Subbasin'):
+                elementId =  int(self.paramsTopology.myparams[element]['number'][key_Param.VALUE].replace('ss', ''))
+                tmpString = self.paramsTopology.myparams[element]['inlets'][key_Param.VALUE].split(',')
                 # If there are no inlet labelled by "--", add it on the first level
                 if(len(tmpString)==1 and tmpString[0].strip()=='--'):
                     # self.topologyDict['Level 1'][element] = self.subBasinDict[elementId]
@@ -814,9 +814,9 @@ class Catchment:
                             self.subBasinDict[iDSub].increment_level()
                     elif tmpString[i][0] == 'J' and (tmpString[i] in self.paramsTopology.myparams):
                         nbInter += 1
-                        if(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'Subbasin'):
+                        if(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'Subbasin'):
                             nbSub += 1
-                            iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number']['value'].replace('ss', ''))
+                            iDSub = int(self.paramsTopology.myparams[tmpString[i]]['number'][key_Param.VALUE].replace('ss', ''))
                             if(self.subBasinDict[iDSub].alreadyUsed):
                                 print("ERROR: a subbasin has already been used. Please check the topology file!")
                                 sys.exit()
@@ -827,7 +827,7 @@ class Catchment:
                                 self.topologyDict['Level 1'][tmpString[i]] = self.subBasinDict[iDSub]
                             elif(self.subBasinDict[iDSub].myLevel == 1):
                                 self.subBasinDict[iDSub].increment_level()
-                        elif(self.paramsTopology.myparams[tmpString[i]]['type']['value'] == 'RB'):
+                        elif(self.paramsTopology.myparams[tmpString[i]]['type'][key_Param.VALUE] == 'RB'):
                             if(self.retentionBasinDict[tmpString[i]].alreadyUsed):
                                 print("ERROR: a RB has already been used! Please check your topo file.")
                                 sys.exit()
@@ -841,9 +841,9 @@ class Catchment:
                         junctionName = self.junctionNamesDict[tmpString[i]]
 
                         nbInter += 1
-                        if(self.paramsTopology.myparams[junctionName]['type']['value'] == 'Subbasin'):
+                        if(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'Subbasin'):
                             nbSub += 1
-                            iDSub = int(self.paramsTopology.myparams[junctionName]['number']['value'].replace('ss', ''))
+                            iDSub = int(self.paramsTopology.myparams[junctionName]['number'][key_Param.VALUE].replace('ss', ''))
                             if(self.subBasinDict[iDSub].alreadyUsed):
                                 print("ERROR: a subbasin has already been used. Please check the topology file!")
                                 sys.exit()
@@ -854,7 +854,7 @@ class Catchment:
                                 self.topologyDict['Level 1'][junctionName] = self.subBasinDict[iDSub]
                             elif(self.subBasinDict[iDSub].myLevel == 1):
                                 self.subBasinDict[iDSub].increment_level()
-                        elif(self.paramsTopology.myparams[junctionName]['type']['value'] == 'RB'):
+                        elif(self.paramsTopology.myparams[junctionName]['type'][key_Param.VALUE] == 'RB'):
                             if(self.retentionBasinDict[junctionName].alreadyUsed):
                                 print("ERROR: a RB has already been used! Please check your topo file.")
                                 sys.exit()
@@ -1361,7 +1361,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]['value'])
+                    excelData[iChar].append(self.topologyDict[level][curBasin].mainCharactDict[curChar][key_Param.VALUE])
                     iChar += 1
                 iBasin += 1
 
@@ -1784,7 +1784,7 @@ class Catchment:
                 except:
                     nbIntervals = len(myBasin.myRain)-1
 
-                # ['Semi distributed model']['How many?']['value']
+                # ['Semi distributed model']['How many?'][key_Param.VALUE]
 
                 maxRain = 0.0
                 for iel in range(len(myBasin.myRain)-nbIntervals):
@@ -1792,7 +1792,7 @@ class Catchment:
                     if maxRain < mySum:
                         maxRain = mySum
 
-                paramsInput.myparams["Distributed production model parameters"][which]['value'] = maxRain
+                paramsInput.myparams["Distributed production model parameters"][which][key_Param.VALUE] = maxRain
 
                 # paramsInput.ApplytoMemory(None)
                 paramsInput.SavetoFile(None)
@@ -1817,7 +1817,7 @@ class Catchment:
         if(show):
             plt.show()
 
-    
+
     def get_all_cumulRain(self, selection_by_iD=[]) -> tuple[np.array, list[np.array]]:
         '''
 
@@ -1834,7 +1834,7 @@ class Catchment:
                     curBasin:SubBasin = self.subBasinDict[iBasin]
                     list_rain.append(curBasin.cumul_rain)
 
-        
+
         return self.time, list_rain
 
 
@@ -2374,9 +2374,9 @@ class Catchment:
 
 
     def get_sub_Nash(self, measure:SubBasin,
-                     selection_by_iD, 
+                     selection_by_iD,
                      intervals:list[tuple[datetime.datetime]]=[]):
-        
+
         # for element in selection_by_iD:
         #     junctionKey = self.get_key_catchmentDict(name=element)
         #     if junctionKey in self.subBasinDict:
@@ -2388,22 +2388,22 @@ class Catchment:
             ns = curSub.evaluate_Nash(measure=measure, intervals=intervals)
 
         return ns
-    
 
 
-    def get_sub_peak(self, selection_by_iD, 
+
+    def get_sub_peak(self, selection_by_iD,
                      intervals:list[tuple[datetime.datetime]]=[]):
-        
+
         junctionKey = self.get_key_catchmentDict(name=selection_by_iD)
         if junctionKey in self.catchmentDict:
             curSub:SubBasin = self.catchmentDict[junctionKey]
             ns = curSub.get_peak(intervals=intervals)
-            
+
         return ns
-    
+
 
     def set_eff_outlet_coord(self):
-        
+
         all_nodes = [self.charact_watrshd.find_rivers(whichsub=ii+1)[0][0] for ii in range(self.nbSubBasin)]
         for el in all_nodes:
             el:Node_Watershed
@@ -2416,7 +2416,7 @@ class Catchment:
     def update_charact_watrshd(self):
         if self.charact_watrshd.to_update_times:
             self.charact_watrshd.update_times(self.time_wolf_array)
-    
+
 
     def make_nd_array(self, c_pointer, shape, dtype=np.float64, order='C', own_data=True,readonly=False):
         arr_size = np.prod(shape[:]) * np.dtype(dtype).itemsize