From 4f59742e172704e76f05fe49962011ef8e4799df Mon Sep 17 00:00:00 2001 From: Robert John Date: Thu, 9 Jan 2025 13:38:52 +0100 Subject: [PATCH] update insert_per_scenario --- src/egon/data/datasets/chp/__init__.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/egon/data/datasets/chp/__init__.py b/src/egon/data/datasets/chp/__init__.py index d8cb7356d..f326da6a2 100644 --- a/src/egon/data/datasets/chp/__init__.py +++ b/src/egon/data/datasets/chp/__init__.py @@ -405,9 +405,9 @@ def insert_chp_statusquo(): ].Nettonennleistung.sum() print( - f""" - CHPs with a total installed electrical capacity of {dropped_capacity} kW are dropped - because of missing or wrong location data + f""" + CHPs with a total installed electrical capacity of {dropped_capacity} kW are dropped + because of missing or wrong location data """ ) @@ -648,14 +648,16 @@ def insert_chp_egon100re(): insert_per_scenario = set() -if "status2019" in config.settings()["egon-data"]["--scenarios"]: - insert_per_scenario.add(insert_chp_statusquo) +for scenario in config.settings()["egon-data"]["--scenarios"]: -if "eGon2035" in config.settings()["egon-data"]["--scenarios"]: - insert_per_scenario.add(insert_chp_egon2035) + if "status" in scenario: + insert_per_scenario.add(insert_chp_statusquo) + + if scenario == "eGon2035": + insert_per_scenario.add(insert_chp_egon2035) -if "eGon100RE" in config.settings()["egon-data"]["--scenarios"]: - insert_per_scenario.add(insert_chp_egon100re) + if scenario == "eGon100RE": + insert_per_scenario.add(insert_chp_egon100re) tasks = tasks + (insert_per_scenario, assign_heat_bus)