From 324ededa66afc6f0591cedac55c72afcde880511 Mon Sep 17 00:00:00 2001 From: FabianHofmann Date: Thu, 31 Oct 2019 14:59:51 +0100 Subject: [PATCH] fix typo --- config.default.yaml | 9 +++++---- scripts/build_powerplants.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 4316ca30..59ed067a 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -34,15 +34,16 @@ electricity: battery: 6 H2: 168 + powerplants_filter: false + custom_powerplants: false #replace or add + restrict_buildyear: false #delete generators built after 2015 + conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] + # estimate_renewable_capacities_from_capacity_stats: # # Wind is the Fueltype in ppm.data.Capacity_stats, onwind, offwind-{ac,dc} the carrier in PyPSA-Eur # Wind: [onwind, offwind-ac, offwind-dc] # Solar: [solar] - powerplants_filter: false - custom_powerplants: false #replace or add - restrict_buildyear: false #delete generators built after 2015 - conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] atlite: nprocesses: 4 diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py index 09099b60..0dad724e 100644 --- a/scripts/build_powerplants.py +++ b/scripts/build_powerplants.py @@ -79,7 +79,7 @@ if __name__ == "__main__": df.Technology.replace('Steam Turbine', 'OCGT').fillna('OCGT'))))) - ppl_query = snakemake.config['electricity']['powerplant_filter'] + ppl_query = snakemake.config['electricity']['powerplants_filter'] if isinstance(ppl_query, str): ppl.query(ppl_query, inplace=True)