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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2023-06-29 12:51:41 +00:00
parent 519a4f2a2a
commit a8f69821dc
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/add_electricity.py
View File

@ -385,25 +385,28 @@ def attach_conventional_generators(
ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency_r) ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency_r)
if unit_commitment is not None: if unit_commitment is not None:
committable_attrs = ppl.carrier.isin(unit_commitment).to_frame('committable') committable_attrs = ppl.carrier.isin(unit_commitment).to_frame("committable")
for attr in unit_commitment.index: for attr in unit_commitment.index:
default = pypsa.components.component_attrs['Generator'].default[attr] default = pypsa.components.component_attrs["Generator"].default[attr]
committable_attrs[attr] = ppl.carrier.map(unit_commitment.loc[attr]).fillna(default) committable_attrs[attr] = ppl.carrier.map(unit_commitment.loc[attr]).fillna(
default
)
else: else:
committable_attrs = {} committable_attrs = {}
if fuel_price is not None: if fuel_price is not None:
fuel_price = (fuel_price.assign(OCGT=fuel_price['gas'], fuel_price = fuel_price.assign(
CCGT=fuel_price['gas']) OCGT=fuel_price["gas"], CCGT=fuel_price["gas"]
.drop("gas", axis=1)) ).drop("gas", axis=1)
missing_carriers = list(carriers - set(fuel_price)) missing_carriers = list(carriers - set(fuel_price))
fuel_price = fuel_price.assign(**costs.fuel[missing_carriers]) fuel_price = fuel_price.assign(**costs.fuel[missing_carriers])
fuel_price = fuel_price.reindex(ppl.carrier, axis=1) fuel_price = fuel_price.reindex(ppl.carrier, axis=1)
fuel_price.columns = ppl.index fuel_price.columns = ppl.index
marginal_cost = fuel_price.div(ppl.efficiency).add(ppl.carrier.map(costs.VOM)) marginal_cost = fuel_price.div(ppl.efficiency).add(ppl.carrier.map(costs.VOM))
else: else:
marginal_cost = ppl.carrier.map(costs.VOM) + ppl.carrier.map(costs.fuel) / ppl.efficiency marginal_cost = (
ppl.carrier.map(costs.VOM) + ppl.carrier.map(costs.fuel) / ppl.efficiency
)
# Define generators using modified ppl DataFrame # Define generators using modified ppl DataFrame
caps = ppl.groupby("carrier").p_nom.sum().div(1e3).round(2) caps = ppl.groupby("carrier").p_nom.sum().div(1e3).round(2)
@ -422,7 +425,7 @@ def attach_conventional_generators(
capital_cost=ppl.capital_cost, capital_cost=ppl.capital_cost,
build_year=ppl.datein.fillna(0).astype(int), build_year=ppl.datein.fillna(0).astype(int),
lifetime=(ppl.dateout - ppl.datein).fillna(np.inf), lifetime=(ppl.dateout - ppl.datein).fillna(np.inf),
**committable_attrs **committable_attrs,
) )
for carrier in set(conventional_params) & carriers: for carrier in set(conventional_params) & carriers:
@ -771,8 +774,12 @@ if __name__ == "__main__":
unit_commitment = None unit_commitment = None
if params.conventional["dynamic_fuel_price"]: if params.conventional["dynamic_fuel_price"]:
monthly_fuel_price = pd.read_csv(snakemake.input.fuel_price, index_col=0, header=0) monthly_fuel_price = pd.read_csv(
monthly_fuel_price.index = pd.date_range(start=n.snapshots[0], end=n.snapshots[-1], freq='MS') snakemake.input.fuel_price, index_col=0, header=0
)
monthly_fuel_price.index = pd.date_range(
start=n.snapshots[0], end=n.snapshots[-1], freq="MS"
)
fuel_price = monthly_fuel_price.reindex(n.snapshots).fillna(method="ffill") fuel_price = monthly_fuel_price.reindex(n.snapshots).fillna(method="ffill")
else: else:
fuel_price = None fuel_price = None

1
scripts/solve_network.py
View File

@ -149,7 +149,6 @@ def prepare_network(
planning_horizons=None, planning_horizons=None,
co2_sequestration_potential=None, co2_sequestration_potential=None,
): ):
if "clip_p_max_pu" in solve_opts: if "clip_p_max_pu" in solve_opts:
for df in ( for df in (
n.generators_t.p_max_pu, n.generators_t.p_max_pu,