Commit Graph

4903 Commits

Author SHA1 Message Date
Micha
d3283f5084
Merge branch 'master' into fix-lifetime 2024-03-06 08:22:25 +01:00
Fabian Neumann
b1074e493f
Merge pull request #947 from PyPSA/energy_totals
Eurostat 2023 data for energy totals
2024-03-05 19:37:48 +01:00
Fabian Neumann
da8119e47e reset CI data cache 2024-03-05 19:08:22 +01:00
Fabian Neumann
4732bfa9e3 Merge branch 'energy_totals' of github.com:PyPSA/pypsa-eur into energy_totals 2024-03-05 19:07:07 +01:00
Fabian Neumann
85ceb9ad54 add release notes 2024-03-05 19:03:48 +01:00
pre-commit-ci[bot]
ca91c02bf7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 17:56:41 +00:00
Fabian Neumann
c13e0b83cf remove remaining references of eurostat report year 2024-03-05 18:55:59 +01:00
Fabian Neumann
bf60da973b build_energy_totals: revision of eurostat report upgrade 2024-03-05 18:43:24 +01:00
Fabian Neumann
5b513f81db move eurostat into data/eurostat subdirectory from sector-bundle 2024-03-05 18:42:15 +01:00
Fabian Neumann
41f23f9589 change eurostat year in build_industrial_production_per_country 2024-03-05 18:40:06 +01:00
pre-commit-ci[bot]
3da649c13f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 13:08:17 +00:00
Michael Lindner
1e25f3adaf add grouping years 1960-1975 2024-03-05 14:07:46 +01:00
Michael Lindner
3c24ae9204 add release note 2024-03-05 13:51:24 +01:00
pre-commit-ci[bot]
8c465dbe3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 12:49:35 +00:00
Fabian Neumann
9d0724566c Merge remote-tracking branch 'origin/master' into fneum/energy_totals 2024-03-05 13:40:49 +01:00
Michael Lindner
7f5f0ee45e compute lifetime after grouping DateIn 2024-03-05 12:00:50 +01:00
Fabian Neumann
3af878d69c remove power statistics references 2024-03-05 10:33:41 +01:00
pre-commit-ci[bot]
8aa6d98f56 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 18:38:31 +00:00
Fabian Neumann
77ec07d55d Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 19:38:02 +01:00
Fabian Neumann
8904943a87 integrate artificial load data supplement into build_electricity_demand 2024-03-04 19:37:52 +01:00
Fabian Neumann
96f71d7e9c outsource drop_leap_day in temporal aggregation 2024-03-04 19:37:02 +01:00
Fabian Neumann
9d913bcb38 smaller fixes and reduction of diff 2024-03-04 19:36:41 +01:00
pre-commit-ci[bot]
f4f4c1bf37 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 17:26:41 +00:00
Fabian Neumann
92922728d8 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 18:25:05 +01:00
Fabian Neumann
249cfab429 remove remaining {weather_year} wildcard usages 2024-03-04 18:24:01 +01:00
pre-commit-ci[bot]
7b584f16bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:56:00 +00:00
Fabian Neumann
1f7d4da3e6 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 17:55:32 +01:00
Fabian Neumann
030e5b15ad remove rule build_cutout_year 2024-03-04 17:51:32 +01:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Fabian Neumann
e6347621f9 remove operations rules to reduce amount of simultaneous changes 2024-03-04 17:42:35 +01:00
pre-commit-ci[bot]
a805f5cfb3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:38:39 +00:00
lisazeyen
9c93917c31 add release notes 2024-03-04 17:37:16 +01:00
pre-commit-ci[bot]
3549e6843d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:24:52 +00:00
lisazeyen
1b6e5dc0c2 adjust for perfect foresight 2024-03-04 17:23:19 +01:00
pre-commit-ci[bot]
9607eb0e6b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:16:28 +00:00
pre-commit-ci[bot]
ff0093c8fe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:01:32 +00:00
lisazeyen
fe51fd7022 adjust for temporal aggregation 2024-03-04 17:00:57 +01:00
lisazeyen
6712e48aa0 fix spelling mistake 2024-03-04 15:51:06 +01:00
pre-commit-ci[bot]
fb08d16be9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 14:49:19 +00:00
lisazeyen
66257e1e84 fix bug with cyclic shift 2024-03-04 15:46:36 +01:00
pre-commit-ci[bot]
fa935be5cb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 11:11:45 +00:00
lisazeyen
c14f782f51 add lifetime to links 2024-03-04 12:11:19 +01:00
lisazeyen
d4bdf489c9 add cyclic shift for EVs 2024-03-04 12:08:45 +01:00
lisazeyen
f2ba96e148 add color for land transport demand 2024-03-04 11:26:06 +01:00
pre-commit-ci[bot]
4242a0841c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 08:44:54 +00:00
lisazeyen
04d3164d7f adjust p_nom + profile 2024-03-04 09:41:22 +01:00
lisazeyen
4ffa702d30 temperature correction in extra function 2024-03-04 08:49:44 +01:00
lisazeyen
8efe43f35f add temperature correction 2024-03-04 08:34:08 +01:00
Koen van Greevenbroek
1ff8321c5e Remove erroneous automatic snakefmt formatting 2024-03-01 15:56:09 +01:00
Koen van Greevenbroek
e48b25f777 Fix unresolved or faulty merge conflicts in documentation 2024-03-01 15:50:21 +01:00