[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
parent
fe51fd7022
commit
ff0093c8fe
@ -1701,9 +1701,9 @@ def add_ice_cars(n, nodes, p_set, ice_share, temperature):
|
|||||||
suffix = " land transport ICE"
|
suffix = " land transport ICE"
|
||||||
|
|
||||||
p_nom = ice_share * p_set.div(efficiency).max()
|
p_nom = ice_share * p_set.div(efficiency).max()
|
||||||
|
|
||||||
profile = p_set.div(efficiency) / p_set.div(efficiency).max()
|
profile = p_set.div(efficiency) / p_set.div(efficiency).max()
|
||||||
|
|
||||||
n.madd(
|
n.madd(
|
||||||
"Link",
|
"Link",
|
||||||
nodes,
|
nodes,
|
||||||
@ -3690,30 +3690,32 @@ def lossy_bidirectional_links(n, carrier, efficiencies={}):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def adjust_transport_temporal_agg(n):
|
def adjust_transport_temporal_agg(n):
|
||||||
|
|
||||||
engine_types = {"fuel_cell":'land transport fuel cell',
|
engine_types = {
|
||||||
"electric": 'land transport EV',
|
"fuel_cell": "land transport fuel cell",
|
||||||
"ice": 'land transport oil'}
|
"electric": "land transport EV",
|
||||||
|
"ice": "land transport oil",
|
||||||
p_set = n.loads_t.p_set.loc[:, n.loads.carrier=="land transport demand"]
|
}
|
||||||
|
|
||||||
|
p_set = n.loads_t.p_set.loc[:, n.loads.carrier == "land transport demand"]
|
||||||
|
|
||||||
for engine, carrier in engine_types.items():
|
for engine, carrier in engine_types.items():
|
||||||
share = get(options[f"land_transport_{engine}_share"], investment_year)
|
share = get(options[f"land_transport_{engine}_share"], investment_year)
|
||||||
|
|
||||||
if share==0: continue
|
if share == 0:
|
||||||
links_i = n.links[n.links.carrier==carrier].index
|
continue
|
||||||
|
links_i = n.links[n.links.carrier == carrier].index
|
||||||
efficiency = n.links_t.efficiency.loc[:, links_i]
|
efficiency = n.links_t.efficiency.loc[:, links_i]
|
||||||
p_set.columns = efficiency.columns
|
p_set.columns = efficiency.columns
|
||||||
p_nom = share * p_set.div(efficiency).max()
|
p_nom = share * p_set.div(efficiency).max()
|
||||||
profile = p_set.div(efficiency) / p_set.div(efficiency).max()
|
profile = p_set.div(efficiency) / p_set.div(efficiency).max()
|
||||||
|
|
||||||
n.links.loc[links_i, "p_nom"] = p_nom
|
n.links.loc[links_i, "p_nom"] = p_nom
|
||||||
n.links_t.p_max_pu[links_i] = profile
|
n.links_t.p_max_pu[links_i] = profile
|
||||||
n.links_t.p_min_pu[links_i] = profile
|
n.links_t.p_min_pu[links_i] = profile
|
||||||
|
|
||||||
|
|
||||||
# %%
|
# %%
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
if "snakemake" not in globals():
|
if "snakemake" not in globals():
|
||||||
@ -3812,7 +3814,7 @@ if __name__ == "__main__":
|
|||||||
solver_name = snakemake.config["solving"]["solver"]["name"]
|
solver_name = snakemake.config["solving"]["solver"]["name"]
|
||||||
resolution = snakemake.params.time_resolution
|
resolution = snakemake.params.time_resolution
|
||||||
n = set_temporal_aggregation(n, resolution, solver_name)
|
n = set_temporal_aggregation(n, resolution, solver_name)
|
||||||
|
|
||||||
adjust_transport_temporal_agg(n)
|
adjust_transport_temporal_agg(n)
|
||||||
|
|
||||||
co2_budget = snakemake.params.co2_budget
|
co2_budget = snakemake.params.co2_budget
|
||||||
|
Loading…
Reference in New Issue
Block a user