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

MAgPIE release 4.9.1 #770

Merged
merged 66 commits into from
Jan 31, 2025
Merged

MAgPIE release 4.9.1 #770

merged 66 commits into from
Jan 31, 2025

Conversation

pascal-sauer
Copy link
Contributor

  • changes in virtually all files, due to changed copyright to 2025

pascal-sauer and others added 30 commits December 6, 2024 13:51
@pascal-sauer
merge master into develop
869b9ed
@pascal-sauer
Merge pull request magpiemodel#757 from pascal-sauer/develop
4623164 
merge master into develop
@pascal-sauer
FSEC AMTs one folder per scenario, inputdelete spamplots
624d2d1
@pascal-sauer
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
2b8f0d3 
…develop
@pascal-sauer
Merge pull request magpiemodel#758 from pascal-sauer/develop
02fe329 
FSEC AMTs one folder per scenario, inputdelete spamplots
@pvjeetze
automatic peatland allocation during SEALS downscaling
76e251d
@pvjeetze
changelog
2e53021
@pvjeetze
input file fix
255fd28
@pvjeetze
modified rewetting criterion
4bb6050
@pvjeetze
additional fixes
85b6902
@pvjeetze
file path fix
794e636
@flohump
bugfix BII
cd11062
@flohump
test
bec50ed
@flohump
update scaling
a8299bf
@flohump
test
6846f7a
@flohump
revert
9b3a59c
@flohump
cleanup
55f248b
@flohump
bugfix
b3a7ba7
@flohump
bugfix
043e72a
@flohump
bugfix
0a68dcf
@flohump
lock_timeout
fb8fe70
@pvjeetze
Merge pull request magpiemodel#759 from pvjeetze/f_mag-seals
9f0e4a0 
Peatland rewetting automatically considered during SEALS downscaling
@flohump
increase R package versions
72dffb6
@flohump
Merge pull request magpiemodel#760 from flohump/f_fixBII
d0e13f2 
 fix feasibilty and slow convergences issues related bii_target_apr24
@pvjeetze
mitiConsv start script
3a48f3f
@pvjeetze
changelog
297d3b7
@pvjeetze
scenario config
223bb0a
@pvjeetze
fixes
f593ccc
@pvjeetze
removed commented code
c077dff
@pvjeetze
additional fix
e07076b
pvjeetze and others added 25 commits January 8, 2025 13:56
@pvjeetze
Merge pull request magpiemodel#761 from pvjeetze/f_MitiConsv
9161484 
Start script for mitigation and conservation paper
@pvjeetze
calibration and coupled NPI fixes
2b19c89
@pvjeetze
Merge pull request magpiemodel#763 from pvjeetze/f_MitiConsv
0a644fb 
calibration and coupled NPI fixes in MitiConsv start script
@pvjeetze
bugfix
33bdb32
@pvjeetze
change order
49aeb4a
@pvjeetze
Merge pull request magpiemodel#764 from pvjeetze/f_MitiConsv
183c89c 
MitiConsv start script bugfix
@FelicitasBeier
updated c30_bioen_water setting and added sensitivity for PB Deep Div…
68fd7b7 
…e paper revision
@pascal-sauer
Merge pull request magpiemodel#762 from FelicitasBeier/DeepDive_Develop
0cae50d 
Deep dive develop
@pascal-sauer
start script to be run on release
3d433ba
@pvjeetze
fixes start script
11ee8bf
@pvjeetze
calibration added to scenario config
9fffc09
@pvjeetze
calibration update
c830370
@pascal-sauer
minimal changes
39539c3
@pascal-sauer
changelog
5087b78
@pascal-sauer
Merge pull request magpiemodel#765 from pascal-sauer/develop
fb39ad6 
start script to be run on release
@pvjeetze
intermediate update
7a3aeed
@pvjeetze
changed land conversion cost calib defaults
b002590
@pvjeetze
calib restart false
f3115dc
@pvjeetze
unnecessary line
e7f3ba4
@pvjeetze
shortened scenario names
056dd02
@pvjeetze
update start script
6588a30
@pvjeetze
minor fix
ccb6b2c
@pvjeetze
Merge pull request magpiemodel#766 from pvjeetze/f_MitiConsv
267ac50 
fixes start script & reverting some default land conversion cost calibration settings
@pascal-sauer
magpie release 4.9.1
6bcb1a4
@pascal-sauer
clarify fsec in test runs
54bad42
FelicitasBeier
FelicitasBeier approved these changes Jan 28, 2025
View reviewed changes
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.

Looks good

@pascal-sauer pascal-sauer merged commit 817f599 into magpiemodel:master Jan 31, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FelicitasBeier FelicitasBeier FelicitasBeier approved these changes

@pvjeetze pvjeetze Awaiting requested review from pvjeetze

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

Successfully merging this pull request may close these issues.
4 participants
@pascal-sauer @FelicitasBeier @pvjeetze @flohump