Merge pull request #110 from nicobauer/develop

*NB* added constraints for historic oil imports (2010, 2015). In addi…

main.gms

@@ -84,7 +84,7 @@
 * 
 * Input data revision: 5.94
 * 
-* Last modification (input data): Tue Mar 10 09:56:11 2020
+* Last modification (input data): Thu Mar 19 16:15:13 2020
 * 
 *###################### R SECTION END (VERSION INFO) ###########################
 

modules/24_trade/standard/bounds.gms

@@ -92,6 +92,12 @@ vm_Xport.up("2010",regi,"peoil") = 1.05 * pm_IO_trade("2010",regi,"peoil","Xport
 vm_Xport.lo("2015",regi,"peoil") = 0.95 * pm_IO_trade("2015",regi,"peoil","Xport");
 vm_Xport.up("2015",regi,"peoil") = 1.05 * pm_IO_trade("2015",regi,"peoil","Xport");
 
+*** bounds on oil imports in 2010 and 2015
+vm_Mport.lo("2010",regi,"peoil") = 0.95 * pm_IO_trade("2010",regi,"peoil","Mport");
+vm_Mport.up("2010",regi,"peoil") = 1.05 * pm_IO_trade("2010",regi,"peoil","Mport");
+vm_Mport.lo("2015",regi,"peoil") = 0.95 * pm_IO_trade("2015",regi,"peoil","Mport");
+vm_Mport.up("2015",regi,"peoil") = 1.05 * pm_IO_trade("2015",regi,"peoil","Mport");
+
 *** bounds on gas exports in 2010 and 2015
 vm_Xport.lo("2010",regi,"pegas") = 0.95 * pm_IO_trade("2010",regi,"pegas","Xport");
 vm_Xport.up("2010",regi,"pegas") = 1.05 * pm_IO_trade("2010",regi,"pegas","Xport");