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

Adapted procedure of retrieving input data to new procedure that is harmonized with REMIND. #76

Merged
merged 15 commits into from
Apr 16, 2019
Merged

Adapted procedure of retrieving input data to new procedure that is harmonized with REMIND. #76

merged 15 commits into from
Apr 16, 2019

Conversation

dklein-pik
Copy link
Member

No description provided.

@dklein-pik
Moved the procedure of downloading and distributing the input data to…
37dbffb 
… the new structure (using common code with REMIND)
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
0941c80 
…develop
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
ee3cfc2 
…develop
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
6ca69ac 
…develop
@dklein-pik
1. Updated CO2 prices for emulator runs. 2. Sorting list of runs lexi…
f464c46 
…cographically
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
fdb568b 
…develop
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
892022c 
…develop
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
814dde4 
…develop
@dklein-pik
Updated CO2 prices for emulator runs. Added SSP1 scenarios to emulato…
379e78f 
…r runs.
@dklein-pik
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
f638f51 
…develop
@dklein-pik
Harmonized the way input files are downloaded and distributed with th…
ebc925e 
…e prociedure in REMIND.
@dklein-pik
Bugfix in .travis.yml
aff47b2
@dklein-pik
Removed sort function that requires gtools to reduce package dependency.
fa5e1b7
tscheypidi
tscheypidi requested changes Apr 12, 2019
View reviewed changes
Copy link
Member

@tscheypidi tscheypidi left a comment

Choose a reason for hiding this comment

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

Please use "requireNamespace" instead of require to avoid that a package as a whole is loaded and adress functions from these packages via :: e.g. lucode::download_distribute or lucode::replace_in_file

@abhimishr
Copy link
Member

Travis has passed the build and there appears to be no merge conflicts, is the merge on halt for some reason?

@tscheypidi
Copy link
Member

thanks for asking. I just forgot to finalize the process 8)

@tscheypidi tscheypidi merged commit 6119fbb into magpiemodel:develop Apr 16, 2019
flohump pushed a commit to flohump/magpie that referenced this pull request Mar 17, 2023
@robinhasse
Merge pull request magpiemodel#76 from robinhasse/resComFloorReporting
91986c0 
Add and rename rename floor space variables.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tscheypidi tscheypidi tscheypidi 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.
3 participants
@dklein-pik @abhimishr @tscheypidi