Powerplants (#94)

* add nice carrier names to n.carriers

* closes #48

* update environment
This commit is contained in:
FabianHofmann 2019-11-09 09:08:25 +01:00 committed by Fabian Neumann
parent 7141ce9e5c
commit 0ea5a5c28f
3 changed files with 10 additions and 3 deletions

View File

@ -46,4 +46,4 @@ dependencies:
- git+https://github.com/PyPSA/glaes.git#egg=glaes - git+https://github.com/PyPSA/glaes.git#egg=glaes
- git+https://github.com/PyPSA/geokit.git#egg=geokit - git+https://github.com/PyPSA/geokit.git#egg=geokit
- cdsapi - cdsapi
- powerplantmatching - powerplantmatching>=0.4.2

View File

@ -577,6 +577,11 @@ def add_emission_prices(n, emission_prices=None, exclude_co2=False):
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)
def add_nice_carrier_names(n):
nice_names = pd.Series(snakemake.config['plotting']['nice_names'])
n.carriers['nice_names'] = nice_names[n.carriers.index]
if __name__ == "__main__": if __name__ == "__main__":
# Detect running outside of snakemake and mock snakemake for testing # Detect running outside of snakemake and mock snakemake for testing
if 'snakemake' not in globals(): if 'snakemake' not in globals():
@ -615,5 +620,6 @@ if __name__ == "__main__":
attach_storage(n, costs) attach_storage(n, costs)
estimate_renewable_capacities(n) estimate_renewable_capacities(n)
add_nice_carrier_names(n)
n.export_to_netcdf(snakemake.output[0]) n.export_to_netcdf(snakemake.output[0])

View File

@ -103,6 +103,7 @@ if __name__ == "__main__":
countries = n.buses.country.unique() countries = n.buses.country.unique()
ppl = (pm.powerplants(from_url=True) ppl = (pm.powerplants(from_url=True)
.powerplant.fill_missing_decommyears()
.powerplant.convert_country_to_alpha2() .powerplant.convert_country_to_alpha2()
.query('Fueltype not in ["Solar", "Wind"] and Country in @countries') .query('Fueltype not in ["Solar", "Wind"] and Country in @countries')
.replace({'Technology': {'Steam Turbine': 'OCGT'}}) .replace({'Technology': {'Steam Turbine': 'OCGT'}})