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

Merge 4.2.0 back into develop #172

Merged
merged 26 commits into from
Apr 15, 2020
Merged

Merge 4.2.0 back into develop #172

merged 26 commits into from
Apr 15, 2020

Conversation

tscheypidi
Copy link
Member

No description provided.

giannou and others added 26 commits August 6, 2019 17:45
removed a bug that could lead to unnecessary iterations between MAgPIE and Food Demand Model
Changed some rounding that made problems for very very small countries
included f15_bodyheight_regr_paras.cs3 which includes the regression parameters for the bodyheight regressions
bugfix c_past was missing in main.gms and default.cfg
@tscheypidi tscheypidi requested a review from flohump April 15, 2020 10:15
Copy link
Contributor

@flohump flohump left a comment

Choose a reason for hiding this comment

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

Looks all fine to me.
Maybe @bodirsky can approve the changes in the food module

@tscheypidi
Copy link
Member Author

I think there is no need to as there were no merge conflicts in the food module
Hence, everything should be according to MAgPIE 4.1.1

@tscheypidi tscheypidi merged commit e7ec3d1 into develop Apr 15, 2020
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.

5 participants