Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
17b57f9
refactor: add option to only run BtL CC without BtL
lisazeyen Nov 24, 2025
136795d
refactor: remove unsustainable potentials, add scaling for biomass an…
lisazeyen Nov 24, 2025
62206bc
refactor: move adjustements to tyndp config
lisazeyen Nov 24, 2025
5216f93
fix: add mapping for biogas to biomass
lisazeyen Nov 26, 2025
af0fa7f
refactor: force biogas usage
lisazeyen Nov 26, 2025
12522c5
refactor: force biomass usage
lisazeyen Nov 26, 2025
8fb87dc
feat: add final energy demand for biomass
lisazeyen Nov 26, 2025
4d27776
fix: uncomment adjustments for solid biomass
lisazeyen Nov 26, 2025
c75bccc
fix: add missing variables to add_biomass function
lisazeyen Nov 27, 2025
0c107f9
fix: set biomass spatial in config.tyndp.yaml to false
lisazeyen Nov 27, 2025
0d0ead4
fix: set final energy demand for biomass to false in test config
lisazeyen Nov 27, 2025
ad44c8c
fix: correct scaling factor for bio potentials
lisazeyen Nov 27, 2025
e8c30dd
refactor: move unsustainable share settings to tyndp configs
lisazeyen Nov 27, 2025
aeb204e
fix: set manual adjustments to false
lisazeyen Nov 27, 2025
54f4e60
fix: add missing scaling factors for 2035
lisazeyen Nov 27, 2025
6b2d117
fix: add final biomass demand in test tyndp config
lisazeyen Nov 27, 2025
566b593
fix: remove not needed electricity distribution grid adjustment
lisazeyen Nov 27, 2025
ea5ad98
refactor: add switch to force bio potentials to be used
lisazeyen Nov 27, 2025
d64d022
chore: enable biomass to liquid again
lisazeyen Nov 27, 2025
f8c8d69
feat: add check when final energy demand is added no spatial biomass
lisazeyen Nov 27, 2025
64a192d
chore: move config settings forcing bio potentials for NT to tyndp c…
lisazeyen Nov 28, 2025
afe1af1
fix: remove biogas mapping from benchmark config
lisazeyen Nov 28, 2025
9d5f2b3
docs: document new configuration options
lisazeyen Nov 28, 2025
da6bd15
docs: align order in config
lisazeyen Nov 28, 2025
ad99f75
docs: add release note
lisazeyen Nov 28, 2025
35546cf
refactor: rename e_sum_min and add logger info
lisazeyen Nov 28, 2025
3f02c11
chore: add biomass adjustments to test config
lisazeyen Nov 28, 2025
49499ae
chore: set force biomass potential in tyndp config to true
lisazeyen Nov 28, 2025
0631bb3
set Btl to true, Btl + CC to false in default config
lisazeyen Nov 28, 2025
11147c7
docs: remove white space in release notes
lisazeyen Nov 28, 2025
55ccf0b
docs: add unit for biomass final energy demand
lisazeyen Nov 28, 2025
47aa633
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 28, 2025
6e94a36
fix: scale must run and final energy demand for fraction of the year
lisazeyen Nov 28, 2025
ebffd74
Merge branch 'master' into fix/biomass-adjustments
daniel-rdt Nov 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,9 @@ sector:
keep_existing_capacities: false
biomass_to_liquid: true
biomass_to_liquid_cc: false
biomass_final_demand: false
force_biomass_potential: false
force_biogas_potential: false
electrobiofuels: true
biosng: false
biosng_cc: false
Expand Down
58 changes: 58 additions & 0 deletions config/config.tyndp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,24 @@ pypsa_eur:
- hydro
Store: []

biomass:
share_unsustainable_use_retained:
2020: 0
2025: 0
2030: 0
2035: 0
2040: 0
2045: 0
2050: 0
share_sustainable_potential_available:
2020: 1
2025: 1
2030: 1
2035: 1
2040: 1
2045: 1
2050: 1

sector:
transport: true
heating: false
Expand Down Expand Up @@ -257,8 +275,15 @@ sector:
h2_topology_tyndp: true
gas_network: false
gas_demand_exogenously: true
biomass_spatial: false
biomass_to_liquid: true
biomass_to_liquid_cc: true
force_biomass_potential: true
force_biogas_potential: true
biomass_final_demand: # in TWh
2030: 902
2035: 815 # linear interpolation
2040: 728
electrobiofuels: false
transmission_efficiency:
enable:
Expand Down Expand Up @@ -304,6 +329,39 @@ clustering:
temporal:
resolution_sector: 6H

adjustments:
electricity: false
sector:
factor:
Generator:
biogas:
p_nom:
2030: 1.26 # EU27 biogas potential: PyPSA-Eur 301 TWh vs TYNDP 379 TWh
2035: 1.89 # interpolated
2040: 2.51 # EU27 biogas potential: PyPSA-Eur 306 TWh vs TYNDP 767 TWh
e_sum_max:
2030: 1.26
2035: 1.89
2040: 2.51
e_sum_min:
2030: 1.26
2035: 1.89
2040: 2.51
solid biomass:
p_nom:
2030: 1.47 # EU27 biomass potential: PyPSA-Eur 974 TWh vs TYNDP 1431 TWh
2035: 1.40 # interpolated
2040: 1.33 # EU27 biomass potential: PyPSA-Eur 950 TWh vs TYNDP 1261 TWh
e_sum_max:
2030: 1.47
2035: 1.40
2040: 1.33
e_sum_min:
2030: 1.47
2035: 1.40
2040: 1.33
absolute: false

plotting:
balance_map:
imports_as_flows: true
Expand Down
1 change: 1 addition & 0 deletions config/plotting.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ plotting:
solid biomass import: '#d5ca8d'
solid biomass transport: '#baa741'
solid biomass for industry: '#7a6d26'
biomass final energy demand: '#7a6d26'
solid biomass for industry CC: '#47411c'
solid biomass for industry co2 from atmosphere: '#736412'
solid biomass for industry co2 to stored: '#47411c'
Expand Down
4 changes: 4 additions & 0 deletions config/scenarios.tyndp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ DE:
- OCGT
- CCGT
sector:
force_biomass_potential: false
force_biogas_potential: false
co2_sequestration_potential:
# Values from TYNDP 2024 Supply Tool
2030: 60
Expand Down Expand Up @@ -57,6 +59,8 @@ GA:
- OCGT
- CCGT
sector:
force_biomass_potential: false
force_biogas_potential: false
co2_sequestration_potential:
# Values from TYNDP 2024 Supply
2030: 48
Expand Down
58 changes: 58 additions & 0 deletions config/test/config.tyndp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,24 @@ pypsa_eur:
- hydro
Store: []

biomass:
share_unsustainable_use_retained:
2020: 0
2025: 0
2030: 0
2035: 0
2040: 0
2045: 0
2050: 0
share_sustainable_potential_available:
2020: 1
2025: 1
2030: 1
2035: 1
2040: 1
2045: 1
2050: 1

sector:
transport: true
heating: false
Expand Down Expand Up @@ -259,8 +277,15 @@ sector:
h2_topology_tyndp: true
gas_network: false
gas_demand_exogenously: true
biomass_spatial: false
biomass_to_liquid: true
biomass_to_liquid_cc: true
force_biomass_potential: true
force_biogas_potential: true
biomass_final_demand: # in TWh
2030: 902
2035: 815 # linear interpolation
2040: 728
electrobiofuels: false
transmission_efficiency:
enable:
Expand Down Expand Up @@ -294,6 +319,39 @@ costs:
2045: 157.5 # interpolated
2050: 168

adjustments:
electricity: false
sector:
factor:
Generator:
biogas:
p_nom:
2030: 1.26 # EU27 biogas potential: PyPSA-Eur 301 TWh vs TYNDP 379 TWh
2035: 1.89 # interpolated
2040: 2.51 # EU27 biogas potential: PyPSA-Eur 306 TWh vs TYNDP 767 TWh
e_sum_max:
2030: 1.26
2035: 1.89
2040: 2.51
e_sum_min:
2030: 1.26
2035: 1.89
2040: 2.51
solid biomass:
p_nom:
2030: 1.47 # EU27 biomass potential: PyPSA-Eur 974 TWh vs TYNDP 1431 TWh
2035: 1.40 # interpolated
2040: 1.33 # EU27 biomass potential: PyPSA-Eur 950 TWh vs TYNDP 1261 TWh
e_sum_max:
2030: 1.47
2035: 1.40
2040: 1.33
e_sum_min:
2030: 1.47
2035: 1.40
2040: 1.33
absolute: false

clustering:
mode: administrative
administrative:
Expand Down
Loading