commit
89d28ed06e
@ -397,6 +397,7 @@ sector:
|
|||||||
biomass: true
|
biomass: true
|
||||||
industry: true
|
industry: true
|
||||||
agriculture: true
|
agriculture: true
|
||||||
|
fossil_fuels: true
|
||||||
district_heating:
|
district_heating:
|
||||||
potential: 0.6
|
potential: 0.6
|
||||||
progress:
|
progress:
|
||||||
|
@ -4,6 +4,7 @@ heating,--,"{true, false}",Flag to include heating sector.
|
|||||||
biomass,--,"{true, false}",Flag to include biomass sector.
|
biomass,--,"{true, false}",Flag to include biomass sector.
|
||||||
industry,--,"{true, false}",Flag to include industry sector.
|
industry,--,"{true, false}",Flag to include industry sector.
|
||||||
agriculture,--,"{true, false}",Flag to include agriculture sector.
|
agriculture,--,"{true, false}",Flag to include agriculture sector.
|
||||||
|
fossil_fuels,--,"{true, false}","Flag to include imports of fossil fuels ( [""coal"", ""gas"", ""oil"", ""lignite""])"
|
||||||
district_heating,--,,`prepare_sector_network.py <https://github.com/PyPSA/pypsa-eur-sec/blob/master/scripts/prepare_sector_network.py>`_
|
district_heating,--,,`prepare_sector_network.py <https://github.com/PyPSA/pypsa-eur-sec/blob/master/scripts/prepare_sector_network.py>`_
|
||||||
-- potential,--,float,maximum fraction of urban demand which can be supplied by district heating. Ignored where below current fraction.
|
-- potential,--,float,maximum fraction of urban demand which can be supplied by district heating. Ignored where below current fraction.
|
||||||
-- progress,--,Dictionary with planning horizons as keys., Increase of today's district heating demand to potential maximum district heating share. Progress = 0 means today's district heating share. Progress = 1 means maximum fraction of urban demand is supplied by district heating
|
-- progress,--,Dictionary with planning horizons as keys., Increase of today's district heating demand to potential maximum district heating share. Progress = 0 means today's district heating share. Progress = 1 means maximum fraction of urban demand is supplied by district heating
|
||||||
@ -71,7 +72,7 @@ boilers,--,"{true, false}",Add option for transforming gas into heat using gas b
|
|||||||
resistive_heaters,--,"{true, false}",Add option for transforming electricity into heat using resistive heaters (independently from 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
|
||||||
overdimension_individual_heating,--,"float",Add option for overdimensioning individual heating systems by a certain factor. This allows them to cover heat demand peaks e.g. 10% higher than those in the data with a setting of 1.1.
|
overdimension_individual_heating,--,float,Add option for overdimensioning individual heating systems by a certain factor. This allows them to cover heat demand peaks e.g. 10% higher than those in the data with a setting of 1.1.
|
||||||
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)
|
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)
|
||||||
micro_chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP) for decentral areas.
|
micro_chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP) for decentral areas.
|
||||||
solar_thermal,--,"{true, false}",Add option for using solar thermal to generate heat.
|
solar_thermal,--,"{true, false}",Add option for using solar thermal to generate heat.
|
||||||
|
|
@ -10,6 +10,8 @@ Release Notes
|
|||||||
Upcoming Release
|
Upcoming Release
|
||||||
================
|
================
|
||||||
|
|
||||||
|
* Add flag ``sector: fossil_fuels`` in config to remove the option of importing fossil fuels
|
||||||
|
|
||||||
* Renamed the carrier of batteries in BEVs from `battery storage` to `EV battery` and the corresponding bus carrier from `Li ion` to `EV battery`. This is to avoid confusion with stationary battery storage.
|
* Renamed the carrier of batteries in BEVs from `battery storage` to `EV battery` and the corresponding bus carrier from `Li ion` to `EV battery`. This is to avoid confusion with stationary battery storage.
|
||||||
|
|
||||||
* Changed default assumptions about waste heat usage from PtX and fuel cells in district heating.
|
* Changed default assumptions about waste heat usage from PtX and fuel cells in district heating.
|
||||||
|
@ -542,14 +542,17 @@ def add_carrier_buses(n, carrier, nodes=None):
|
|||||||
capital_cost=capital_cost,
|
capital_cost=capital_cost,
|
||||||
)
|
)
|
||||||
|
|
||||||
n.madd(
|
fossils = ["coal", "gas", "oil", "lignite"]
|
||||||
"Generator",
|
if options.get("fossil_fuels", True) and carrier in fossils:
|
||||||
nodes,
|
|
||||||
bus=nodes,
|
n.madd(
|
||||||
p_nom_extendable=True,
|
"Generator",
|
||||||
carrier=carrier,
|
nodes,
|
||||||
marginal_cost=costs.at[carrier, "fuel"],
|
bus=nodes,
|
||||||
)
|
p_nom_extendable=True,
|
||||||
|
carrier=carrier,
|
||||||
|
marginal_cost=costs.at[carrier, "fuel"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# TODO: PyPSA-Eur merge issue
|
# TODO: PyPSA-Eur merge issue
|
||||||
@ -2898,7 +2901,7 @@ def add_industry(n, costs):
|
|||||||
carrier="oil",
|
carrier="oil",
|
||||||
)
|
)
|
||||||
|
|
||||||
if "oil" not in n.generators.carrier.unique():
|
if options.get("fossil_fuels", True) and "oil" not in n.generators.carrier.unique():
|
||||||
n.madd(
|
n.madd(
|
||||||
"Generator",
|
"Generator",
|
||||||
spatial.oil.nodes,
|
spatial.oil.nodes,
|
||||||
|
Loading…
Reference in New Issue
Block a user