From d45636522573388a95531cbebaf1d3e5e0a1537a Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Thu, 16 Dec 2021 10:21:21 +0100 Subject: [PATCH] Filter target values by scenario name --- src/egon/data/datasets/heat_supply/district_heating.py | 1 + src/egon/data/datasets/power_plants/wind_farms.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egon/data/datasets/heat_supply/district_heating.py b/src/egon/data/datasets/heat_supply/district_heating.py index 8210167fb..cb4fececd 100644 --- a/src/egon/data/datasets/heat_supply/district_heating.py +++ b/src/egon/data/datasets/heat_supply/district_heating.py @@ -36,6 +36,7 @@ def capacity_per_district_heating_category(district_heating_areas, scenario): 'urban_central_resistive_heater', 'urban_central_geo_thermal', 'urban_central_solar_thermal_collector') + AND scenario_name = '{scenario}' """, index_col="technology", ) diff --git a/src/egon/data/datasets/power_plants/wind_farms.py b/src/egon/data/datasets/power_plants/wind_farms.py index e21a17886..6b7848fd5 100755 --- a/src/egon/data/datasets/power_plants/wind_farms.py +++ b/src/egon/data/datasets/power_plants/wind_farms.py @@ -26,7 +26,7 @@ def insert(): ) # target_power_df has the expected capacity of each federal state - sql = "SELECT carrier, capacity, nuts, scenario_name FROM supply.egon_scenario_capacities" + sql = "SELECT carrier, capacity, nuts, scenario_name FROM supply.egon_scenario_capacities WHERE scenario_name='eGon2035'" target_power_df = pd.read_sql(sql, con) # mv_districts has geographic info of medium voltage districts in Germany