cleanup of gams files before rebasing

message_ix/model/MESSAGE/data_load.gms

@@ -17,8 +17,7 @@ $LOAD type_tec, cat_tec, type_year, cat_year, type_emission, cat_emission, type_
 $LOAD inv_tec, renewable_tec
 $LOAD shares
 $LOAD addon, type_addon, cat_addon, map_tec_addon
-* Added for storage
-$LOAD storage_tec, level_storage, map_tec_storage, relation_storage
+$LOAD storage_tec, level_storage, map_tec_storage
 $GDXIN
 
 Execute_load '%in%'
@@ -70,8 +69,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
-* Added for storage
-bound_storage_lo, bound_storage_up, storage_loss, time_seq
+* storage parameters
+bound_storage_lo, bound_storage_up, storage_loss, relation_storage, time_seq
 ;
 
 *----------------------------------------------------------------------------------------------------------------------*
@@ -154,7 +153,6 @@ addon_up(node,tec,year_all,mode,time,type_addon)$(
 emission_scaling(type_emission,emission)$( cat_emission(type_emission,emission)
         and not emission_scaling(type_emission,emission) ) = 1 ;
 
-* Added for storage
 * mapping of charging technologies to their level and commodity
 map_tec_charge(node,tec,mode,commodity,level_storage,year_all,time)$( Not storage_tec(tec) AND
     SUM((node2,year_all2,time_act),

message_ix/model/includes/period_parameter_assignment.gms

@@ -13,7 +13,6 @@ Sets
     last_period(year_all)            flag for last period in model horizon
     macro_initial_period(year_all)   flag for period in model horizon in which to initialize model parameters in (period prior to first model period) - used in MACRO
     macro_base_period(year_all)      flag for base year period in model horizon (period prior to first model period) - used in MACRO
-* Added for storage
     map_time_period(year_all,year_all2,time,time2)           mapping of one sub-annual timestep (time) to the next (time2)
 
 ;
@@ -44,7 +43,6 @@ if ( sum(year_all$( cat_year("initializeyear_macro",year_all) ), 1 ) > 1 ,
 seq_period(year_all,year_all2)$( ORD(year_all) + 1 = ORD(year_all2) ) = yes ;
 map_period(year_all,year_all2)$( ORD(year_all) <= ORD(year_all2) ) = yes ;
 
-* Added for storage
 * mapping of sequence of time in a period
 map_time_period(year_all,year_all2,time,time2)$( ORD(year_all) = ORD(year_all2) AND time_seq(time) AND
     (time_seq(time) + 1 = time_seq(time2) ) ) = yes;