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

Prepare release of MAgPIE 4.2.1 #181

Merged
merged 181 commits into from
May 14, 2020
Merged

Prepare release of MAgPIE 4.2.1 #181

merged 181 commits into from
May 14, 2020

Conversation

tscheypidi
Copy link
Member

No description provided.

mishkos and others added 30 commits October 28, 2019 14:42
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
f2b4de6 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
6d5d01e 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
3ece76a 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
bcf925f 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
052b34f 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
b4237d9 
…develop
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
ea4511f 
…develop
@tscheypidi
- 2 bugfixes in start_npi_ndc.R both only related to AD policies
02cae83 
  - flows were only calculated for the last out of all policy countries
  - time period lengths were mapped incorrectly on the data
- rewrote scripts for better performance (new scripts are approx 4x faster)
@flohump
added realization for parallel optimization
955fadd
@flohump
priority
a652992
@flohump
bugfix
090f958
@flohump
start script highres
c2c7b28
@flohump
start script
ecab983
@flohump
bugfix
91cdfd4
@flohump
update
60fd8ff
@flohump
update
7a8901b
@flohump
calib
746d312
@flohump
calib
3ee11c3
@flohump
bugfix
9909ee0
@flohump
update
b0c0cf5
@flohump
update submit.sh
b0e3aa8
@flohump
update
2a50112
@flohump
update
1161b5e
@flohump
update
fd40ec1
@flohump
test c5000
6b00567
@flohump
update
91c7392
@flohump
update
245b753
@flohump
bugfix
0e08501
@flohump
update
8c974d8
@flohump
Update
fcbb592
flohump and others added 27 commits April 28, 2020 08:49
@flohump
floor rounding for ndc calc to avoid infeasibilites
8cef6b3
@mishkos
corrected the calculation of npi/ndc aff policy for countries listed …
40d395a 
…in the policy mapping
@flohump
Merge pull request #164 from mishkos/f_npi_ndc_bugfix
d4bf8e4 
F npi ndc bugfix
@flohump
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland4
dc18b7f
@flohump
floor rounding for ndc policy calcs to avoid infeasibilities
2e0cc33
@tscheypidi
Update CHANGELOG.md
45dfcba
@flohump
change log
ffcf2d4
@flohump
output script
772f299
@flohump
update change log
db0341b
@flohump
update start script
c95df61
@flohump
update output script
2fac1cf
@flohump
bugfix
0bda0b4
@flohump
bugfix
faa0faa
@flohump
update
d5ec88b
@flohump
update start script
74b67ab
@tscheypidi
Update CITATION.cff
1566295
@flohump
update output script
4910199
@flohump
update output script
0bf265d
@flohump
bugfixes
5e37638
@flohump
bugfix j2 to j
0d42672
@flohump
start script rev counter
23d868d
@flohump
bugfix co2 price weight
dc9458f
@flohump
update highres start script
16ecce7
@tscheypidi
added .zenodo.json file (created with citation::cff2zenodo)
d9ac71f
@tscheypidi
Merge pull request #179 from tscheypidi/develop
35dec97 
added .zenodo.json file (created with citation::cff2zenodo)
@flohump
Merge branch 'develop' into f_peatland4
f8dc947
@flohump
Merge pull request #178 from flohump/f_peatland4
2baf48d 
Peatland Module + SSPDB input bugfix
@tscheypidi tscheypidi requested a review from flohump May 14, 2020 14:12
flohump
flohump approved these changes May 14, 2020
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 good to me.

@tscheypidi tscheypidi merged commit f877f74 into release_candidate May 14, 2020
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.
6 participants
@tscheypidi @flohump @mishkos @abhimishr @FelicitasBeier @dklein-pik