Commit Graph

3908 Commits

Author SHA1 Message Date
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
Fabian Neumann
9c592d9f73 add config/config.yaml to .gitignore 2024-02-14 10:49:40 +01:00
Fabian Neumann
44d0859640
Merge pull request #925 from PyPSA/default-config
use default config as base configuration
2024-02-13 07:39:56 +01:00
Fabian Neumann
a13da7bab7
Merge pull request #926 from PyPSA/efficient-helper-source-path
remove inefficient _helper.py file search
2024-02-13 07:38:39 +01:00
Fabian Neumann
b725a754cc Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config 2024-02-12 13:57:04 +01:00
Fabian Neumann
69e20e3448 need at least one entry for config/config.yaml to read as yaml 2024-02-12 13:55:32 +01:00
Fabian Neumann
fa931cc2b1 alternative approach 2 2024-02-12 13:54:28 +01:00
Fabian Neumann
1e5163b66b alternative approach 2024-02-12 13:45:42 +01:00
Fabian Neumann
5840a9aa11 remove inefficient _helper.py file search 2024-02-12 12:17:13 +01:00
pre-commit-ci[bot]
abe06a68fb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-12 11:11:04 +00:00
Fabian Neumann
fe143ff8fe use default config as base configuration 2024-02-12 12:10:05 +01:00
Fabian Neumann
e8c8d72b3f
Merge pull request #924 from PyPSA/merged-electricity-demand
Merged electricity demand sources (powerstatistics, OPSD)
2024-02-12 10:56:13 +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
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
3691f9f4c1 update version compatibility handling 2024-02-09 13:59:15 +01:00
Fabian Neumann
e0dafc50b3 add missing heat pump colors 2024-02-09 10:15:11 +01:00
Fabian Neumann
682ff4fee3
Merge pull request #918 from PyPSA/fneum/cp-from-ariadne2
Merge from `ariadne2`
2024-02-07 18:56:58 +01:00
Fabian Neumann
b9c71c3c15 add logs to plot_*_network rules 2024-02-07 18:52:01 +01:00
pre-commit-ci[bot]
3e411fe79d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-07 16:27:22 +00:00
Fabian Neumann
7ad5dcc3ee add release notes and documentation 2024-02-07 17:25:09 +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
560e2854b7 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-02-07 11:20:17 +01:00
Fabian Neumann
5902be199f powerplants_filter: phase-out status 2023 (incl. nuclear in DE) 2024-02-07 11:20:05 +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
823765b353 update technology-data to 0.7.0 by default 2024-02-07 09:52:30 +01:00
Fabian Neumann
dce3d81a13
Merge pull request #912 from PyPSA/fneum/year-specific-techs
REVIEWED: Add technology specific renewable profiles for different planning horizons
2024-02-06 19:06:26 +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
Fabian Neumann
3e6394b23c revert to previous offshore wind turbine models 2024-02-06 13:55:27 +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 Neumann
6c7d79f524
Merge pull request #914 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-02-05 20:43:06 +01:00
Fabian Neumann
a859deac5a
Merge pull request #913 from PyPSA/sanitize-locations
add sanitize_locations function and apply it
2024-02-05 19:46:38 +01:00
pre-commit-ci[bot]
39890630ef [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-05 18:23:51 +00:00