Merge pull request #114 from dklein-pik/develop

New input data revision (corresponds to second commit included: switch off LU CO2 MAC)

config/default.cfg

@@ -22,7 +22,7 @@ cfg$title <- "default"
 cfg$regionmapping <- "config/regionmappingH12.csv"
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$revision <- 5.94
+cfg$revision <- 5.941
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE

core/datainput.gms

@@ -1046,8 +1046,9 @@ $if %carbonprice% == "NPi2018"  pm_macSwitch(emiMacMagpie) = 0;
 
 *DK* LU emissions are abated in MAgPIE in coupling mode
 *** An alternative to the approach below could be to introduce a new value for c_macswitch that only deactivates the LU MACs
-$if %cm_MAgPIE_coupling% == "on"  pm_macSwitch("co2luc") = 0;
 $if %cm_MAgPIE_coupling% == "on"  pm_macSwitch(enty)$emiMacMagpie(enty) = 0;
+*** As long as there is hardly any CO2 LUC reduction in MAgPIE we dont need MACs in REMIND
+$if %cm_MAgPIE_coupling% == "off"  pm_macSwitch("co2luc") = 0;
 
 pm_macCostSwitch(enty)=pm_macSwitch(enty);
 pm_macSwitch("co2cement_process") =0 ;