prepare_network: revise imports, add line_break

This commit is contained in:
Fabian 2019-11-14 16:21:00 +01:00
parent 3370bd3b92
commit af22261c10

View File

@ -25,7 +25,7 @@ Relevant Settings
co2limit: co2limit:
max_hours: max_hours:
.. seealso:: .. seealso::
Documentation of the configuration file ``config.yaml`` at Documentation of the configuration file ``config.yaml`` at
:ref:`costs_cf`, :ref:`electricity_cf` :ref:`costs_cf`, :ref:`electricity_cf`
@ -50,21 +50,17 @@ Description
""" """
import logging from add_electricity import load_costs, update_transmission_costs
logger = logging.getLogger(__name__) from six import iteritems
import pandas as pd
idx = pd.IndexSlice
import numpy as np import numpy as np
import scipy as sp
import xarray as xr
import re import re
from six import iteritems
import geopandas as gpd
import pypsa 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): 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: if emission_prices is None:
emission_prices = snakemake.config['costs']['emission_prices'] emission_prices = snakemake.config['costs']['emission_prices']
if exclude_co2: emission_prices.pop('co2') 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.generators['marginal_cost'] += n.generators.carrier.map(ep)
n.storage_units['marginal_cost'] += n.storage_units.carrier.map(ep) n.storage_units['marginal_cost'] += n.storage_units.carrier.map(ep)