Commit Graph

2166 Commits

Author SHA1 Message Date
lisazeyen
5bfc64a658
Merge branch 'master' into land-transport-fix 2024-03-06 09:25:08 +01:00
lisazeyen
74504a0ff3
add lifetime to BEV 2024-03-06 09:04:30 +01:00
Micha
d3283f5084
Merge branch 'master' into fix-lifetime 2024-03-06 08:22:25 +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]
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
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]
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
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
lisazeyen
bed2ef43d5 fix p_nom ICE 2024-03-01 15:47:52 +01:00
lisazeyen
548a99f273 restructure to links without temperature correction 2024-03-01 15:19:00 +01:00
lisazeyen
b70aa59dce safe transport demand in unit kinetic energy 2024-03-01 11:32:12 +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
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
Koen van Greevenbroek
db9f234fad Fix typo in snakemake input 2024-02-20 18:38:21 +01:00
Koen van Greevenbroek
87088904ee Merge remote-tracking branch 'upstream/master' into no-offwind-fix 2024-02-20 14:41:24 +01:00
Fabian Neumann
184f3a0e03 Merge branch 'scenario-management' 2024-02-20 14:23:05 +01:00
Fabian Neumann
26b202f463 prepare_sector: automatically interpolate in config get() function 2024-02-20 12:34:19 +01:00
Fabian Neumann
719d4dad23 Merge branch 'master' into scenario-management 2024-02-20 12:08:54 +01:00
pre-commit-ci[bot]
d713e3c52b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-20 09:03:57 +00:00