prepare sector: harmonize logger infos
This commit is contained in:
parent
98e3c7ab2c
commit
46e3b16959
@ -452,7 +452,9 @@ def remove_elec_base_techs(n):
|
|||||||
for c in n.iterate_components(snakemake.config["pypsa_eur"]):
|
for c in n.iterate_components(snakemake.config["pypsa_eur"]):
|
||||||
to_keep = snakemake.config["pypsa_eur"][c.name]
|
to_keep = snakemake.config["pypsa_eur"][c.name]
|
||||||
to_remove = pd.Index(c.df.carrier.unique()).symmetric_difference(to_keep)
|
to_remove = pd.Index(c.df.carrier.unique()).symmetric_difference(to_keep)
|
||||||
print("Removing", c.list_name, "with carrier", to_remove)
|
if to_remove.empty:
|
||||||
|
continue
|
||||||
|
logger.info(f"Removing {c.list_name} with carrier {list(to_remove)}")
|
||||||
names = c.df.index[c.df.carrier.isin(to_remove)]
|
names = c.df.index[c.df.carrier.isin(to_remove)]
|
||||||
n.mremove(c.name, names)
|
n.mremove(c.name, names)
|
||||||
n.carriers.drop(to_remove, inplace=True, errors="ignore")
|
n.carriers.drop(to_remove, inplace=True, errors="ignore")
|
||||||
@ -463,7 +465,9 @@ def remove_non_electric_buses(n):
|
|||||||
"""
|
"""
|
||||||
remove buses from pypsa-eur with carriers which are not AC buses
|
remove buses from pypsa-eur with carriers which are not AC buses
|
||||||
"""
|
"""
|
||||||
print("drop buses from PyPSA-Eur with carrier: ", n.buses[~n.buses.carrier.isin(["AC", "DC"])].carrier.unique())
|
to_drop = list(n.buses.query("carrier not in ['AC', 'DC']").carrier.unique())
|
||||||
|
if to_drop:
|
||||||
|
logger.info(f"Drop buses from PyPSA-Eur with carrier: {to_drop}")
|
||||||
n.buses = n.buses[n.buses.carrier.isin(["AC", "DC"])]
|
n.buses = n.buses[n.buses.carrier.isin(["AC", "DC"])]
|
||||||
|
|
||||||
|
|
||||||
@ -785,12 +789,12 @@ def insert_electricity_distribution_grid(n, costs):
|
|||||||
# TODO pop_layout?
|
# TODO pop_layout?
|
||||||
# TODO options?
|
# TODO options?
|
||||||
|
|
||||||
print("Inserting electricity distribution grid with investment cost factor of",
|
cost_factor = options['electricity_distribution_grid_cost_factor']
|
||||||
options['electricity_distribution_grid_cost_factor'])
|
|
||||||
|
logger.info(f"Inserting electricity distribution grid with investment cost factor of {cost_factor:.2f}")
|
||||||
|
|
||||||
nodes = pop_layout.index
|
nodes = pop_layout.index
|
||||||
|
|
||||||
cost_factor = options['electricity_distribution_grid_cost_factor']
|
|
||||||
|
|
||||||
n.madd("Bus",
|
n.madd("Bus",
|
||||||
nodes + " low voltage",
|
nodes + " low voltage",
|
||||||
@ -905,7 +909,7 @@ def insert_gas_distribution_costs(n, costs):
|
|||||||
|
|
||||||
f_costs = options['gas_distribution_grid_cost_factor']
|
f_costs = options['gas_distribution_grid_cost_factor']
|
||||||
|
|
||||||
print("Inserting gas distribution grid with investment cost factor of", f_costs)
|
logger.info(f"Inserting gas distribution grid with investment cost factor of {f_costs}")
|
||||||
|
|
||||||
capital_cost = costs.loc['electricity distribution grid']["fixed"] * f_costs
|
capital_cost = costs.loc['electricity distribution grid']["fixed"] * f_costs
|
||||||
|
|
||||||
@ -1451,7 +1455,7 @@ def add_heat(n, costs):
|
|||||||
# exogenously reduce space heat demand
|
# exogenously reduce space heat demand
|
||||||
if options["reduce_space_heat_exogenously"]:
|
if options["reduce_space_heat_exogenously"]:
|
||||||
dE = get(options["reduce_space_heat_exogenously_factor"], investment_year)
|
dE = get(options["reduce_space_heat_exogenously_factor"], investment_year)
|
||||||
print(f"assumed space heat reduction of {dE*100} %")
|
logger.info(f"assumed space heat reduction of {dE:.2%}")
|
||||||
for sector in sectors:
|
for sector in sectors:
|
||||||
heat_demand[sector + " space"] = (1 - dE) * heat_demand[sector + " space"]
|
heat_demand[sector + " space"] = (1 - dE) * heat_demand[sector + " space"]
|
||||||
|
|
||||||
@ -1811,10 +1815,9 @@ def create_nodes_for_heat_sector():
|
|||||||
diff = (urban_fraction * central_fraction) - dist_fraction_node
|
diff = (urban_fraction * central_fraction) - dist_fraction_node
|
||||||
progress = get(options["district_heating"]["progress"], investment_year)
|
progress = get(options["district_heating"]["progress"], investment_year)
|
||||||
dist_fraction_node += diff * progress
|
dist_fraction_node += diff * progress
|
||||||
print(
|
logger.info(
|
||||||
"The current district heating share compared to the maximum",
|
"Increase district heating share by a progress factor of {progress:.2%} "
|
||||||
f"possible is increased by a progress factor of\n{progress}",
|
f"resulting in new average share of {dist_fraction_node.mean():.2%}"
|
||||||
f"resulting in a district heating share of\n{dist_fraction_node}"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return nodes, dist_fraction_node, urban_fraction
|
return nodes, dist_fraction_node, urban_fraction
|
||||||
@ -2586,7 +2589,7 @@ def maybe_adjust_costs_and_potentials(n, opts):
|
|||||||
else:
|
else:
|
||||||
sel = c.df.carrier.str.contains(carrier)
|
sel = c.df.carrier.str.contains(carrier)
|
||||||
c.df.loc[sel,attr] *= factor
|
c.df.loc[sel,attr] *= factor
|
||||||
print("changing", attr , "for", carrier, "by factor", factor)
|
logger.info(f"changing {attr} for {carrier} by factor {factor}")
|
||||||
|
|
||||||
|
|
||||||
# TODO this should rather be a config no wildcard
|
# TODO this should rather be a config no wildcard
|
||||||
@ -2831,7 +2834,7 @@ if __name__ == "__main__":
|
|||||||
for o in opts:
|
for o in opts:
|
||||||
if o[:4] == "wave":
|
if o[:4] == "wave":
|
||||||
wave_cost_factor = float(o[4:].replace("p", ".").replace("m", "-"))
|
wave_cost_factor = float(o[4:].replace("p", ".").replace("m", "-"))
|
||||||
print("Including wave generators with cost factor of", wave_cost_factor)
|
logger.info(f"Including wave generators with cost factor of {wave_cost_factor}")
|
||||||
add_wave(n, wave_cost_factor)
|
add_wave(n, wave_cost_factor)
|
||||||
if o[:4] == "dist":
|
if o[:4] == "dist":
|
||||||
options['electricity_distribution_grid'] = True
|
options['electricity_distribution_grid'] = True
|
||||||
@ -2897,7 +2900,7 @@ if __name__ == "__main__":
|
|||||||
limit = o[o.find("Co2L")+4:]
|
limit = o[o.find("Co2L")+4:]
|
||||||
limit = float(limit.replace("p", ".").replace("m", "-"))
|
limit = float(limit.replace("p", ".").replace("m", "-"))
|
||||||
break
|
break
|
||||||
print("Add CO2 limit from", limit_type)
|
logger.info(f"Add CO2 limit from {limit_type}")
|
||||||
add_co2limit(n, Nyears, limit)
|
add_co2limit(n, Nyears, limit)
|
||||||
|
|
||||||
for o in opts:
|
for o in opts:
|
||||||
|
Loading…
Reference in New Issue
Block a user