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

add figures, text and refs for water4energy implementation #19

Merged
merged 4 commits into from
Aug 2, 2019

Conversation

scparkinson
Copy link
Contributor

#18
#18
Energy: add water for energy implementation @scparkinson

@khaeru khaeru added this to the Public release milestone Jul 11, 2019
- Fixing merge conflicts I created by editing main.bib on the other branch, sorry!
Copy link
Member

@khaeru khaeru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added one commit to tidy up a merge conflict that appeared because I made some changes to main.bib in #20—sorry!

Only did a quick read-through of the text and equations. A couple minor changes, but otherwise good to go from my perspective.

source/water/index.rst Outdated Show resolved Hide resolved
source/water/index.rst Outdated Show resolved Hide resolved
air cooling), with the investment into and operation of the cooling technologies included in the
optimization decision variables. This enables MESSAGE to choose the type of cooling technology
for each power plant type and track how the operation of the cooling technologies impact water
withdrawals, return flows, thermal pollution and parasitic electricity use.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oxford comma? @volker-krey what's the preferred style?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no opinion on this and even had to look up what the 'Oxford comma' is. Let's take a vote in tomorrow's meeting.

source/water/index.rst Outdated Show resolved Hide resolved
@volker-krey
Copy link
Contributor

@scparkinson this looks very good to me. From a structure perspective, it might make sense to split the water section into water for energy, water for land and other uses (industry, residential). This would mirror the structure under emissions where we also have an energy and land part. Any thoughts on this?

@scparkinson
Copy link
Contributor Author

I can definitely add the description of the other water uses but purposefully left out in this case because it was initially indicated just to include the water for energy part. Please let me know if you want me to add the description of the other water uses.

@volker-krey
Copy link
Contributor

@scparkinson thanks for the offer, but I would suggest that for the moment we keep it at the level you have provided which is consistent with the mainstream version of the global model version. I just thought that structurally it would make sense to anticipate that other components than "water for energy" will be added at some point.

@volker-krey volker-krey merged commit 07f7184 into iiasa:2019-update Aug 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants