Skip to content

Commit

Permalink
Release v0.6.6 (#336)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryn Pickering committed Oct 9, 2020
1 parent 0ce7683 commit 3e1abcf
Show file tree
Hide file tree
Showing 19 changed files with 11,419 additions and 2,693 deletions.
2 changes: 1 addition & 1 deletion calliope/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.6.5"
__version__ = "0.6.6"
2 changes: 1 addition & 1 deletion calliope/backend/pyomo/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def get_all_pyomo_model_attrs(backend_model):
# Indexed objected
objects = {
objname: {
i.name: [j.name for j in i.index_set().set_tuple]
i.name: [j.name for j in i.index_set().subsets()]
if i.name + "_index" == i.index_set().name
else [i.index_set().name]
for i in backend_model.component_objects()
Expand Down
2 changes: 1 addition & 1 deletion calliope/backend/pyomo/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def get_var(backend_model, var, dims=None, sparse=False):

if not dims:
if var + "_index" == var_container.index_set().name:
dims = [i.name for i in var_container.index_set().set_tuple]
dims = [i.name for i in var_container.index_set().subsets()]
else:
dims = [var_container.index_set().name]

Expand Down
2 changes: 1 addition & 1 deletion calliope/example_models/national_scale/model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ model:
name: National-scale example model

# What version of Calliope this model is intended for
calliope_version: 0.6.5
calliope_version: 0.6.6

# Time series data path - can either be a path relative to this file, or an absolute path
timeseries_data_path: 'timeseries_data'
Expand Down
2 changes: 1 addition & 1 deletion calliope/example_models/urban_scale/model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model:
name: Urban-scale example model

# What version of Calliope this model is intended for
calliope_version: 0.6.5
calliope_version: 0.6.6

# Time series data path - can either be a path relative to this file, or an absolute path
timeseries_data_path: 'timeseries_data'
Expand Down
4 changes: 2 additions & 2 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Release History
===============

0.6.6 (dev)
-----------
0.6.6 (2020-10-08)
------------------

|new| `spores` run mode now available, to find Spatially-explicit Practically Optimal REsultS (SPORES)

Expand Down

0 comments on commit 3e1abcf

Please sign in to comment.