cpschau
e932466b05
FT and electrolyis waste heat for DH as float
2024-07-09 12:05:50 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 ( #1136 )
...
* address geopandas and pandas deprecations/warnings
* compatibility with geopandas v1
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-08 08:29:16 +02:00
pre-commit-ci[bot]
e42b36e83d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 11:40:21 +00:00
millingermarkus
fbacb76e9c
Minor edits to MSW
2024-07-04 13:34:05 +02:00
millingermarkus
c81d208da2
Remove redundant Waste CHP addition
2024-07-04 11:59:32 +02:00
Markus Millinger
521cf0e753
Merge branch 'PyPSA:master' into msw_incineration
2024-07-04 11:53:00 +02:00
pre-commit-ci[bot]
5ca27837f3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 09:21:00 +00:00
millingermarkus
5c7bb2bf51
Add option to exclude fossil fuels
2024-07-04 11:16:00 +02:00
pre-commit-ci[bot]
ee6d8b1e42
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 08:22:24 +00:00
millingermarkus
c71fa78bfa
Added biomass imports to prepare sector network
2024-07-04 10:18:19 +02:00
Markus Millinger
821eb07e98
Correct costs of BtL and BioSNG
2024-07-04 09:59:45 +02:00
pre-commit-ci[bot]
192a8eb14b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 07:30:52 +00:00
Markus Millinger
270ce82b9f
Cost correction
2024-07-04 09:30:22 +02:00
pre-commit-ci[bot]
b934653b65
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 10:42:07 +00:00
millingermarkus
84ddfea91e
Added electrobiofuels
2024-07-03 12:38:16 +02:00
pre-commit-ci[bot]
53328e89f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 08:07:32 +00:00
millingermarkus
76e15d6862
Carbon capture capital cost for waste CHP
2024-07-03 09:42:15 +02:00
millingermarkus
b5ff1e8f9c
Added note on carbon capture for BioSNG and BtL
2024-07-03 09:38:08 +02:00
millingermarkus
c7ce47dffd
Energy penalty for solid biomass CHP
2024-07-03 09:22:09 +02:00
Fabian Neumann
6348c904bd
Merge pull request #1103 from PyPSA/methanol-store-capital-cost
...
non-zero capital_cost for methanol stores
2024-06-17 18:57:35 +02:00
Philipp Glaum
ad38016f6d
prepare_sector_network: add floating wind to update cost function
2024-06-17 15:22:33 +02:00
Michael Lindner
b174a53480
non-zero capital_cost for methanol stores
2024-06-14 11:29:59 +02:00
LukasFrankenQ
4752840009
improved docs on EGS cost scaling
2024-06-01 00:32:44 +01:00
LukasFrankenQ
2f1d6d20b1
final corrections, improved docs
2024-06-01 00:20:31 +01:00
millingermarkus
b29e1c196e
Added msw incineration
2024-05-30 14:28:34 +02:00
LukasFrankenQ
2801b00100
Merge https://github.com/pypsa/pypsa-eur
2024-05-26 22:38:03 +01:00
Fabian Neumann
422c37827c
time_aggregation: handle case without any temporal aggregation
2024-05-25 15:48:48 +02:00
Koen van Greevenbroek
2a6dcc4c12
Minor bugfixes for new time aggregation implementation
2024-05-21 18:09:09 +02:00
Fabian Neumann
d32feb3aae
mark downloaded files as ancient rather than protected
2024-05-20 22:37:16 +02:00
Fabian Neumann
00efffcc13
move up methanol for industry, to before shipping
2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a
Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production
2024-05-20 22:06:15 +02:00
Fabian Neumann
60a26a67a0
simplify check for coal/coke industry demand
2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c
Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand
2024-05-20 21:01:16 +02:00
Fabian Neumann
a2012d8937
pre-commit formatting [no ci]
2024-05-20 15:49:40 +02:00
Fabian Neumann
7ce15931e5
add simplified power distribution grid losses
2024-05-20 12:41:54 +02:00
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
Thomas Gilon
c3dcff8a35
Define methanol energy demand for industry
2024-05-17 16:04:48 +02:00
Fabian Neumann
27009f5060
double solar rooftop PV potentials ( closes #935 )
2024-05-15 18:18:15 +02:00
Fabian Neumann
e8779fa5a4
small follow-up to #1066 solar-hsat
2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
...
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
1aa4f12c5e
remove adjust_transport_temporal_agg
2024-05-15 16:51:17 +02:00
Fabian Neumann
5b5be71341
use loads instead of links where possible
2024-05-15 16:41:49 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14
Merge branch 'master' into land-transport-fix
2024-05-15 15:25:56 +02:00
lisazeyen
e8de4f308f
rename solar-hsat in config
2024-05-15 15:08:52 +02:00
lisazeyen
541e267a83
replace print with logger.info
2024-05-15 15:00:42 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +02:00
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
02e434c8b0
Fix non steel related coal demand during transition (using sector_ratios)
2024-05-02 17:29:07 +02:00
Thomas Gilon
54e3d2bb1b
Fix typo
2024-05-02 14:19:58 +02:00
pre-commit-ci[bot]
3e93c14dd4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
Parisra
be876761f2
Add remove option for solar-hsat
...
Add function to remove solar-hsat if the config option is 'False'
2024-04-25 11:37:53 +02:00
Parisra
692d837b14
Update add_electricity_grid_connection
...
Add solar-hsat as technology with a grid connection cost
2024-04-25 11:35:29 +02:00
lisazeyen
245ba5c20b
rename efficiencies in script
2024-04-12 14:38:56 +02:00
lisazeyen
53a6b91b06
clear up units
2024-04-12 14:28:52 +02:00
LukasFrankenQ
0396828e3a
Merge https://github.com/pypsa/pypsa-eur
2024-03-27 00:09:02 +01:00
LukasFrankenQ
9abe1a10d8
removed geothermal chp constraint
2024-03-27 00:04:51 +01:00
LukasFrankenQ
46cd9a8274
changed implementation to always use 2020 cost
2024-03-26 23:54:25 +01:00
pre-commit-ci[bot]
435350e07b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-26 15:25:49 +00:00
lisazeyen
d7fedc6235
Merge branch 'master' into land-transport-fix
2024-03-26 16:25:27 +01:00
LukasFrankenQ
97acf2f12e
included Lisas PR suggestions
2024-03-19 19:30:23 +01: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
LukasFrankenQ
09765ad060
Merged https://github.com/pypsa/pypsa-eur
2024-03-14 12:03:56 +01:00
Fabian Neumann
579cd0c756
Merge branch 'master' into multiyear
2024-03-06 16:34:53 +01:00
lisazeyen
5046289c5f
add lifetime V2G
2024-03-06 14:00:38 +01:00
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
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
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
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
Koen van Greevenbroek
9a69f88a36
Fix bug bug in time segmentation function signature
2024-03-01 15:49:39 +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
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
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
Fabian Neumann
2183e742b2
add release notes, minor code improvements
2024-01-22 09:18:26 +01:00
Tom Brown
9897cd6f05
only add district heating (DH) for nodes with non-zero DH share
2024-01-22 08:01:31 +01:00
Tom Brown
1a477d6b32
move calculation of district heating share to its own script
...
Now the script build_district_heat_share.py does what the old function
create_nodes_for_heating() in prepare_sector_networks.py did.
There is no need to build nodes lists for each heating sector, since
all nodes have district heating now.
2024-01-22 08:01:31 +01:00
Tom Brown
6c20ce83d7
move building of daily heat profile to its own script
...
Previously this was handled inside prepare_sector_network.py.
2024-01-22 08:01:31 +01:00
Fabian
025688bf70
refactor and fix remaining linting problems
2024-01-19 12:17:45 +01:00
Fabian
b1d21813af
fix import order
2024-01-19 12:17:45 +01:00
Fabian Neumann
195966af45
Merge pull request #871 from PyPSA/feature_kernnetz
...
wasserstoff kernnetz
2024-01-19 10:51:17 +01:00
Julian Geis
128e1afc00
Update scripts/prepare_sector_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 10:01:11 +01:00
Julian Geis
9c56c1e929
Update scripts/prepare_sector_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 09:57:26 +01:00
Julian Geis
88ba4af9ad
Update scripts/prepare_sector_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 09:56:52 +01:00
pre-commit-ci[bot]
446b0b3722
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-17 10:36:15 +00:00
JulianGeis
ec4e9aa548
wasserstoff kernnetz
2024-01-17 11:23:29 +01:00
