Commit Graph

548 Commits

Author SHA1 Message Date
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
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
Tom Brown
4f91c6c43d bugfix: make sure coal demand is there with regional demand 2024-02-20 09:49:19 +01:00
Koen van Greevenbroek
ccb43a5612 Allow absence of offshore wind from sector-coupled networks 2024-02-19 22:45:17 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
Fabian Neumann
35b2228891 Merge branch 'wc-to-cf' into scenario-management 2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de Merge branch 'master' into scenario-management 2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e handle all {opts} and {sector_opts} wildcard values in config 2024-02-17 11:57:16 +01:00
pre-commit-ci[bot]
e0b6ebd174 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-12 10:54:15 +00:00
Fabian Neumann
40b27b4107 use set_scenario_config everywhere 2024-02-12 11:53:20 +01:00
pre-commit-ci[bot]
17105b8125 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 18:18:00 +00:00
Tom Brown
8781e69066 bugfix: coal emissions for industry weren't tracked
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
pre-commit-ci[bot]
e838b63ded [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 16:22:38 +00:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
3691f9f4c1 update version compatibility handling 2024-02-09 13:59:15 +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
Fabian Neumann
602375af8c
Merge branch 'master' into fneum/year-specific-techs 2024-02-06 13:56:14 +01:00
Fabian
2a01ed3d48 prepare_sector: add description of eu bus 2024-02-05 19:15:55 +01:00
Fabian Hofmann
32451f6ca8
Update scripts/prepare_sector_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-02-05 19:13:42 +01:00
Fabian
76872fa0f1 add sanitize_locations function and apply it
address some deprecation warnings
2024-02-05 16:16:34 +01:00
Fabian Neumann
a834ff222a streamline code for year-dependent technologies (turbines/panels) 2024-02-05 12:10:35 +01:00
Fabian Neumann
5b71979547
Merge branch 'master' into dac-location-consistency 2024-02-05 08:50:33 +01:00
JulianGeis
550e6f0794 deleted code to include kernnetz as it is no longer needed 2024-02-01 14:23:04 +01:00
Fabian Neumann
66592b9e58
Merge branch 'master' into dac-location-consistency 2024-01-30 17:11:48 +01:00
pre-commit-ci[bot]
d2f2d4ab0b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-29 18:31:05 +00:00
Fabian
7b0356803f prepare_sector: adjust DAC costs 2024-01-29 09:01:08 +01:00
Fabian Hofmann
8251323696
Merge branch 'master' into dac-location-consistency 2024-01-26 23:22:21 +01:00
Fabian
ae1b83121d prepare_sector: fix dac co2 input/output efficiencies 2024-01-26 23:20:03 +01:00
Fabian
ae825d82dc prepare_sector_network: reorder buses for dac components 2024-01-26 12:10:39 +01:00
Fabian Neumann
c4b305bfbe
Merge branch 'master' into fneum/ariadne2 2024-01-25 16:52:46 +01:00
Fabian Neumann
2bee36be87 follow-up to #891: remove remaining solar+p3 references 2024-01-24 10:17:26 +01:00
pre-commit-ci[bot]
bdc36dc5da [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-23 17:43:04 +00:00
Fabian Neumann
2d12f7ddd0 add air-sourced heat pumps to rural areas 2024-01-23 18:41:52 +01:00
Fabian Neumann
a9ac68b50e bugfix: correct way to identify if entry is in snakemake.input 2024-01-22 14:31:35 +01:00
Fabian Neumann
9865a97089 apply automated formatting 2024-01-22 09:29:32 +01:00