config: remove unneeded plotting entries
This commit is contained in:
parent
0664f1050f
commit
9c6e5e0ed0
@ -665,48 +665,6 @@ plotting:
|
|||||||
energy_max: 20000
|
energy_max: 20000
|
||||||
energy_min: -20000
|
energy_min: -20000
|
||||||
energy_threshold: 50.
|
energy_threshold: 50.
|
||||||
vre_techs:
|
|
||||||
- onwind
|
|
||||||
- offwind-ac
|
|
||||||
- offwind-dc
|
|
||||||
- solar
|
|
||||||
- ror
|
|
||||||
renewable_storage_techs:
|
|
||||||
- PHS
|
|
||||||
- hydro
|
|
||||||
conv_techs:
|
|
||||||
- OCGT
|
|
||||||
- CCGT
|
|
||||||
- Nuclear
|
|
||||||
- Coal
|
|
||||||
storage_techs:
|
|
||||||
- hydro+PHS
|
|
||||||
- battery
|
|
||||||
- H2
|
|
||||||
load_carriers:
|
|
||||||
- AC load
|
|
||||||
AC_carriers:
|
|
||||||
- AC line
|
|
||||||
- AC transformer
|
|
||||||
link_carriers:
|
|
||||||
- DC line
|
|
||||||
- Converter AC-DC
|
|
||||||
heat_links:
|
|
||||||
- heat pump
|
|
||||||
- resistive heater
|
|
||||||
- CHP heat
|
|
||||||
- CHP electric
|
|
||||||
- gas boiler
|
|
||||||
- central heat pump
|
|
||||||
- central resistive heater
|
|
||||||
- central CHP heat
|
|
||||||
- central CHP electric
|
|
||||||
- central gas boiler
|
|
||||||
heat_generators:
|
|
||||||
- gas boiler
|
|
||||||
- central gas boiler
|
|
||||||
- solar thermal collector
|
|
||||||
- central solar thermal collector
|
|
||||||
|
|
||||||
nice_names:
|
nice_names:
|
||||||
OCGT: "Open-Cycle Gas"
|
OCGT: "Open-Cycle Gas"
|
||||||
|
@ -7,13 +7,4 @@ energy_max,TWh,float,Upper y-axis limit in energy bar plots.
|
|||||||
energy_min,TWh,float,Lower y-axis limit in energy bar plots.
|
energy_min,TWh,float,Lower y-axis limit in energy bar plots.
|
||||||
energy_threshold,TWh,float,Threshold below which technologies will not be shown in energy bar plots.
|
energy_threshold,TWh,float,Threshold below which technologies will not be shown in energy bar plots.
|
||||||
tech_colors,--,carrier -> HEX colour code,Mapping from network ``carrier`` to a colour (`HEX colour code <https://en.wikipedia.org/wiki/Web_colors#Hex_triplet>`_).
|
tech_colors,--,carrier -> HEX colour code,Mapping from network ``carrier`` to a colour (`HEX colour code <https://en.wikipedia.org/wiki/Web_colors#Hex_triplet>`_).
|
||||||
vre_techs ,--,subset of carriers,Value not in use
|
|
||||||
renewable_storage_techs ,--,subset of carriers,Value not in use
|
|
||||||
conv_techs ,--,subset of carriers,Value in use with unworthy significance. Used as the definition of conventional carrier in solve_network
|
|
||||||
storage_techs ,--,subset of carriers,Value not in use
|
|
||||||
load_carriers ,--,subset of carriers,Value not in use
|
|
||||||
AC_carriers ,--,subset of carriers,Value not in use
|
|
||||||
link_carriers ,--,subset of carriers,Value not in use
|
|
||||||
heat_links ,--,subset of carriers,Value not in use
|
|
||||||
heat_generators ,--,subset of carriers,Value not in use
|
|
||||||
nice_names,--,str -> str,Mapping from network ``carrier`` to a more readable name.
|
nice_names,--,str -> str,Mapping from network ``carrier`` to a more readable name.
|
||||||
|
|
@ -378,13 +378,14 @@ def add_SAFE_constraints(n, config):
|
|||||||
peakdemand = n.loads_t.p_set.sum(axis=1).max()
|
peakdemand = n.loads_t.p_set.sum(axis=1).max()
|
||||||
margin = 1.0 + config["electricity"]["SAFE_reservemargin"]
|
margin = 1.0 + config["electricity"]["SAFE_reservemargin"]
|
||||||
reserve_margin = peakdemand * margin
|
reserve_margin = peakdemand * margin
|
||||||
# TODO: do not take this from the plotting config!
|
conventional_carriers = config["electricity"]["conventional_carriers"]
|
||||||
conv_techs = config["plotting"]["conv_techs"]
|
ext_gens_i = n.generators.query(
|
||||||
ext_gens_i = n.generators.query("carrier in @conv_techs & p_nom_extendable").index
|
"carrier in @conventional_carriers & p_nom_extendable"
|
||||||
|
).index
|
||||||
p_nom = n.model["Generator-p_nom"].loc[ext_gens_i]
|
p_nom = n.model["Generator-p_nom"].loc[ext_gens_i]
|
||||||
lhs = p_nom.sum()
|
lhs = p_nom.sum()
|
||||||
exist_conv_caps = n.generators.query(
|
exist_conv_caps = n.generators.query(
|
||||||
"~p_nom_extendable & carrier in @conv_techs"
|
"~p_nom_extendable & carrier in @conventional_carriers"
|
||||||
).p_nom.sum()
|
).p_nom.sum()
|
||||||
rhs = reserve_margin - exist_conv_caps
|
rhs = reserve_margin - exist_conv_caps
|
||||||
n.model.add_constraints(lhs >= rhs, name="safe_mintotalcap")
|
n.model.add_constraints(lhs >= rhs, name="safe_mintotalcap")
|
||||||
|
Loading…
Reference in New Issue
Block a user