Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wat ssp upd3: third update to cooling technology, with SSP differentiation #256

Merged
merged 25 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4596dbb
Add modes for cooling technologies and a test
adrivinca Nov 19, 2024
7b65e7c
Add SSP config file, first draft
adrivinca Nov 19, 2024
7cd8b9f
Auto stash before revert of "Add modes for cooling technologies and a…
adrivinca Nov 19, 2024
1d5c5a5
add method for unscaled infeasibilities and fix csp remaining data file
adrivinca Nov 21, 2024
34c0c78
Add share constraint sets and params for cooling technologies
adrivinca Nov 21, 2024
736b718
Simplify data yamls and load cooling data by default
adrivinca Nov 22, 2024
2155ab1
Update data with correct csp tec and geo_ppl fix
adrivinca Nov 27, 2024
0e30c65
adjust csp technology in the cost module
adrivinca Nov 27, 2024
61da214
Add csp corrected technology in set and tech yamls
adrivinca Nov 27, 2024
08f258d
add geo_ppl related cooling techs and update hist_act function
adrivinca Nov 27, 2024
35f5409
change constraints from 0 to 0.001 in water ssp yaml file
adrivinca Nov 27, 2024
00bb8e8
Update cooling share data and R script (previous update was manual)
adrivinca Nov 28, 2024
37bd3f7
review fixes
adrivinca Nov 28, 2024
badc13d
Remove pd.dataframe where not needed
adrivinca Nov 28, 2024
b2fa3f0
Add test build function and fix test_get_spec()
adrivinca Nov 28, 2024
507ec9a
Add test for SSP water parametrization
adrivinca Nov 28, 2024
343a138
Correct test_build.py, no need to add a region
adrivinca Nov 28, 2024
c32ba23
Replace make_df for set making with pd.dataframe
adrivinca Dec 2, 2024
5bf9965
Remove csv files from gitattribute
adrivinca Dec 2, 2024
745aace
Convert LFS files into csv for ppl cooling folder
adrivinca Dec 2, 2024
c8d0c76
Remove old files not used
adrivinca Dec 2, 2024
47b248e
Update log info for nexus and cooling functions
adrivinca Dec 2, 2024
cfd3d31
Update water Whatsnew and documentation
adrivinca Dec 2, 2024
2950ac7
Untrack all water csv files from LFS, see as csv
adrivinca Dec 2, 2024
121885b
Update type doc/whatsnew.rst
adrivinca Dec 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions doc/water/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions doc/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand Down
72 changes: 64 additions & 8 deletions message_ix_models/data/costs/cooling/tech_map.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions message_ix_models/data/water/.gitattributes
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading