diff --git a/figures/all_layers_pv_generation_all_4_cities.png b/figures/all_layers_pv_generation_all_4_cities.png new file mode 100644 index 00000000..455e16bd Binary files /dev/null and b/figures/all_layers_pv_generation_all_4_cities.png differ diff --git a/figures/layer_6_pv_generation_multi_city.pdf b/figures/layer_6_pv_generation_multi_city.pdf new file mode 100644 index 00000000..c3c337b4 Binary files /dev/null and b/figures/layer_6_pv_generation_multi_city.pdf differ diff --git a/figures/layers_total_pv_all_4_cities.png b/figures/layers_total_pv_all_4_cities.png new file mode 100644 index 00000000..b8c0aecb Binary files /dev/null and b/figures/layers_total_pv_all_4_cities.png differ diff --git a/figures/lcoe_values.png b/figures/lcoe_values.png new file mode 100644 index 00000000..b4881ce5 Binary files /dev/null and b/figures/lcoe_values.png differ diff --git a/figures/self_sufficiency.png b/figures/self_sufficiency.png new file mode 100644 index 00000000..8b4a6ff9 Binary files /dev/null and b/figures/self_sufficiency.png differ diff --git a/figures/yearly_pv_generation.png b/figures/yearly_pv_generation.png new file mode 100644 index 00000000..0c1e4422 Binary files /dev/null and b/figures/yearly_pv_generation.png differ diff --git a/main.py b/main.py index 10451d16..0772f093 100644 --- a/main.py +++ b/main.py @@ -18,9 +18,9 @@ from pv_assessment.pv_system_assessment_with_lcoe import PvSystemAssessment from scripts import random_assignation input_file_1 = "./data/updated_geojson_layers/output_layer_6.geojson" -input_file_2 = "./data/updated_geojson_layers/output_layer_20.geojson" -input_file_3 = "./data/updated_geojson_layers/output_layer_38.geojson" -input_file_4 = "./data/updated_geojson_layers/output_layer_53.geojson" +# input_file_2 = "./data/updated_geojson_layers/output_layer_20.geojson" +# input_file_3 = "./data/updated_geojson_layers/output_layer_38.geojson" +# input_file_4 = "./data/updated_geojson_layers/output_layer_53.geojson" demand_file = "data/energy_demand_data.csv" output_path = (Path(__file__).parent.parent / 'hub/out_files').resolve() @@ -89,9 +89,9 @@ def process_city(input_file, name_suffix): city1 = process_city(input_file_1, "_city1") -city2 = process_city(input_file_2, "_city2") -city3 = process_city(input_file_3, "_city3") -city4 = process_city(input_file_4, "_city4") +# city2 = process_city(input_file_2, "_city2") +# city3 = process_city(input_file_3, "_city3") +# city4 = process_city(input_file_4, "_city4") print("All cities processed.") @@ -125,14 +125,14 @@ def city_to_gdf(city_obj): return gdf gdf_city1 = city_to_gdf(city1) -gdf_city2 = city_to_gdf(city2) -gdf_city3 = city_to_gdf(city3) -gdf_city4 = city_to_gdf(city4) +# gdf_city2 = city_to_gdf(city2) +# gdf_city3 = city_to_gdf(city3) +# gdf_city4 = city_to_gdf(city4) -all_buildings_gdf = gpd.GeoDataFrame(pd.concat([gdf_city1, gdf_city2, gdf_city3, gdf_city4], ignore_index=True), +all_buildings_gdf = gpd.GeoDataFrame(pd.concat([gdf_city1], ignore_index=True), crs=gdf_city1.crs) -print("Dataframe for all 4 cities created, now plotting and saving figures") +print("Dataframe for all cities created, now plotting and saving figures") layers_file = "data/cmm_limites_avec_mtl.geojson" layers_gdf = gpd.read_file(layers_file)