text cleanup in GAMS

iiasa · Apr 28, 2019 · 5db4515 · 5db4515
1 parent ecceb37
commit 5db4515
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,3 @@ tests/testdb/test.properties
 tests/testdb/ixmptest.properties
 tests/testdb/ixmptest.lck
 .Rproj.user
-
-message_ix/model/MESSAGE/workflow_modification\.gms
-
-message_ix/model/cplex\.opt
diff --git a/doc/temporary/Implementation of storage equations in MESSAGEix framework.docx b/doc/temporary/Implementation of storage equations in MESSAGEix framework.docx
diff --git a/message_ix/model/MESSAGE/data_load.gms b/message_ix/model/MESSAGE/data_load.gms
@@ -70,8 +70,8 @@ demand_fixed=demand
 * fixing variables to pre-specified values
 is_fixed_extraction, is_fixed_stock, is_fixed_new_capacity, is_fixed_capacity, is_fixed_activity, is_fixed_land
 fixed_extraction, fixed_stock, fixed_new_capacity, fixed_capacity, fixed_activity, fixed_land
-* BZ added for storage
-bound_storage_lo,bound_storage_up,storage_loss,time_seq
+* Added for storage
+bound_storage_lo, bound_storage_up, storage_loss, time_seq
 ;
 
 *----------------------------------------------------------------------------------------------------------------------*

diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -202,7 +202,7 @@ def test_storage(test_mp):
     # I.2. Activity of discharger should be always =< activity of charger
     act_pump = scen.var('ACT', {'technology': 'pump'})['lvl']
     act_turb = scen.var('ACT', {'technology': 'turbine'})['lvl']
-    assert act_turb.sum() < act_pump.sum()
+    assert act_turb.sum() <= act_pump.sum()
 
     # I.3. Max activity of charger is lower than storage capacity
     max_pump = max(act_pump)