Skip to content

Merge all updates#20

Merged
khaeru merged 68 commits intomasterfrom
2019-update
Mar 5, 2020
Merged

Merge all updates#20
khaeru merged 68 commits intomasterfrom
2019-update

Conversation

@khaeru
Copy link
Copy Markdown
Member

@khaeru khaeru commented Jul 11, 2019

Individual PRs for #18 will merge into this branch.

Preview: https://message.iiasa.ac.at/projects/global/en/2019-update/

@khaeru khaeru added this to the Public release milestone Jul 11, 2019
@khaeru khaeru changed the title Merge all updates WIP: Merge all updates Jul 11, 2019
@khaeru
Copy link
Copy Markdown
Member Author

khaeru commented Jul 11, 2019

I did some simple find-and-replace cleanup for the entries in main.bib, and added the following instructions to the README:

  • Add references to source/bibs/main.bib. Format entries:
    • Field lines like [TAB]year = {2010},: tab indent, spaces around =, value inside {}, trailing comma.
    • Use either doi (preferred) or url, not both.
    • keywords separated by semicolons (';').
    • Do not include abstract, localfile, or file fields.

However, someone should go through and check for dead links in the URL fields, as I think there are several.

khaeru and others added 18 commits July 11, 2019 14:48
@khaeru
Merge branch '2019-update' into water4energy
d59cdbc 
- Fixing merge conflicts I created by editing main.bib on the other branch, sorry!
@scparkinson
Merge remote-tracking branch 'origin/water4energy' into water4energy
1e5d8d0
@scparkinson
water4energy update inline figure refs and restructure a sentence
38599a5
@behnam-zakeri
updated "in press" references
d7afad8
@behnam-zakeri
adding reference to MESSAGEix paper and updating reference list
f48defc
@behnam-zakeri
Updating the text in spatial and temporal resolution for R14 and 5 year
246dc41
@behnam-zakeri
clean-up and update of references in Energy
d1ead6d
@behnam-zakeri
adding some text and references to global DBs for resources
d5ef01c
@behnam-zakeri
harmonizing and cleanup of Globiom references
73844fd
@behnam-zakeri
cleanup of references in emissions and socio-econ
b81cf51
@behnam-zakeri
updated "overview\temporal" for years and mathematical formulation
5b29963
@OFR-IIASA
added RES excerpt on CHP modelling
1be7160
@OFR-IIASA
added section on technology add-ons
3c8d142
@OFR-IIASA
changed index structure to include technology addon section
35a9a4a
@OFR-IIASA
added section on fuel blending
122df51
@volker-krey
Merge pull request #19 from scparkinson/water4energy
07f7184 
add figures, text and refs for water4energy implementation
@OFR-IIASA
added description of policy implementations
3335bb7
@OFR-IIASA
added header to file so that it can be referenced in other parts of t…
1163afd 
…he documentation
guofei2016 and others added 23 commits October 10, 2019 14:46
@guofei2016
Reflecting the new comments for the "End Use" and "Socio-economic"
000c0e1
@guofei2016
Revision for the "End Use" and "Socio-economic"
fbf40e9
@OFR-IIASA
clarified how emission targets in policies are implemented
e0d2919
@OFR-IIASA
updated based on review comments
6aa6dfe
@GamzeUnlu95
Merge pull request #23 from OFR-IIASA/2019-update-add_ons
4090b51 
2019 update - Energy section extended to include description of addons
@jkikstra
Merge pull request #35 from guofei2016/Revision_Fei
f688e15 
Suggested changes for Section "Energy end-use" and " Socio-economic"
@jkikstra
Merge pull request #34 from Jihoon/reviews
1c04781 
Suggested changes for sections: energy demand & tech change - correct branch
@behnam-zakeri
Correction of punctuation after Gamze's review
191e3ec
@behnam-zakeri
Merge remote-tracking branch 'origin/2019-update' into update_references
784ce24
@GamzeUnlu95
Merge pull request #21 from behnam-zakeri/update_references
0d6d4ac 
Update and clean-up of references
@volker-krey
reworked overview section and added new references
dc3e32c
@francescolovat
Update index.rst
c1044c0
Update main.bib
b20c2da 
Made the degree sign capital (°C)
Merge branch 'proof_reading' of https://github.com/volker-krey/messag…
703dff3 
…e_doc into pr/36
@jkikstra
some minor textual changes for readibility
1d5b0f1 
my apologies for committing this directly; normally I would have done this through a mini-PR, but for some reason GitHub gives a 404 when I try to do that.
@jkikstra
Merge pull request #36 from volker-krey/proof_reading
2e1335c 
reworked overview section and added new references
@jkikstra
Merge branch '2019-update' into 2019-update-fuel_blending
c65c2bd
@jkikstra
Merge pull request #24 from OFR-IIASA/2019-update-fuel_blending
d91337e 
 2019 update - Energy section extended to include description of fuel blending
@behnam-zakeri
correcting URL to MESSAGE III documentation
ae3a1a6
@khaeru
Merge pull request #28 from OFR-IIASA/2019-update-add_CCS_capture_rates
a3d6066 
2019 update - Emission section extended to include CCS capture rate
@khaeru
Merge pull request #27 from volker-krey/macro-update
29bb9d5 
adjusted MACRO documentation
@khaeru
Add references to #42, #43
b5f946c
@khaeru
Merge pull request #25 from OFR-IIASA/2019-update-representing_policies
d08e2f6 
 2019 update - Energy section extended to include description of policy implementation
@khaeru
Copy link
Copy Markdown
Member Author

khaeru commented Mar 5, 2020

In an effort to get this to the finish line, I merged #28, #27, and #25, while creating issues for the orphaned tasks identified in those PRs.

@khaeru khaeru self-assigned this Mar 5, 2020
@khaeru khaeru linked an issue Mar 5, 2020 that may be closed by this pull request
Update for current version of MESSAGEix-GLOBIOM #18
Closed
13 tasks
@khaeru khaeru changed the title WIP: Merge all updates Merge all updates Mar 5, 2020
@khaeru
Copy link
Copy Markdown
Member Author

khaeru commented Mar 5, 2020

The build succeeds on RTD.

@khaeru khaeru merged commit 1812f2d into master Mar 5, 2020
@glatterf42 glatterf42 deleted the 2019-update branch July 4, 2023 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@khaeru khaeru

Labels

None yet

Projects

None yet

Milestone

2019 update

Development

Successfully merging this pull request may close these issues.

Update for current version of MESSAGEix-GLOBIOM