Commit Graph

106 Commits

Author SHA1 Message Date
Fabian Neumann
a67c5ea3b7 default to full land transport electrification by 2050 2024-01-04 19:03:34 +01:00
Fabian Neumann
29a95dc997 default to approximating transmission losses in HVAC lines 2024-01-04 16:02:02 +01:00
Fabian Neumann
addaecf77a move comments to documentation 2024-01-04 12:43:55 +01:00
Fabian Neumann
8316861722 Merge branch 'master' into fneum/ariadne 2024-01-04 09:54:27 +01:00
Fabian Neumann
2096131b03
Merge pull request #842 from PyPSA/luisa-2
add option to use LUISA land coverage data
2024-01-04 09:32:55 +01:00
Fabian Neumann
b4fb395158 Merge branch 'master' into custom-extra-functionality 2024-01-04 08:32:29 +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
ecd85d23d3 add option to use LUISA land coverage data 2024-01-03 15:01:43 +01:00
Fabian Neumann
6242675c27
Merge pull request #836 from PyPSA/remove-helmeth
remove helmeth option
2024-01-03 13:24:43 +01:00
Fabian Neumann
c283a3c89c
Merge pull request #838 from PyPSA/remove-conservative-potential-method
renewable_profiles: remove conservative potential estimation method
2024-01-03 13:23:01 +01:00
Fabian Neumann
a3cfc8cde5 add heat vent to tech_colors 2024-01-03 13:05:46 +01:00
Fabian Neumann
6b344c9901 renewable_profiles: remove conservative potential estimation method 2024-01-03 10:33:33 +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
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
872c92d1c0 extended waste heat from PtX, revised minimum part loads 2024-01-02 19:45:02 +01:00
Fabian Neumann
c7790d7c60 change default offshore turbine to NREL Reference 2020 ATB 5.5 MW 2024-01-02 19:16:42 +01: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
a10a60b951 rename setting from biomass_upgrading_cc to biogas_upgrading_cc 2024-01-02 18:52:22 +01:00
Fabian Neumann
b0cca00b70 add documentation and release note for biogas upgrading CC 2024-01-02 18:51:03 +01:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00
Tom Brown
1b569dde1b move code for national CO2 budgets out of extra_functionality
This can be added by derived workflows like PyPSA-Eur via
additional_functionality.

Changed additional_functionality to pass snakemake rather than
wildcards and config separately. This gives maximal flexibility.
2024-01-02 16:02:10 +01:00
Fabian Neumann
79ca64382b correct path for custom_extra_functionality 2023-12-31 14:15:37 +01:00
Fabian Neumann
8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file 2023-12-29 17:19:19 +01: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
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks" 2023-12-14 16:30:30 +01:00
Fabian Neumann
e0ca38be6e
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
2023-12-11 20:12:26 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
Fabian Neumann
9b2edd076b ensure just a single focus_weights definition 2023-12-11 20:08:27 +01:00
Fabian Neumann
0f3fb540ef finalise ukraine_hackathon branch for merge 2023-12-11 18:24:57 +01:00
Fabian Neumann
df40fdf904 Merge branch 'master' into ukraine_hackathon 2023-12-11 16:24:40 +01:00
Fabian Neumann
e5bdb4796a move focus_weights into clustering configuration segment (backward compatible) 2023-12-06 10:09:17 +01:00
lisazeyen
54c2128419 add heat vent 2023-12-04 10:47:41 +01:00
Fabian Neumann
5d6d01f8c0 make CC in blast furnaces optional 2023-11-23 12:11:12 +01:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
chrstphtrs
94afba7c5d add coal tech_color to config 2023-10-24 16:39:33 +02:00
chrstphtrs
9b9090c76c add option for additional national carbon budget constraints 2023-10-18 16:59:49 +02:00
chrstphtrs
c81b707113 Add tech_color for 'coal for industry' in config 2023-10-18 16:44:52 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Fabian Neumann
892ee30d98
Update config/config.default.yaml 2023-10-11 16:07:00 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
Fabian Neumann
a15157c788 add optional function to restore transmission connections to Crimea 2023-10-09 16:16:53 +02:00
Fabian Neumann
a89a9670e5 no longer ignore 500 kV lines, type as 380 kV due to missing data 2023-10-09 16:15:56 +02:00
Fabian Neumann
ea99f3c43e Merge branch 'master' into ukraine_hackathon 2023-10-09 09:53:42 +02:00
Fabian Neumann
85c8812702
Merge branch 'master' into complete-losses 2023-10-08 11:58:03 +02:00
Fabian Neumann
118cabe8a6 add option to consider compression losses in pipelines as electricity demand 2023-09-12 17:28:00 +02:00