Skip to content

Commit

Permalink
Update usage of ixmp.config.get() in GAMSModel (per iiasa/ixmp#435)
Browse files Browse the repository at this point in the history
  • Loading branch information
khaeru committed Feb 9, 2022
1 parent f025910 commit 1934504
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion message_ix/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def __init__(self, name=None, **model_options):
# Update the default options with any user-provided options
model_options.setdefault("model_dir", config.get("message model dir"))
self.cplex_opts = copy(DEFAULT_CPLEX_OPTIONS)
self.cplex_opts.update(config.get("message solve options"))
self.cplex_opts.update(config.get("message solve options") or dict())
self.cplex_opts.update(model_options.pop("solve_options", {}))

super().__init__(name, **model_options)
Expand Down

0 comments on commit 1934504

Please sign in to comment.