Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e07ca33
split industry heat demands into temperature bands
LukasFrankenQ Dec 8, 2025
9e55ec9
aligned rule order with graph structure
LukasFrankenQ Dec 8, 2025
5e9fd11
expanded industry heat endogenisation to per_node_today
LukasFrankenQ Dec 8, 2025
9689d90
moved heat band calculation to dedicated endogenous script
LukasFrankenQ Dec 8, 2025
6cbe89b
finalised move of endogenous heat shares to dedicated script
LukasFrankenQ Dec 9, 2025
1cf0468
added docstrings
LukasFrankenQ Dec 9, 2025
6658506
merged exogenous and endogenous ratios into nodal industry demands
LukasFrankenQ Dec 9, 2025
df2d482
towards integration of endogenous heat in prepare_sector_network
LukasFrankenQ Dec 10, 2025
3247093
added endogenous industry option to config
LukasFrankenQ Dec 10, 2025
faea957
fixed bugs in prepare_sector_network
LukasFrankenQ Dec 10, 2025
699332c
system averages taken for unavailable product-demand combinations
LukasFrankenQ Dec 11, 2025
e02fb59
endogenous ind heat ratios now includes HVC recycling and DRI + Elect…
LukasFrankenQ Dec 18, 2025
219c3af
fixed bug that caused reaccuring carrier columns
LukasFrankenQ Jan 1, 2026
ab54d15
endogenous heating no longer takes methanol, etc from exogenous demands
LukasFrankenQ Jan 1, 2026
df8f88e
harmonised industry heat supply naming
LukasFrankenQ Jan 2, 2026
aa8026a
added colors for industry heat bands
LukasFrankenQ Jan 2, 2026
93bd62f
Merge branch 'master' into endog
LukasFrankenQ Mar 24, 2026
d4296e6
merged with upstream
LukasFrankenQ May 6, 2026
0f8a8cc
adjusted licensing
LukasFrankenQ May 6, 2026
4b14728
merged with origin
LukasFrankenQ May 6, 2026
53d2b98
Merge remote-tracking branch 'upstream/master' into endog
LukasFrankenQ Jun 16, 2026
cf12900
fix: correct pulp/paper mapping and mechanical pulp heat bands
LukasFrankenQ Jun 16, 2026
a67060f
docs: add release note for endogenous industry process heat
LukasFrankenQ Jun 16, 2026
a041a0d
rewired industry biomass boilers to draw from spatial.biomass
LukasFrankenQ Jun 16, 2026
69c7975
slight code simplification
LukasFrankenQ Jun 16, 2026
6384b20
fixed process emission treatment
LukasFrankenQ Jun 16, 2026
3e32e3c
added industry-sector-specific endogenous heat
LukasFrankenQ Jun 16, 2026
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
9 changes: 8 additions & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,11 @@ path = [
"data/ch_cantons.csv",
]
SPDX-FileCopyrightText = "Wikipedia contributors"
SPDX-License-Identifier = "CC-BY-SA-4.0"
SPDX-License-Identifier = "CC-BY-SA-4.0"

[[annotations]]
path = [
"data/ente202300981-sup-0001-suppdata-s1.xlsx",
]
SPDX-FileCopyrightText = "Fleiter et al."
SPDX-License-Identifier = "CC-BY-4.0"
34 changes: 34 additions & 0 deletions config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,40 @@ sector:
conventional_generation:
OCGT: gas
CCGT: gas
industry_t:
endogen: false
must_run: 0.8
endogenise_sectors:
"Aluminium - primary production": true
"Aluminium - secondary production": true
Alumina production: true
"Other non-ferrous metals": true
HVC: true
Cement: true
"Ceramics & other NMM": true
Glass production: true
Pulp production: true
Paper production: true
Printing and media reproduction: true
Food, beverages and tobacco: true
Pharmaceutical products etc.: true
Transport equipment: true
Machinery equipment: true
Wood and wood products: true
Textiles and leather: true
Other industrial sectors: true
"heat100-200":
biomass: true
methane: true
heat_pumps: true
electric_boiler: true
"heat200-500":
biomass: true
methane: true
hydrogen: true
"heat>500":
methane: true
hydrogen: true
biomass_to_liquid: true
biomass_to_liquid_cc: false
electrobiofuels: true
Expand Down
20 changes: 19 additions & 1 deletion config/plotting.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,12 @@ plotting:
gas for industry co2 to stored: '#8a3400'
gas for industry: '#853403'
gas for industry CC: '#692e0a'
heat100-200 industry gas: '#853403'
heat200-500 industry gas: '#853403'
heat>500 industry gas: '#853403'
heat100-200 industry gas CC: '#692e0a'
heat200-500 industry gas CC: '#692e0a'
heat>500 industry gas CC: '#692e0a'
gas pipeline: '#ebbca0'
gas pipeline new: '#a87c62'
# oil
Expand Down Expand Up @@ -505,6 +511,10 @@ plotting:
BioSNG: '#123456'
BioSNG CC: '#45233b'
solid biomass to hydrogen: '#654321'
heat100-200 industry solid biomass: '#7a6d26'
heat200-500 industry solid biomass: '#7a6d26'
heat100-200 industry solid biomass CC: '#47411c'
heat200-500 industry solid biomass CC: '#47411c'
# power transmission
lines: '#6c9459'
transmission lines: '#6c9459'
Expand All @@ -517,6 +527,7 @@ plotting:
industry electricity: '#2d2a66'
industry new electricity: '#2d2a66'
agriculture electricity: '#494778'
heat100-200 industry electric boiler steam: '#2d2a66'
# battery + EVs
battery: '#ace37f'
battery storage: '#ace37f'
Expand Down Expand Up @@ -596,7 +607,10 @@ plotting:
residential urban decentral heat: '#a33c3c'
residential urban decentral heat dsm: '#a33c3c'
services urban decentral heat: '#cc1f1f'
low-temperature heat for industry: '#8f2727'
low-temperature heat for industry: '#8f2626'
heat100-200 industry: '#8f2828'
heat200-500 industry: '#c72020'
heat>500 industry: '#ff0000'
process heat: '#ff0000'
agriculture heat: '#d9a5a5'
# heat supply
Expand Down Expand Up @@ -634,6 +648,7 @@ plotting:
services rural resistive heater: '#a5ed9d'
services urban decentral resistive heater: '#98e991'
urban central resistive heater: '#8cdf85'
heat100-200 industry industrial heat pump high temperature: '#2fb537'
retrofitting: '#8487e8'
building retrofitting: '#8487e8'
# hydrogen
Expand All @@ -654,6 +669,9 @@ plotting:
H2 Fuel Cell: '#c251ae'
H2 fuel cell: '#c251ae'
H2 turbine: '#991f83'
heat100-200 industry hydrogen: '#991f83'
heat200-500 industry hydrogen: '#991f83'
heat>500 industry hydrogen: '#991f83'
H2 Electrolysis: '#ff29d9'
H2 electrolysis: '#ff29d9'
# ammonia
Expand Down
Loading
Loading