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.

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

Scenci #173

Merged
merged 2 commits into from
Feb 27, 2019
Merged

Scenci #173

merged 2 commits into from
Feb 27, 2019

Conversation

gidden
Copy link
Member

@gidden gidden commented Feb 26, 2019

Updating our integration tests to include multiple test cases and a scenario with a carbon budget

message_ix/core.py Outdated Show resolved Hide resolved
message_ix/core.py Outdated Show resolved Hide resolved
message_ix/core.py Outdated Show resolved Hide resolved
message_ix/core.py Outdated Show resolved Hide resolved
@gidden
Copy link
Member Author

gidden commented Feb 27, 2019

Hi @danielhuppmann and/or @khaeru if you could please take a look, that would be great.

To note: please do not squash and merge these should be two separate commits. The first enables the ability to pass options to the cplex solver (yes, we will want to refactor this eventually to be solver agnostic). The second adds an additional test to our scenario suite utilizing the barrier method for solving. @danielhuppmann you should be able to build off of this to test the pricing changes.

Finally, i realize that I forgot to add release notes. Once this passes CI, I will do so, make the commits correct, and then we can merge it in.

Copy link
Member

@khaeru khaeru left a comment

Choose a reason for hiding this comment

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

@gidden the documentation says (here) that message_ix.Scenario.solve() is only one of three recognized ways of running the model. Does deletion of the file cplex.opt muck with the other two?

message_ix/core.py Outdated Show resolved Hide resolved
@gidden
Copy link
Member Author

gidden commented Feb 27, 2019

@gidden the documentation says (here) that message_ix.Scenario.solve() is only one of three recognized ways of running the model. Does deletion of the file cplex.opt muck with the other two?

Ah, good point. I suspect it will still run (with defaults), but perhaps it is better to keep it as is. To note, the first time a user solves with the solve function, that original cplex.opt will get overwritten.. @danielhuppmann any thoughts here?

@danielhuppmann
Copy link
Member

@gidden the documentation says (here) that message_ix.Scenario.solve() is only one of three recognized ways of running the model. Does deletion of the file cplex.opt muck with the other two?

@khaeru I would think that GAMS will write a warning message to the log file but still solve

update readme for env vars

update some scenci files

add solve options to ci tests
@gidden
Copy link
Member Author

gidden commented Feb 27, 2019

Ok, this should now be good to go (after being reviewed)

Copy link
Member

@danielhuppmann danielhuppmann 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 to me, thanks @gidden

@gidden
Copy link
Member Author

gidden commented Feb 27, 2019

@danielhuppmann when this passes CI, I will "rebase and merge" so if you want to rebase #172 on this branch, you should be safe to do so

@gidden gidden merged commit f80ad36 into master Feb 27, 2019
@gidden gidden deleted the scenci branch February 27, 2019 17:56
@gidden
Copy link
Member Author

gidden commented Feb 27, 2019

ok @danielhuppmann all is good to go here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants