Merge pull request #76 from PyPSA/country-subsets

energy_totals: only fix 'BA' if in list of countries
This commit is contained in:
Tom Brown 2020-11-30 16:43:15 +01:00 committed by GitHub
commit 7cfce2e324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -378,7 +378,7 @@ def build_energy_totals():
clean_df.loc[missing,"total aviation passenger"] = clean_df.loc[missing,["total domestic aviation passenger","total international aviation passenger"]].sum(axis=1) clean_df.loc[missing,"total aviation passenger"] = clean_df.loc[missing,["total domestic aviation passenger","total international aviation passenger"]].sum(axis=1)
clean_df.loc[missing,"total aviation freight"] = clean_df.loc[missing,["total domestic aviation freight","total international aviation freight"]].sum(axis=1) clean_df.loc[missing,"total aviation freight"] = clean_df.loc[missing,["total domestic aviation freight","total international aviation freight"]].sum(axis=1)
if "BA" in clean_df.index:
#fix missing data for BA (services and road energy data) #fix missing data for BA (services and road energy data)
missing = (clean_df.loc["BA"] == 0.) missing = (clean_df.loc["BA"] == 0.)