Skip to content
Snippets Groups Projects
Commit 6d82a5cf authored by Bruhwyler Roxane's avatar Bruhwyler Roxane
Browse files

Merge branch... 

Merge branch '127-hotfix-error-in-main-and-example-files-in-the-call-of-get_light_maps' into 'develop'

Resolve "[hotfix] Error in main and example files in the call of get_light_maps()"

See merge request !35
parents dece1bfe 2af50601
No related branches found
No related tags found
1 merge request!35Resolve "[hotfix] Error in main and example files in the call of get_light_maps()"
Hide whitespace changes
Inline Side-by-side
example.py
+ 2
− 2
View file @ 6d82a5cf
......@@ -86,8 +86,8 @@ L.get_light_maps(Sun_positions_samp.solar_vector,
scheme=Loc_1['SkyDiscretizationScheme'],
MF=Loc_1['MF'],
n_small_suns=Loc_1['FibonacciSamples'],
True,
3)
visualization=False,
Sun_P_map_to_visualize=3)
# Integration of irradiation along days
L.get_daily_irradiation_map(Sun_positions_samp.SP, Light_instance.data, True,
......
logging_file.log
+ 29
− 26
View file @ 6d82a5cf
09:41:20 AM (INFO) - START OF THE SIMULATION
09:41:20 AM (INFO) - Input values from Example1_loc.yaml have been imported successfully
09:41:20 AM (INFO) - Input values from Example1_AV.yaml have been imported successfully
09:41:20 AM (INFO) - Input values from Example1_PV_Module.yaml have been imported successfully
09:41:20 AM (INFO) - Input values from simple_example.yml have been imported successfully
09:41:20 AM (INFO) - Get hourly weather data for year 2005 from PvGis
09:41:20 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
09:41:21 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2005&endyear=2005&components=1&outputformat=json HTTP/1.1" 302 0
09:41:21 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
09:41:22 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2005&endyear=2005&components=1&outputformat=json HTTP/1.1" 200 961476
09:41:23 AM (INFO) - Get hourly weather data for year 2006 from PvGis
09:41:23 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
09:41:23 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2006&endyear=2006&components=1&outputformat=json HTTP/1.1" 302 0
09:41:23 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
09:41:24 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2006&endyear=2006&components=1&outputformat=json HTTP/1.1" 200 961912
09:41:25 AM (INFO) - Get hourly weather data for year 2007 from PvGis
09:41:25 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
09:41:25 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2007&endyear=2007&components=1&outputformat=json HTTP/1.1" 302 0
09:41:25 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
09:41:26 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2007&endyear=2007&components=1&outputformat=json HTTP/1.1" 200 961132
09:41:27 AM (INFO) - Computation of daily weather data for year 2005
09:41:27 AM (INFO) - Computation of daily weather data for year 2006
09:41:27 AM (INFO) - Computation of daily weather data for year 2007
09:41:27 AM (DEBUG) - falling back to hashlib hashing: `pip install xxhash`for 50x faster cache checks
09:41:44 AM (INFO) - Input values from CROPS/SIMPLE/crop_init.yaml have been imported successfully
09:41:44 AM (INFO) - Input values from CROPS/SIMPLE/soil_init.yaml have been imported successfully
08:41:33 AM (INFO) - START OF THE SIMULATION
08:41:33 AM (INFO) - Input values from Example1_loc.yaml have been imported successfully
08:41:33 AM (INFO) - Input values from Example1_AV.yaml have been imported successfully
08:41:33 AM (INFO) - Input values from Example1_PV_Module.yaml have been imported successfully
08:41:33 AM (INFO) - Input values from simple_example.yml have been imported successfully
08:41:33 AM (INFO) - Get hourly weather data for year 2005 from PvGis
08:41:33 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
08:41:33 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2005&endyear=2005&components=1&outputformat=json HTTP/1.1" 302 0
08:41:33 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
08:41:38 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2005&endyear=2005&components=1&outputformat=json HTTP/1.1" 200 961476
08:41:39 AM (INFO) - Get hourly weather data for year 2006 from PvGis
08:41:39 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
08:41:40 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2006&endyear=2006&components=1&outputformat=json HTTP/1.1" 302 0
08:41:40 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
08:41:45 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2006&endyear=2006&components=1&outputformat=json HTTP/1.1" 200 961912
08:41:47 AM (INFO) - Get hourly weather data for year 2007 from PvGis
08:41:47 AM (DEBUG) - Starting new HTTP connection (1): re.jrc.ec.europa.eu:80
08:41:47 AM (DEBUG) - http://re.jrc.ec.europa.eu:80 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2007&endyear=2007&components=1&outputformat=json HTTP/1.1" 302 0
08:41:47 AM (DEBUG) - Starting new HTTPS connection (1): re.jrc.ec.europa.eu:443
08:41:52 AM (DEBUG) - https://re.jrc.ec.europa.eu:443 "GET /api/seriescalc?lat=50.376&lon=5.677&raddatabase=PVGIS-SARAH3&useHorizon=1&userHorizon=&startyear=2007&endyear=2007&components=1&outputformat=json HTTP/1.1" 200 961132
08:41:58 AM (INFO) - Computation of daily weather data for year 2005
08:41:58 AM (INFO) - Computation of daily weather data for year 2006
08:41:58 AM (INFO) - Computation of daily weather data for year 2007
08:42:05 AM (DEBUG) - Sum of solid angles = 2.004 * pi
08:42:05 AM (WARNING) - Sum of solid angles seems off, check the sky discretization scheme
08:42:05 AM (WARNING) - Sum of solid angles = 2.004 * pi
08:42:05 AM (DEBUG) - Sum of surface areas = 1.002
08:42:37 AM (INFO) - Input values from CROPS/SIMPLE/crop_init.yaml have been imported successfully
08:42:37 AM (INFO) - Input values from CROPS/SIMPLE/soil_init.yaml have been imported successfully
main.py
+ 5
− 3
View file @ 6d82a5cf
......@@ -99,8 +99,8 @@ L.get_light_maps(Sun_positions_samp.solar_vector,
scheme=Loc_1['SkyDiscretizationScheme'],
MF=Loc_1['MF'],
n_small_suns=Loc_1['FibonacciSamples'],
True,
3)
visualization=False,
Sun_P_map_to_visualize=3)
# Integration of irradiation along days
L.get_daily_irradiation_map(Sun_positions_samp.SP,
Light_instance.data)
......@@ -214,11 +214,13 @@ Soil_plot, Crop_plot = run_crop_simu(crop_config, option_2D, WD.nyears_daily_dat
L.daily_irr_spat,
Loc_1)
save_csv('mean_data.csv', Crop_plot.nyears_data, ['Biomass', 'Dry_yield'])
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²')
save_csv('mean_data.csv', Crop_plot.nyears_data, ['Dry_yield', 'Biomass'])
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'])
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment