Fix issue with year_vtg being assigned to year_act; Filter year_act

measrainsey · khaeru · commit f6a6268ffa0f · 2024-04-09T14:00:21.000+02:00
diff --git a/message_ix_models/tools/costs/projections.py b/message_ix_models/tools/costs/projections.py
@@ -446,10 +446,11 @@ def create_message_outputs(df_projections: pd.DataFrame, fom_rate: float):
             technology=lambda x: x.technology.astype("string"),
             unit=lambda x: x.unit.astype("string"),
             year_vtg=lambda x: x.year_vtg.astype(int),
-            year_act=lambda x: x.year_vtg.astype(int),
+            year_act=lambda x: x.year_act.astype(int),
             value=lambda x: x.value.astype(float),
         )
         .query("year_vtg <= 2060 or year_vtg % 10 == 0")
+        .query("year_act <= 2060 or year_act % 10 == 0")
         .reset_index(drop=True)
     )
 

Original file line number	Diff line number	Diff line change
`@@ -446,10 +446,11 @@ def create_message_outputs(df_projections: pd.DataFrame, fom_rate: float):`
`446`	`446`	`technology=lambda x: x.technology.astype("string"),`
`447`	`447`	`unit=lambda x: x.unit.astype("string"),`
`448`	`448`	`year_vtg=lambda x: x.year_vtg.astype(int),`
`449`		`- year_act=lambda x: x.year_vtg.astype(int),`
	`449`	`+ year_act=lambda x: x.year_act.astype(int),`
`450`	`450`	`value=lambda x: x.value.astype(float),`
`451`	`451`	`)`
`452`	`452`	`.query("year_vtg <= 2060 or year_vtg % 10 == 0")`
	`453`	`+ .query("year_act <= 2060 or year_act % 10 == 0")`
`453`	`454`	`.reset_index(drop=True)`
`454`	`455`	`)`
`455`	`456`