Commit Graph

4281 Commits

Author SHA1 Message Date
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
Fabian Neumann
93e53e0b03 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-06 16:18:33 +01:00
Fabian Neumann
cb5d9c4319
Merge pull request #958 from PyPSA/fix-lifetime
compute lifetime after grouping DateIn
2024-03-06 08:55:29 +01:00
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]
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
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
Koen van Greevenbroek
9a69f88a36 Fix bug bug in time segmentation function signature 2024-03-01 15:49:39 +01:00
Koen van Greevenbroek
75ff4134fb Select correct snapshots for hourly heating demand 2024-03-01 15:26:47 +01:00
Koen van Greevenbroek
61d565ec09 Correct formatting in build_electricity.smk 2024-03-01 15:26:16 +01:00
Koen van Greevenbroek
0c7c0a8585 Minor bugfixes in postprocessing code 2024-03-01 14:37:45 +01:00
Koen van Greevenbroek
e891305c9d Add selection of cutouts for heat to config 2024-03-01 14:37:16 +01:00
Koen van Greevenbroek
d2527ed0ad Add copyright headers 2024-03-01 13:30:01 +01:00
Koen van Greevenbroek
fa88e411d7 Automatic formatting 2024-03-01 13:25:38 +01:00
Koen van Greevenbroek
c2e7c125c7 Automatic formatting of snakemake rules 2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
3c31caf993 Fix typos in rule inputs 2024-03-01 11:59:04 +01:00
Koen van Greevenbroek
0debf66169 Fix summary plot output 2024-03-01 11:51:34 +01:00
Koen van Greevenbroek
f6f98c102c Use default cutout for ship and nature raster extents
This avoids the need to either collect all cutouts for all weather
years or arbitrarily pick all cutouts for a certain weather year.
2024-03-01 11:45:39 +01:00
Koen van Greevenbroek
de0c0cd1f4 Merge remote-tracking branch 'upstream/master' into multiyear 2024-03-01 11:45:31 +01:00
Koen van Greevenbroek
90fb0b13da Various bugfixes to make multiyear branch run 2024-02-29 12:48:16 +01:00
lisazeyen
986c7be48e
Merge pull request #954 from PyPSA/bump-technology-data-version-to-0.8.1
change technology data version to 0.8.1
2024-02-28 16:41:51 +01:00