From 0279f9756c6962120425e2a617dda45012222bc0 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 22 Jan 2025 15:39:48 +0100 Subject: [PATCH 1/2] adjust delete sql statement --- src/egon/data/datasets/power_plants/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/egon/data/datasets/power_plants/__init__.py b/src/egon/data/datasets/power_plants/__init__.py index d40acc663..316aff5ee 100755 --- a/src/egon/data/datasets/power_plants/__init__.py +++ b/src/egon/data/datasets/power_plants/__init__.py @@ -577,6 +577,7 @@ def insert_hydro_biomass(): f""" DELETE FROM {cfg['target']['schema']}.{cfg['target']['table']} WHERE carrier IN ('biomass', 'reservoir', 'run_of_river') + AND scenario IN ('eGon2035', 'eGon100RE') """ ) From f43fc7339c5478e93d65bd95ce09eebd709270d3 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 22 Jan 2025 16:17:43 +0100 Subject: [PATCH 2/2] adjust when target is a national value --- src/egon/data/datasets/power_plants/__init__.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/egon/data/datasets/power_plants/__init__.py b/src/egon/data/datasets/power_plants/__init__.py index 316aff5ee..99360c487 100755 --- a/src/egon/data/datasets/power_plants/__init__.py +++ b/src/egon/data/datasets/power_plants/__init__.py @@ -324,7 +324,16 @@ def insert_hydro_plants(scenario): for carrier in map_carrier.keys(): # import target values - target = select_target(carrier, scenario) + if scenario == "eGon100RE": + target = pd.read_sql( + f"""SELECT capacity FROM supply.egon_scenario_capacities + WHERE scenario_name = '{scenario}' + AND carrier = '{carrier}' + """, + con=db.engine(), + ).capacity[0] + elif scenario == "eGon2035": + target = select_target(carrier, scenario) # import data for MaStR mastr = pd.read_csv(