Commit Graph

4461 Commits

Author SHA1 Message Date
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
lisazeyen
e933acd9e8
update release_notes.rst 2024-02-28 16:15:43 +01:00
lisazeyen
f08c6fe772
change technology data version to 0.8.1 2024-02-28 16:13:36 +01:00
Fabian Hofmann
7e9599cf4f
Merge pull request #949 from aodenweller/cplexFix
Allow CPLEX for MIQP in cluster_network
2024-02-27 15:04:51 +01:00
Adrian Odenweller
06a777d96e
Merge branch 'master' into cplexFix 2024-02-27 14:37:49 +01:00
toniseibold
ae187b8ba3 Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals 2024-02-27 14:32:21 +01:00
toniseibold
bd0880c022 correcting misleading comment 2024-02-27 14:32:09 +01:00
pre-commit-ci[bot]
8dfab45453 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-27 12:35:59 +00:00
toniseibold
7616ae31fe Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals 2024-02-27 13:33:08 +01:00
toniseibold
5bcecc62c6 retrieve eurostat data is now outside of retrieve_sector_databundle 2024-02-27 13:32:07 +01:00
pre-commit-ci[bot]
9182d6d667 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-27 12:14:43 +00:00
toniseibold
14d6c3b97f merge 2024-02-27 13:14:09 +01:00
toniseibold
d363aeb57d removing old eurostat data reports as an option, cleaning up code 2024-02-27 12:04:07 +01:00
Fabian Hofmann
58bcef4625
cluster_network: update solver_name if clause style 2024-02-27 11:39:26 +01:00
lisazeyen
a5f7b11070
Merge pull request #948 from PyPSA/fix-heatpump-lowvoltage
adjust AC bus to low voltage
2024-02-26 11:51:48 +01:00
Adrian Odenweller
1db30ae63b Allow CPELX for MIQP in cluster_network 2024-02-24 12:10:08 +01:00
lisazeyen
6b5ab53f0c
Merge branch 'master' into fix-heatpump-lowvoltage 2024-02-23 15:28:36 +01:00
pre-commit-ci[bot]
60653de9f6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-23 14:27:20 +00:00
lisazeyen
c6ed36df62 adjust AC bus to low voltage 2024-02-23 15:23:55 +01:00
pre-commit-ci[bot]
ace51b9e55 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-23 12:56:46 +00:00
toniseibold
3298572ced new energy totals from eurostat 2023 report scaling JRC IDEES data from 2015 2024-02-23 13:53:28 +01:00