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

fix computation of shipping demands

Browse Source
This commit is contained in:
Fabian Neumann 2022-12-28 13:45:42 +01:00
parent f645d13743
commit 292ec9d5a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/prepare_sector_network.py
View File

@ -2148,8 +2148,8 @@ def add_industry(n, costs):
if total_share != 1:
logger.warning(f"Total shipping shares sum up to {total_share*100}%, corresponding to increased or decreased demand assumptions.")
domestic_navigation = pop_weighted_energy_totals.loc[nodes, "total domestic navigation"]
international_navigation = pd.read_csv(snakemake.input.shipping_demand, index_col=0)
domestic_navigation = pop_weighted_energy_totals.loc[nodes, "total domestic navigation"].squeeze()
international_navigation = pd.read_csv(snakemake.input.shipping_demand, index_col=0).squeeze()
all_navigation = domestic_navigation + international_navigation
p_set = all_navigation * 1e6 / 8760
@ -2204,7 +2204,7 @@ def add_industry(n, costs):
)
n.madd("Link",
spatial.h2.locations + "methanolisation",
spatial.h2.locations + " methanolisation",
bus0=spatial.h2.nodes,
bus1=spatial.methanol.nodes,
bus2=nodes,