fix computation of shipping demands
This commit is contained in:
parent
f645d13743
commit
292ec9d5a1
@ -2148,8 +2148,8 @@ def add_industry(n, costs):
|
|||||||
if total_share != 1:
|
if total_share != 1:
|
||||||
logger.warning(f"Total shipping shares sum up to {total_share*100}%, corresponding to increased or decreased demand assumptions.")
|
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"]
|
domestic_navigation = pop_weighted_energy_totals.loc[nodes, "total domestic navigation"].squeeze()
|
||||||
international_navigation = pd.read_csv(snakemake.input.shipping_demand, index_col=0)
|
international_navigation = pd.read_csv(snakemake.input.shipping_demand, index_col=0).squeeze()
|
||||||
all_navigation = domestic_navigation + international_navigation
|
all_navigation = domestic_navigation + international_navigation
|
||||||
p_set = all_navigation * 1e6 / 8760
|
p_set = all_navigation * 1e6 / 8760
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user