Commit Graph

2074 Commits

Author SHA1 Message Date
Tom Brown
4f91c6c43d bugfix: make sure coal demand is there with regional demand 2024-02-20 09:49:19 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
Fabian Neumann
7f1ff0c324 Fix plotting of retrofitted hydrogen pipelines with pathway optimisation. 2024-02-16 16:41:21 +01:00
Fabian Neumann
27f9fb8cba add back in to_csv export (accidentally deleted) 2024-02-16 16:18:31 +01:00
Fabian Neumann
77753fff0d Merge branch 'master' into industry-pathway 2024-02-16 15:31:54 +01:00
Fabian Neumann
8ae0669b33 Revert "add_electricity: set locations and units of electricity buses"
This reverts commit 472a099881.
2024-02-16 15:31:17 +01:00
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway 2024-02-16 15:15:27 +01:00
Fabian Neumann
93bb4e5f54 add release note, simplify build_industry_sector_ratios_intermediate script 2024-02-16 15:14:18 +01:00
Fabian Neumann
472a099881 add_electricity: set locations and units of electricity buses 2024-02-16 13:30:52 +01:00
Fabian Neumann
4d4badc519 Merge branch 'master' into industry-pathway 2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec Merge branch 'industry-coal-bug' 2024-02-16 12:47:34 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit 2024-02-16 12:40:29 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia 2024-02-16 12:14:00 +01:00
Fabian Neumann
67484f9cf0 remove numpy import, add release ntoe 2024-02-16 12:13:35 +01:00
pre-commit-ci[bot]
4fa504b0db [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-14 17:32:24 +00:00
pre-commit-ci[bot]
b45df1724b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-14 17:31:52 +00:00
Tom Brown
e14bae345b new script to interpolate industry sector ratios today to tomorrow
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.

This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9 use production to determine today's energy demand for basic chemicals
This uniformises how demand for basic chemicals is calculated.

We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
Tom Brown
cc57952402 industrial prod: use EU28 total for denominator for distribution key
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.

Without this change, industry production is overestimated when using
subsets of countries.

Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38 for today's industry energy demand, separate MeOH, Cl and HVC
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.

This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Tom Brown
c54626cc1a bugfix: correct units of subtracted chlorine and methanol
in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
2024-02-14 18:29:02 +01:00
Tom Brown
ecedea02d6 bugfix: include all countries in ammonia production resource
This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.

No other downstream scripts are affected by this change.
2024-02-14 18:28:22 +01:00
Martha Frysztacki
234f2f247c
Merge branch 'master' into bus-regions 2024-02-14 17:05:43 +01:00
Fabian Neumann
09ada56bf1 finishing touches and release notes 2024-02-12 10:49:45 +01:00
Fabian Neumann
49171901d7 selective cherry-pick from 91eff472a7 2024-02-12 10:12:03 +01:00
Fabian
94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2024-02-12 10:08:39 +01:00
Fabian
2bd8021058 retrieve electricity demand: make online version snakemake params 2024-02-12 09:48:42 +01:00
Fabian
5c7bbcd94d retrieve electricity demand: use script in order to concat time-series 2024-02-12 09:48:28 +01:00
pre-commit-ci[bot]
17105b8125 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 18:18:00 +00:00
Tom Brown
8781e69066 bugfix: coal emissions for industry weren't tracked
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
Fabian Neumann
cbb3ab36a6
Merge pull request #920 from PyPSA/env-versions
update version compatibility handling
2024-02-09 17:00:11 +01:00
Fabian Neumann
201d0ddcfe build_shapes: handle europe_shape multipolygon with shapely>=2 (closes #852) 2024-02-09 15:48:54 +01:00
Fabian Neumann
4b6199de42 create a bus for every unique coordinate, not only substations (closes #699) 2024-02-09 15:43:27 +01:00
Fabian Neumann
3691f9f4c1 update version compatibility handling 2024-02-09 13:59:15 +01:00
Tom Brown
92d00a0c83 add new default to overdimension heating in individual buildings
This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.

The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.

Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
2024-02-07 17:18:04 +01:00
Tom Brown
6d94439bbb for existing heating use new default_heating_lifetime
This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.

Now existing boilers are smoothly distributed across 20 years.
2024-02-07 17:15:37 +01:00
Fabian Neumann
d7f3f16a9b autoformat 2024-02-07 17:15:08 +01:00
Tom Brown
f38681f134 correctly source the existing heating technologies for buildings
The source URL has changed. It represents the year 2012 and is only
for buildings, not district heating. So the capacities for urban
central are now set to zero from this source.
2024-02-07 17:13:53 +01:00
Fabian Neumann
0ded96c405
Merge pull request #916 from koen-vg/pandas-dep-fixes
Pandas deprecation fixes
2024-02-07 11:13:28 +01:00
Fabian Neumann
bf07300010 add_electricity: Remove long-deprecated function attach_extendable_generators 2024-02-07 11:03:48 +01:00
Koen van Greevenbroek
c3d3b5f415 Fixes to calculated_weighted_prices 2024-02-07 10:55:44 +01:00
Fabian Neumann
e8df321a24 Merge branch 'fneum/year-specific-techs' of github.com:PyPSA/pypsa-eur into fneum/year-specific-techs 2024-02-06 18:39:06 +01:00
Fabian Neumann
c8e1829880 fix to backwards compatibility with old profile_{tech}.nc files 2024-02-06 18:38:53 +01:00
Fabian Neumann
602375af8c
Merge branch 'master' into fneum/year-specific-techs 2024-02-06 13:56:14 +01:00
Fabian Neumann
ba409c2f1e backwards compatibility with old profile_{tech}.nc files 2024-02-06 13:55:51 +01:00
Koen van Greevenbroek
1f482f3c92 Revert mistaken deprecation "fix" 2024-02-06 11:45:20 +01:00
Koen van Greevenbroek
73b80ebab3 Address pandas deprecation warnings in prepare_perfect_foresight 2024-02-06 10:50:52 +01:00
Koen van Greevenbroek
7fbb605134 Address FutureWarnings in make_summary_perfect related to groupby 2024-02-06 10:50:29 +01:00
Fabian
2a01ed3d48 prepare_sector: add description of eu bus 2024-02-05 19:15:55 +01:00
Fabian Hofmann
32451f6ca8
Update scripts/prepare_sector_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-02-05 19:13:42 +01:00