update ember column headers

trevorb1 · trevorb1 · commit be5a112ba2fb · 2026-01-30T16:01:00.000-08:00
diff --git a/workflow/scripts/osemosys_global/demand/read.py b/workflow/scripts/osemosys_global/demand/read.py
@@ -67,8 +67,8 @@ def import_ember_elec(f: str) -> pd.DataFrame:
 
     df = pd.read_csv(f, encoding="latin-1")
     return (
-        df[["Country code", "Year", "Variable", "Value"]]
-        .rename(columns={"Value": "ember_Elec", "Country code": "Country"})
+        df[["ISO 3 code", "Year", "Variable", "Value"]]
+        .rename(columns={"Value": "ember_Elec", "ISO 3 code": "Country"})
         .dropna()
         .set_index("Country")
     )
diff --git a/workflow/scripts/osemosys_global/emissions/read.py b/workflow/scripts/osemosys_global/emissions/read.py
@@ -32,7 +32,7 @@ def _read_ember_data(csv_file: str) -> pd.DataFrame:
     """
     df = pd.read_csv(csv_file)
     df = df.rename(
-        columns={"Country code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}
+        columns={"ISO 3 code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}
     )
     df = df[["COUNTRY", "YEAR", "Category", "Subcategory", "Variable", "Unit", "VALUE"]]
     return df[(df.YEAR >= 2015) & (df.Unit != "%")].copy()
diff --git a/workflow/scripts/osemosys_global/validation/ember.py b/workflow/scripts/osemosys_global/validation/ember.py
@@ -74,7 +74,7 @@ def _read_ember_data(csv_file: str) -> pd.DataFrame:
     """
     df = pd.read_csv(csv_file)
     df = df.rename(
-        columns={"Country code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}
+        columns={"ISO 3 code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}
     )
     df = df[["COUNTRY", "YEAR", "Category", "Subcategory", "Variable", "Unit", "VALUE"]]
     return df[(df.YEAR >= 2015) & (df.Unit != "%")].copy()

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ def _read_ember_data(csv_file: str) -> pd.DataFrame:`
`32`	`32`	`"""`
`33`	`33`	`df = pd.read_csv(csv_file)`
`34`	`34`	`df = df.rename(`
`35`		`- columns={"Country code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}`
	`35`	`+ columns={"ISO 3 code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}`
`36`	`36`	`)`
`37`	`37`	`df = df[["COUNTRY", "YEAR", "Category", "Subcategory", "Variable", "Unit", "VALUE"]]`
`38`	`38`	`return df[(df.YEAR >= 2015) & (df.Unit != "%")].copy()`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def _read_ember_data(csv_file: str) -> pd.DataFrame:`
`74`	`74`	`"""`
`75`	`75`	`df = pd.read_csv(csv_file)`
`76`	`76`	`df = df.rename(`
`77`		`- columns={"Country code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}`
	`77`	`+ columns={"ISO 3 code": "COUNTRY", "Year": "YEAR", "Value": "VALUE"}`
`78`	`78`	`)`
`79`	`79`	`df = df[["COUNTRY", "YEAR", "Category", "Subcategory", "Variable", "Unit", "VALUE"]]`
`80`	`80`	`return df[(df.YEAR >= 2015) & (df.Unit != "%")].copy()`