bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #813 from yerbol-akhmetov/issue1_issue2

Browse Source 
Resolve waste heat and resistive heaters (issue1 and issue2)
This commit is contained in:
Martha Frysztacki 2023-12-28 10:07:12 +01:00 committed by GitHub
commit 61c54152b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.default.yaml
View File

@ -440,6 +440,7 @@ sector:
decentral: 3 decentral: 3
central: 180 central: 180
boilers: true boilers: true
resistive_heaters: true
oil_boilers: false oil_boilers: false
biomass_boiler: true biomass_boiler: true
chp: true chp: true

3
doc/configtables/sector.csv
View File

@ -62,7 +62,8 @@ tes,--,"{true, false}",Add option for storing thermal energy in large water pits
tes_tau,,,The time constant used to calculate the decay of thermal energy in thermal energy storage (TES): 1- :math:`e^{-1/24τ}`. tes_tau,,,The time constant used to calculate the decay of thermal energy in thermal energy storage (TES): 1- :math:`e^{-1/24τ}`.
-- decentral,days,float,The time constant in decentralized thermal energy storage (TES) -- decentral,days,float,The time constant in decentralized thermal energy storage (TES)
-- central,days,float,The time constant in centralized thermal energy storage (TES) -- central,days,float,The time constant in centralized thermal energy storage (TES)
boilers,--,"{true, false}",Add option for transforming electricity into heat using resistive heater boilers,--,"{true, false}",Add option for transforming gas into heat using gas boilers
resistive_heaters,--,"{true, false}",Add option for transforming electricity into heat using resistive heaters (independently from gas boilers)
oil_boilers,--,"{true, false}",Add option for transforming oil into heat using boilers oil_boilers,--,"{true, false}",Add option for transforming oil into heat using boilers
biomass_boiler,--,"{true, false}",Add option for transforming biomass into heat using boilers biomass_boiler,--,"{true, false}",Add option for transforming biomass into heat using boilers
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP) chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)

1 Unit Values Description
62 tes_tau The time constant used to calculate the decay of thermal energy in thermal energy storage (TES): 1- :math:`e^{-1/24τ}`.
63 -- decentral days float The time constant in decentralized thermal energy storage (TES)
64 -- central days float The time constant in centralized thermal energy storage (TES)
65 boilers -- {true, false} Add option for transforming electricity into heat using resistive heater Add option for transforming gas into heat using gas boilers
66 resistive_heaters -- {true, false} Add option for transforming electricity into heat using resistive heaters (independently from gas boilers)
67 oil_boilers -- {true, false} Add option for transforming oil into heat using boilers
68 biomass_boiler -- {true, false} Add option for transforming biomass into heat using boilers
69 chp -- {true, false} Add option for using Combined Heat and Power (CHP)

5
scripts/prepare_sector_network.py
View File

@ -1827,7 +1827,7 @@ def add_heat(n, costs):
lifetime=costs.at[name_type + " water tank storage", "lifetime"], lifetime=costs.at[name_type + " water tank storage", "lifetime"],
) )
if options["boilers"]: if options["resistive_heaters"]:
key = f"{name_type} resistive heater" key = f"{name_type} resistive heater"
n.madd( n.madd(
@ -1842,6 +1842,7 @@ def add_heat(n, costs):
lifetime=costs.at[key, "lifetime"], lifetime=costs.at[key, "lifetime"],
) )
if options["boilers"]:
key = f"{name_type} gas boiler" key = f"{name_type} gas boiler"
n.madd( n.madd(
@ -3415,7 +3416,7 @@ if __name__ == "__main__":
if "I" in opts: if "I" in opts:
add_industry(n, costs) add_industry(n, costs)
if "I" in opts and "H" in opts: if "H" in opts:
add_waste_heat(n) add_waste_heat(n)
if "A" in opts: # requires H and I if "A" in opts: # requires H and I