Skip to content

Develop#1

Open
wehnerja wants to merge 8810 commits intowehnerja:developfrom
magpiemodel:develop
Open

Develop#1
wehnerja wants to merge 8810 commits intowehnerja:developfrom
magpiemodel:develop

Conversation

@wehnerja
Copy link
Owner

@wehnerja wehnerja commented Sep 9, 2019

No description provided.

georg-schroeter and others added 30 commits June 3, 2025 14:33
Add consumer margin to food price postsolve
Update input data from rev4.118 to rev rev4.119
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Update of pasture feed balance flows and inclusion of feed intake switch
pascal-sauer and others added 30 commits January 13, 2026 09:51
Co-authored-by: georg-schroeter <Georg.Schroeter@pik-potsdam.de>
New protected area data for China
Co-authored-by: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com>
Update revision + starting script for biomass
…magpie_calib_expansion

# Conflicts:
#	CHANGELOG.md
Co-authored-by: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com>
reverted calculation of 2020 as average of 2010 and 2015
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.