Clarify report comment; recode water supply fix

Author: adrivinca

message_ix_models/model/water/data/water_supply.py

@@ -94,12 +94,11 @@ def map_basin_region_wat(context: "Context") -> pd.DataFrame:
         # Reading data, the data is spatially and temporally aggregated from GHMs
         df_sw["BCU_name"] = df_x["BCU_name"]
 
-        if context.type_reg == "country":
-            df_sw["MSGREG"] = context.map_ISO_c[context.regions]
-        else:
-            df_sw["MSGREG"] = (
-                f"{context.regions}_" + df_sw["BCU_name"].str.split("|").str[-1]
-            )
+        df_sw["MSGREG"] = (
+            context.map_ISO_c[context.regions]
+            if context.type_reg == "country"
+            else f"{context.regions}_" + df_sw["BCU_name"].str.split("|").str[-1]
+        )
 
         df_sw = df_sw.set_index(["MSGREG", "BCU_name"])
         df_sw.drop(columns="Unnamed: 0", inplace=True)

message_ix_models/model/water/report.py

@@ -1113,7 +1113,8 @@ def report(sc: Scenario, reg: str, sdgs: bool = False) -> None:
     for ur in ["urban", "rural"]:
         # CHANGE TO URBAN AND RURAL POP
         pop_tot = sc.timeseries(variable=("Population|" + ur.capitalize()))
-        pop_tot = pop_tot[-(pop_tot.region == "GLB region (R11)")]  # ONLY R11!!!
+        # ONLY R11!!! Need to fix when updating the reporting to work with any region
+        pop_tot = pop_tot[-(pop_tot.region == "GLB region (R11)")]
         pop_reg = np.unique(pop_tot["region"])
         # need to change names
         reg_map = mp2.regions()