Merge pull request #256 from iiasa/wat_SSP_upd3

Water SSP Update 3: third update to cooling technology, with SSP differentiation

Author: glatterf42

doc/water/index.rst

@@ -21,11 +21,15 @@ model and scenario specifications can be either set manually in ``cli.py`` or sp
 
 .. code::
 
-   Usage: mix-models water [OPTIONS] COMMAND [ARGS]...
+   Usage: mix-models water-ix [OPTIONS] COMMAND [ARGS]...
+
+   MESSAGEix-Water and Nexus variant.
 
    Options:
-   --regions [ISR|R11|R12|R14|R32|RCP|ZMB]
+   --regions [ADVANCE|B210-R11|ISR|R11|R12|R14|R17|R20|R32|RCP|ZMB]
                                     Code list to use for 'node' dimension.
+   --ssp [LED|SSP1|SSP2|SSP3|SSP4|SSP5]
+   --time TEXT                     Manually defined time
    --help                          Show this message and exit.
 
    Commands:

doc/whatsnew.rst

@@ -4,6 +4,7 @@ What's new
 Next release
 ============
 
+- Introduce an SSP configuration for cooling technologies with share constraints (:pull:`256`).
 - :mod:`message_ix_models` is tested and compatible with `Python 3.13 <https://www.python.org/downloads/release/python-3130/>`__ (:pull:`250`).
 - Support for Python 3.8 is dropped (:pull:`250`), as it has reached end-of-life.
 - Connect the water module to the cost module for cooling technologies (:pull:`245`).

message_ix_models/data/costs/cooling/tech_map.csv

@@ -91,11 +91,67 @@ solar_th_ppl__air,energy,solar_th_ppl,220,0,2015
 solar_th_ppl__cl_fresh,energy,solar_th_ppl,100,0,2015
 solar_th_ppl__ot_fresh,energy,solar_th_ppl,0.4,0,2015
 solar_th_ppl__ot_saline,energy,solar_th_ppl,0.3,0,2015
-csp_sm1_ppl__air,energy,csp_sm1_ppl,220,0,2015
-csp_sm1_ppl__cl_fresh,energy,csp_sm1_ppl,100,0,2015
-csp_sm1_ppl__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
-csp_sm1_ppl__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
-csp_sm3_ppl__air,energy,csp_sm3_ppl,220,0,2015
-csp_sm3_ppl__cl_fresh,energy,csp_sm3_ppl,100,0,2015
-csp_sm3_ppl__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
-csp_sm3_ppl__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm1_res__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res1__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res1__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res1__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res1__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res2__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res2__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res2__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res2__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res3__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res3__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res3__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res3__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res4__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res4__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res4__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res4__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res5__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res5__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res5__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res5__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res6__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res6__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res6__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res6__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm1_res7__air,energy,csp_sm1_ppl,220,0,2015
+csp_sm1_res7__cl_fresh,energy,csp_sm1_ppl,100,0,2015
+csp_sm1_res7__ot_fresh,energy,csp_sm1_ppl,0.4,0,2015
+csp_sm1_res7__ot_saline,energy,csp_sm1_ppl,0.3,0,2015
+csp_sm3_res__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res1__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res1__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res1__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res1__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res2__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res2__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res2__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res2__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res3__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res3__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res3__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res3__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res4__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res4__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res4__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res4__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res5__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res5__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res5__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res5__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res6__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res6__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res6__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res6__ot_saline,energy,csp_sm3_ppl,0.3,0,2015
+csp_sm3_res7__air,energy,csp_sm3_ppl,220,0,2015
+csp_sm3_res7__cl_fresh,energy,csp_sm3_ppl,100,0,2015
+csp_sm3_res7__ot_fresh,energy,csp_sm3_ppl,0.4,0,2015
+csp_sm3_res7__ot_saline,energy,csp_sm3_ppl,0.3,0,2015

message_ix_models/data/water/.gitattributes

@@ -1,4 +1,2 @@
 *.shp filter=lfs diff=lfs merge=lfs -text
 *.Rda filter=lfs diff=lfs merge=lfs -text
-*.csv filter=lfs diff=lfs merge=lfs -text
-ppl_cooling_tech/*.csv filter=lfs diff=lfs merge=lfs -text