Merge branch '126-feature-refactor-crop-models-outputs-homogenize' into 'develop'

Resolve "[feature] Refactor crop models outputs - homogenize"

See merge request !34

MODULES/CROPS/GRASSIM/management/management.py

@@ -95,7 +95,7 @@ class Management():
 
     def init_daily_loop(self, day, crop, soil):
         self.day = day
-        self.year = day.year
+        self.year = str(day.year)
         self.fert_org = 0
         self.fert_min = 0
         self.exported_BM = np.zeros(self.grid)

MODULES/CROPS/GRASSIM/run_grassim.py

@@ -50,7 +50,7 @@ def run_grassim(config, WD, daily_irr, lat, alt):
 
             run_daily_loop(day, ET0, WD[year].loc[day], day_irr, soil, crop, management)
 
-    return soil, (crop, management)
+    return soil, crop, management
 
 
 def run_daily_loop(day, ET0, WD, day_irr, soil, crop, management):

MODULES/CROPS/STICS/JAVA/run_java_stics.py

@@ -95,7 +95,6 @@ def run_independant_usms(config, WD, daily_irr, scenario_P):
                 
             Crop_plot.fill_dict_variables_for_each_year(year)
     
-    Soil_plot = object()
     
-    return Soil_plot, Crop_plot
+    return Crop_plot
         

MODULES/CROPS/run_crop_simulations.py

@@ -12,20 +12,32 @@ from MODULES.CROPS.GRASSIM.run_grassim import run_grassim
 
 
 def run_crop_simu(config, option_2D, WD, daily_irr, scenario_P):
+
+    results = {}
         
     if config['CropModel'] == 'simple':
-        
         Soil_plot, Crop_plot = run_independant_years_of_crop(config, option_2D, WD, daily_irr, 
                                                              scenario_P['Latitude'],
                                                              scenario_P['Altitude'])
+        results = merge_results([Soil_plot, Crop_plot])
         
     if config['CropModel'] == 'stics':
-
-        Soil_plot, Crop_plot = run_independant_usms(config, WD, daily_irr, scenario_P)        
+        Crop_plot = run_independant_usms(config, WD, daily_irr, scenario_P)  
+        results = Crop_plot.nyears_data      
         
     if config['CropModel'] == 'grassim':
-        
-        Soil_plot, Crop_plot = run_grassim(config, WD, daily_irr, scenario_P['Latitude'], scenario_P['Altitude'])
-        
+        Soil_plot, Crop_plot, Management_plot = run_grassim(config, WD, daily_irr, scenario_P['Latitude'], scenario_P['Altitude'])
+        results = merge_results([Soil_plot, Crop_plot, Management_plot])
     
-    return Soil_plot, Crop_plot
+    return results
+
+
+def merge_results(objects):
+    results = {}
+    years = objects[0].nyears_data.keys()
+    for year in years:
+        merged_dict = {}
+        for object in objects:
+            merged_dict.update(object.nyears_data[year])
+        results[year] = merged_dict
+    return results

main.py

@@ -210,12 +210,14 @@ PV_central.get_several_years_of_electricity_production(Sun_positions_complete, L
 ### CROP MODEL
 #Temporary line, this parameter (option_2D) should be in SCENARIOS input files (general parameters)
 option_2D = 1 # 0 pour pas de spatialisation et 1 pour une spatialisation du modèle de culture
-Soil_plot, Crop_plot = run_crop_simu(crop_config, option_2D, WD.nyears_daily_data,
+results = run_crop_simu(crop_config, option_2D, WD.nyears_daily_data,
                                      L.daily_irr_spat,
                                      Loc_1)
 
 
 
+# Code below obsolete since issue 126 (crop model outputs refactor)
+"""
 if crop_config['CropModel'] == ('simple' or 'stics'):
     Crop_plot.visualize_map_of_a_variable('Fresh_yield', PV_1_3Dconfig.PV_central_PD, 
                                           M, 2008, MM_DD='10-10', unit='g/m²')
@@ -223,4 +225,4 @@ if crop_config['CropModel'] == ('simple' or 'stics'):
 else:
     Crop_plot[0].visualize_map_of_a_variable('BM', PV_1_3Dconfig.PV_central_PD, 
                                              M, 2008, MM_DD='10-10', unit='t/ha')
-    save_csv('mean_data.csv', Crop_plot[0].nyears_data, ['BM', 'GRO'])
+"""
\ No newline at end of file