wolfhece 2.0.43__py3-none-any.whl → 2.0.45__py3-none-any.whl

wolfhece/hydrology/constant.py

@@ -35,10 +35,10 @@ DEFAULT_LANDUSE[6] = _("plan d'eau")
 
 
 ##
-DATE_FORMAT_HYDRO = '%Y-%m-%dT%H:%M:%S' 
+DATE_FORMAT_HYDRO = '%Y%m%d-%H%M%S' 
 
 
 ## Version of the code
-VERSION_WOLFHYDRO_2023_0 = "2023.1"     # First version to include the versioning
+VERSION_WOLFHYDRO_2023_0 = "2023.0"     # First version to include the versioning
 VERSION_WOLFHYDRO_2023_1 = "2023.1"     # First version to include the versioning
 VERSION_WOLFHYDRO = "2023.1"

wolfhece/hydrology/cst_exchanges.py

@@ -49,63 +49,75 @@ VHM = {}
 VHM["Nb"] = 12
 VHM["Parameters"] = {}
 VHM["Parameters"][exchange_parameters_VHM_aif1] = {}
+VHM["Parameters"][exchange_parameters_VHM_aif1]["Name"] = "Coeff aif1"
 VHM["Parameters"][exchange_parameters_VHM_aif1]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_aif1]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_aif1]["Key"] = "Coeff aif1"
 VHM["Parameters"][exchange_parameters_VHM_aif1]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_aif2] = {}
+VHM["Parameters"][exchange_parameters_VHM_aif2]["Name"] = "Coeff aif2"
 VHM["Parameters"][exchange_parameters_VHM_aif2]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_aif2]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_aif2]["Key"] = "Coeff aif2"
 VHM["Parameters"][exchange_parameters_VHM_aif2]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_aof1] = {}
+VHM["Parameters"][exchange_parameters_VHM_aof1]["Name"] = "Coeff aof1"
 VHM["Parameters"][exchange_parameters_VHM_aof1]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_aof1]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_aof1]["Key"] = "Coeff aof1"
 VHM["Parameters"][exchange_parameters_VHM_aof1]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_aof2] = {}
+VHM["Parameters"][exchange_parameters_VHM_aof2]["Name"] = "Coeff aof2"
 VHM["Parameters"][exchange_parameters_VHM_aof2]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_aof2]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_aof2]["Key"] = "Coeff aof2"
 VHM["Parameters"][exchange_parameters_VHM_aof2]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_au1] = {}
+VHM["Parameters"][exchange_parameters_VHM_au1]["Name"] = "Coeff au1"
 VHM["Parameters"][exchange_parameters_VHM_au1]["File"] = "simul_soil.param" 
 VHM["Parameters"][exchange_parameters_VHM_au1]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_au1]["Key"] = "Coeff au1"
 VHM["Parameters"][exchange_parameters_VHM_au1]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_au2] = {}
+VHM["Parameters"][exchange_parameters_VHM_au2]["Name"] = "Coeff au2"
 VHM["Parameters"][exchange_parameters_VHM_au2]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_au2]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_au2]["Key"] = "Coeff au2"
 VHM["Parameters"][exchange_parameters_VHM_au2]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_au3] = {}
+VHM["Parameters"][exchange_parameters_VHM_au3]["Name"] = "Coeff au3"
 VHM["Parameters"][exchange_parameters_VHM_au3]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_au3]["Group"] = "Flow fraction parameters"
 VHM["Parameters"][exchange_parameters_VHM_au3]["Key"] = "Coeff au3"
 VHM["Parameters"][exchange_parameters_VHM_au3]["Unit"] = "[-]"
 VHM["Parameters"][exchange_parameters_VHM_Umax] = {}
+VHM["Parameters"][exchange_parameters_VHM_Umax]["Name"] = "Umax"
 VHM["Parameters"][exchange_parameters_VHM_Umax]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_Umax]["Group"] = "Soil characteristics"
 VHM["Parameters"][exchange_parameters_VHM_Umax]["Key"] = "Umax"
 VHM["Parameters"][exchange_parameters_VHM_Umax]["Unit"] = "[mm]"
 VHM["Parameters"][exchange_parameters_VHM_Uevap] = {}
+VHM["Parameters"][exchange_parameters_VHM_Uevap]["Name"] = "Uevap"
 VHM["Parameters"][exchange_parameters_VHM_Uevap]["File"] = "simul_soil.param"
 VHM["Parameters"][exchange_parameters_VHM_Uevap]["Group"] = "Soil characteristics"
 VHM["Parameters"][exchange_parameters_VHM_Uevap]["Key"] = "Uevap"
 VHM["Parameters"][exchange_parameters_VHM_Uevap]["Unit"] = "[mm]"
 VHM["Parameters"][exchange_parameters_VHM_kof] = {}
+VHM["Parameters"][exchange_parameters_VHM_kof]["Name"] = "kof"
 VHM["Parameters"][exchange_parameters_VHM_kof]["File"] = "simul_of.param"
 VHM["Parameters"][exchange_parameters_VHM_kof]["Group"] = "Time Parameters"
 VHM["Parameters"][exchange_parameters_VHM_kof]["Key"] = "Lagtime"
 VHM["Parameters"][exchange_parameters_VHM_kof]["Unit"] = "[sec]"
 VHM["Parameters"][exchange_parameters_VHM_kof]["Convertion Factor"] = 1/3600.0    # [sec] -> [h]
 VHM["Parameters"][exchange_parameters_VHM_kif] = {}
+VHM["Parameters"][exchange_parameters_VHM_kif]["Name"] = "kif"
 VHM["Parameters"][exchange_parameters_VHM_kif]["File"] = "simul_if.param"
 VHM["Parameters"][exchange_parameters_VHM_kif]["Group"] = "Time Parameters"
 VHM["Parameters"][exchange_parameters_VHM_kif]["Key"] = "Lagtime"
 VHM["Parameters"][exchange_parameters_VHM_kif]["Unit"] = "[sec]"
 VHM["Parameters"][exchange_parameters_VHM_kif]["Convertion Factor"] = 1/3600.0    # [sec] -> [h]
 VHM["Parameters"][exchange_parameters_VHM_kbf] = {}
+VHM["Parameters"][exchange_parameters_VHM_kbf]["Name"] = "kbf"
 VHM["Parameters"][exchange_parameters_VHM_kbf]["File"] = "simul_bf.param"
 VHM["Parameters"][exchange_parameters_VHM_kbf]["Group"] = "Time Parameters"
 VHM["Parameters"][exchange_parameters_VHM_kbf]["Key"] = "Lagtime"
@@ -115,21 +127,25 @@ GR4 = {}
 GR4["Parameters"] = {}
 GR4["Nb"] = 4
 GR4["Parameters"][exchange_parameters_GR4_x1] = {}
+GR4["Parameters"][exchange_parameters_GR4_x1]["Name"] = "X1"
 GR4["Parameters"][exchange_parameters_GR4_x1]["File"] = "simul_GR4.param"
 GR4["Parameters"][exchange_parameters_GR4_x1]["Group"] = "GR4 Parameters"
 GR4["Parameters"][exchange_parameters_GR4_x1]["Key"] = "X1"
 GR4["Parameters"][exchange_parameters_GR4_x1]["Unit"] = "[mm]"
 GR4["Parameters"][exchange_parameters_GR4_x2] = {}
+GR4["Parameters"][exchange_parameters_GR4_x2]["Name"] = "X2"
 GR4["Parameters"][exchange_parameters_GR4_x2]["File"] = "simul_GR4.param"
 GR4["Parameters"][exchange_parameters_GR4_x2]["Group"] = "GR4 Parameters"
 GR4["Parameters"][exchange_parameters_GR4_x2]["Key"] = "X2"
 GR4["Parameters"][exchange_parameters_GR4_x2]["Unit"] = "[mm]"
 GR4["Parameters"][exchange_parameters_GR4_x3] = {}
+GR4["Parameters"][exchange_parameters_GR4_x3]["Name"] = "X3"
 GR4["Parameters"][exchange_parameters_GR4_x3]["File"] = "simul_GR4.param"
 GR4["Parameters"][exchange_parameters_GR4_x3]["Group"] = "GR4 Parameters"
 GR4["Parameters"][exchange_parameters_GR4_x3]["Key"] = "X3"
 GR4["Parameters"][exchange_parameters_GR4_x3]["Unit"] = "[mm]"
 GR4["Parameters"][exchange_parameters_GR4_x4] = {}
+GR4["Parameters"][exchange_parameters_GR4_x4]["Name"] = "X4"
 GR4["Parameters"][exchange_parameters_GR4_x4]["File"] = "simul_GR4.param"
 GR4["Parameters"][exchange_parameters_GR4_x4]["Group"] = "GR4 Parameters"
 GR4["Parameters"][exchange_parameters_GR4_x4]["Key"] = "X4"
@@ -141,61 +157,80 @@ UHDIST_LINBF = {}
 UHDIST_LINBF["Nb"] = 13
 UHDIST_LINBF["Parameters"] = {}
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax]["Name"] = "Umax"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax]["Group"] = "Distributed production model parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax]["Key"] = "Umax"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_Umax]["Unit"] = "[mm]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["Name"] = "Time span soil"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["Group"] = "Distributed production model parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["Key"] = "Time span soil"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["Unit"] = "[sec]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Soil_TSPAN]["Convertion Factor"] = 1/3600.0    # [sec] -> [h]
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_F0] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_F0]["Name"] = "Horton F0"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_F0]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_F0]["Group"] = "Horton parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_F0]["Key"] = "F0"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_FC] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_FC]["Name"] = "Horton Fc"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_FC]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_FC]["Group"] = "Horton parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_FC]["Key"] = "Fc"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_K] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_K]["Name"] = "Horton k"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_K]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_K]["Group"] = "Horton parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_Horton_K]["Key"] = "k"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs]["Name"] = "Storage reservoir Hs"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs]["Group"] = "Storage reservoir parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs]["Key"] = "hs"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_Hs]["Unit"] = "[mm]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS]["Name"] = "Storage reservoir Ts"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS]["File"] = "simul_soil.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS]["Group"] = "Storage reservoir parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS]["Key"] = "Ts"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_RS_TS]["Unit"] = "[h]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["Name"] = "kif"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["File"] = "simul_if.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["Group"] = "Time Parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["Key"] = "Lagtime"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["Unit"] = "[sec]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Dist_kif]["Convertion Factor"] = 1/3600.0    # [sec] -> [h]
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif]["Name"] = "Qlif"
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif]["File"] = "simul_if.param"
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif]["Group"] = "Time Parameters"
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif]["Key"] = "Specific flow rate"
+UHDIST_LINBF["Parameters"][exchange_parameters_Dist_qlif]["Unit"] = "[m^2/s]"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_riv] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_riv]["Name"] = "Froude min (river)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_riv]["File"] = "..\\Characteristic_maps\\Drainage_basin.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_riv]["Group"] = "Froude parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_riv]["Key"] = "Froude min (river)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_riv] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_riv]["Name"] = "Froude max (river)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_riv]["File"] = "..\\Characteristic_maps\\Drainage_basin.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_riv]["Group"] = "Froude parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_riv]["Key"] = "Froude max (river)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_bas] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_bas]["Name"] = "Froude min (basin)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_bas]["File"] = "..\\Characteristic_maps\\Drainage_basin.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_bas]["Group"] = "Froude parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_min_bas]["Key"] = "Froude min (basin)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_bas] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_bas]["Name"] = "Froude max (basin)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_bas]["File"] = "..\\Characteristic_maps\\Drainage_basin.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_bas]["Group"] = "Froude parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_max_bas]["Key"] = "Froude max (basin)"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_discharge] = {}
+UHDIST_LINBF["Parameters"][exchange_parameters_Froude_discharge]["Name"] = "Froude discharge"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_discharge]["File"] = "..\\Characteristic_maps\\Drainage_basin.param"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_discharge]["Group"] = "Froude parameters"
 UHDIST_LINBF["Parameters"][exchange_parameters_Froude_discharge]["Key"] = "Discharge"

wolfhece/hydrology/plot_hydrology.py

@@ -106,7 +106,7 @@ def compare_plot(nbElements, writeDir, x, y, x_title, y_titles, graph_title='',
 # elif y is a list : each element is located [here][]
 # TO DO : Maybe change this rationale for y -> Too complicated
 def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharge [m³/s]"), time=None, beginDate:datetime.datetime=None, endDate:datetime.datetime=None, dt:float=None, \
-                graph_title:str=None, y_labels:str=None, rangeData:list = [], myColors:list=None, typeOfTraits:list=None, \
+                graph_title:str=None, y_labels:str=None, rangeData:list[datetime.datetime] = [], myColors:list=None, typeOfTraits:list=None, \
                 measures=[], beginDateMeasure=None, endDateMeasure=None, dtMeasure=None, surfaceMeasure=-1.0, addMeasfInTab:bool=False, \
                 upperPlot:bool=False, nbAddPlot:int=1, z=[], y_labelAddPlot=[], factor_RH:float=1.5, y_rain_range=[], y_data_range=[], figSize = [10.4,6.25],\
                 writeFile:str = '', deltaMajorTicks=-1, deltaMinorTicks=-1, \
@@ -132,18 +132,16 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
             sys.exit()
 
     if(time is not None):
-        # Particular case if the user give the time in time stamps and the dates: it will check the validiy of the arguments
-        if(beginDate is not None and endDate is not None and dt is not None):
-            tmpBeginDate = beginDate
-            tmpEndDate = endDate
-            tmpDt = dt
         beginDate = datetime.datetime.fromtimestamp(time[0], tz=datetime.timezone.utc)
         endDate = datetime.datetime.fromtimestamp(time[-1], tz=datetime.timezone.utc)
         dt = time[1]-time[0]
+        tmpBeginDate = beginDate
+        tmpEndDate = endDate
+        tmpDt = dt
         time_delta = datetime.timedelta(seconds=dt)
         # Check the regularity of the time steps
         for i in range(1,len(time)):
-            if(time[i+1]-time[i] != dt):
+            if(time[i]-time[i-1] != dt):
                 print("ERROR: this procedure cannot take into account irregular time steps")
                 sys.exit()
                 break
@@ -284,8 +282,8 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
         # complete summary table
         summaryTab.append([])
         # summaryTab[0].append("%.3f"%(y1.max()))
-        summaryTab[0].append(str(int(round(y1.max()))))
-        indexMax = np.argmax(y1)
+        summaryTab[0].append(str(int(round(np.nanmax(y1)))))
+        indexMax = np.nanargmax(y1)
         timeMax = num2date(xdatePlot[indexMax])
         # summaryTab[0].append(timeMax.strftime("%m/%d/%Y, %H:%M:%S"))
         summaryTab[0].append(timeMax.strftime("%m/%d/%Y, %H:%M"))
@@ -332,16 +330,16 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
             # complete summary table
             summaryTab.append([])
             # summaryTab[i].append("%.3f"%(y1.max()))
-            summaryTab[i].append(str(int(round((y1.max())))))
-            indexMax = np.argmax(y1)
+            summaryTab[i].append(str(int(round((np.nanmax(y1))))))
+            indexMax = np.nanargmax(y1)
             timeMax = num2date(xdatePlot[indexMax])
             # summaryTab[i].append(timeMax.strftime("%m/%d/%Y, %H:%M:%S"))
             summaryTab[i].append(timeMax.strftime("%m/%d/%Y, %H:%M"))
             if(allSurfaces!=[]):
-                summaryTab[i].append(np.sum(y1)*dt_Plot)
+                summaryTab[i].append(np.nansum(y1)*dt_Plot)
 
-            if(y1.max()>max_):
-                max_ = y1.max()
+            if(np.nanmax(y1)>max_):
+                max_ = np.nanmax(y1)
             if(myColors[i]==''):
                 if(len(xdatePlot)==len(y1)):
                     ax1.plot_date(xdatePlot,y1,typeOfTraits[i],label=title[i])
@@ -396,8 +394,8 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
     if(measures!=[]):
         y1 = measures
         x_date_measure = check_drange_bug(x_date_measure,y1)
-        if(y1.max()>max_):
-            max_ = y1.max()
+        if(np.nanmax(y1)>max_):
+            max_ = np.nanmax(y1)
         if(myColors[nbElements]==''):
             ax1.plot_date(x_date_measure,y1, typeOfTraits[-1],label=title[nbElements])
         else:
@@ -406,13 +404,13 @@ def plot_hydro(nbElements:int, y, rain=[], x_title="Dates", y_titles=_("Discharg
         if(addMeasfInTab):
             summaryTab.append([])
             i = len(summaryTab)-1
-            summaryTab[i].append(str(int(round((y1.max())))))
-            indexMax = np.argmax(y1)
+            summaryTab[i].append(str(int(round((np.nanmax(y1))))))
+            indexMax = np.nanargmax(y1)
             timeMax = num2date(x_date_measure[indexMax])
             # summaryTab[i].append(timeMax.strftime("%m/%d/%Y, %H:%M:%S"))
             summaryTab[i].append(timeMax.strftime("%m/%d/%Y, %H:%M"))
             if(allSurfaces!=[]):
-                summaryTab[i].append(np.sum(y1)*dtMeasure)
+                summaryTab[i].append(np.nansum(y1)*dtMeasure)
 
     # Set the axis parameters
     if(y_data_range==[]):

wolfhece/hydrology/read.py

@@ -1,6 +1,8 @@
 import numpy as np
 import os
 import logging
+from datetime import datetime as date
+from datetime import timezone
 from struct import unpack, calcsize, unpack_from
 
 
@@ -145,7 +147,7 @@ def read_binary_file(path, fileName, format="", buffer_size=-1, init_offset=8):
     if format == "":
         # Classical format
         format = "<bbhbbbd"
-    elif "<" in format:
+    elif "<" not in format:
         logging.warning("Format should start with '<' if you are on Windows. If not, the file can be read wrongly!")
 
     data_size = calcsize(format)  # Size of one set of values
@@ -159,7 +161,7 @@ def read_binary_file(path, fileName, format="", buffer_size=-1, init_offset=8):
         nbC = int.from_bytes(buffer[4:8], byteorder='little', signed=True)
         # Check the compatibility between the format and the number of columns
         nb_args = format.replace("<", "")
-        if nbC != nb_args:
+        if nbC != len(nb_args)-1:
             logging.error("The number of column is not compatible with the number of element in format")
         if buffer_size < 0:
             buffer_size = nbL
@@ -218,14 +220,71 @@ def relative_2_absolute(fileName:str, prefix:str="", applyCWD:bool=True)-> tuple
     if is_relative_path(fileName):
         finalName = os.path.join(prefix, fileName)
     else:
-        logging.warning("This path is not initially a relative path!")
-
+        # logging.warning("This path is not initially a relative path!")
         info  = 1
         finalName = fileName
 
     return info, finalName
 
 
+def read_hydro_file(path:str, fileName:str, nbCol:int=6, nbCol_data:int=1) -> tuple[np.array, np.array]:
+    format_bin = "<bbhbbbd"
+    header_offset = 8
+    
+    data = read_binary_file(path, fileName, format=format_bin, init_offset=header_offset)
+    data = np.array(data).astype("double")
+    time, value = parse_hydro_data(data)
+
+    return time, value
+
+
+def parse_hydro_data(data:np.array)-> tuple[np.array, np.array]:
+    nbCol = 6
+    nbCol_data = 1
+    values = data[:, nbCol+nbCol_data-1]
+
+    # Create an array of datetime objects
+    date_objects = [
+        date(int(el[2]), int(el[1]), int(el[0]), int(el[3]), int(el[4]), int(el[5]), tzinfo=timezone.utc)
+        for el in data]
+    # Transform the datetime objects into timestamps
+    time = np.array([el.timestamp() for el in date_objects])
+
+    return time, values
+
+
+def write_excel_from_dict(data:dict[str:dict[str:np.array]], path:str, fileName:str, time:np.array=None, summary:dict[str:np.array]={}):
+    import pandas as pd
+
+    writer = pd.ExcelWriter(os.path.join(path,fileName), engine = 'xlsxwriter')
+
+    for station,values in data.items():
+        # if the dictionary is empty, skip the station -> no creation of the sheet
+        if values == {}:
+            continue
+        
+        excl_dict = {}
+        if time is not None:
+            excl_dict["Time [s]"] = time
+            excl_dict.update(values)
+        else:
+            excl_dict = values
+        curSheet = pd.DataFrame(excl_dict)
+        curSheet.to_excel(writer, sheet_name=station, index=False)
+        curSheet = writer.sheets[station]
+        curSheet.autofit()
+    
+    # if the summary is empty, skip the summary -> no creation of the sheet
+    if summary != {}:
+        curSheet = pd.DataFrame(summary)
+        curSheet.to_excel(writer, sheet_name="Summary", index=False)
+        curSheet = writer.sheets["Summary"]
+        curSheet.autofit()
+
+    writer.close()
+    
+    return
+
 def check_path(fileName:str, prefix:str="", applyCWD:bool=True) -> tuple[bool, str] :
 
     info, finalName = relative_2_absolute(fileName, prefix, applyCWD)

wolfhece/pyGui1D.py

@@ -1919,6 +1919,18 @@ class GuiNotebook1D( wx.Frame):
     def onclose(self, event: wx.Event):
         self.close()
 
+    def get_bathymetry(self):
+        """Return the bathymetry object
+        from the notebook.
+
+        :return: bathymetry object
+        :rtype: `WolfArray`
+        """
+        try:
+            return self.data[Constants.BATHYMETRY.value]
+        except KeyError:
+            return None
+
     # --- CREATION OF A SIMULATION ---
     # ________________________________
 
@@ -1932,48 +1944,55 @@ class GuiNotebook1D( wx.Frame):
         for whatever reasons.
         """
         if self.test_required_data() == True:
-            self.grid_parameters.save_automatically_to_file()
-
-        if self.simulation_directory != '':
-            logging.info(_("Creating the model... ... ...\
-                            \nPatience, you'll be notified whenever the model is ready."))
-            # self.grid_parameters.saveme FIXME Param from GUI
-            # FIXME Parallel value should not be mandatory in case only one vector exists.
-            try:
-                self.disable_button_save()
-                # self.grid_parameters.Hide()
-                self.creator1D.write_simulation_files_from_crosssections(folder_path = self.simulation_directory,
-                                                                        cross_sections = self.data[Constants.CROSS_SECTIONS.value],
-                                                                        parallels = self.data[Constants.BED_AND_BANKS.value],
-                                                                        banks= self.data[Constants.BED_AND_BANKS.value],
-                                                                        boundary_conditions= self.get_boundary_conditions(),
-                                                                        hydrographs=self.get_hydrographs(),
-                                                                        roughness= self.get_frictions(),
-                                                                        roughness_selection= self.get_agglomeration_mode(),
-                                                                        roughness_option= self.get_roughness_option(),
-                                                                        exe_file= self.get_folder_executable(),
-                                                                        initial_depth= self.get_initial_water_depth(),
-                                                                        topography= self.data[Constants.BATHYMETRY.value],
-                                                                        initial_discharge= self.get_initial_discharge(),
-                                                                        file_type_initial_cond= self.get_ic_file_format(),
-                                                                        extrapolation_of_extremities= self.get_extrapolation_of_extremities(),
-                                                                        wetdry= self.get_computation_mode(),
-                                                                        steady= self.get_steadiness_mode(),
-                                                                        writing_type_infiltration= self.get_infiltration_preprocess(),
-                                                                        epsilon_infiltration= self.get_epsilon(),
-                                                                        executable_type= self.get_executable(),
-                                                                        run_simulation= self.get_run_command(),
-                                                                        simulation_name= self.simulation_name,
-                                                                        new_directory= self.simulation_directory
-                                                                        )
-                logging.info(_("The model was successfully created."))
-                self.grid_parameters.Destroy()
-                self.param_exists == False
-                self.enable_button_parameters()
-
-            except:
-                self.enable_button_parameters()
-                raise Exception(logging.info("The simulation not saved due to an error."))
+            if self.simulation_directory != '':
+                logging.info(_("Creating the model... ... ...\
+                                \nPatience, you'll be notified whenever the model is ready."))
+                # self.grid_parameters.saveme FIXME Param from GUI
+                # FIXME Parallel value should not be mandatory in case only one vector exists.
+                try:
+                    self.disable_button_save()
+                    # self.grid_parameters.Hide()
+                    simul = self.creator1D.write_simulation_files_from_crosssections(folder_path = self.simulation_directory,
+                                                                            cross_sections = self.data[Constants.CROSS_SECTIONS.value],
+                                                                            parallels = self.data[Constants.BED_AND_BANKS.value],
+                                                                            banks= self.data[Constants.BED_AND_BANKS.value],
+                                                                            boundary_conditions= self.get_boundary_conditions(),
+                                                                            hydrographs=self.get_hydrographs(),
+                                                                            roughness= self.get_frictions(),
+                                                                            roughness_selection= self.get_agglomeration_mode(),
+                                                                            roughness_option= self.get_roughness_option(),
+                                                                            exe_file= self.get_folder_executable(),
+                                                                            initial_depth= self.get_initial_water_depth(),
+                                                                            topography= self.get_bathymetry(),
+                                                                            initial_discharge= self.get_initial_discharge(),
+                                                                            file_type_initial_cond= self.get_ic_file_format(),
+                                                                            extrapolation_of_extremities= self.get_extrapolation_of_extremities(),
+                                                                            wetdry= self.get_computation_mode(),
+                                                                            steady= self.get_steadiness_mode(),
+                                                                            writing_type_infiltration= self.get_infiltration_preprocess(),
+                                                                            epsilon_infiltration= self.get_epsilon(),
+                                                                            executable_type= self.get_executable(),
+                                                                            run_simulation= 'no',
+                                                                            simulation_name= self.simulation_name,
+                                                                            new_directory= self.simulation_directory
+                                                                            )
+                    logging.info(_("The model was successfully created."))
+                    self.grid_parameters.save_automatically_to_file()
+                    self.param_exists == False
+                    self.enable_button_parameters()
+                    self.grid_parameters.Destroy()
+                    if self.get_run_command() == 'yes':
+                        try:
+                            self.creator1D.run_bat_files(os.path.join(simul[0], f'{simul[1]}.bat'))
+                        except:
+                            try:
+                                batch_file = self.creator1D.find_file_from_extension(self.simulation_directory, '.bat')
+                            except:
+                                logging.info(f"The batch file was not found.\n The {self.simulation_name} was not run.")
+
+                except:
+                    self.enable_button_parameters()
+                    raise Exception(logging.info("The simulation not saved due to an error."))
         # self.disable_button_save()
 
     # --- DEPRECIATING METHODS ---
@@ -2060,6 +2079,59 @@ class GuiNotebook1D( wx.Frame):
                                                                         new_directory= self.simulation_directory
                                                                         )
 
+    def __button_save_clicked(self, event: wx.Event):
+        """Gather all the inputs in the notebook
+        and generate a 1D model (simulation).
+
+        :param event: wx.EVT_BUTTON
+        :type event: wx.Event
+        :raises Exception: In case, the model fails to create the simulation
+        for whatever reasons.
+        """
+        if self.test_required_data() == True:
+            self.grid_parameters.save_automatically_to_file()
+
+        if self.simulation_directory != '':
+            logging.info(_("Creating the model... ... ...\
+                            \nPatience, you'll be notified whenever the model is ready."))
+            # self.grid_parameters.saveme FIXME Param from GUI
+            # FIXME Parallel value should not be mandatory in case only one vector exists.
+            try:
+                self.disable_button_save()
+                # self.grid_parameters.Hide()
+                self.creator1D.write_simulation_files_from_crosssections(folder_path = self.simulation_directory,
+                                                                        cross_sections = self.data[Constants.CROSS_SECTIONS.value],
+                                                                        parallels = self.data[Constants.BED_AND_BANKS.value],
+                                                                        banks= self.data[Constants.BED_AND_BANKS.value],
+                                                                        boundary_conditions= self.get_boundary_conditions(),
+                                                                        hydrographs=self.get_hydrographs(),
+                                                                        roughness= self.get_frictions(),
+                                                                        roughness_selection= self.get_agglomeration_mode(),
+                                                                        roughness_option= self.get_roughness_option(),
+                                                                        exe_file= self.get_folder_executable(),
+                                                                        initial_depth= self.get_initial_water_depth(),
+                                                                        topography= self.data[Constants.BATHYMETRY.value],
+                                                                        initial_discharge= self.get_initial_discharge(),
+                                                                        file_type_initial_cond= self.get_ic_file_format(),
+                                                                        extrapolation_of_extremities= self.get_extrapolation_of_extremities(),
+                                                                        wetdry= self.get_computation_mode(),
+                                                                        steady= self.get_steadiness_mode(),
+                                                                        writing_type_infiltration= self.get_infiltration_preprocess(),
+                                                                        epsilon_infiltration= self.get_epsilon(),
+                                                                        executable_type= self.get_executable(),
+                                                                        run_simulation= self.get_run_command(),
+                                                                        simulation_name= self.simulation_name,
+                                                                        new_directory= self.simulation_directory
+                                                                        )
+                logging.info(_("The model was successfully created."))
+                self.grid_parameters.Destroy()
+                self.param_exists == False
+                self.enable_button_parameters()
+
+            except:
+                self.enable_button_parameters()
+                raise Exception(logging.info("The simulation not saved due to an error."))
+
     def __add_bed_and_banks(self, event: pg.EVT_PG_DOUBLE_CLICK):
         """
         Add or change the river and bank data.

wolfhece/scenario/check_scenario.py

@@ -48,7 +48,7 @@ def check_file_update(fichier_py:Path):
         sys.path.pop(0)
     except:
         logging.error(f'Le fichier {fichier_py} ne peut pas être importé. Prière de vérifier que l\'encodage est bien en UTF-8 ou supprimer tous les commentaires avec des accents !')
-        logging.error(f'The file {fichier_py} can not be impotred. Please check if the file is encoded in UTF-8 or remove any accentuated character!')
+        logging.error(f'The file {fichier_py} can not be imported. Please check if the file is encoded in UTF-8 or remove any accentuated character!')
         return False
 
     # Récupérer la classe parente et la classe dérivée à partir du module