iiasa · Wegatriespython · May 4, 2026 · May 5, 2026 · May 5, 2026 · May 20, 2026
@@ -165,21 +165,11 @@ Pre-processing
 
   - :file:`calculate_ppl_cooling_technology_shares.r`: contains script for processing cooling technology shares at global level for different regional specifications.
   - :file:`groundwater_harmonize.r`: contains workflow to calculate historical capacity of renewable groundwater, table depth and energy consumption
-  - :file:`generate_water_constraints.r`: contains function to calculate municipal, manufacturing, rural water demands, water access and sanitation rates
-  - :file:`desalination.r`: contains script for assessing the historical and possible future desalination capacity of a region or country
-  - :file:`hydro_agg_raster.py`: contains workflow for processing the hydrological data in NC4 and adjust the unit conversions, daily to monthly aggregation.
-  - :file:`hydro_agg_spatial.R`: contains workflow for spatially aggregating monthly hydrological data onto basin using appropriate raster masking onto shapefiles
-  - :file:`hydro_agg_basin.py`: contains workflow for aggregating monthly data to 5 yearly averages using appropriate statistical methods (quantiles, averages etc.).
-    It also calculates e flows based on Variable MF method.
-
-Deprecated R Code
-=================
-
-- :file:`data/water/deprecated`: contains `R` scripts from the older water sector implementation
-
-  - :file:`Figures.R`: R script for producing figures
-  - :file:`cooling_tech_av.R`: contains similar code as in the above-mentioned scripts, but this was originated from another workstream.
-  - :file:`add_water_infrastructure.R`: contains spatially-explicit analysis of gridded demands and socioeconomic indicators to develop pathways for sectoral water withdrawals, return flows and infrastructure penetration rates in each MESSAGE region. The pathways feature branching points reflecting a specific water sector development narrative (e.g., convergence towards achieving specific SDG targets).
+  - :file:`basin_allocation.py`: contains shared helpers for mapping country totals to R12 basins
+  - :file:`generate_access_rates.py`: contains script for generating R12 drinking-water access rate CSVs
+  - :file:`generate_sectoral_demands.py`: contains script for generating R12 sectoral water demand CSVs
+  - :file:`generate_desalination.py`: contains script for generating R12 historical and projected desalination capacity CSVs
+  - :file:`generate_hydro_availability.py`: contains workflow for generating R12 hydro availability and e-flow CSVs
 
 Reference
 =========

diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -7,6 +7,9 @@ Next release
 - Add IAMC code list :class:`~.iamc.structure.CL_SCENARIO_DIAGNOSTIC` (:pull:`501`).
 - New module :ref:`tools-newclimate` (:pull:`499`).
 - Add :class:`.model.water.Config` to collect water module settings (:pull:`509`).
+- Retire urban/rural unconnected water technologies and disable CPLEX scaling in water-ix solves (:pull:`510`).
+- Refresh R12 water module input data and replace legacy pre-processing scripts (:pull:`513`).
+- Fix water-nexus supply constraints in :mod:`.model.water` (:pull:`522`).
 - Add :doc:`/api/model-bmt` (:pull:`433`).
 
   - Add

@@ -0,0 +1,210 @@
+BCU_name
+50|MEA
+30|MEA
+50|SAS
+30|SAS
+30|FSU
+10|FSU
+10|SAS
+67|SAS
+148|CHN
+13|AFR
+57|AFR
+38|AFR
+6|AFR
+161|AFR
+0|EEU
+14|MEA
+93|LAM
+139|LAM
+100|LAM
+137|LAM
+76|LAM
+84|LAM
+75|LAM
+111|LAM
+155|LAM
+31|FSU
+22|PAO
+21|PAO
+19|PAO
+20|PAO
+18|PAO
+91|PAO
+149|PAO
+48|WEU
+39|WEU
+39|EEU
+48|EEU
+96|AFR
+158|AFR
+95|AFR
+8|AFR
+7|AFR
+53|SAS
+65|SAS
+24|SAS
+24|PAS
+28|LAM
+106|EEU
+106|FSU
+42|FSU
+51|FSU
+32|LAM
+9|LAM
+152|LAM
+101|LAM
+99|LAM
+125|LAM
+113|LAM
+46|LAM
+29|LAM
+73|PAS
+53|CHN
+107|AFR
+80|AFR
+78|AFR
+109|NAM
+52|NAM
+81|NAM
+103|NAM
+36|NAM
+126|NAM
+90|NAM
+63|NAM
+142|NAM
+17|NAM
+153|NAM
+47|WEU
+119|WEU
+67|CHN
+54|CHN
+77|CHN
+118|CHN
+105|CHN
+159|CHN
+70|CHN
+88|CHN
+62|CHN
+61|CHN
+60|CHN
+162|CHN
+11|CHN
+35|CHN
+98|CHN
+123|CHN
+37|LAM
+83|LAM
+108|LAM
+82|AFR
+33|LAM
+85|WEU
+41|WEU
+121|AFR
+5|AFR
+145|WEU
+4|MEA
+3|MEA
+3|AFR
+87|MEA
+95|MEA
+78|MEA
+134|LAM
+116|LAM
+96|MEA
+5|MEA
+85|MEA
+120|MEA
+40|MEA
+4|WEU
+45|WEU
+86|WEU
+130|AFR
+127|WEU
+51|WEU
+127|FSU
+140|PAS
+49|WEU
+68|WEU
+128|WEU
+25|FSU
+26|FSU
+129|AFR
+0|WEU
+144|PAS
+114|PAS
+72|PAS
+143|PAS
+110|PAS
+69|PAS
+124|SAS
+66|SAS
+12|SAS
+70|PAS
+70|SAS
+31|MEA
+151|MEA
+34|MEA
+115|MEA
+64|WEU
+150|WEU
+71|PAO
+154|FSU
+146|FSU
+105|FSU
+77|FSU
+54|FSU
+1|AFR
+148|FSU
+59|PAS
+88|PAS
+88|RCPA
+59|RCPA
+156|RCPA
+98|PAS
+61|RCPA
+141|SAS
+39|FSU
+43|FSU
+27|LAM
+97|LAM
+122|LAM
+54|RCPA
+105|RCPA
+160|RCPA
+160|FSU
+11|RCPA
+11|FSU
+2|AFR
+135|AFR
+4|AFR
+92|AFR
+94|PAO
+115|SAS
+15|SAS
+117|PAS
+112|PAS
+133|PAS
+28|NAM
+132|FSU
+157|FSU
+44|FSU
+23|FSU
+74|FSU
+131|FSU
+79|FSU
+123|FSU
+71|FSU
+26|WEU
+151|WEU
+31|WEU
+147|PAS
+104|NAM
+27|NAM
+55|NAM
+97|NAM
+33|NAM
+122|NAM
+56|NAM
+58|NAM
+136|AFR