Emi|xxx|Energy Demand/Supply does not always follow naming convention

[chroetz]

Reported variables for emissions should follow the naming convention Emi|xxx|Energy|Demand... or Emi|xxx|Energy|Supply..., where xxx is the emitted substance, e.g. CO2, CH4, BC, ... Not all reported variables follow this convention. This leads to mismatches between historical data and scenario data, see table below.

This issue was discussed with @fschreyer and @fbenke-pik. It was rated as low priority at the moment.

# A tibble: 22 × 2
   REMIND                            historical                       
   <chr>                             <chr>                            
 1 Emi|BC|Energy Demand|Industry     Emi|BC|Energy|Demand|Industry    
 2 Emi|BC|Energy Demand|Transport    Emi|BC|Energy|Demand|Transport   
 3 Emi|BC|Energy Supply              Emi|BC|Energy|Supply             
 4 Emi|BC|Energy Supply|Electricity  Emi|BC|Energy|Supply|Electricity 
 5 Emi|CH4|Energy Supply             Emi|CH4|Energy|Supply            
 6 Emi|CO|Energy Demand|Industry     Emi|CO|Energy|Demand|Industry    
 7 Emi|CO|Energy Demand|Transport    Emi|CO|Energy|Demand|Transport   
 8 Emi|CO|Energy Supply              Emi|CO|Energy|Supply             
 9 Emi|CO|Energy Supply|Electricity  Emi|CO|Energy|Supply|Electricity 
10 Emi|N2O|Energy Supply             Emi|N2O|Energy|Supply            
11 Emi|NH3|Energy Demand|Industry    Emi|NH3|Energy|Demand|Industry   
12 Emi|NH3|Energy Demand|Transport   Emi|NH3|Energy|Demand|Transport  
13 Emi|NH3|Energy Supply             Emi|NH3|Energy|Supply            
14 Emi|NH3|Energy Supply|Electricity Emi|NH3|Energy|Supply|Electricity
15 Emi|OC|Energy Demand|Industry     Emi|OC|Energy|Demand|Industry    
16 Emi|OC|Energy Demand|Transport    Emi|OC|Energy|Demand|Transport   
17 Emi|OC|Energy Supply              Emi|OC|Energy|Supply             
18 Emi|OC|Energy Supply|Electricity  Emi|OC|Energy|Supply|Electricity 
19 Emi|VOC|Energy Demand|Industry    Emi|VOC|Energy|Demand|Industry   
20 Emi|VOC|Energy Demand|Transport   Emi|VOC|Energy|Demand|Transport  
21 Emi|VOC|Energy Supply             Emi|VOC|Energy|Supply            
22 Emi|VOC|Energy Supply|Electricity Emi|VOC|Energy|Supply|Electricity