diff --git a/config.default.yaml b/config.default.yaml index c5f8172e..d99fd6b6 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -33,8 +33,8 @@ electricity: battery: 6 H2: 168 - powerplants_filter: false - custom_powerplants: false #replace or add + powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany'] + custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany'] conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] # estimate_renewable_capacities_from_capacity_stats: diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 381293a9..aff17143 100644 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -18,7 +18,6 @@ snapshots: closed: 'left' # end is not inclusive enable: - powerplantmatching: false prepare_links_p_nom: false electricity: @@ -33,6 +32,8 @@ electricity: battery: 6 H2: 168 + powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany'] + custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany'] conventional_carriers: [coal, CCGT] # [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] atlite: diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 2172e6b9..7d4d1e53 100644 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -32,8 +32,8 @@ electricity: battery: 6 H2: 168 - powerplants_filter: false - custom_powerplants: false #replace or add + powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany'] + custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany'] conventional_carriers: [coal, CCGT] # [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] atlite: