Merge pull request #242 from iiasa/wat_SSP_upd2

khaeru · web-flow · commit 0645fd54d2a6 · 2024-11-04T13:02:56.000+01:00
Flexible setup of constraints for cooling technologies
diff --git a/doc/water/index.rst b/doc/water/index.rst
@@ -1,6 +1,10 @@
 MESSAGEix-Nexus (:mod:`.model.water`)
 *************************************
 
+.. note:: The current version of :mod:`.model.water` is configured to work with scenarios that have technology set elements including ``csp_sm1_ppl`` and ``csp_sm3_ppl`` instead of ``solar_th_ppl``.
+   Previous versions (in :mod:`message_ix_models` v2024.8.6 and earlier) were configured to work with scenarios including the technology ``solar_th_ppl``.
+   See further discussion at :pull:`242`.
+
 :mod:`message_ix_models.model.water` adds water usage and demand related representation to the MESSAGEix-GLOBIOM global model.
 The resulting model is referred to as **“MESSAGEix-Nexus”**.
 This work extends the water sector linkage described by Parkinson et al. (2019) :cite:`parkinson-2019`.
diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -4,7 +4,8 @@ What's new
 Next release
 ============
 
-- Fix the nexus/cooling function and adding test for checking some input data (:pull:`236`).
+- Make setup of constraints for cooling technologies flexible and update solar csp tech. name (:pull:`242`). 
+- Fix the nexus/cooling function and add 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`).
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cool_techs_country_share.csv b/message_ix_models/data/water/ppl_cooling_tech/cool_techs_country_share.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:669c1dd152ff47b2b203a29decd8ded056a6ca76d7823af8665c29d274e68625
-size 31012
+oid sha256:7b20ea1a29b19485f529db6bd25eb98495b82db58a39826cf27da5bb7e2be15b
+size 26173
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share.csv b/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f03cf7b25a4eb15af32252a5498f7534ab1298a540b9e4041905084b4054b9e3
-size 7094
+oid sha256:e234d4a8238dc36e38b7836e74b52c54522c6d11bb5fc0441d5bfea616fbc698
+size 5154
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share_R11.csv b/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share_R11.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4b53fd2df77644122011041ba958ff0fd84646bdfb81a4bd918ee10e6a8dd15
-size 7138
+oid sha256:9137797fc3b6e1f67e3b5224014b8bd7c82fac39eca5d006232c766dff9af446
+size 5198
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share_R12.csv b/message_ix_models/data/water/ppl_cooling_tech/cool_techs_region_share_R12.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e54b2a38792540e3e83e0ae4812286137235ab0f9fb7c9a26f70f6d9bb910339
-size 7528
+oid sha256:64f8064f5971680fd928e35df10c13ba24b202f3328a8686e61536ba69586fcb
+size 5492
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_country.csv b/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_country.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71d69e10931793d6a410226ea2098530cc568f80f4dec5e8587c9f7d5aa8d69e
-size 50969
+oid sha256:72ee20f7102b8f71ab9fed966b042d2bc59d74d0c2d404dd5ca469d180d09f77
+size 52407
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg.csv b/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:024f4981a4232caf1c206f6c2206b118d4230164a4e4dd9dafa21aa6887f0c04
-size 11413
+oid sha256:500138012d5bf33da1ba44745053cada82ce594a091a286887f3c591b9513a4d
+size 12039
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg_R11.csv b/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg_R11.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed4e738f2dc9667ea9faa1f5420c78b52007de701aa96f29f44cce18c658c404
-size 11457
+oid sha256:9a9420d1197e1d5856441b4cf211dd360ea8c7432490e8e568266e186c01f8fa
+size 12083
diff --git a/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg_R12.csv b/message_ix_models/data/water/ppl_cooling_tech/cooltech_cost_and_shares_ssp_msg_R12.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2962d1cfbae328fdc027823e2de151020500047d01f3ab3ba855b95bd3e80ded
-size 11903
+oid sha256:9639f5b03a8deaff90f211cb146ffbf0cdf83ab3bf88927ab738bc0bcd8936a4
+size 12545
diff --git a/message_ix_models/data/water/set.yaml b/message_ix_models/data/water/set.yaml
@@ -50,6 +50,8 @@ nexus:
     - cooling__loil_ppl
     - cooling__nuc_hc
     - cooling__solar_th_ppl
+    - cooling__csp_sm1_ppl
+    - cooling__csp_sm3_ppl
 
     add:
     - electr
@@ -210,9 +212,16 @@ nexus:
     - nuc_hc__ot_saline
     - solar_th_ppl__ot_fresh
     - solar_th_ppl__cl_fresh
-    - solar_th_ppl__cl_fresh
     - solar_th_ppl__ot_saline
     - solar_th_ppl__air
+    - csp_sm1_ppl__ot_fresh
+    - csp_sm1_ppl__cl_fresh
+    - csp_sm1_ppl__ot_saline
+    - csp_sm1_ppl__air
+    - csp_sm3_ppl__ot_fresh
+    - csp_sm3_ppl__cl_fresh
+    - csp_sm3_ppl__ot_saline
+    - csp_sm3_ppl__air
     - extract__freshwater_supply
     - extract__freshwater_instream
     - extract__saline_supply
@@ -318,6 +327,14 @@ nexus:
     - solar_th_ppl__cl_fresh
     - solar_th_ppl__ot_saline
     - solar_th_ppl__air
+    - csp_sm1_ppl__ot_fresh
+    - csp_sm1_ppl__cl_fresh
+    - csp_sm1_ppl__ot_saline
+    - csp_sm1_ppl__air
+    - csp_sm3_ppl__ot_fresh
+    - csp_sm3_ppl__cl_fresh
+    - csp_sm3_ppl__ot_saline
+    - csp_sm3_ppl__air
 
   # cat_addon includes cooling technology addons for parent technologies
   type_addon:
@@ -345,6 +362,8 @@ nexus:
     - cooling__nuc_hc
     - cooling__nuc_lc
     - cooling__solar_th_ppl
+    - cooling__csp_sm1_ppl
+    - cooling__csp_sm3_ppl
 
   map_tec_addon:
     add:
@@ -370,7 +389,8 @@ nexus:
     - [loil_ppl, cooling__loil_ppl]
     - [nuc_hc, cooling__nuc_hc]
     - [nuc_lc, cooling__nuc_lc]
-    # - [solar_th_ppl, cooling__solar_th_ppl]
+    - [csp_sm1_ppl, cooling__csp_sm1_ppl]
+    - [csp_sm3_ppl, cooling__csp_sm3_ppl]
 
 
   cat_addon:
@@ -468,6 +488,14 @@ nexus:
     - [cooling__solar_th_ppl, solar_th_ppl__cl_fresh]
     - [cooling__solar_th_ppl, solar_th_ppl__ot_saline]
     - [cooling__solar_th_ppl, solar_th_ppl__air]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__ot_fresh]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__cl_fresh]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__ot_saline]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__air]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__ot_fresh]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__cl_fresh]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__ot_saline]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__air]
 
   type_tec:
     add:
@@ -611,6 +639,8 @@ cooling:
     - cooling__loil_ppl
     - cooling__nuc_hc
     - cooling__solar_th_ppl
+    - cooling__csp_sm1_ppl
+    - cooling__csp_sm3_ppl
 
     add:
     - electr
@@ -747,9 +777,16 @@ cooling:
     - nuc_hc__ot_saline
     - solar_th_ppl__ot_fresh
     - solar_th_ppl__cl_fresh
-    - solar_th_ppl__cl_fresh
     - solar_th_ppl__ot_saline
     - solar_th_ppl__air
+    - csp_sm1_ppl__ot_fresh
+    - csp_sm1_ppl__cl_fresh
+    - csp_sm1_ppl__ot_saline
+    - csp_sm1_ppl__air
+    - csp_sm3_ppl__ot_fresh
+    - csp_sm3_ppl__cl_fresh
+    - csp_sm3_ppl__ot_saline
+    - csp_sm3_ppl__air
     - extract__upstream_landuse
     - extract__saline_supply
     - extract__freshwater_supply
@@ -856,6 +893,14 @@ cooling:
     - solar_th_ppl__cl_fresh
     - solar_th_ppl__ot_saline
     - solar_th_ppl__air
+    - csp_sm1_ppl__ot_fresh
+    - csp_sm1_ppl__cl_fresh
+    - csp_sm1_ppl__ot_saline
+    - csp_sm1_ppl__air
+    - csp_sm3_ppl__ot_fresh
+    - csp_sm3_ppl__cl_fresh
+    - csp_sm3_ppl__ot_saline
+    - csp_sm3_ppl__air
 
   # cat_addon includes cooling technology addons for parent technologies
   type_addon:
@@ -883,6 +928,8 @@ cooling:
     - cooling__nuc_hc
     - cooling__nuc_lc
     - cooling__solar_th_ppl
+    - cooling__csp_sm1_ppl
+    - cooling__csp_sm3_ppl
 
   map_tec_addon:
     add:
@@ -909,6 +956,8 @@ cooling:
     - [nuc_hc, cooling__nuc_hc]
     - [nuc_lc, cooling__nuc_lc]
     # - [solar_th_ppl, cooling__solar_th_ppl]
+    - [csp_sm1_ppl, cooling__csp_sm1_ppl]
+    - [csp_sm3_ppl, cooling__csp_sm3_ppl]
 
 
   cat_addon:
@@ -1006,6 +1055,14 @@ cooling:
     - [cooling__solar_th_ppl, solar_th_ppl__cl_fresh]
     - [cooling__solar_th_ppl, solar_th_ppl__ot_saline]
     - [cooling__solar_th_ppl, solar_th_ppl__air]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__ot_fresh]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__cl_fresh]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__ot_saline]
+    - [cooling__csp_sm1_ppl, csp_sm1_ppl__air]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__ot_fresh]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__cl_fresh]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__ot_saline]
+    - [cooling__csp_sm3_ppl, csp_sm3_ppl__air]
 
 
   unit:
diff --git a/message_ix_models/data/water/technology.yaml b/message_ix_models/data/water/technology.yaml
@@ -576,6 +576,54 @@ nexus:
       technology using parasitic electricity
     input: {commodity: electr}
 
+  csp_sm1_ppl__ot_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: freshwater_supply}
+
+  csp_sm1_ppl__cl_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by closed loop cooling
+      technology using freshwater supply & parasitic electricity
+    input: {commodity: freshwater_supply,electr}
+
+  csp_sm1_ppl__ot_saline:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: saline_supply_ppl}
+
+  csp_sm1_ppl__air:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using parasitic electricity
+    input: {commodity: electr}
+
+  csp_sm3_ppl__ot_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: freshwater_supply}
+
+  csp_sm3_ppl__cl_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by closed loop cooling
+      technology using freshwater supply & parasitic electricity
+    input: {commodity: freshwater_supply,electr}
+
+  csp_sm3_ppl__ot_saline:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: saline_supply_ppl}
+
+  csp_sm3_ppl__air:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using parasitic electricity
+    input: {commodity: electr}
+
   urban_t_d:
     description: >-
       Urban water transmission & distribution
@@ -1324,3 +1372,53 @@ cooling:
       technology using parasitic electricity
     input: {commodity: electr}
 
+  csp_sm1_ppl__ot_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: freshwater_supply}
+
+  csp_sm1_ppl__cl_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by closed loop cooling
+      technology using freshwater supply & parasitic electricity
+    input: {commodity: freshwater_supply,electr}
+
+  csp_sm1_ppl__ot_saline:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: saline_supply_ppl}
+
+  csp_sm1_ppl__air:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using parasitic electricity
+    input: {commodity: electr}
+
+  csp_sm3_ppl__ot_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: freshwater_supply}
+
+  csp_sm3_ppl__cl_fresh:
+    description: >-
+      Solar thermal power plant with storage cooling by closed loop cooling
+      technology using freshwater supply & parasitic electricity
+    input: {commodity: freshwater_supply,electr}
+
+  csp_sm3_ppl__ot_saline:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using freshwater supply
+    input: {commodity: saline_supply_ppl}
+
+  csp_sm3_ppl__air:
+    description: >-
+      Solar thermal power plant with storage cooling by once through cooling
+      technology using parasitic electricity
+    input: {commodity: electr}
+
+  
+
diff --git a/message_ix_models/model/water/cli.py b/message_ix_models/model/water/cli.py
@@ -267,6 +267,9 @@ def cooling(context, regions, rcps, rels):
     # Build
     build(context, scen)
 
+    # Set scenario as default
+    scen.set_as_default()
+
     # Solve
     scen.solve(solve_options={"lpmethod": "4"}, case=caseName)
 
diff --git a/message_ix_models/model/water/data/water_for_ppl.py b/message_ix_models/model/water/data/water_for_ppl.py
diff --git a/message_ix_models/model/water/data/water_supply.py b/message_ix_models/model/water/data/water_supply.py
diff --git a/message_ix_models/model/water/report.py b/message_ix_models/model/water/report.py
diff --git a/message_ix_models/tests/model/water/data/test_water_for_ppl.py b/message_ix_models/tests/model/water/data/test_water_for_ppl.py
