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

Develop #26

Merged
merged 228 commits into from
Aug 21, 2020
Merged

Develop #26

merged 228 commits into from
Aug 21, 2020

Conversation

abhimishr
Copy link
Owner

No description provided.

@emolinab
Fetch develop magpie branch
677d78b
@emolinab
Script and realization without annuities (woa)
172c85d
@emolinab
corrections on not used variables
c281d85
@emolinab
Merge remote-tracking branch 'magpie_master/develop' into develop
cab5879
@emolinab
Script for develop runs
f55ad33
@emolinab
Last develop statusMerge remote-tracking branch 'magpie_master/develo…
b54e809 
…p' into develop
@emolinab
fresh develop from master
2256903
@emolinab
Merge remote-tracking branch 'magpie_master/develop' into develop
b19bb49
@emolinab
Sticky merge current develop
afaf2f0
@emolinab
update not used variables in other factor realizations
ea4386d
@emolinab
start script
fffad22
@emolinab
bugs in the sticky start script
9a44bc5
@emolinab
inputs corrected in the script
5fc4fd7
@emolinab
Script bugs
e42d6e7
@emolinab
to skip c200 mixed realization
97576ea
@emolinab
Unavailable files for c400
8b6d1f5
@emolinab
Script
fe3e7a8
@emolinab
rev44 of isimip doesnt exist for c400
20bbf72
@emolinab
isimip rev 42 and 44
670eb1b
@emolinab
c400 resolution, old input
90700f7
@emolinab
High resoution parallel optimization. Trade -> exo
bb8b17e
@emolinab
libraries needed to read data missing FIXED
4c800a8
@emolinab
Update from develop branch Merge remote-tracking branch 'magpie_maste…
d6fdec5 
…r/develop' into develop_sticky_merge
@emolinab
Sticky realization and annuities accumulation in the postsolve
1441f37
@emolinab
Merge remote-tracking branch 'magpie_master/develop' into develop_sti…
9cdf8d2 
…cky_merge
@emolinab
Sticky Scripts
501c6c9
@emolinab
Sticky scripts including the lastest input .tgz
4e70925
@emolinab
Changes requested for pull request #186
9521a02
@emolinab
Test run
cd10c97
@emolinab
Changed name
37bdba1
bodirsky and others added 27 commits August 12, 2020 15:12
@bodirsky
Revert "Develop-sticky merge"
5307363
@emolinab
New sticky realization default
34696be
@bodirsky
Merge pull request #208 from magpiemodel/revert-199-develop_sticky_merge
4ad89fd 
Revert "Develop-sticky merge"
@emolinab
New sticky realization listed in the default
aa95fc9
@emolinab
Merge branch 'develop_sticky_merge' of https://github.com/emolinab/ma…
5f55cfd 
…gpie into develop_sticky_merge
@emolinab
Changelog fixed
aeb0e18
@emolinab
Sticky scripts
a3336cd
@emolinab
typo name of start script
dfa0920
@emolinab
inputs
24e3f7f
@emolinab
try
985f4a6
@emolinab
Only Sticky in the start-script
fcd8d28
@emolinab
typo start script for sticky
c0152b6
@emolinab
Updated changes in the CHANGELOG.md
74650c5
@emolinab
Fixes to merge with develop
a6ad674
@emolinab
Revert "Revert "Develop-sticky merge""
d692be6
@emolinab
Merge pull request #210 from magpiemodel/revert-208-revert-199-develo…
931d1d5 
…p_sticky_merge

Revert "Revert "Develop-sticky merge""
@bodirsky
Merge pull request #198 from abhimishr/develop
60b00a3 
Added pr template
@bodirsky
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
132c058 
…develop
@bodirsky
changed = to <- (even though I think both is valid syntax)
f2dca06 
deleted filename
@tscheypidi
Merge pull request #211 from emolinab/develop_Sticky_August
b41d40e 
Develop sticky documentation fixed
@tscheypidi
Update MAgPIE2LPJmL.R
f0bf922 
added newline at the end of the file
@flohump
bugfix outputdirs outputdir
1406b7c
@abhimishr
Merge pull request #212 from flohump/develop
7541061 
bugfix output scripts not working in postprocessing on cluster
@bodirsky
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
a51683a 
…develop
@bodirsky
added origin folder to outputs
79201b1
@bodirsky
Merge branch 'develop' of https://github.com/bodirsky/magpie into dev…
639d3fc 
…elop
@bodirsky
Merge pull request #204 from bodirsky/develop
42040fb 
output script to create land and nitrogen inputs for LPJmL
@abhimishr abhimishr merged commit 24c6df6 into abhimishr:develop Aug 21, 2020
flohump pushed a commit that referenced this pull request Mar 18, 2022
@FelicitasBeier
Merge pull request #26 from magpiemodel/develop
9352ae0 
Develop
abhimishr pushed a commit that referenced this pull request Feb 7, 2023
@caviddhen
Merge pull request #26 from caviddhen/develop
a11e40e 
merge develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@abhimishr @emolinab @mikewin-climsci @bodirsky @tscheypidi @flohump