iiasa · Wegatriespython · Jul 29, 2025 · Jul 15, 2025 · Jul 15, 2025 · Jul 15, 2025
diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -4,6 +4,17 @@ What's new
 Next release
 ============
 
+  Water/Nexus
+  -----------
+
+  - Update :doc:`/water/index` with unit standardization from Km^3 to MCM and model size reduction (:pull:`371`).
+  - Deactivate share calibration constraints for cooling water technologies (:pull:`371`).
+  - Fix excess vintage activity year generation in :mod:`.model.water.utils` to reduce model size (:pull:`371`).
+  - Add missing electricity input units for water technologies in :mod:`.model.water.data.infrastructure` (:pull:`371`).
+  - Fix incorrect data for desalination projected capacity in :mod:`.model.water.data.infrastructure` (:pull:`371`).
+  - Add missing basins_country_R12.csv data file to :mod:`.model.water.data` (:pull:`371`).
+  - Convert Excel data files to CSV format and add improve test coverage for :mod:`.model.water.data` (:pull:`371`).
+
 - Improve :mod:`.tools.costs` for |ssp-scenariomip| (:pull:`378`).
 
   - :attr:`Config.module <.tools.costs.Config.module>` is no longer a :class:`str`

@@ -0,0 +1,3 @@
+tec,incmd,inlvl,outcmd,outlvl,recovery_rate_low,recovery_rate_mid,recovery_rate_high,cooling_water_withdrawal_low,cooling_water_withdrawal_mid,cooling_water_withdrawal_high,cooling_water_return_low,cooling_water_return_mid,cooling_water_return_high,electricity_input_low,electricity_input_mid,electricity_input_high,heat_input_low,heat_input_mid,heat_input_high,thermal_pollution_low,thermal_pollution_mid,thermal_pollution_high,inv_cost_low,inv_cost_mid,inv_cost_high,fix_cost_low,fix_cost_mid,fix_cost_high,var_cost_low,var_cost_mid,var_cost_high,capacity_factor_low,capacity_factor_mid,capacity_factor_high,lifetime_low,lifetime_mid,lifetime_high
+membrane,salinewater_basin,water_avail_basin,freshwater_basin,water_supply_basin,0.4,0.35,0.3,2.4,5.2,7.1,2.3,5.1,7,0.171,0.342,0.456,0.456,1.026,1.368,0.04275,0.0855,0.114,4383.561644,5205.479452,6027.39726,369.8630137,424.6575342,369.8630137,0,0,0,0.9,0.85,0.8,50,30,25
+distillation,salinewater_basin,water_avail_basin,freshwater_basin,water_supply_basin,0.45,0.4,0.35,0,0,0,0,0,0,0.342,0.456,0.571,0,0,0,0,0,0,3561.643836,4246.575342,4931.506849,3561.643836,4520.547945,4931.506849,0,0,0,0.9,0.85,0.8,50,30,25
@@ -0,0 +1,29 @@
+tec,incmd,inlvl,outcmd,outlvl,value_low,value_mid,value_high,capacity_factor_low,capacity_factor_mid,capacity_factor,investment_low_high,Likely Units,investment_mid,investment_high,technical_lifetime_low,technical_lifetime_mid,technical_lifetime_high,fix_cost_low,Likely Units.1,fix_cost_mid,fix_cost_high,var_cost_low,var_cost_mid,var_cost_high,out_value_low,out_value_mid,out_value_high,recovery_rate_low,recovery_rate_mid,recovery_rate_high
+extract_groundwater,,,,,,,,,,,,,,,15.0,20.0,25.0,,,,,,,,,,,,,
+extract_surfacewater,,,,,,,,,,,,,,,40.0,50.0,60.0,,,,,,,,,,,,,
+rural_discharge,rural_collected_wst,water_treat,,,1.0,1.0,1.0,1.0,1.0,1.0,660.0,USD/(m³/day),2080.0,3560.0,30.0,25.0,20.0,66.0,USD/(m³/day)/yr,208.0,356.0,0.0,0.0,0.0,0.97,0.95,0.9,0.0,0.0,0.0
+rural_discharge,electr,final,,,0.0,0.01484018,0.02968037,,,,,,,,,,,,,,,,,,,,,,,
+rural_recycle,rural_collected_wst,water_treat,freshwater_basin,water_supply_basin,1.0,1.0,1.0,0.95,0.9,0.85,495.0,USD/(m³/day),1560.0,2670.0,40.0,30.0,25.0,49.5,USD/(m³/day)/yr,156.0,267.0,0.0,0.0,0.0,0.9,0.8,0.7,0.0,0.0,0.0
+rural_sewerage,electr,final,,,0.00197869,0.04303653,0.08409437,,,,,,,,,,,,,,,,,,,,,0.0,0.0,0.0
+rural_sewerage,rural_collected_wst,final,rural_collected_wst,water_treat,1.0,1.0,1.0,1.0,1.0,1.0,870.2054794520549,USD/(m³/day),1613.8356164383563,2278.3561643835615,50.0,40.0,30.0,217.55136986301372,USD/(m³/day)/yr,403.45890410958907,569.5890410958904,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+rural_t_d,freshwater_basin,water_supply_basin,rural_mw,final,1.0,1.0,1.0,1.0,1.0,1.0,666.027397260274,USD/(m³/day),901.095890410959,2154.7945205479455,30.0,20.0,10.0,33.301369863013704,USD/(m³/day)/yr,45.05479452054795,107.73972602739728,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+rural_t_d,electr,final,,,0.00228311,0.19178082,0.38127854,,,,,,,,,,,,,,,,,,,,,,,
+rural_unconnected,freshwater_basin,water_supply_basin,rural_disconnected,final,1.0,1.0,1.0,1.0,1.0,1.0,0.0,,0.0,0.0,1.0,1.0,1.0,0.0,,0.0,0.0,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+rural_untreated,rural_uncollected_wst,final,,,1.0,1.0,1.0,1.0,1.0,1.0,0.0,,0.0,0.0,1.0,1.0,1.0,0.0,,0.0,0.0,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+urban_discharge,urban_collected_wst,water_treat,,,1.0,1.0,1.0,0.95,0.9,0.85,303.0,USD/(m³/day),429.0,627.0,40.0,30.0,25.0,21.0,USD/(m³/day)/yr,35.0,67.0,0.0,0.0,0.0,0.95,0.9,0.85,0.0,0.0,0.0
+urban_discharge,electr,final,,,0.0,0.01484018,0.02968037,,,,,,,,,,,,,,,,,,,,,,,
+urban_recycle,urban_collected_wst,water_treat,freshwater_basin,water_supply_basin,1.0,1.0,1.0,0.95,0.9,0.85,2761.643835616438,USD/(m³/day),3704.1095890410957,5506.849315068493,40.0,30.0,25.0,172.60273972602738,USD/(m³/day)/yr,268.4931506849315,479.4520547945205,0.0,0.0,0.0,0.9,0.8,0.7,0.0,0.0,0.0
+urban_recycle,electr,final,,,0.091324200913242,0.1141552511415525,0.17123287671232876,,,,,,,,,,,,,,,,,,,,,0.0,0.0,0.0
+urban_sewerage,urban_collected_wst,final,urban_collected_wst,water_treat,1.0,1.0,1.0,1.0,1.0,1.0,1160.2739726027398,USD/(m³/day),2151.780821917808,3037.808219178082,50.0,40.0,30.0,290.06849315068496,USD/(m³/day)/yr,537.945205479452,759.4520547945204,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+urban_sewerage,electr,final,,,0.00197869,0.04303653,0.08409437,,,,,,,,,,,,,,,,,,,,,0.0,0.0,0.0
+urban_t_d,freshwater_basin,water_supply_basin,urban_mw,final,1.0,1.0,1.0,1.0,1.0,1.0,1491.7808219178085,USD/(m³/day),2766.5753424657537,3905.7534246575347,50.0,40.0,30.0,372.9452054794521,USD/(m³/day)/yr,691.6438356164384,976.4383561643837,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+urban_t_d,electr,final,,,0.00228311,0.19178082,0.38127854,,,,,,,,,,,,,,,,,,,,,,,
+urban_unconnected,freshwater_basin,water_supply_basin,urban_disconnected,final,1.0,1.0,1.0,1.0,1.0,1.0,0.0,,0.0,0.0,1.0,1.0,1.0,0.0,,0.0,0.0,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+urban_untreated,urban_uncollected_wst,final,,,1.0,1.0,1.0,1.0,1.0,1.0,0.0,,0.0,0.0,1.0,11.0,1.0,0.0,,0.0,0.0,0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Notes ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"rural sewerage, recyling, treatment make sense only for a handful of basins in the global north. ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,urban technologies need to be geo-matched against urban basins,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"cost estimates need units, confirmation on whether they are const USD or nominal. ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,