Merge pull request #236 from iiasa/wat_SSP_upd1

Nexus cooling updates for R12/SSP scenarios

doc/whatsnew.rst

@@ -4,6 +4,7 @@ What's new
 Next release
 ============
 
+- Fix the nexus/cooling function and adding test for checking some input data (:pull:`236`).
 - Add :doc:`/project/circeular` project code and documentation (:pull:`232`).
 - Update water availability data and major code editing to allow a new test suite for the water module (:pull:`106`).
 - Expand :doc:`repro` with sections on :ref:`repro-doc` and :ref:`versioning`, including :ref:`a list of external model names and ‘versions’ <model-names>` like “MESSAGEix-GLOBIOM 2.0” (:issue:`224`, :pull:`226`).

message_ix_models/data/water/set.yaml

@@ -370,7 +370,7 @@ nexus:
     - [loil_ppl, cooling__loil_ppl]
     - [nuc_hc, cooling__nuc_hc]
     - [nuc_lc, cooling__nuc_lc]
-    - [solar_th_ppl, cooling__solar_th_ppl]
+    # - [solar_th_ppl, cooling__solar_th_ppl]
 
 
   cat_addon:
@@ -908,7 +908,7 @@ cooling:
     - [loil_ppl, cooling__loil_ppl]
     - [nuc_hc, cooling__nuc_hc]
     - [nuc_lc, cooling__nuc_lc]
-    - [solar_th_ppl, cooling__solar_th_ppl]
+    # - [solar_th_ppl, cooling__solar_th_ppl]
 
 
   cat_addon:

message_ix_models/model/water/cli.py

@@ -94,8 +94,20 @@ def water_ini(context: "Context", regions, time):
 
 @cli.command("nexus")
 @click.pass_obj
-@click.option("--rcps", default="6p0", type=click.Choice(_RCPS))
-@click.option("--rels", default="low", type=click.Choice(_REL))
+@click.option(
+    "--rcps",
+    default="no_climate",
+    type=click.Choice(_RCPS),
+    show_default=True,
+    help="Specifies the climate scenario used ['no_climate','6p0','2p6']",
+)
+@click.option(
+    "--rels",
+    default="low",
+    type=click.Choice(_REL),
+    show_default=True,
+    help="Specifies the reliability of hydrological data ['low','mid','high']",
+)
 @click.option(
     "--sdgs",
     default="baseline",
@@ -194,8 +206,20 @@ def nexus(context: "Context", regions, rcps, sdgs, rels, macro=False):
 
 @cli.command("cooling")
 @common_params("regions")
-@click.option("--rcps", type=click.Choice(_RCPS))
-@click.option("--rels", type=click.Choice(_REL))
+@click.option(
+    "--rcps",
+    default="no_climate",
+    type=click.Choice(_RCPS),
+    show_default=True,
+    help="Specifies the climate scenario used ['no_climate','6p0','2p6']",
+)
+@click.option(
+    "--rels",
+    default="low",
+    type=click.Choice(_REL),
+    show_default=True,
+    help="Specifies the reliability of hydrological data ['low','mid','high']",
+)
 @click.pass_obj
 def cooling_cli(context, regions, rcps, rels):
     """Build and solve model with new cooling technologies."""