comment(GLOBIOM unit) : verified MCM input.

Author: Wegatriespython

message_ix_models/model/water/data/demands.py

@@ -985,7 +985,7 @@ def add_irrigation_demand(context: "Context") -> dict[str, pd.DataFrame]:
     land_out["commodity"] = "freshwater"
 
     land_out["value"] = land_out["value"]
-    # FIXME : check if input is already in MCM as we are assumptions
+    # Input from Globiom is already in MCM
 
     # take land_out edited and add as a demand in  land_input
     results["land_input"] = land_out

message_ix_models/model/water/utils.py

@@ -143,7 +143,9 @@ def func(row: pd.Series):
     return df.apply(func, axis=1)
 
 
-def get_vintage_and_active_years(info, technical_lifetime: int | None) -> pd.DataFrame:
+def get_vintage_and_active_years(
+    info, technical_lifetime: Optional[int] = None
+) -> pd.DataFrame:
     """Calculate valid vintage-activity year combinations without scenario dependency.
 
     This implements similar logic as scenario.vintage_and_active_years() but