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

Merge remote-tracking branch 'origin/master' into update-district-heating-cops

Browse Source
This commit is contained in:
AmosSchledorn 2024-07-25 15:12:13 +02:00
commit e21694473f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/build_industry_sector_ratios_intermediate.py
View File

@ -129,11 +129,12 @@ def build_industry_sector_ratios_intermediate():
] ]
today_sector_ratios_ct.loc[:, ~missing_mask] = today_sector_ratios_ct.loc[ today_sector_ratios_ct.loc[:, ~missing_mask] = today_sector_ratios_ct.loc[
:, ~missing_mask :, ~missing_mask
].fillna(0) ].fillna(future_sector_ratios)
intermediate_sector_ratios[ct] = ( intermediate_sector_ratios[ct] = (
today_sector_ratios_ct * (1 - fraction_future) today_sector_ratios_ct * (1 - fraction_future)
+ future_sector_ratios * fraction_future + future_sector_ratios * fraction_future
) )
intermediate_sector_ratios = pd.concat(intermediate_sector_ratios, axis=1) intermediate_sector_ratios = pd.concat(intermediate_sector_ratios, axis=1)
intermediate_sector_ratios.to_csv(snakemake.output.industry_sector_ratios) intermediate_sector_ratios.to_csv(snakemake.output.industry_sector_ratios)