Merge pull request #1 from rbarillot/Thermal_beta_origin

Thermal beta origin
openalea-incubator · Nov 2, 2020 · 24f47ad · 24f47ad
2 parents 77dfb89 + b0ddf33
commit 24f47ad
Show file tree

Hide file tree

Showing 13 changed files with 19,037 additions and 29,692 deletions.
diff --git a/lgrass/Lgrass_plot_functions.py b/lgrass/Lgrass_plot_functions.py
@@ -67,10 +67,10 @@ def graph_tiller_number(self, csv_name):
             data.groupby('TPS')['id talle'].count().plot(label=id_plant, legend=True)
 
         # Legends
-        plt.xlabel(u'Temps thermique (°C jour-1)')
+        plt.xlabel(u'Temps (heure)')
         plt.ylabel(u'Nombre de talles par n° plante')
         # Save plot
-        plt.savefig(os.path.join(csv_name + '_' + 'Nombre_talles' + '.PNG'))
+        plt.savefig(os.path.join(self.graph_dirpath, 'Nombre_talles.PNG'))
         plt.close()
 
     def graph_LAI(self, csv_name, pattern):
@@ -85,10 +85,10 @@ def graph_LAI(self, csv_name, pattern):
         df.groupby('TPS')['LAI'].sum().plot()
 
         # Legends
-        plt.xlabel(u'Temps thermique (°C jour-1)')
+        plt.xlabel(u'Temps (heure)')
         plt.ylabel('LAI')
         # Save plot
-        plt.savefig(os.path.join(csv_name + '_' + 'LAI' + '.PNG'))
+        plt.savefig(os.path.join(self.graph_dirpath, 'LAI.PNG'))
         plt.close()
 
     def graph_leaf_number(self, csv_name):
@@ -103,7 +103,7 @@ def graph_leaf_number(self, csv_name):
             plt.figure()
             data.groupby('TPS')['nb_feuille_emergees'].mean().plot(label=topo, legend=True)
             # Legends
-            plt.xlabel(u'Temps thermique (°C jour-1)')
+            plt.xlabel(u'Temps (heure)')
             plt.ylabel('Leaf number per axis')
             # Save plot
             pdf_file.savefig()

diff --git a/lgrass/inputs/Parametre_plante_Lgrass.xls b/lgrass/inputs/Parametre_plante_Lgrass.xls