Commit Graph

572 Commits

Author SHA1 Message Date
Fabian Neumann
a9333458b3 handle potentially diverging spatial resolutions of HVC 2024-05-13 17:40:10 +02:00
pre-commit-ci[bot]
b529ab1d3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
649e277c7d make waste-to-energy work without regional_oil_demand 2024-05-13 17:13:16 +02:00
Michael Lindner
afa5cc5014 add heating output, correct bus ordering 2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef add extra bus for HVC, which can either go to air or waste CHP
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
Tom Brown
ac0d52e1c3 Allow some plastics sequestered in landfill or built environment
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
e023872d44 stop using wildcard by default 2024-05-13 10:50:24 +02:00
Thomas Gilon
54e3d2bb1b Fix typo 2024-05-02 14:19:58 +02:00
Fabian Neumann
a2f97ad1b3 make build_eurostat independent of snakemake object to be imported 2024-03-14 19:24:37 +01:00
Fabian Neumann
8d85acc61a remove unused keyword argument in temporal aggregation [no ci] 2024-03-14 18:19:25 +01:00
Fabian Neumann
4fbb3c81c4 fix build_district_heat_share and build_transport_demand for multiyear 2024-03-14 16:48:32 +01:00
Fabian Neumann
57b487f163 handle leap days in temporal clustering 2024-03-14 15:38:36 +01:00
Fabian Neumann
0d6ba9fbd1 move leap year handling into helper function 2024-03-14 15:15:56 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +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
96f71d7e9c outsource drop_leap_day in temporal aggregation 2024-03-04 19:37:02 +01:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +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
fa88e411d7 Automatic formatting 2024-03-01 13:25:38 +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
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