release notes added

iiasa · Apr 27, 2019 · e01b6d6 · e01b6d6
1 parent 0fc33b5
commit e01b6d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -119,3 +119,4 @@ jdbc.pwd = ixmp
 - [#65](https://github.com/iiasa/message_ix/pull/65): Bugfix for downloading tutorials. Now downloads current installed version by default.
 - [#60](https://github.com/iiasa/message_ix/pull/60): Add basic ability to write and read model input to/from Excel
 - [#59](https://github.com/iiasa/message_ix/pull/59): Added MacOSX CI support
+- [#190](https://github.com/iiasa/message_ix/pull/190): Storage equations in GAMS, unit test, and documentation
diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -87,7 +87,7 @@ def init_storage(scen):
                                          'level', 'year', 'time'])
     # Initiating a parameter for specifying storage losses (percentage)
     scen.init_par('storage_loss', idx_sets=['node', 'technology', 'commodity',
-                                         'level', 'year', 'time'])
+                                            'level', 'year', 'time'])
 
 
 # A function for adding storage technologies and parameterization
@@ -119,22 +119,22 @@ def add_storage_data(scen, time_order):
     for y in set(scen.set('year')):
         for h in time_order.keys():
             scen.add_par('bound_storage_lo', ['node', 'dam', 'electr',
-                                 'storage', y, h], 0.0, '%')
+                                              'storage', y, h], 0.0, '%')
 
             scen.add_par('bound_storage_up', ['node', 'dam', 'electr',
-                                 'storage', y, h], 1.0, '%')
+                                              'storage', y, h], 1.0, '%')
 
             scen.add_par('storage_loss', ['node', 'dam', 'electr',
-                                 'storage', y, h], 0.05, '%')
+                                          'storage', y, h], 0.05, '%')
 
     # input, output, and capacity factor for storage technologies
     output = {'dam': ['node', 'stored_com', 'storage'],
-                    'pump': ['node', 'stored_com', 'storage'],
-                    'turbine': ['node', 'electr', 'level']}
+              'pump': ['node', 'stored_com', 'storage'],
+              'turbine': ['node', 'electr', 'level']}
 
     inp = {'dam': ['node', 'stored_com', 'storage'],
-                    'pump': ['node', 'electr', 'level'],
-                    'turbine': ['node', 'stored_com', 'storage']}
+           'pump': ['node', 'electr', 'level'],
+           'turbine': ['node', 'stored_com', 'storage']}
 
     var_cost = {'dam': 0, 'pump': 0.2, 'turbine': 0.3}
 
@@ -218,7 +218,7 @@ def test_storage(test_mp):
     if storage_in_java:
         # II.1. Equality: storage content in the beginning and end is equal
         assert scen.var('STORAGE', {'time': 'a'})['lvl'] == scen.var('STORAGE',
-                {'time': 'd'})['lvl']
+                                   {'time': 'd'})['lvl']
 
         # II.2. Storage content should never exceed storage capacity
         assert max(scen.var('STORAGE')['lvl']) <= cap_storage
@@ -231,4 +231,4 @@ def test_storage(test_mp):
         # II.4. Energy balance: storage change + losses = storage content
         storage = scen.var('STORAGE').set_index(['year', 'time'])['lvl']
         assert storage[(2020, 'b')] * (1 - loss[(2020, 'b')]
-                                       ) == -change[(2020, 'c')]
+                                       ) == -change[(2020, 'c')]