wolfhece 2.0.17__py3-none-any.whl → 2.0.18__py3-none-any.whl

wolfhece/mar/Interface_MAR_WOLF_objet.py

@@ -32,15 +32,16 @@ class MAR_input_data:
                  date_fin=datetime.datetime(2020,7,11,5),
                  directory='~/BUP_srv7/',
                  directory_hist_sim='~/BUP_srv7/',
+                 model_name='MIROC6',
                  var='MBRR',
                  var_unb='E',
                  UnborNot=0,
                  syu=1981,eyu=2010,
-                 mod_ydays=1):
+                 mod_ydays=1,
+                 generate_quantiles=1):
         
         
         """
-        
         xsummits : abscisses Lambert 72 du rectangle d'extraction'
         ysummits : idem pour ordonnées
         
@@ -58,8 +59,9 @@ class MAR_input_data:
         
         UnborNot : 1 si débiaisage, 0 si données brutes
         
-        syu et eyu : année de début et de fin de la période historique utilisée pour comparer modèle et observations
+        syu et eyu : année de début et de fin de la période future utilisée pour comparer modèle et observations
         
+        mod_ydays: 1 si modèel avec années bissextiles, 0 sinon 1
         """
         
         self.directory_hist_sim=directory_hist_sim
@@ -79,19 +81,30 @@ class MAR_input_data:
             
         print(self.directory,date_debut.year)
         print(self.fn)
+        
         self.ds=xr.open_dataset(self.fn[0])
+        
         self.lons=np.transpose(np.array(self.ds.LON))
         self.lats=np.transpose(np.array(self.ds.LAT))
+        
         self.Lb72=pyproj.Proj(projparams='epsg:31370')
         self.x_Lb72, self.y_Lb72 = self.Lb72(self.lons,self.lats)
+        
         self.mask=self.mask_rectangles()
-        self.plot_mask()
+        
+        # self.plot_mask()
         self.vec_data=self.select_MARdata()
         # self.historical_matrix=
+        
         self.directory_unbiasing="/srv7_tmp1/jbrajkovic/These/IRM/"
-        self.syu=syu;self.eyu=eyu
         
+        self.fn_quant_ev='/srv7_tmp1/jbrajkovic/These/Unbiasing/evapotranspiration_quantiles_1981_2010.nc'
+        self.fn_quant_pr='/srv7_tmp1/jbrajkovic/These/Unbiasing/precipitation_quantiles_1981_2010.nc'
+        
+        self.syu=syu;self.eyu=eyu
         
+        self.generate_quantiles=generate_quantiles
+        self.model_name=model_name
         
 
     def mask_rectangles(self):
@@ -196,7 +209,8 @@ class MAR_input_data:
         cmap=cm.Greens
         MSK=np.zeros_like(mask1)
         ct.quick_map_plot(self.lons, self.lats, mask1, bounds, cmap, MSK)
-        plt.savefig('mask.png')
+        # plt.show()
+        # plt.savefig('mask.png')
         
 
     "Séléction des données entre les deux dates pour le masque rectangulaire"
@@ -436,6 +450,7 @@ class MAR_input_data:
                                  values2[:,j]=values2[:,j]*covers[:,1]
                                  values3[:,j]=values3[:,j]*covers[:,2]
                              values=np.append(values,(values1+values2+values3),axis=1)
+                             print(self.var,values.shape)
                             else:
                              fn = glob.glob(self.directory+"*"+str(y)+"**nc*")
                              if 'IRM_grid' in fn[0]:
@@ -456,9 +471,15 @@ class MAR_input_data:
                             
              else:
                  #print(mask)
+                 
                  values=np.transpose(np.array(ds[var]))[:,:,indice_debut:][mask]
                  print(self.var,values.shape)
                  for y in range(year+1,self.date_fin.year+1):
+                      
+                     fn = glob.glob(self.directory+"*"+str(y)+"**nc*")
+                     if 'IRM_grid' in fn[0]:
+                       fn = glob.glob(self.directory+"*MAR_grid*"+str(year)+"**nc*") 
+                     ds=xr.open_dataset(fn[0])
                      print(y)
                      if y<self.date_fin.year:
                          values=np.append(values,
@@ -483,11 +504,14 @@ class MAR_input_data:
         "**********************************************************"
         "Lecture des données sur la période historiqe de simulation"
         "**********************************************************"
+        if self.generate_quantiles==1:
+            historical_matrix_unbias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
+                                            date_debut=datetime.datetime(1981,1,1,0),
+                                             date_fin=datetime.datetime(2010,12,31,23),
+                                             directory=self.directory_unbiasing, var=self.var_unb).vec_data
+        
+        
         
-        historical_matrix_unbias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
-                                        date_debut=datetime.datetime(1981,1,1,0),
-                                         date_fin=datetime.datetime(2010,12,31,23),
-                                         directory=self.directory_unbiasing, var=self.var_unb).vec_data
         date_debutu=datetime.datetime(self.syu,1,1,0)
         date_finu=datetime.datetime(self.eyu,12,31,23)
             
@@ -495,15 +519,18 @@ class MAR_input_data:
         
         if self.var_unb=='PRECIP_QUANTITY':
             
-            historical_matrix_bias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
-                                             date_debut=datetime.datetime(1981,1,1,0),
-                                             date_fin=datetime.datetime(2010,12,31,23),
-                                             directory=self.directory, var='MBRR',mod_ydays=self.mod_ydays).vec_data+\
-                                    MAR_input_data(xsummits=self.xsummits,ysummits= self.ysummits,
-                                                                     date_debut=datetime.datetime(1981,1,1,0),
-                                                                     date_fin=datetime.datetime(2010,12,31,23),
-                                                                     directory=self.directory, var='MBSF',
-                                                                     mod_ydays=self.mod_ydays).vec_data
+            if self.generate_quantiles==1:
+                print('on va le faire')
+                historical_matrix_bias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
+                                                 date_debut=datetime.datetime(1981,1,1,0),
+                                                 date_fin=datetime.datetime(2010,12,31,23),
+                                                 directory=self.directory, var='MBRR',mod_ydays=self.mod_ydays).vec_data+\
+                                        MAR_input_data(xsummits=self.xsummits,ysummits= self.ysummits,
+                                                                         date_debut=datetime.datetime(1981,1,1,0),
+                                                                         date_fin=datetime.datetime(2010,12,31,23),
+                                                                         directory=self.directory, var='MBSF',
+                                                                         mod_ydays=self.mod_ydays).vec_data
+                                        
             biased_data=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
                                              date_debut=self.date_debut,
                                              date_fin=self.date_fin,
@@ -532,12 +559,12 @@ class MAR_input_data:
                     
 
         elif self.var_unb=='E':
-            
-           historical_matrix_bias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
-                                            date_debut=datetime.datetime(1981,1,1,0),
-                                            date_fin=datetime.datetime(2010,12,31,23),
-                                                    directory=self.directory, var='MBEP', 
-                                                    mod_ydays=self.mod_ydays).vec_data
+           if self.generate_quantiles==1: 
+               historical_matrix_bias=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
+                                                date_debut=datetime.datetime(1981,1,1,0),
+                                                date_fin=datetime.datetime(2010,12,31,23),
+                                                        directory=self.directory, var='MBEP', 
+                                                        mod_ydays=self.mod_ydays).vec_data
            biased_data=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
                                             date_debut=self.date_debut,
                                             date_fin=self.date_fin,
@@ -553,29 +580,42 @@ class MAR_input_data:
         "****************************************************"
         "Calcul des quantiles historiques simulés et observés"
         "****************************************************"   
-
-        quant_mat=np.zeros([historical_matrix_unbias.shape[0],101])
-        quant_mat_bias=np.zeros([historical_matrix_bias.shape[0],101])
-        quant_coeffs=np.zeros([historical_matrix_unbias.shape[0],101])
-        historical_matrix_unbias[historical_matrix_unbias<th_drizzle]=0
         
-        if self.find_timestep()[1]=='hours':
-            tsd=24
-            historical_matrix_bias_d=np.zeros([historical_matrix_bias.shape[0],
-                                               int(historical_matrix_bias.shape[1]/tsd)])
-            for i in range(historical_matrix_bias_d.shape[0]):
-                for d in range(historical_matrix_bias_d.shape[1]):
-                    historical_matrix_bias_d[i,d]=np.sum(historical_matrix_bias[i,d*tsd:(d+1)*tsd])
-                historical_matrix_bias_d[historical_matrix_bias_d<th_drizzle]=0
-            # print(historical_matrix_unbias.shape,historical_matrix_bias_d.shape)    
+        quant_mat=np.zeros([biased_data.shape[0],101])
+        quant_mat_bias=np.zeros([biased_data.shape[0],101])
+        quant_coeffs=np.zeros([biased_data.shape[0],101])
+        
+        
+        
+        
+        
+        if self.generate_quantiles==1:
             
-            for i in range(historical_matrix_unbias.shape[0]):
+            historical_matrix_unbias[historical_matrix_unbias<th_drizzle]=0
+            if self.find_timestep()[1]=='hours':
+                tsd=24
+                historical_matrix_bias_d=np.zeros([historical_matrix_bias.shape[0],
+                                                   int(historical_matrix_bias.shape[1]/tsd)])
+                for i in range(historical_matrix_bias_d.shape[0]):
+                    for d in range(historical_matrix_bias_d.shape[1]):
+                        historical_matrix_bias_d[i,d]=np.sum(historical_matrix_bias[i,d*tsd:(d+1)*tsd])
+                    historical_matrix_bias_d[historical_matrix_bias_d<th_drizzle]=0
+                # print(historical_matrix_unbias.shape,historical_matrix_bias_d.shape)    
                 
-                quant_mat_bias[i,:]=np.quantile(historical_matrix_bias_d[i,:]\
-                                                [historical_matrix_bias_d[i,:]>th_drizzle],np.arange(0,1.01,0.01))
-                quant_mat[i,:]=np.quantile(historical_matrix_unbias[i,:][historical_matrix_unbias[i,:]>th_drizzle],np.arange(0,1.01,0.01))
+                for i in range(historical_matrix_unbias.shape[0]):
+                    
+                    quant_mat_bias[i,:]=np.quantile(historical_matrix_bias_d[i,:]\
+                                                    [historical_matrix_bias_d[i,:]>th_drizzle],np.arange(0,1.01,0.01))
+                    quant_mat[i,:]=np.quantile(historical_matrix_unbias[i,:][historical_matrix_unbias[i,:]>th_drizzle],np.arange(0,1.01,0.01))
+                    for j in range(quant_mat.shape[1]):quant_coeffs[i,j]=quant_mat[i,j]/quant_mat_bias[i,j]
+                    
+        else:
+            if self.var_unb=='E':fn_quant=self.fn_quant_ev
+            else:fn_quant=self.fn_quant_pr
+            quant_mat_bias=ct.marray(xr.open_dataset(fn_quant),self.model_name)[self.mask]
+            quant_mat=ct.marray(xr.open_dataset(fn_quant),'IRM')[self.mask]
+            for i in range(quant_mat.shape[0]):
                 for j in range(quant_mat.shape[1]):quant_coeffs[i,j]=quant_mat[i,j]/quant_mat_bias[i,j]
-                
         # biased_data_var=np.array(self.vec_data)
  
         "******************************************"
@@ -583,13 +623,12 @@ class MAR_input_data:
         "******************************************"
         
         "Future quantiles to assess value location"
-        
-     
+
         if self.find_timestep()[1]=='hours':
             tsd=24
-            FutUnb_d=np.zeros([historical_matrix_bias.shape[0],
+            FutUnb_d=np.zeros([biased_data.shape[0],
                                                int(FutUnb.shape[1]/tsd)])
-            for i in range(historical_matrix_bias_d.shape[0]):
+            for i in range(biased_data.shape[0]):
                 for d in range(FutUnb_d.shape[1]):
                     FutUnb_d[i,d]=np.sum(FutUnb[i,d*tsd:(d+1)*tsd]) 
                     
@@ -638,46 +677,74 @@ class MAR_input_data:
         Unbiased_data=np.zeros_like(biased_data)
         
         print ("redistributing on the daily time-step")
-        
-        for i in range(self.vec_data.shape[0]):
-            # print(i)
-            d=0  
-            while d<ydays:
-                # if i==67:print(d,Unbiased_data_d[i,d])
-                # if d%100==0:print(d)
-                if Unbiased_data_d[i,d]<=0.1:d+=1
- 
-                else:
-                    
-                    d1=d
-                    ndays=0
-                    
-                    while d1<ydays and Unbiased_data_d[i,d1]>.1 :
-                        d1+=1;ndays+=1
-                    
-             
-                    precip_sum_d=np.sum(Unbiased_data_d[i,d:d+ndays])
-                    biased_sum=np.sum(biased_data\
-                                       [i,d*tsd:(d+ndays)*tsd])
-                    biased_hourly=(biased_data)\
-                                       [i,d*tsd:(d+ndays)*tsd]
-          
-                    weights=biased_hourly/biased_sum
-                    
-                    Unbiased_data[i,d*tsd:(d+ndays)*tsd]=\
-                        precip_sum_d*weights
-                   
-                    # print(d,PRECIP_IRM[i,j,d])
-        
-                    d+=ndays
+        if self.var_unb=='PRECIP_QUANTITY':
+            
+            "Si ce sont les pluies qui sont débiasées"
+            "On débiaise sur tout l'événement et non pas jour après jour"
+            
+            for i in range(self.vec_data.shape[0]):
+                # print(i)
+                d=0  
+                while d<ydays:
+                    # if i==67:print(d,Unbiased_data_d[i,d])
+                    # if d%100==0:print(d)
+                    if Unbiased_data_d[i,d]<=0.1:d+=1
+     
+                    else:
+                        
+                        d1=d
+                        ndays=0
+                        
+                        while d1<ydays and Unbiased_data_d[i,d1]>.1 :
+                            d1+=1;ndays+=1
+                        
+                 
+                        precip_sum_d=np.sum(Unbiased_data_d[i,d:d+ndays])
+                        biased_sum=np.sum(biased_data\
+                                           [i,d*tsd:(d+ndays)*tsd])
+                        biased_hourly=(biased_data)\
+                                           [i,d*tsd:(d+ndays)*tsd]
+              
+                        weights=biased_hourly/biased_sum
+                        
+                        Unbiased_data[i,d*tsd:(d+ndays)*tsd]=\
+                            precip_sum_d*weights
+                       
+                        # print(d,PRECIP_IRM[i,j,d])
+            
+                        d+=ndays
+        else:
+            "Débiai<-sage jour après jour pour l'évapotranspiration notamment"
+            for i in range(self.vec_data.shape[0]):
+                # print(i)
+                d=0  
+                while d<ydays:
+                    # if i==67:print(d,Unbiased_data_d[i,d])
+                    # if d%100==0:print(d)
+                    if Unbiased_data_d[i,d]<=0.1:d+=1
+     
+                    else:
+                        
+
+                        precip_sum_d=Unbiased_data_d[i,d]
+                        biased_sum=np.sum(biased_data\
+                                           [i,d*tsd:(d+1)*tsd])
+                        biased_hourly=(biased_data)\
+                                           [i,d*tsd:(d+1)*tsd]
+              
+                        weights=biased_hourly/biased_sum
+                        
+                        Unbiased_data[i,d*tsd:(d+1)*tsd]=\
+                            precip_sum_d*weights
+                       
+                        # print(d,PRECIP_IRM[i,j,d])
+            
+                        d+=1
+            
         
         if self.var=='MBRO3' or self.var=='MBRR' or self.var=='MBSF':
             # biased_data_var=np.array(self.vec_data)
-            biased_data_var=MAR_input_data(xsummits=self.xsummits, ysummits=self.ysummits,
-                                             date_debut=self.date_debut,
-                                             date_fin=self.date_fin,
-                                             directory=self.directory, var=self.var, 
-                                             mod_ydays=self.mod_ydays).vec_data
+            biased_data_var=self.vec_data
             
             print("biased data var shape ",biased_data_var.shape)
             print('unbiased data shape' ,Unbiased_data.shape)
@@ -886,22 +953,33 @@ class MAR_input_data:
 "Test de l'objet"
 
 if __name__ == "__main__":
-    # dir_ds="/srv1_tmp1/fettweis/EU-MAR-7.5km/histo/EUb-ERA/" #dossier avec sortie MAR au format Netcdf
-    # dir_ds="/srv1_tmp1/fettweis/EUh-MPI-5km/output-5km-ssp370/"
-    # dir_ds='/climato_tmp1/fettweis/MAR/out/EUb/output-hourly/'
-    dir_ds='/phypc11_tmp3/MARv3.14/MARv3.14-EUk-NorESM2-MM-5km-ssp585/'
-    dir_hist='/phypc11_tmp3/MARv3.14/MARv3.14-EUk-NorESM2-MM-5km-ssp585/'
+  
+    dir_ds='/phypc11_tmp3/MARv3.14/MARv3.14-EUi-MIROC6-5km-ssp585/'
+    dir_hist='/phypc11_tmp3/MARv3.14/MARv3.14-EUi-MIROC6-5km-ssp585/'
     
-    dir_stock='/phypc11_tmp3/MARv3.14/'
+    dir_stock='/srv1_tmp6/fettweis/MARv3.14/'
     dir_ins=['MARv3.14-EUh-MPI-ESM1-2-HR-5km-',
     'MARv3.14-EUi-MIROC6-5km-',
     'MARv3.14-EUm-EC-Earth3-Veg-5km-',
-    'MARv3.14-EUk-NorESM2-MM-5km-'
+    'MARv3.14-EUk-NorESM2-MM-5km-',
+    'MARv3.14-EUq-CMCC-CM2-SR5-5km-',
+    'MARv3.14-EUl-IPSL-CM6A-LR-5km-'
+    
               ]
     
-    mod_racs=['MPI','MIR','EC3','NOR']
+    mod_names=['MPI-ESM1',
+               'MIROC6',
+               'EC3',
+               'NorESM2',
+               'CMCC-CM2-SR5',
+               'IPSL'
+               ]
+    
+    mod_racs=['MPI','MIR','EC3','NOR','CMC','IPSL']
+    
     scens=['ssp126','ssp245','ssp370','ssp585']
-    # dir_ds="/srv7_tmp1/jbrajkovic/These/ERA5/"
+
+
     dirout="/srv7_tmp1/jbrajkovic/These/forWOLF/evapo"#-MPI_1981-2010/" #dossier outputs
     filenameshp="grid.shp" #nom du shapefile en sortie
     
@@ -909,63 +987,85 @@ if __name__ == "__main__":
     "dates entre lesquelles sélectionner les données (Heures,jour,mois,annee"
     "code à retravailler si simulations futures avec pas de temps inférieur à l'heure"
     
-    # date_debut1=datetime.datetime(2016,1,1,5)
-    # date_fin1=datetime.datetime(2100,12,31,23)
-    
-    # "Définition d'un rectangle"
-    
-    # xs=np.array([200000,200000,
-    #               272000,272000.])
-    # ys=np.array([63000,152000,
-    #               152000,63000])
-    
-    # for mod in range(4):
-    #     for scen in range(4):
-        
-    #         dirin=dir_stock+dir_ins[mod]+scens[scen]+'/'
-    #         print(dirin)
-    #         objet_MAR=MAR_input_data(xsummits=xs,ysummits=ys,
-    #                        date_debut=date_debut1,
-    #                        date_fin=date_fin1,
-    #                        directory=dirin,
-    #                        directory_hist_sim=dir_hist,
-    #                        var='MBEP',
-    #                        var_unb='E',
-    #                        UnborNot=1,
-    #                        syu=date_debut1.year,
-    #                        eyu=date_fin1.year)
+    date_debut1=datetime.datetime(1981,1,1,0)
+    date_fin1=datetime.datetime(2010,12,31,23)
+    
+    "Définition d'un rectangle"
+    
+    xs=np.array([200000,200000,
+                  272000,272000.])
+    ys=np.array([63000,152000,
+                  152000,63000])
+    
+    dat_types=[1,1,1,0,0,1]
+    
+    sc=3
+    
+    for mod in range(6):
+        # for sc in range(4):
+            dirin=dir_stock+dir_ins[mod]+scens[sc]+'/'
+            print(dirin)
+            objet_MAR=MAR_input_data(xsummits=xs,ysummits=ys,
+                            date_debut=date_debut1,
+                            date_fin=date_fin1,
+                            directory=dirin,
+                            directory_hist_sim=dir_hist,
+                            var='MBEP',
+                            var_unb='E',
+                            UnborNot=1,
+                            syu=date_debut1.year,
+                            eyu=date_fin1.year,
+                            mod_ydays=dat_types[mod],
+                            model_name=mod_names[mod],
+                            generate_quantiles=0)
            
         
-    #         print('ok')
-    #         dirout1=dirout+'-'+mod_racs[mod]+'_'+scens[scen]+'_'+str(date_debut1.year)+'-'+\
-    #             str(date_fin1.year)+'/'
+            print('ok')
+            if date_fin1.year>2015:
+                dirout1=dirout+'-'+mod_racs[mod]+'_'+scens[sc]+'_'+str(date_debut1.year)+'-'+\
+                    str(date_fin1.year)+'/'
+            else:
+                
+                dirout1=dirout+'-'+mod_racs[mod]+'_'+str(date_debut1.year)+'-'+\
+                    str(date_fin1.year)+'/'
             
-    #         objet_MAR.MAR_shapefile(filenameshp,dirout1)
-    #         objet_MAR.MAR_BinaryOutputs(dirout1)
-      
-
-
+            objet_MAR.MAR_shapefile(filenameshp,dirout1)
+            objet_MAR.MAR_BinaryOutputs(dirout1)
+            
+            
+            
+    "*************************************"
+    "**Tests pour améliorer le programme***"
+    "*************************************"
 
     xs=np.array([200000,200000,
                   210000,210000.])
     ys=np.array([63000,73000,
                   73000,63000])
     dirin=dir_hist      
+    
     date_debut1=datetime.datetime(2016,1,1,0)
-    date_fin1=datetime.datetime(2017,12,31,23)  
+    date_fin1=datetime.datetime(2019,12,31,23)  
             
     objet_MAR=MAR_input_data(xsummits=xs,ysummits=ys,
-                           date_debut=date_debut1,
-                           date_fin=date_fin1,
-                           directory=dirin,
-                           directory_hist_sim=dir_hist,
-                           var='MBRO3',
-                           var_unb='PRECIP_QUANTITY',
-                           UnborNot=1,
-                           syu=1982,
-                           eyu=1983,
-                           mod_ydays=0)
-
+                            date_debut=date_debut1,
+                            date_fin=date_fin1,
+                            directory=dirin,
+                            directory_hist_sim=dir_hist,
+                            var='MBRO3',
+                            model_name='MIROC6',
+                            var_unb='PRECIP_QUANTITY',
+                            UnborNot=1,
+                            syu=2016,
+                            eyu=2017,
+                            mod_ydays=1,
+                            generate_quantiles=0)
+    
+    dirout1='/srv7_tmp1/jbrajkovic/These/forWOLF/test/'
+    filenameshp='test.shp'
+    objet_MAR.MAR_shapefile(filenameshp,dirout1)
+    objet_MAR.MAR_BinaryOutputs(dirout1)
+    
     # "Tests outputs"
     cmap=ct.IPCC_cmap()
     objet_MAR.plot_mask()
@@ -980,25 +1080,24 @@ if __name__ == "__main__":
     maxi=np.max(maxs)
   
     
-    bounds=np.arange(-maxi,maxi+20,20)
-    norm = mpl.colors.BoundaryNorm(bounds, cmap.N)
-    
-    
-    MSK=objet_MAR.mask_rectangles()
-    fig=plt.figure(figsize=(6,6))
-    ax=plt.subplot()
-    m=ct.map_belgium_zoom(ax, objet_MAR.lons, objet_MAR.lats)
-    lons_w=objet_MAR.lons[MSK==True];lats_w=objet_MAR.lats[MSK]
-    MBRO3=np.array(objet_MAR.lons)
-    for k in range(0,np.size(MBRO3_mask)):
-        for i in range(0,MBRO3.shape[0]):
-            for j in range(0,MBRO3.shape[1]):
-                if lons_w[k]==objet_MAR.lons[i,j] and lats_w[k]==objet_MAR.lats[i,j]:
-                    MBRO3[i,j]=MBRO3_mask[k]
-    vmax=np.max(MBRO3[pd.isna(MBRO3)==False])                
-    MBRO3[MSK==False]=float("nan")
-    x,y=m(objet_MAR.lons,objet_MAR.lats)
-    mapa=m.pcolormesh(x,y,MBRO3,norm=norm,cmap=cmap)
-    cbar=m.colorbar()
-    plt.savefig('fig.png',bbox_inches='tight')
-
+    # bounds=np.arange(-maxi,maxi+20,20)
+    # norm = mpl.colors.BoundaryNorm(bounds, cmap.N)
+    
+    
+    # MSK=objet_MAR.mask_rectangles()
+    # fig=plt.figure(figsize=(6,6))
+    # ax=plt.subplot()
+    # m=ct.map_belgium_zoom(ax, objet_MAR.lons, objet_MAR.lats)
+    # lons_w=objet_MAR.lons[MSK==True];lats_w=objet_MAR.lats[MSK]
+    # MBRO3=np.array(objet_MAR.lons)
+    # for k in range(0,np.size(MBRO3_mask)):
+    #     for i in range(0,MBRO3.shape[0]):
+    #         for j in range(0,MBRO3.shape[1]):
+    #             if lons_w[k]==objet_MAR.lons[i,j] and lats_w[k]==objet_MAR.lats[i,j]:
+    #                 MBRO3[i,j]=MBRO3_mask[k]
+    # vmax=np.max(MBRO3[pd.isna(MBRO3)==False])                
+    # MBRO3[MSK==False]=float("nan")
+    # x,y=m(objet_MAR.lons,objet_MAR.lats)
+    # mapa=m.pcolormesh(x,y,MBRO3,norm=norm,cmap=cmap)
+    # cbar=m.colorbar()
+    # plt.savefig('fig.png',bbox_inches='tight')

wolfhece/opengl/py3d.py

@@ -425,7 +425,7 @@ class WolfArray_plot3D():
     reference for texture 2D : https://registry.khronos.org/OpenGL-Refpages/gl4/html/glTexImage2D.xhtml
 
     OPENGL
-    ------
+
     The first element corresponds to the lower left corner of the texture image.
     Subsequent elements progress left-to-right through the remaining texels in the lowest row of the texture image,
      and then in successively higher rows of the texture image.
@@ -442,7 +442,7 @@ class WolfArray_plot3D():
            const void * data);
 
     NUMPY
-    -----
+
     shape[0] is the number of rows and shape[1] is the number of columns.
 
     The "data" buffer is row-major order or column-major order, depending on the value of the order parameter.
@@ -456,7 +456,7 @@ class WolfArray_plot3D():
        - OpenGL Texture width = shape[0]
        - OpenGL Texture height = shape[1]
 
-    ** ++ IMPORTANT **
+    ++ IMPORTANT
 
     We assume that if data is row-major order, the indexing [i,j] is (y, x) and if data is column-major order, the indexing is (x, y)
 
@@ -469,7 +469,7 @@ class WolfArray_plot3D():
        - Transposition is done by changing the indexing convention.
        - "texture" calls in shaders is the same for both row-major and column-major order.
 
-    ** -- IMPORTANT **
+    -- IMPORTANT
     """
 
     def __init__(self,

wolfhece/pyshields.py

@@ -303,7 +303,7 @@ def _get_Rouse(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=R
       elif frac==100:
             return rouse-1.2
 
-def get_transport_mode(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUREWATER) -> BED_LOAD | SUSPENDED_LOAD_50 | SUSPENDED_LOAD_100 | WASH_LOAD:
+def get_transport_mode(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUREWATER): # -> BED_LOAD | SUSPENDED_LOAD_50 | SUSPENDED_LOAD_100 | WASH_LOAD:
       """
       Transport mode
 
@@ -350,7 +350,7 @@ def get_d_cr_susp(q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUR
       except:
             return 0.
 
-def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with sadim"""
 
       smax = 1000
@@ -406,7 +406,7 @@ def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWAT
 
       return fig,ax
 
-def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with dstar"""
 
       smax = 1000
@@ -465,7 +465,7 @@ def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWAT
 
       return fig,ax
 
-def shieldsdia_dim(figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_dim(figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with dimensional values"""
 
       smax=1e6