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.

Sign up for GitHub

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

Jump to bottom

release MAgPIE 4.9.0 #756

Merged
merged 274 commits into from
Dec 6, 2024
Merged

release MAgPIE 4.9.0 #756

merged 274 commits into from
Dec 6, 2024

Conversation

pascal-sauer
Copy link
Contributor

No description provided.

pascal-sauer and others added 30 commits September 24, 2024 12:07
@pascal-sauer
pkgType
134ada7
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
20e7ac8 
…waterTest
Updated change log
8dc7d46
@jdrtommey
merge master into develop
88503ba
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
391a188
@flohump
GDP2017 input file update rev4.112
62dfe6c
Edited changelog
50aaadd
@jdrtommey
Merge pull request magpiemodel#728 from jdrtommey/develop
e1df200 
Merge master into develop
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
fcdf2ae 
# Conflicts:
#	CHANGELOG.md
@flohump
count-up start script
7e22298
@flohump
bugfix
6b93227
Fixed gti conflict in Changelog
e7eb67c
@vartika271987
Merge branch 'develop' into waterTest
0a39ce2
@vartika271987
Merge pull request magpiemodel#727 from vartika271987/waterTest
59f0599 
Bugfix in water cost equation
@flohump @tscheypidi
Update config/default.cfg
63dd571 
Co-authored-by: Jan Dietrich <[email protected]>
@flohump @pascal-sauer
Update config/default.cfg
51b94fc 
Co-authored-by: Pascal Sauer <[email protected]>
@flohump @pascal-sauer
Update modules/39_landconversion/calib/input.gms
8b03f07 
Co-authored-by: Pascal Sauer <[email protected]>
@flohump @pascal-sauer
Update modules/29_cropland/detail_apr24/input.gms
672a0f7 
Co-authored-by: Pascal Sauer <[email protected]>
@flohump @pascal-sauer
Update config/default.cfg
ea4ed1f 
Co-authored-by: Pascal Sauer <[email protected]>
@flohump
update TC module and monetary units
13ab4a1
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
16cc022 
# Conflicts:
#	CHANGELOG.md
#	main.gms
updated some more currency units
b649f77
@flohump
macc USD unit corrections
8f33e04
@flohump
Merge branch 'gdp2017' of github.com:caviddhen/magpie into gdp2017
82c5f15 
# Conflicts:
#	config/default.cfg
update in livestock regression and cost share regressions
2d2c3d6
@flohump
defaults
9ace917
@flohump
defaults
e4e09b8
@flohump @deleip
Update config/projects/scenario_config_fsec.csv
bf485ed 
Co-authored-by: Debbora Leip <[email protected]>
@flohump
bugfix macc USD + land conversions cost calib
11de788
@flohump
bugfix sticky_labor
878d2d1
flohump and others added 27 commits November 22, 2024 08:44
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
4a44206
@flohump
bugfix remove empty files file
38349ef
@pascal-sauer
Merge pull request magpiemodel#753 from flohump/f_grass
4dd6b3f 
bugfix remove empty files file
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
b558f9c
@flohump
bugfix
e632d7d
@flohump
test
70990a9
@flohump
bugfix
60c56e4
@flohump
bugfix removal grassland realisation
e993340
@flohump
renamed mapping
c03a114
@flohump
update start script
48f84f5
@flohump
Merge pull request magpiemodel#754 from flohump/f_grass
8e21df5 
bugfix removal grassland realisation
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
212b4fe
@flohump
Merge pull request magpiemodel#750 from flohump/f_peatland2
b1e7f23 
option for exogenous peatland rewetting
@flohump
bugfix fader
c49c11f
@flohump
update fader default
c0d3d3f
@flohump
update magpie4 version
711f9c2
@flohump
bugfix timber config
9340349
@mishkos
Update default.cfg
2f1efb9 
new additional_data version with upgraded npi_ndc policy settings.
@mishkos
Update start_npi_ndc.R
adc36cc 
syncing npi and ndc policies to year 2025.
@mishkos
Update CHANGELOG.md
9e79cb7
@flohump
additional_data_rev4.59.tgz
87428b9
@flohump
bugfix vm_carbon_stock.l in equations
41624b5
@flohump
renamed _country_dummy to _country_switch in all modules
f5e1215
@flohump
renamed _country_dummy to _country_switch in all modules
93ef0e9
@flohump
add source
e2e6481
@flohump
Merge pull request magpiemodel#755 from flohump/f_fixfader
66d69ab 
bugfix fader GHG emission pricing policy and Sync of NPI and NDC policies to  2025
@pascal-sauer
magpie release 4.9.0
7056f39
@pascal-sauer pascal-sauer requested a review from flohump December 5, 2024 13:54
flohump
flohump approved these changes Dec 5, 2024
View reviewed changes
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.

@pascal-sauer pascal-sauer merged commit 72620bc into magpiemodel:master Dec 6, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flohump flohump flohump approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@pascal-sauer @flohump @jdrtommey @vartika271987 @orichters @deleip @pvjeetze @FelicitasBeier @mishkos