Commit Graph

582 Commits

Author SHA1 Message Date
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
lisazeyen
0a789a22dc change type of co2 constraint 2024-01-12 21:33:38 +01:00
Fabian Neumann
a6edce58fb remove wave energy generator 2024-01-11 09:47:09 +01:00
Fabian Neumann
725a0ef8c0 maybe_adjust_cost_and_potentials: cover all flags 2024-01-10 16:17:16 +01:00
Fabian Neumann
6dd9d6a9c1 Merge branch 'fneum/services_heat' 2024-01-05 14:39:29 +01:00
Fabian Neumann
b6cba0388c do not skip gas generator 2024-01-05 14:34:48 +01:00
pre-commit-ci[bot]
29cda7042b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:30:31 +00:00
Fabian Neumann
e594f34e00 fix sequestration buses string replacement with pd.Index 2024-01-04 20:30:00 +01:00
Fabian Neumann
95c696594e Merge branch 'cm' of github.com:PyPSA/pypsa-eur into cm 2024-01-04 20:15:07 +01:00
pre-commit-ci[bot]
4883287417 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:10:07 +00:00
Fabian Neumann
6078b46262 remove duplicate marginal_cost for methanolisation from merge 2024-01-04 20:04:56 +01:00
Fabian
4e03e5a7ec prepare_sector: add VOM for FT and methanolization, always use .at accessor for costs 2024-01-04 19:57:42 +01:00
Fabian
be5331c89c formulate sequestration limit constraint as operational_limit constraint 2024-01-04 19:56:01 +01:00
Fabian
c71c4e7567 add biomass constraint for biomass spatial enabled 2024-01-04 19:54:48 +01:00
Fabian
2d027e80c3 fix capital costs of co2 tanks 2024-01-04 19:54:25 +01:00
Fabian
254d50b1b4 prepare sectors: allow for updating co2 network costs 2024-01-04 19:49:59 +01:00
Fabian
608a12fed2 prepare_sector: allow planning_horizons wc to be a scalar value 2024-01-04 19:30:20 +01:00
Fabian Neumann
f9fec1a4be more precise restrictive handling of opts cost adjustment flags 2024-01-04 18:58:04 +01:00
Fabian Neumann
9530d63e55 cluster_heat_buses: performance boost and tidy code 2024-01-04 18:57:09 +01:00
Fabian Neumann
cf5f3cbd88 segmentation_clustering: log distribution of snapshot durations (fix) 2024-01-04 18:54:49 +01:00
Fabian Neumann
29b24b1b41 segmentation_clustering: log distribution of snapshot durations 2024-01-04 18:42:47 +01:00
pre-commit-ci[bot]
817995c8a2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 14:39:30 +00:00
martacki
d6137f8e93 merge branch 'master' into services_heat 2024-01-04 15:38:10 +01:00
Fabian Neumann
8054ad382c prepare_sector_network: simplify process emissions with outsourced feedstock emissions 2024-01-04 12:47:26 +01:00
Fabian Neumann
8316861722 Merge branch 'master' into fneum/ariadne 2024-01-04 09:54:27 +01:00
Fabian Neumann
cd3eddcc3a
Merge pull request #739 from PyPSA/complete-losses
Lossy bidirectional links
2024-01-03 16:54:02 +01:00
Fabian Neumann
c3bb41c900 Merge branch 'master' into multiyear 2024-01-03 15:14:27 +01:00
pre-commit-ci[bot]
4606cb131b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 10:44:16 +00:00
Fabian Neumann
29afffb4ca fix potential duplicate renaming of length_original 2024-01-03 11:31:56 +01:00
Fabian Neumann
9d939fa635 remove helmeth option 2024-01-03 10:12:43 +01:00
Fabian Neumann
1245c93264
Merge branch 'master' into complete-losses 2024-01-03 09:29:55 +01:00
Fabian Neumann
4db59eddc2 Merge branch 'master' into complete-losses 2024-01-03 09:29:14 +01:00
pre-commit-ci[bot]
2b2bad392f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 08:08:23 +00:00
Fabian Neumann
0d03d384cc lossy_bidirectional_links: use original length for loss calculation 2024-01-03 09:07:48 +01:00
Fabian Neumann
838ee4d913
Merge pull request #835 from PyPSA/gas-storage
add locations, capacities and costs of existing gas storage
2024-01-03 09:05:19 +01:00
Fabian Neumann
b5ad0f11ee
Merge pull request #834 from PyPSA/all-waste-heat-min-part-load
extended waste heat from PtX, revised minimum part loads
2024-01-03 08:21:57 +01:00
Fabian Neumann
00a8ff5e4a
Merge pull request #833 from PyPSA/biomass-boiler-pelletizing
add biomass boiler pelletizing cost
2024-01-03 08:21:11 +01:00
Fabian Neumann
252f6d2c15 pre-commit formatting 2024-01-03 08:13:01 +01:00
Fabian Neumann
7c058f1ed3 add locations, capacities and costs of existing gas storage 2024-01-03 07:57:45 +01:00
pre-commit-ci[bot]
fb5b107805 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:59:38 +00:00
Fabian Neumann
71b27b524e prevent failure if potential waste heat technologies not present 2024-01-02 19:57:40 +01:00
pre-commit-ci[bot]
777899f686 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:45:58 +00:00
Fabian Neumann
872c92d1c0 extended waste heat from PtX, revised minimum part loads 2024-01-02 19:45:02 +01:00
Fabian Neumann
37df47110c biomass_boiler: add pelletizing cost 2024-01-02 19:32:02 +01:00
pre-commit-ci[bot]
815b828311 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:11:45 +00:00
Fabian Neumann
631c794cda
Merge branch 'master' into haber-bosch-h2-input 2024-01-02 19:11:23 +01:00
Fabian Neumann
438b40cdb1 haber-bosch: use DECHEMA source for electricity input 2024-01-02 19:09:46 +01:00
Fabian Neumann
5e4a81f828 haber-bosch: use DECHEMA source for hydrogen input 2024-01-02 19:04:34 +01:00
Fabian Neumann
861e7b5fe5
Merge branch 'master' into biogas-upgrade-cc 2024-01-02 18:55:29 +01:00
Fabian Neumann
a10a60b951 rename setting from biomass_upgrading_cc to biogas_upgrading_cc 2024-01-02 18:52:22 +01:00
Fabian Neumann
c5bd95d124 Merge branch 'biogas-upgrade-cc' of github.com:PyPSA/pypsa-eur into biogas-upgrade-cc 2024-01-02 18:49:26 +01:00
Fabian Neumann
9884dee7a0 remove biogas upgrading CC in normal link 2024-01-02 18:48:52 +01:00
pre-commit-ci[bot]
6714858e17 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 17:47:49 +00:00
Fabian Neumann
4b178a7fa1 Merge branch 'master' into biogas-upgrade-cc 2024-01-02 18:46:54 +01:00
Fabian Neumann
fd81058008 add VOM of PtX processes (closes #747) 2024-01-02 18:35:10 +01:00
pre-commit-ci[bot]
2678fdef99 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 17:13:37 +00:00
Fabian Neumann
f2a636c62c bugfix: correct unit of capital_cost of Haber-Bosch 2024-01-02 18:12:49 +01:00
pre-commit-ci[bot]
e580ac85d9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 15:33:11 +00:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00
Fabian Neumann
e3539b0e69 heat vent: add bus 2024-01-02 16:31:16 +01:00
pre-commit-ci[bot]
f494dd85b9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 15:21:51 +00:00
Martha Frysztacki
ba928bf839
Merge pull request #814 from yerbol-akhmetov/no_gas_gen
No gas generators
2023-12-28 10:11:45 +01:00
pre-commit-ci[bot]
125c406013 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-23 08:55:59 +00:00
yerbol-akhmetov
1bee34d57f remove gas generators 2023-12-23 14:51:01 +06:00
Tom Brown
8a55a55d20 copperplate oil/methanol supply; allow demand to be regional
Force a single supply bus for oil/methanol (until we allow
oil/methanol transport). Introduce new config switches
"regional_oil/methanol_demand" that allow demand to be
regionalised. This is important if regional CO2 budgets need to be
enforced.
2023-12-21 16:08:43 +01:00
yerbol-akhmetov
17e9b4d1df make resistive heaters separate of boilers 2023-12-21 20:59:35 +06:00
yerbol-akhmetov
25cfcaf97b fix add_waste_heat 2023-12-21 20:54:17 +06:00