Merge branch 'master' into ASEAN-ClimateFinance

OSeMOSYS · Jan 14, 2025 · 457c0da · 457c0da
2 parents 006578a + e24b6ba
commit 457c0da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/workflow/scripts/osemosys_global/summary/carbon_intensity.py b/workflow/scripts/osemosys_global/summary/carbon_intensity.py
@@ -41,7 +41,7 @@ def format_emissions(annual_emissions: pd.DataFrame) -> pd.DataFrame:
     df["COUNTRY"] = df.EMISSION.str[3:6]
     return df.groupby(["REGION", "EMISSION", "COUNTRY", "YEAR"]).sum()
 
-def format_global_values(production: pd.DataFrame, emissions: pd.DataFrame):
+def format_global_values(production: pd.DataFrame, emissions: pd.DataFrame) -> tuple[pd.DataFrame, pd.DataFrame]:
     p_global = production.reset_index()[["YEAR", "VALUE"]
                                        ].groupby(["YEAR"]).sum()
 

diff --git a/workflow/scripts/osemosys_global/summary/costs.py b/workflow/scripts/osemosys_global/summary/costs.py
@@ -51,9 +51,9 @@ def get_transmission_cost(discounted_cost_tech: pd.DataFrame, country: bool) ->
 
     df = discounted_cost_tech.copy()
 
-    df1 = df.copy()[
+    df1 = df[
         (df.index.get_level_values("TECHNOLOGY").str.startswith("TRN"))
-    ]
+    ].copy()
 
     if country:
         r = "COUNTRY"