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

Release v4.3.2 #262

Merged
merged 479 commits into from
Mar 19, 2021
Merged

Release v4.3.2 #262

merged 479 commits into from
Mar 19, 2021

Conversation

tscheypidi
Copy link
Member

Please fill following information
(Add additional info if you think its important and not covered by this Pull Request (PR)):

Purpose of this PR

Release of MAgPIE v4.3.2

flohump and others added 30 commits January 18, 2021 17:52
Bugfix in HalfEarth Scenario: Synchronization until 2020 with WDPA protection scenario
Replaced TravisCI with GitHubActions
bugfix m_fillmissingyears macro
… demand model and the magpie model are now reported over each iteration.

Moreover, the numbering of iterations was increased by 1 (starting now at iteration 1 instead of 0)
The covergence criterium was lifted to a maximum of 1% income difference of one single region (instead of 0.5% before).
… NUE as an interface to the emission module

equations were sepearted into several, whcih makes reading easier and is a preparation for an emission module that will be based on nitrogen surplus
@abhimishr abhimishr added enhancement New feature or request Release candidate Release candidate labels Mar 17, 2021
abhimishr
abhimishr previously approved these changes Mar 17, 2021
Copy link
Member

@abhimishr abhimishr left a comment

Choose a reason for hiding this comment

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

🚀 Good to go 💎 🙌🏽 📈

Copy link
Member

@FelicitasBeier FelicitasBeier left a comment

Choose a reason for hiding this comment

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

Minor code cleanup changes requested.

CHANGELOG.md Outdated Show resolved Hide resolved
modules/10_land/landmatrix_dec18/start.gms Show resolved Hide resolved
modules/15_food/anthropometrics_jan18/intersolve.gms Outdated Show resolved Hide resolved
modules/35_natveg/static/declarations.gms Outdated Show resolved Hide resolved
modules/39_landconversion/global_static_aug18/not_used.txt Outdated Show resolved Hide resolved
modules/52_carbon/normal_dec17/preloop.gms Outdated Show resolved Hide resolved
@abhimishr
Copy link
Member

@tscheypidi what would be the best way to address the requested changes? Branch out from my commits at #249, call it rc in my fork, make a PR for my fork's rc with main model's rc?

@abhimishr
Copy link
Member

I marked most of the requests resolved. @FelicitasBeier can you also check if #262 (comment) is okay? (Also if you'd like to re-open the changes I marked resolved)

Copy link
Member

@FelicitasBeier FelicitasBeier left a comment

Choose a reason for hiding this comment

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

seems fine

Copy link
Member

@abhimishr abhimishr left a comment

Choose a reason for hiding this comment

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

🚀 ready to go

@tscheypidi tscheypidi merged commit a1b061f into master Mar 19, 2021
@tscheypidi tscheypidi deleted the rc branch March 19, 2021 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Release candidate Release candidate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants