wolfhece 1.8.8__py3-none-any.whl → 1.8.9__py3-none-any.whl

wolfhece/hydrology/RetentionBasin.py

@@ -27,7 +27,7 @@ class RetentionBasin():
     surfaceDrainedHydro:float # TO BUILD !!!!!!!!!!!!!!
     filledVolume:np.ndarray
 
-    def __init__(self, _dateBegin, _dateEnd, _deltaT, _time=[], _id='J1', _name='Default name', _type='', _dictRB={}, _directDictRB={}, _tz=0, _outletNames=[], withRBDict=True, _workingDir=""):
+    def __init__(self, _dateBegin, _dateEnd, _deltaT, _time=None, _id='J1', _name='Default name', _type='', _dictRB={}, _directDictRB={}, _tz=0, _outletNames=[], withRBDict=True, _workingDir=""):
         print('Creation of a RetentionBasin!')
         self.iD = _id
         self.name = _name
@@ -65,12 +65,12 @@ class RetentionBasin():
 
         # inlets and outlets
         self.intletsObj = {}
-        self.inlets = []
-        self.inletsRaw = []
+        self.inlets = None
+        self.inletsRaw = None
 
         self.directFluxObj = {}
-        self.directFluxInRB = []
-        self.directFluxInRB_Raw = []
+        self.directFluxInRB = None
+        self.directFluxInRB_Raw = None
         self.downstreamObj = {}
         self._outFlow = {}
         if(_outletNames != []):
@@ -1213,7 +1213,7 @@ class RetentionBasin():
             sys.exit()
         # Save time array if it does not exist yet
         # Otherwise, check the consistency of the array with the time array of the object
-        if(self.time==[]):
+        if(self.time is None):
             self.time=timeArray
         elif(self.time.all()!=timeArray.all()):
             print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")

wolfhece/hydrology/SubBasin.py

@@ -132,7 +132,7 @@ class SubBasin:
         self.isActivated = True
         ## Time array containing all the timestamps
         # @var time timestamps array of dimension equal to rain and evap (or 1 element more than myHydro so far (VHM but not UH)).
-        self.time = []
+        self.time = None
 
         self.dateBegin = _dateBegin     # Must be in GMT+0 !!!
         self.dateEnd = _dateEnd         # Must be in GMT+0 !!!
@@ -159,8 +159,8 @@ class SubBasin:
         self.myHydro = []                           # [m^3/s] Hydro of the subbasin only -> UPDATE: [mm/h]!!!!!
 
         self.intletsObj = {}
-        self.inlets = []
-        self.inletsRaw = []
+        self.inlets = None
+        self.inletsRaw = None
         self.downstreamObj = {}
 
         ## @var outFlow
@@ -171,15 +171,15 @@ class SubBasin:
         # self.outFlowRaw = []                        # [m^3/s]
         # Hyeto
         self.myHyetoDict = {}
-        self.myRain = []                            # [mm/h]   Caution in the difference of units in rain !!!!!!
+        self.myRain = None                          # [mm/h]   Caution in the difference of units in rain !!!!!!
         self.rain = []                              # [m^3/h]  Caution in the difference of units in rain !!!!!!
         # Evapotranspiration
-        self.myEvap = []                            # [mm/h]
-        self.evap = []                              # [mm/h]
+        self.myEvap = None                          # [mm/h]
+        self.evap = None                            # [mm/h]
         # Temperature
-        self.myTemp = []
+        self.myTemp = None
         # Outflow converted in hystograph
-        self.hydrograph = []        # //
+        self.hydrograph = None        # //
         # self.hystograph = []
 
         # Main subbasin characteristics
@@ -216,7 +216,7 @@ class SubBasin:
             self.init_timeDelay()
         if(readHydro):
             timeTest, self.myHydro = self.get_hydro(self.iDSorted, _workingDir, tzDelta=datetime.timedelta(hours=self.tz))
-            if(self.time==[]):
+            if(self.time is None):
                 self.time = timeTest
             else:
                 if not(np.array_equal(timeTest,self.time)):
@@ -333,7 +333,7 @@ class SubBasin:
                 sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif(self.time!=timeArray):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -456,7 +456,7 @@ class SubBasin:
                 sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif((self.time!=timeArray).all()):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -583,7 +583,7 @@ class SubBasin:
                 sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif((self.time!=timeArray).all()):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -710,7 +710,7 @@ class SubBasin:
                 sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif((self.time!=timeArray).all()):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -810,7 +810,7 @@ class SubBasin:
                 sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif(self.time!=timeArray):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -883,7 +883,7 @@ class SubBasin:
                 # sys.exit()
             # Save time array if it does not exist yet
             # Otherwise, check the consistency of the array with the time array of the object
-            if(self.time==[]):
+            if(self.time is None):
                 self.time=timeArray
             elif(self.time!=timeArray):
                 print("ERROR: the dates read are not consitent with the dates already recored in this subbasin!")
@@ -1154,7 +1154,7 @@ class SubBasin:
             print("Date timestamp expected = ", self.dateEnd)
             sys.exit()
         # Save the time if it does not exist yet
-        if(self.time==[]):
+        if(self.time is None):
             self.time=time
             print("Time didn't exist before, therefore it is save now according to rain data time serie!")
 
@@ -1239,7 +1239,7 @@ class SubBasin:
             print("Date expected = ", self.dateEnd)
             sys.exit()
         # Save the time if it does not exist yet
-        if(self.time==[]):
+        if(self.time is None):
             self.time=time
             print("Time didn't exist before, therefore it is saved now according to rain data time serie!")
         elif not(np.array_equal(time,self.time)):
@@ -1311,7 +1311,7 @@ class SubBasin:
             print("Delta t read = ", diffTimeInSeconds)
             print("Delta t expected = ", self.deltaT)
             sys.exit()
-        if(self.time==[]):
+        if(self.time is None):
             self.time = time
         elif not(np.array_equal(time,self.time)):
             print('Time arrays are not the same! Please check your answers.')
@@ -1363,8 +1363,8 @@ class SubBasin:
             else:
                 tzDelta = datetime.timedelta(seconds=tzPlot*3600.0)
                 timeDelayDelta = datetime.timedelta(seconds=self.timeDelay)
-                beginDate = datetime.datetime.fromtimestamp(self.time[0], tz=datetime.timezone.utc)+tzDelta
-                endDate = datetime.datetime.fromtimestamp(self.time[-1], tz=datetime.timezone.utc)+tzDelta
+                beginDate = datetime.datetime.fromtimestamp(self.time[0], tz=datetime.timezone.utc)+tzDelta-timeDelayDelta
+                endDate = datetime.datetime.fromtimestamp(self.time[-1], tz=datetime.timezone.utc)+tzDelta-timeDelayDelta
                 dt = self.time[1]-self.time[0]
                 time_delta = datetime.timedelta(seconds=dt)
                 if(rangeData==[]):
@@ -2370,9 +2370,9 @@ class SubBasin:
         tmpSum = np.zeros(len(myOutFlow)-lastElement)
         y = np.zeros((len(myOutFlow)-lastElement,nbElements))
 
-        y[:,0] = tmpCumul[:-1]
-        y[:,1] = tmpCumul2[:-1]
-        y[:,2] = tmpCumul[:-1] - tmpCumul2[:-1]
+        y[:,0] = tmpCumul[:]
+        y[:,1] = tmpCumul2[:]
+        y[:,2] = tmpCumul[:] - tmpCumul2[:]
 
 
 
@@ -2964,9 +2964,54 @@ class SubBasin:
             logging.error("=================")
 
         return gOutFlow
+    
 
-
-    # FIXME Finish the function below
+    @property
+    def cumul_rain(self) -> np.array:
+        return np.cumsum(self.myRain)
+    
+
+
+    def evaluate_Nash(self, measure,
+                      intervals:list[tuple[datetime.datetime]]=[]) -> list[float]:
+        ns = []
+        
+        if intervals == []:
+            ns.append( datt.evaluate_Nash(self.outFlow, self.time, 
+                                         measures=measure.get_myHydro(), tMeasures=measure.time, 
+                                         dateBegin=self.dateBegin, dateEnd=self.dateEnd) )
+            return tuple(ns)
+        
+        # for el in intervals:
+        #     ns.append( datt.evaluate_Nash(self.outFlow, self.time, 
+        #                                  measures=measure.get_myHydro(), tMeasures=measure.time, 
+        #                                  dateBegin=el[0], dateEnd=el[1]) )
+        ns = [ datt.evaluate_Nash(self.outFlow, self.time, 
+                                  measures=measure.get_myHydro(), tMeasures=measure.time, 
+                                  dateBegin=el[0], dateEnd=el[1])
+              for el in intervals ]
+
+        return tuple(ns)
+    
+
+    def get_peak(self, intervals:list[tuple[datetime.datetime]]=[]) -> list[float]:
+        
+        peak_s = []
+        for element in intervals:
+            # We conisder the indice to form complete intervals
+            simul_i = math.ceil((element[0]-self.dateBegin).total_seconds()/self.deltaT)
+            simul_f = math.floor((element[1]-self.dateBegin).total_seconds()/self.deltaT)
+            # meas_i = math.floor((element[0]-measure.dateBegin).total_seconds/measure.deltaT)
+            # meas_f = math.floor((element[1]-measure.dateBegin).total_seconds/measure.deltaT)
+            if simul_i<0 or simul_f>len(self.time):
+                continue        
+            peak_s.append(self.outFlow[simul_i:simul_f+1].max())
+        
+        return peak_s
+        
+
+
+    # FIXME Finish the function below -> returning all possible or desired internal variables
     # def get_InterVar(self, typeVar:int):
 
     #     if typeVar==

wolfhece/hydrology/data_treatment.py

@@ -461,7 +461,7 @@ def cumul_fromCst(cst, dateBegin, dateEnd, dt, isFlow=False):
 def evaluate_Nash(simul, tSimul, measures, tMeasures, dateBegin, dateEnd, mask=[]):
     """
     Function evaluating the Nash-Suttcliff coeff
-    Caution: So far, if a measure is 0, it is not considered the N-S evaluation.
+    Caution: So far, if a measure is 0, it is not considered in the N-S evaluation.
     """
     # Nash–Sutcliffe model efficiency coefficient
     print("TO CORRECT -> Check 'Hello !'  !!!!!")
@@ -538,10 +538,12 @@ def evaluate_Nash(simul, tSimul, measures, tMeasures, dateBegin, dateEnd, mask=[
         counter = 0
         mask = [False for i in range(nb_el_measures)]
         for i in range(nb_el_measures):
-            if(measures[i]!=0.0):
-                meanMeasures += measures[i]
+            if(measures[first_el_measures+i]!=0.0):
+                meanMeasures += measures[first_el_measures+i]
                 mask[i]= True
                 counter += 1
+        if counter == 0:
+            return 0.0
         meanMeasures = meanMeasures/counter
 
         for i in range(nb_el_measures):

wolfhece/hydrology/plot_hydrology.py

@@ -249,7 +249,6 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
         title = y_labels
 
 
-
     # Plot hydro
     if(nbElements==1):
         if(len(np.shape(y))==1):
@@ -550,7 +549,7 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
                 ax3[i].set_ylabel(y_labelAddPlot[i],color='orange')
             xdatePlotGen = check_drange_bug(xdatePlotGen,y1)
             ax3[i].plot_date(xdatePlotGen,y1, '-', color='orange')
-            ax3[i].set_xlim(rangeData[0]-time_deltaGen,rangeData[1])
+            ax3[i].set_xlim(rangeData[0],rangeData[1]-time_deltaGen)
             if(deltaMajorTicks>0):
                 majorTicks = HourLocator(interval=math.floor(deltaMajorTicks/3600))
                 ax3[i].xaxis.set_major_locator(majorTicks)
@@ -765,4 +764,66 @@ def plot_piechart(data:list, legend:list=[], colors:list=None, figSize:list = [1
     if toShow:
         plt.show()
 
-    return fig
+    return fig
+
+
+def bar_Nash_n_other(all_data:list[dict], all_colors:list[dict], nb_x, nb_data, nb_lines, 
+                     y_titles:list[str]=[], x_titles:list[str]=[], nameModel:list[str]=[], line_names:list[str]=[],
+                     hatchs:list[str]=["/",  ".", "*", "x", "|", "-", "+", "o", "\\"],
+                     writeFile:str="", toShow:bool=False):
+    
+    assert len(hatchs) < 10
+    
+    nb_models = nb_data
+    nb_stations = nb_lines
+    nb_intervals = nb_x
+    type_of_data = y_titles
+    type_of_model = nameModel
+
+    if line_names == []:
+        sorted_keys = all_data[0].keys()
+    else:
+        assert len(line_names) == len(all_data[0].keys())
+        sorted_keys = line_names
+
+    all_names = x_titles
+
+    fig, ax = plt.subplots(nb_stations*2, nb_data)
+
+    x = np.arange(nb_intervals)
+    step = 1.0/nb_intervals
+    sub_x = np.arange(0, 1, step)
+
+
+    for i_int in range(nb_intervals):
+        for i_data in range(nb_data):
+            i_station = 0
+            for k in sorted_keys:
+                cur_ax = ax[i_station*2, i_data]
+                ax[i_station*2+1, i_data].set_axis_off()
+                cur_d = all_data[i_data][k]
+                cur_c = all_colors[i_data][k]  
+                for i_model in range(nb_models):
+                    # y = [cur_d[i_model]]       
+                    cur_ax.bar(x + sub_x[i_model], cur_d[i_model], color = cur_c[i_model], width = step, hatch = hatchs[i_model])
+                cur_ax.set_xticks(x)
+                if i_station == len(sorted_keys)-1:
+                    cur_ax.set_xticklabels(labels=all_names, rotation=10)
+                else:
+                    cur_ax.set_xticklabels(labels=[], rotation=10)
+                
+                if i_station == 0:
+                    cur_ax.set_ylabel(type_of_data[i_data])
+                # cur_ax.legend(labels=type_of_model)
+                cur_ax.set_ylim([-1, 1])
+                cur_ax.set_title(" ".join(["", k]))
+                i_station += 1
+
+    ax_legend  = [plt.bar([0], np.nan, color="w", hatch=hatchs[i], label=type_of_model[i], edgecolor="k") for i in range(len(type_of_model))]
+    # fig.legend(ax_legend, labels=type_of_model)
+    # plt.legend()
+    fig.legend(handlelength=3, handleheight=2, borderpad=2)
+    
+
+    if toShow : 
+        plt.show()

wolfhece/hydrology/read.py

@@ -202,7 +202,7 @@ def is_relative_path(path:str):
 
 
 
-def relative_2_absolute(fileName:str, prefix:str="", applyCWD:bool=True):
+def relative_2_absolute(fileName:str, prefix:str="", applyCWD:bool=True)-> tuple[bool, str] :
 
     info = 0
 
@@ -211,14 +211,14 @@ def relative_2_absolute(fileName:str, prefix:str="", applyCWD:bool=True):
             # prefix = os.path.dirname(__file__)
             prefix = os.getcwd()
         else:
-            logging.error("ERROR : the path is relative but no prefix is given")
+            logging.error("The path is relative but no prefix is given")
             info = -1
             return info
 
     if is_relative_path(fileName):
         finalName = os.path.join(prefix, fileName)
     else:
-        logging.error("This path is not initially a relative path!")
+        logging.warning("This path is not initially a relative path!")
 
         info  = 1
         finalName = fileName
@@ -226,7 +226,7 @@ def relative_2_absolute(fileName:str, prefix:str="", applyCWD:bool=True):
     return info, finalName
 
 
-def check_path(fileName:str, prefix:str="", applyCWD:bool=True):
+def check_path(fileName:str, prefix:str="", applyCWD:bool=True) -> tuple[bool, str] :
 
     info, finalName = relative_2_absolute(fileName, prefix, applyCWD)
     if info<0:

wolfhece/mesh2d/wolf2dprev.py

@@ -684,106 +684,110 @@ class prev_parameters_simul:
                 self.translx = float(lines[1])
                 self.transly = float(lines[2])
 
-        with open(fn + '.par') as f:
-            lines = f.read().splitlines()
+        if exists(fn + '.par'):
 
-            # Lecture des PARAMETRES GLOBAUX
-            # Durée de la simulation et résultats
-            self.npas = np.int64(float(lines[0]))  # nbre de pas de simulation à réaliser
-            self.dur = float(lines[1])  # durée souhaitée d'un pas de temps
-            self.freq = float(lines[2])  # fréquence de sortie des résultats
-            self.ntypefreq = int(lines[3])  # type de fréquence de sortie des résultats (en temps ou en pas)
-            self.ntypewrite = int(lines[4])  # format d'écriture des résultats (1 = texte, 2 = binaire, 3=csr)
-            self.ntyperead = int(lines[5])  # format de lecture des données (1 = texte, 2 = binaire, 3 = binaire par blocs)
-            self.nun_seul_resu = int(lines[6])  # ecriture d'un seul résu ou pas
-            # maillage fin
-            self.dxfin = float(lines[7])  # dx du maillage le + fin = maillage sur lequel sont données
-            self.dyfin = float(lines[8])  # dy    les caract de topo, frot,...
-            self.nxfin = int(lines[9])  # nbre de noeuds selon x du maillage le + fin
-            self.nyfin = int(lines[10])  # y
-            self.xminfin = float(lines[11])  # coordonnées absolues inf droites de la matrice des données
-            self.yminfin = float(lines[12])  # (maillage le plus fin : dxfin et dyfin)
-            # conditions limites
-            self.impfgen = int(lines[13])  # nbre de cl fortes
-            self.impfbxgen = int(lines[14])  # nbre de cl faibles sur les bords x
-            self.impfbygen = int(lines[15])  # nbre de cl faibles sur les bords y
-            # stabilité et schéma
-            self.ponderation = float(lines[16])  # indicateur du type de schéma r-k
-            self.vncsouhaite = float(lines[17])  # nbre de courant souhaité
-            self.mult_dt = float(lines[18])  # facteur mult du pas de temps pour vérif a posteriori
-            self.noptpas = int(lines[19])  # =1 si optimisation du pas de temps
-            self.nmacc = int(lines[20])  # mac cormack ou non
-            # limiteurs
-            self.ntyplimit = int(lines[21])  # 0 si pas de limiteur, 1 si barth jesperson, 2 si venkatakrishnan
-            # 3 si superbee, 4 si van leer, 5 si van albada, 6 si minmod
-            self.vkvenka = float(lines[22])  # k de venkatakrishnan et des limiteurs modifiés
-            # constantes de calcul
-            self.vminhdiv = float(lines[23])  # hauteur min de division
-            self.vminh = float(lines[24])  # hauteur d'eau min sur 1 maille
-            self.vminh2 = float(lines[25])  # hauteur d'eau min sur 1 maille pour la calculer
-            self.nepsrel = int(lines[26])  # epsilon relatif pour la dtm de q nul sur les bords
-            # paramètres de calcul
-            self.nderdec = int(lines[27])  # =2 si dérivées centrées, 1 sinon
-            self.npentecentree = int(lines[28])  # pente centrée ou non
-            self.vlatitude = float(lines[29])  # latitude pour le calcul de la force de coriolis
-            # options
-            self.mailonly = int(lines[30])  # 1 si uniquement maillage
-            self.nremaillage = int(lines[31])  # =1 si remaillage
-            self.ntronc = int(lines[32])  # troncature des variables
-            self.nsmooth = int(lines[33])  # =1 si smoothing arithmétique, =2 si smoothing géométrique
-            self.nclinst = int(lines[34])  # cl instationnaires ou pas
-            # nbre de blocs
-            self.nblocks = int(lines[35])  # nombre de blocs
-
-            # allocation des espaces mémoire pour le stockage des param de blocs
-            self.my_param_blocks:list[prev_parameters_blocks] = []
-
-            # lecture des parametres propres aux blocs
-            decal = 36
-            for nbblocks in range(self.nblocks):
-                curparambl = prev_parameters_blocks(lines[decal:])
-                self.my_param_blocks.append(curparambl)
-                decal += 23
-
-            # allocation des matrices contenant les cl générales
-            self.clf.set_header()
-            self.clfbx.set_header()
-            self.clfby.set_header()
-
-            self.clf.read_file(lines[decal:decal + self.impfgen], 'strongbc')
-            decal += self.impfgen
-            self.clfbx.read_file(lines[decal:decal + self.impfbxgen], 'x')
-            decal += self.impfbxgen
-            self.clfby.read_file(lines[decal:decal + self.impfbygen], 'y')
-            decal += self.impfbygen
-
-            # lecture des paramètres debug globaux
-            self.vdebug = []
-            for i in range(60):
-                self.vdebug.append(float(lines[decal + i]))
-
-            decal += 60
-
-            # lecture des paramètres debug par blocs
-            for nbblocks in range(self.nblocks):
+            with open(fn + '.par') as f:
+                lines = f.read().splitlines()
+
+                # Lecture des PARAMETRES GLOBAUX
+                # Durée de la simulation et résultats
+                self.npas = np.int64(float(lines[0]))  # nbre de pas de simulation à réaliser
+                self.dur = float(lines[1])  # durée souhaitée d'un pas de temps
+                self.freq = float(lines[2])  # fréquence de sortie des résultats
+                self.ntypefreq = int(lines[3])  # type de fréquence de sortie des résultats (en temps ou en pas)
+                self.ntypewrite = int(lines[4])  # format d'écriture des résultats (1 = texte, 2 = binaire, 3=csr)
+                self.ntyperead = int(lines[5])  # format de lecture des données (1 = texte, 2 = binaire, 3 = binaire par blocs)
+                self.nun_seul_resu = int(lines[6])  # ecriture d'un seul résu ou pas
+                # maillage fin
+                self.dxfin = float(lines[7])  # dx du maillage le + fin = maillage sur lequel sont données
+                self.dyfin = float(lines[8])  # dy    les caract de topo, frot,...
+                self.nxfin = int(lines[9])  # nbre de noeuds selon x du maillage le + fin
+                self.nyfin = int(lines[10])  # y
+                self.xminfin = float(lines[11])  # coordonnées absolues inf droites de la matrice des données
+                self.yminfin = float(lines[12])  # (maillage le plus fin : dxfin et dyfin)
+                # conditions limites
+                self.impfgen = int(lines[13])  # nbre de cl fortes
+                self.impfbxgen = int(lines[14])  # nbre de cl faibles sur les bords x
+                self.impfbygen = int(lines[15])  # nbre de cl faibles sur les bords y
+                # stabilité et schéma
+                self.ponderation = float(lines[16])  # indicateur du type de schéma r-k
+                self.vncsouhaite = float(lines[17])  # nbre de courant souhaité
+                self.mult_dt = float(lines[18])  # facteur mult du pas de temps pour vérif a posteriori
+                self.noptpas = int(lines[19])  # =1 si optimisation du pas de temps
+                self.nmacc = int(lines[20])  # mac cormack ou non
+                # limiteurs
+                self.ntyplimit = int(lines[21])  # 0 si pas de limiteur, 1 si barth jesperson, 2 si venkatakrishnan
+                # 3 si superbee, 4 si van leer, 5 si van albada, 6 si minmod
+                self.vkvenka = float(lines[22])  # k de venkatakrishnan et des limiteurs modifiés
+                # constantes de calcul
+                self.vminhdiv = float(lines[23])  # hauteur min de division
+                self.vminh = float(lines[24])  # hauteur d'eau min sur 1 maille
+                self.vminh2 = float(lines[25])  # hauteur d'eau min sur 1 maille pour la calculer
+                self.nepsrel = int(lines[26])  # epsilon relatif pour la dtm de q nul sur les bords
+                # paramètres de calcul
+                self.nderdec = int(lines[27])  # =2 si dérivées centrées, 1 sinon
+                self.npentecentree = int(lines[28])  # pente centrée ou non
+                self.vlatitude = float(lines[29])  # latitude pour le calcul de la force de coriolis
+                # options
+                self.mailonly = int(lines[30])  # 1 si uniquement maillage
+                self.nremaillage = int(lines[31])  # =1 si remaillage
+                self.ntronc = int(lines[32])  # troncature des variables
+                self.nsmooth = int(lines[33])  # =1 si smoothing arithmétique, =2 si smoothing géométrique
+                self.nclinst = int(lines[34])  # cl instationnaires ou pas
+                # nbre de blocs
+                self.nblocks = int(lines[35])  # nombre de blocs
+
+                # allocation des espaces mémoire pour le stockage des param de blocs
+                self.my_param_blocks:list[prev_parameters_blocks] = []
+
+                # lecture des parametres propres aux blocs
+                decal = 36
+                for nbblocks in range(self.nblocks):
+                    curparambl = prev_parameters_blocks(lines[decal:])
+                    self.my_param_blocks.append(curparambl)
+                    decal += 23
+
+                # allocation des matrices contenant les cl générales
+                self.clf.set_header()
+                self.clfbx.set_header()
+                self.clfby.set_header()
+
+                self.clf.read_file(lines[decal:decal + self.impfgen], 'strongbc')
+                decal += self.impfgen
+                self.clfbx.read_file(lines[decal:decal + self.impfbxgen], 'x')
+                decal += self.impfbxgen
+                self.clfby.read_file(lines[decal:decal + self.impfbygen], 'y')
+                decal += self.impfbygen
+
+                # lecture des paramètres debug globaux
+                self.vdebug = []
                 for i in range(60):
-                    self.my_param_blocks[nbblocks].vdebug.append(float(lines[decal + i]))
+                    self.vdebug.append(float(lines[decal + i]))
+
                 decal += 60
 
-            # lecture index des blocs calculés
-            if self.vdebug[0]>0:
-                for idx in range(int(self.vdebug[0])):
-                    idx_block = int(lines[decal])-1
-                    self.my_param_blocks[idx_block].computed = True
-                    decal+=1
-
-            # lecture des noms de chaque bloc
-            try:
-                for idx in range(self.nblocks):
-                    self.my_param_blocks[idx].name = lines[decal]
-                    decal+=1
-            except :
-                pass
+                # lecture des paramètres debug par blocs
+                for nbblocks in range(self.nblocks):
+                    for i in range(60):
+                        self.my_param_blocks[nbblocks].vdebug.append(float(lines[decal + i]))
+                    decal += 60
+
+                # lecture index des blocs calculés
+                if self.vdebug[0]>0:
+                    for idx in range(int(self.vdebug[0])):
+                        idx_block = int(lines[decal])-1
+                        self.my_param_blocks[idx_block].computed = True
+                        decal+=1
+
+                # lecture des noms de chaque bloc
+                try:
+                    for idx in range(self.nblocks):
+                        self.my_param_blocks[idx].name = lines[decal]
+                        decal+=1
+                except :
+                    pass
+        else:
+            logging.warning(_('.par file not found !'))
 
     def write_file(self, fn=''):
         """Ecriture du fichier de paramètres"""
@@ -805,9 +809,6 @@ class prev_parameters_simul:
         if Path(fn+".par").exists():
             shutil.copyfile(fn + '.par', fnback)
 
-        # with open(fn + '.par', 'r') as f:
-        #     mylines = f.read().splitlines()
-
         with open(fn + '.par', 'w') as f:
             # for i in range(14):
             #     f.write(mylines[i] + '\n')
@@ -945,7 +946,7 @@ class prev_parameters_simul:
         # right.
         assert i >= 1 and i <= self.nxfin, f"1 <= i:{i} <= {self.nxfin+1}"
         assert j >= 1 and j <= self.nyfin, f"1 <= j:{j} <= {self.nyfin+1}"
-        self.clfby.add(i,j,ntype,value,orient)
+        self.clfby.add(i,j,ntype,value,orient='y')
         self.impfbygen += 1
 
     def to_yaml(self):
@@ -1286,6 +1287,9 @@ class bloc_file():
         if self.filename is None:
             return
 
+        if not exists(self.filename):
+            return
+
         ox = self.parent.myparam.xminfin
         oy = self.parent.myparam.yminfin
         tx = self.parent.myparam.translx