diff --git a/config/config.yaml b/config/config.yaml index 8b4b3c27..ebf6340a 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -27,17 +27,17 @@ scenario: # - 'FS' # Falling Short - 'LW' # Leading the Way year: # year of Future Energy Scenario modelled - # - 2040 + - 2050 # - 2025 - # - 2030 + - 2030 # - 2035 - - 2050 + - 2040 flexopts: - "" - "ss" - - "cosy" # EVs with go-like tariff - - "tank" # intelligent EV charging; centrally optimal charging of EV fleet - - "go" # intelligent EV charging; centrally optimal charging of EV fleet + - "cosy" + - "tank" + - "go" - "int-v2g" - "go-cosy" - "int-v2g-tank" diff --git a/scripts/make_summary.py b/scripts/make_summary.py index ac3d1554..d8a54bfd 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -870,7 +870,7 @@ def to_csv(df): df = make_summaries(networks_dict) - if "metrics" in df.columns: + if "metrics" in df: df["metrics"].loc["total costs"] = df["costs"].sum() to_csv(df)