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 of v4.2.1 #182

Merged
merged 272 commits into from
May 15, 2020
Merged

Release of v4.2.1 #182

merged 272 commits into from
May 15, 2020

Conversation

tscheypidi
Copy link
Member

No description provided.

FelicitasBeier and others added 30 commits March 12, 2020 11:28
@FelicitasBeier
adjusted spaces in 56_ghg_policy module
e152ab7
@FelicitasBeier
added regional switches: interest rate, food, EFP, NUE
476cb66
@FelicitasBeier
added two regional switches: neff and neff_past
82c9e5f
@FelicitasBeier
commented out switches that are not yet included
83eb1e4
@FelicitasBeier
bugfix: default.cfg country switch of module 50
7c56185
@FelicitasBeier
bugfix: inserted space in set definition
0422800
@FelicitasBeier
added im_pop_iso to not used
917c0a0
@FelicitasBeier
removed unnecessary space in set declaration
9f90d0e
@FelicitasBeier
uncommented regional interest rate policy switch
99dbbeb
@FelicitasBeier
implementation of country interest policy switch
1513a3a
@mishkos
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
ea4511f 
…develop
@FelicitasBeier
renamed country switch into policy_countries56
decb36d
@FelicitasBeier
included food policy switch in config file
bde5de9
@FelicitasBeier
regional food policy switch implementation
25222f0
@FelicitasBeier
switched water policy and food policy on
745b44d
@FelicitasBeier
implementation of regional water switch for EFP policy
eaf6d37
@FelicitasBeier
regional EFP switch included in default cfg
f2d06e6
@FelicitasBeier
implementation of regional interest switch
0118897
@FelicitasBeier
regional interest rate policy switch
ac9df0c
@FelicitasBeier
set default.cfg back to default settings
2238135
@FelicitasBeier
corrected typo in description of scen_countries15
7c18a9c
@FelicitasBeier
include s12_alt_interst switch
eac11e0
@FelicitasBeier
updated sim4nexus start script to include baseline regional scenarios
749f9f7
@FelicitasBeier
bug fixes in sim4nexus start script
eecee3c
@FelicitasBeier
Merge pull request #5 from magpiemodel/develop
7a0a28c 
Develop
@FelicitasBeier
updated develop
e2180b9
@FelicitasBeier
updated titles and settings in sim4nexus start script. This is a work…
c7d51b5 
…ing version of the start script now
@FelicitasBeier
deleted f_reg_interest file
fabbcbd
@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 and others added 23 commits April 29, 2020 21:19
@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
Merge pull request #181 from magpiemodel/develop
f877f74 
Prepare release of MAgPIE 4.2.1
@tscheypidi
Update .travis.yml
03124dd
@tscheypidi
Update CITATION.cff
aab204e
@tscheypidi
Update README.md
5b23ff9
@tscheypidi
updated .zenodo.json
1fc0e69
@tscheypidi
Update CHANGELOG.md
5f25caa
@tscheypidi
Update .travis.yml
4b542fd
@tscheypidi tscheypidi requested a review from flohump May 14, 2020 20:53
flohump
flohump approved these changes May 15, 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.

All good

abhimishr
abhimishr approved these changes May 15, 2020
View reviewed changes
Copy link
Member

@abhimishr abhimishr left a comment

Choose a reason for hiding this comment

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

Seems good to go

@abhimishr abhimishr merged commit e3da83b into master May 15, 2020
@tscheypidi tscheypidi deleted the release_candidate branch May 15, 2020 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhimishr abhimishr abhimishr approved these changes

@flohump flohump flohump approved these changes

@bodirsky bodirsky Awaiting requested review from bodirsky

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@tscheypidi @abhimishr @flohump @FelicitasBeier @mishkos @bodirsky @weindl @dklein-pik