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

add_electricity: revert changes in add_nice_carrier_names

Browse Source
This commit is contained in:
Fabian 2022-01-11 09:58:59 +01:00
parent 66f2d36f0d
commit acd7122aad
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/add_electricity.py
View File

@ -529,18 +529,17 @@ def estimate_renewable_capacities(n, tech_map):
n.generators.loc[tech_i, 'p_nom_min'] = n.generators.loc[tech_i, 'p_nom'] n.generators.loc[tech_i, 'p_nom_min'] = n.generators.loc[tech_i, 'p_nom']
def add_nice_carrier_names(n, nice_names, tech_colors): def add_nice_carrier_names(n, config):
carrier_i = n.carriers.index carrier_i = n.carriers.index
nice_names = (pd.Series(nice_names) nice_names = (pd.Series(config['plotting']['nice_names'])
.reindex(carrier_i).fillna(carrier_i.to_series().str.title())) .reindex(carrier_i).fillna(carrier_i.to_series().str.title()))
n.carriers['nice_name'] = nice_names n.carriers['nice_name'] = nice_names
colors = pd.Series(tech_colors).reindex(carrier_i) colors = pd.Series(config['plotting']['tech_colors']).reindex(carrier_i)
if colors.isna().any(): if colors.isna().any():
missing_i = list(colors.index[colors.isna()]) missing_i = list(colors.index[colors.isna()])
logger.warning(f'tech_colors for carriers {missing_i} not defined.') logger.warning(f'tech_colors for carriers {missing_i} not defined in config.')
n.carriers['color'] = colors n.carriers['color'] = colors
if __name__ == "__main__": if __name__ == "__main__":
if 'snakemake' not in globals(): if 'snakemake' not in globals():
from _helpers import mock_snakemake from _helpers import mock_snakemake
@ -582,7 +581,6 @@ if __name__ == "__main__":
update_p_nom_max(n) update_p_nom_max(n)
plot_config = config['plotting'] add_nice_carrier_names(n, config)
add_nice_carrier_names(n, plot_config['nice_names'], plot_config['tech_colors'])
n.export_to_netcdf(snakemake.output[0]) n.export_to_netcdf(snakemake.output[0])