From af22261c1059c5c6330cd8fd8a2eb3666497f6b7 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 14 Nov 2019 16:21:00 +0100 Subject: [PATCH] prepare_network: revise imports, add line_break --- scripts/prepare_network.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index 55372745..95e3b887 100644 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -25,7 +25,7 @@ Relevant Settings co2limit: max_hours: -.. seealso:: +.. seealso:: Documentation of the configuration file ``config.yaml`` at :ref:`costs_cf`, :ref:`electricity_cf` @@ -50,21 +50,17 @@ Description """ -import logging -logger = logging.getLogger(__name__) -import pandas as pd -idx = pd.IndexSlice +from add_electricity import load_costs, update_transmission_costs +from six import iteritems import numpy as np -import scipy as sp -import xarray as xr import re - -from six import iteritems -import geopandas as gpd - import pypsa -from add_electricity import load_costs, update_transmission_costs +import pandas as pd +import logging + +idx = pd.IndexSlice +logger = logging.getLogger(__name__) def add_co2limit(n, Nyears=1., factor=None): @@ -81,7 +77,8 @@ def add_emission_prices(n, emission_prices=None, exclude_co2=False): if emission_prices is None: emission_prices = snakemake.config['costs']['emission_prices'] if exclude_co2: emission_prices.pop('co2') - ep = (pd.Series(emission_prices).rename(lambda x: x+'_emissions') * n.carriers.filter(like='_emissions')).sum(axis=1) + ep = (pd.Series(emission_prices).rename(lambda x: x+'_emissions') * + n.carriers.filter(like='_emissions')).sum(axis=1) n.generators['marginal_cost'] += n.generators.carrier.map(ep) n.storage_units['marginal_cost'] += n.storage_units.carrier.map(ep)