Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 15, 2024
1 parent fb157d3 commit 88135cd
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 33 deletions.
18 changes: 10 additions & 8 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ rule prepare_sector_networks:
RDIR
+ "/prenetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}.nc",
**config["scenario"],
**config["costs"]
**config["costs"],
),


Expand All @@ -102,7 +102,7 @@ rule override_res_all_nets:
+ "/prenetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}_presec.nc",
**config["scenario"],
**config["costs"],
**config["export"]
**config["export"],
),


Expand All @@ -113,7 +113,7 @@ rule solve_all_networks:
+ "/postnetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}_{h2export}export.nc",
**config["scenario"],
**config["costs"],
**config["export"]
**config["export"],
),


Expand Down Expand Up @@ -203,9 +203,11 @@ rule prepare_sector_network:
shapes_path=pypsaearth(
"resources/bus_regions/regions_onshore_elec_s{simpl}_{clusters}.geojson"
),
pipelines="data_custom/pipelines.csv"
if config["custom_data"]["gas_network"]
else "resources/gas_networks/gas_network_elec_s{simpl}_{clusters}.csv",
pipelines=(
"data_custom/pipelines.csv"
if config["custom_data"]["gas_network"]
else "resources/gas_networks/gas_network_elec_s{simpl}_{clusters}.csv"
),
output:
RDIR
+ "/prenetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}.nc",
Expand Down Expand Up @@ -574,15 +576,15 @@ rule make_summary:
+ "/postnetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}_{h2export}export.nc",
**config["scenario"],
**config["costs"],
**config["export"]
**config["export"],
),
costs=CDIR + "costs_{planning_horizons}.csv",
plots=expand(
RDIR
+ "/maps/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}-costs-all_{planning_horizons}_{discountrate}_{demand}_{h2export}export.pdf",
**config["scenario"],
**config["costs"],
**config["export"]
**config["export"],
),
output:
nodal_costs=SDIR + "/csvs/nodal_costs.csv",
Expand Down
20 changes: 10 additions & 10 deletions scripts/build_base_energy_totals.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ def calc_sector(sector):
energy_totals_base.at[country, "total domestic aviation"] = np.NaN

elif sector == "navigation":
energy_totals_base.at[
country, "total international navigation"
] = np.NaN
energy_totals_base.at[country, "total international navigation"] = (
np.NaN
)
energy_totals_base.at[country, "total domestic navigation"] = np.NaN

_logger.warning("No data for " + country + " in the sector " + sector + ".")
Expand Down Expand Up @@ -229,13 +229,13 @@ def calc_sector(sector):
)

elif sector == "navigation":
energy_totals_base.at[
country, "total international navigation"
] = round(
df_sector[
df_sector.Transaction == "International marine bunkers"
].Quantity_TWh.sum(),
4,
energy_totals_base.at[country, "total international navigation"] = (
round(
df_sector[
df_sector.Transaction == "International marine bunkers"
].Quantity_TWh.sum(),
4,
)
)
energy_totals_base.at[country, "total domestic navigation"] = round(
df_sector[
Expand Down
12 changes: 6 additions & 6 deletions scripts/build_industrial_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ def create_cement_db():
)
avg_c_cap = df_cement.groupby(df_cement.country)["capacity"].mean()
df_cement["capacity"] = df_cement.apply(
lambda x: avg_c_cap[x["country"]]
if math.isnan(x["capacity"])
else x["capacity"],
lambda x: (
avg_c_cap[x["country"]] if math.isnan(x["capacity"]) else x["capacity"]
),
axis=1,
)

Expand Down Expand Up @@ -455,9 +455,9 @@ def create_paper_df():
na_index

df_paper["capacity"] = df_paper.apply(
lambda x: avg_c_cap[x["country"]]
if math.isnan(x["capacity"])
else x["capacity"],
lambda x: (
avg_c_cap[x["country"]] if math.isnan(x["capacity"]) else x["capacity"]
),
axis=1,
)

Expand Down
8 changes: 5 additions & 3 deletions scripts/plot_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,11 @@ def plot_balances():

# remove trailing link ports
df.index = [
i[:-1]
if ((i != "co2") and (i != "H2") and (i[-1:] in ["0", "1", "2", "3"]))
else i
(
i[:-1]
if ((i != "co2") and (i != "H2") and (i[-1:] in ["0", "1", "2", "3"]))
else i
)
for i in df.index
]

Expand Down
6 changes: 3 additions & 3 deletions scripts/prepare_airports.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ def download_airports():

df.insert(2, "airport_size_nr", 1)
df.loc[df["type"].isin(["medium_airport"]), "airport_size_nr"] = 1
df.loc[
df["type"].isin(["large_airport"]), "airport_size_nr"
] = snakemake.params.airport_sizing_factor
df.loc[df["type"].isin(["large_airport"]), "airport_size_nr"] = (
snakemake.params.airport_sizing_factor
)

# Calculate the number of total airports size
df1 = df.copy()
Expand Down
8 changes: 5 additions & 3 deletions scripts/prepare_sector_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -1630,9 +1630,11 @@ def add_industry(n, costs):
spatial.nodes,
suffix=" low-temperature heat for industry",
bus=[
node + " urban central heat"
if node + " urban central heat" in n.buses.index
else node + " services urban decentral heat"
(
node + " urban central heat"
if node + " urban central heat" in n.buses.index
else node + " services urban decentral heat"
)
for node in spatial.nodes
],
carrier="low-temperature heat for industry",
Expand Down

0 comments on commit 88135cd

Please sign in to comment.