Merge pull request #21 from SimonRouet/flowering

Complete example/calibration_GEVES_2021 with files used in the article Rouet et al. (2022) in in silico Plants
openalea-incubator · Jul 21, 2022 · a249105 · a249105
2 parents 8a1a3a6 + de1880b
commit a249105
Show file tree

Hide file tree

Showing 7 changed files with 9,607 additions and 214 deletions.
diff --git a/example/calibration_GEVES_2021/inputs/plan_simulation_calibration_GEVES.csv b/example/calibration_GEVES_2021/inputs/plan_simulation_calibration_GEVES.csv
diff --git a/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_ploudaniel_2009.csv b/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_ploudaniel_2009.csv
diff --git a/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_ploudaniel_2015.csv b/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_ploudaniel_2015.csv
diff --git a/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_theix_2009.csv b/example/calibration_GEVES_2021/inputs/plan_simulation_sensitivity_theix_2009.csv
diff --git a/example/calibration_GEVES_2021/inputs/plan_simulation_validation_GEVES.csv b/example/calibration_GEVES_2021/inputs/plan_simulation_validation_GEVES.csv
diff --git a/example/calibration_GEVES_2021/run_lgrass_GEVES.py b/example/calibration_GEVES_2021/run_lgrass_GEVES.py
@@ -18,7 +18,7 @@ def run_lgrass(scenario_id=1, inputs_dir_path='inputs', outputs_dir_path='output
     """
 
     # Scenario to be run
-    scenarii_df = pd.read_csv(os.path.join('inputs', 'plan_simulation_calibration_GEVES.csv'), index_col='Scenario')
+    scenarii_df = pd.read_csv(os.path.join(inputs_dir_path, 'plan_simulation_calibration_GEVES.csv'), index_col='Scenario')
     scenario = scenarii_df.loc[scenario_id].to_dict()
     scenario_name = scenario['name']
 

diff --git a/lgrass/lgrass.lpy b/lgrass/lgrass.lpy
@@ -1411,7 +1411,7 @@ Feuille(X, X_apex, X_phytomere):
           X.TailleEmergence = Seuil[X.id_plante][X.id_talle]
           TrueAge = X.age - dt_eff #On pourrait affiner la determination de TrueAge qui en realite a eu lieu entre age-dt_eff et age-2dt_eff (soit on prend la moyenne soit au prorata des longueurs)
 
-          tmax_potcroiss = 166.588 #conversion des �C jour en  heures pour manip a 17�C 118*24/17
+          tmax_potcroiss = 166.588 #conversion des °C jour en  heures pour manip a 17°C 118*24/17
           lmax_potcroiss = 338.5554 # mm
 
           if option_profile == "triangular":