From 113745642f97243823f17b65df125510ff6fecda Mon Sep 17 00:00:00 2001
From: vignesh1987 <33900146+vignesh1987@users.noreply.github.com>
Date: Fri, 1 Nov 2019 18:07:32 +0530
Subject: [PATCH 01/31] Updated input CSVs for reading CCS technologies
 separately

The input files have been updated to read technologies with Carbon capture and storage.
---
 input_data/agg_col.csv     |  39 +++++-----
 input_data/agg_pow_col.csv | 142 ++++++++++++++++++-------------------
 input_data/power_tech.csv  |   1 -
 input_data/techcodes.csv   |   5 +-
 4 files changed, 92 insertions(+), 95 deletions(-)

diff --git a/input_data/agg_col.csv b/input_data/agg_col.csv
index d26ea31..760ba85 100644
--- a/input_data/agg_col.csv
+++ b/input_data/agg_col.csv
@@ -1,21 +1,18 @@
-Coal,Oil,Gas,Hydro,Nuclear,Solar CSP,Solar PV,Wind,Geothermal,Biomass,Coal Production,Crude Oil production,Crude oil Refinery,Natural gas extraction,Uranium extraction,Transmission & Distribution,Backstop,Biofuel and Biomass production
-Coal power plant with CCS - Air cooling (new),Oil fired gas turbine (SCGT) - Air cooling (old),Natural gas power plant (combined cycle) - Air cooling (new),Large hydropower plant (Dam),Nuclear power plant - OTS/OTF cooling (old),CSP (without storage),Solar PV (utility),Wind (onshore),Geothermal power plant - Air cooling (old),Biomass & Waste CHP plant with CCS - Air cooling (new),Coal extraction (mining),Crude Oil extraction,Crude oil refinery capacity,Natural gas extraction,Uranium extraction,Transmission technology (Secondary to Tertiary),Backstop technology,Biomass extraction/production/refining
-Coal power plant with CCS - MDT cooling (new),Oil fired gas turbine (SCGT) - MDT cooling (old),Natural gas power plant (combined cycle) - MDT cooling (new),Medium hydropower plant (Run-of river),Nuclear power plant - OTS/OTF cooling (new),CSP (with storage),Solar PV (roof top),Wind (offshore),Geothermal power plant - MDT cooling (old),Biomass & Waste CHP plant  with CCS- MDT cooling (new),,,,,,Distribution technology (Distribution to final electricity demand),,Biofuel production
-Coal power plant with CCS - NDT cooling (new),Oil fired gas turbine (SCGT) - NDT cooling (old),Natural gas power plant (combined cycle) - NDT cooling (new),Small hydropower plant,,,Solar PV with storage,,Geothermal power plant - NDT cooling (old),Biomass & Waste CHP plant with CCS - NDT cooling (new),,,,,,,,
-Coal power plant with CCS - OTF/OTS cooling (new),Oil fired gas turbine (SCGT) - OTF/OTS cooling (old),Natural gas power plant (combined cycle) - OTF/OTS cooling (new),,,,,,Geothermal power plant - OTF/OTS cooling (old),Biomass & Waste CHP plant with CCS - OTF/OTS cooling (new),,,,,,,,
-Coal power plant - Air cooling (old),Oil fired gas turbine (SCGT) - Air cooling (new),Natural gas power plant (combined cycle) - Air cooling (old),,,,,,Geothermal power plant - Air cooling (new),Biomass & Waste CHP plant - Air cooling (old),,,,,,,,
-Coal power plant - MDT cooling (old),Oil fired gas turbine (SCGT) - MDT cooling (new),Natural gas power plant (combined cycle) - MDT cooling (old),,,,,,Geothermal power plant - MDT cooling (new),Biomass & Waste CHP plant - MDT cooling (old),,,,,,,,
-Coal power plant - NDT cooling (old),Oil fired gas turbine (SCGT) - NDT cooling (new),Natural gas power plant (combined cycle) - NDT cooling (old),,,,,,Geothermal power plant - NDT cooling (new),Biomass & Waste CHP plant - NDT cooling (old),,,,,,,,
-Coal power plant - OTF/OTS cooling (old),Oil fired gas turbine (SCGT) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - OTF/OTS cooling (old),,,,,,Geothermal power plant - OTF/OTS cooling (new),Biomass & Waste CHP plant - OTF/OTS cooling (old),,,,,,,,
-Coal power plant - Air cooling (new),Light Fuel Oil stand alone (1kW),Natural gas power plant (single cycle) - Air cooling (old),,,,,,,Biomass & Waste CHP plant - Air cooling (new),,,,,,,,
-Coal power plant - MDT cooling (new),Light Fuel Oil power plant - Air cooling (old),Natural gas power plant (single cycle) - MDT cooling (old),,,,,,,Biomass & Waste CHP plant - MDT cooling (new),,,,,,,,
-Coal power plant - NDT cooling (new),Light Fuel Oil power plant - MDT cooling (old),Natural gas power plant (single cycle) - NDT cooling (old),,,,,,,Biomass & Waste CHP plant - NDT cooling (new),,,,,,,,
-Coal power plant - OTF/OTS cooling (new),Light Fuel Oil power plant - NDT cooling (old),Natural gas power plant (single cycle) - OTF/OTS cooling (old),,,,,,,Biomass & Waste CHP plant - OTF/OTS cooling (new),,,,,,,,
-,Light Fuel Oil power plant - OTF/OTS cooling (old),Natural gas power plant (single cycle) - Air cooling (new),,,,,,,,,,,,,,,
-,Light Fuel Oil power plant - Air cooling (new),Natural gas power plant (single cycle) - MDT cooling (new),,,,,,,,,,,,,,,
-,Light Fuel Oil power plant - MDT cooling (new),Natural gas power plant (single cycle) - NDT cooling (new),,,,,,,,,,,,,,,
-,Light Fuel Oil power plant - NDT cooling (new),Natural gas power plant (single cycle) - OTF/OTS cooling (new),,,,,,,,,,,,,,,
-,Light Fuel Oil power plant - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - CCS - Air cooling (new),,,,,,,,,,,,,,,
-,,Natural gas power plant (combined cycle) - CCS  - MDT cooling (new),,,,,,,,,,,,,,,
-,,Natural gas power plant (combined cycle) - CCS - NDT cooling (new),,,,,,,,,,,,,,,
-,,Natural gas power plant (combined cycle) - CCS  - OTF/OTS cooling (new),,,,,,,,,,,,,,,
+Coal,Coal with ccs,Oil,Gas,Gas with ccs,Hydro,Nuclear,Solar CSP,Solar PV,Wind,Geothermal,Biomass with ccs,Biomass,Coal Production,Crude Oil production,Crude oil Refinery,Natural gas extraction,Uranium extraction,Biofuel and Biomass production
+Coal power plant - Air cooling (old),Coal power plant with CCS - Air cooling (new),Oil fired gas turbine (SCGT) - Air cooling (old),Natural gas power plant (combined cycle) - Air cooling (new),Natural gas power plant (combined cycle) - CCS - Air cooling (new),Large hydropower plant (Dam),Nuclear power plant - OTS/OTF cooling (old),CSP (without storage),Solar PV (utility),Wind (onshore),Geothermal power plant - Air cooling (old),Biomass & Waste CHP plant with CCS - Air cooling (new),Biomass & Waste CHP plant - Air cooling (old),Coal extraction (mining),Crude Oil extraction,Crude oil refinery capacity,Natural gas extraction,Uranium extraction,Biomass extraction/production/refining
+Coal power plant - MDT cooling (old),Coal power plant with CCS - MDT cooling (new),Oil fired gas turbine (SCGT) - MDT cooling (old),Natural gas power plant (combined cycle) - MDT cooling (new),Natural gas power plant (combined cycle) - CCS  - MDT cooling (new),Medium hydropower plant (Run-of river),Nuclear power plant - OTS/OTF cooling (new),CSP (with storage),Solar PV (roof top),Wind (offshore),Geothermal power plant - MDT cooling (old),Biomass & Waste CHP plant  with CCS- MDT cooling (new),Biomass & Waste CHP plant - MDT cooling (old),,,,,,Biofuel production
+Coal power plant - NDT cooling (old),Coal power plant with CCS - NDT cooling (new),Oil fired gas turbine (SCGT) - NDT cooling (old),Natural gas power plant (combined cycle) - NDT cooling (new),Natural gas power plant (combined cycle) - CCS - NDT cooling (new),Small hydropower plant,,,Solar PV with storage,,Geothermal power plant - NDT cooling (old),Biomass & Waste CHP plant with CCS - NDT cooling (new),Biomass & Waste CHP plant - NDT cooling (old),,,,,,
+Coal power plant - OTF/OTS cooling (old),Coal power plant with CCS - OTF/OTS cooling (new),Oil fired gas turbine (SCGT) - OTF/OTS cooling (old),Natural gas power plant (combined cycle) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - CCS  - OTF/OTS cooling (new),,,,,,Geothermal power plant - OTF/OTS cooling (old),Biomass & Waste CHP plant with CCS - OTF/OTS cooling (new),Biomass & Waste CHP plant - OTF/OTS cooling (old),,,,,,
+Coal power plant - Air cooling (new),,Oil fired gas turbine (SCGT) - Air cooling (new),Natural gas power plant (combined cycle) - Air cooling (old),,,,,,,Geothermal power plant - Air cooling (new),,Biomass & Waste CHP plant - Air cooling (new),,,,,,
+Coal power plant - MDT cooling (new),,Oil fired gas turbine (SCGT) - MDT cooling (new),Natural gas power plant (combined cycle) - MDT cooling (old),,,,,,,Geothermal power plant - MDT cooling (new),,Biomass & Waste CHP plant - MDT cooling (new),,,,,,
+Coal power plant - NDT cooling (new),,Oil fired gas turbine (SCGT) - NDT cooling (new),Natural gas power plant (combined cycle) - NDT cooling (old),,,,,,,Geothermal power plant - NDT cooling (new),,Biomass & Waste CHP plant - NDT cooling (new),,,,,,
+Coal power plant - OTF/OTS cooling (new),,Oil fired gas turbine (SCGT) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - OTF/OTS cooling (old),,,,,,,Geothermal power plant - OTF/OTS cooling (new),,Biomass & Waste CHP plant - OTF/OTS cooling (new),,,,,,
+,,Light Fuel Oil stand alone (1kW),Natural gas power plant (single cycle) - Air cooling (old),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - Air cooling (old),Natural gas power plant (single cycle) - MDT cooling (old),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - MDT cooling (old),Natural gas power plant (single cycle) - NDT cooling (old),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - NDT cooling (old),Natural gas power plant (single cycle) - OTF/OTS cooling (old),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - OTF/OTS cooling (old),Natural gas power plant (single cycle) - Air cooling (new),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - Air cooling (new),Natural gas power plant (single cycle) - MDT cooling (new),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - MDT cooling (new),Natural gas power plant (single cycle) - NDT cooling (new),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - NDT cooling (new),Natural gas power plant (single cycle) - OTF/OTS cooling (new),,,,,,,,,,,,,,,
+,,Light Fuel Oil power plant - OTF/OTS cooling (new),,,,,,,,,,,,,,,,
diff --git a/input_data/agg_pow_col.csv b/input_data/agg_pow_col.csv
index 2a70565..35e985e 100644
--- a/input_data/agg_pow_col.csv
+++ b/input_data/agg_pow_col.csv
@@ -1,71 +1,71 @@
-Coal,Oil,Gas,Hydro,Nuclear,Solar CSP,Solar PV,Wind,Biomass,Geothermal,Backstop,power_trade,gas_trade
-Coal power plant with CCS - Air cooling (new),Oil fired gas turbine (SCGT) - Air cooling (old),Natural gas power plant (combined cycle) - Air cooling (new),Large hydropower plant (Dam),Nuclear power plant - OTS/OTF cooling (old),CSP (without storage),Solar PV (utility),Wind (onshore),Biomass & Waste CHP plant with CCS - Air cooling (new),Geothermal power plant - Air cooling (old),Backstop technology,Algeria - Morocco Historic EL trade link,Algeria - Italy Historic NG trade link
-Coal power plant with CCS - MDT cooling (new),Oil fired gas turbine (SCGT) - MDT cooling (old),Natural gas power plant (combined cycle) - MDT cooling (new),Medium hydropower plant (Run-of river),Nuclear power plant - OTS/OTF cooling (new),CSP (with storage),Solar PV (roof top),Wind (offshore),Biomass & Waste CHP plant  with CCS- MDT cooling (new),Geothermal power plant - MDT cooling (old),,Spain - Morocco Historic EL trade link,Algeria - Portugal Historic NG trade link
-Coal power plant with CCS - NDT cooling (new),Oil fired gas turbine (SCGT) - NDT cooling (old),Natural gas power plant (combined cycle) - NDT cooling (new),Small hydropower plant,,,Solar PV with storage,,Biomass & Waste CHP plant with CCS - NDT cooling (new),Geothermal power plant - NDT cooling (old),,Egypt - Sudan Historic and Planned EL trade link,Algeria - Spain Historic and Planned NG trade link
-Coal power plant with CCS - OTF/OTS cooling (new),Oil fired gas turbine (SCGT) - OTF/OTS cooling (old),Natural gas power plant (combined cycle) - OTF/OTS cooling (new),,,,,,Biomass & Waste CHP plant with CCS - OTF/OTS cooling (new),Geothermal power plant - OTF/OTS cooling (old),,Egypt - Jordan Historic EL trade link,Algeria - Morocco Historic NG trade link
-Coal power plant - Air cooling (old),Oil fired gas turbine (SCGT) - Air cooling (new),Natural gas power plant (combined cycle) - Air cooling (old),,,,,,Biomass & Waste CHP plant - Air cooling (old),Geothermal power plant - Air cooling (new),,Egypt - Saudi Arabia Planned EL trade link,Algeria - Tunisia Historic NG trade link
-Coal power plant - MDT cooling (old),Oil fired gas turbine (SCGT) - MDT cooling (new),Natural gas power plant (combined cycle) - MDT cooling (old),,,,,,Biomass & Waste CHP plant - MDT cooling (old),Geothermal power plant - MDT cooling (new),,Libya - Egypt Historic EL trade link,Egypt - Turkey Historic NG trade link
-Coal power plant - NDT cooling (old),Oil fired gas turbine (SCGT) - NDT cooling (new),Natural gas power plant (combined cycle) - NDT cooling (old),,,,,,Biomass & Waste CHP plant - NDT cooling (old),Geothermal power plant - NDT cooling (new),,Morocco - Algeria Historic EL trade link,Israel - Egypt Planned NG trade link
-Coal power plant - OTF/OTS cooling (old),Oil fired gas turbine (SCGT) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - OTF/OTS cooling (old),,,,,,Biomass & Waste CHP plant - OTF/OTS cooling (old),Geothermal power plant - OTF/OTS cooling (new),,Tunisia - Algeria Historic EL trade link,Libya - Italy Historic NG trade link
-Coal power plant - Air cooling (new),Light Fuel Oil stand alone (1kW),Natural gas power plant (single cycle) - Air cooling (old),,,,,,Biomass & Waste CHP plant - Air cooling (new),,,Burundi - Rwanda EL existing trade link,Nigeria - Algeria Planned NG trade link
-Coal power plant - MDT cooling (new),Light Fuel Oil power plant - Air cooling (old),Natural gas power plant (single cycle) - MDT cooling (old),,,,,,Biomass & Waste CHP plant - MDT cooling (new),,,DRC - Burundi EL existing and planned trade link,Ethiopia - Djibouti NG planned trade link
-Coal power plant - NDT cooling (new),Light Fuel Oil power plant - MDT cooling (old),Natural gas power plant (single cycle) - NDT cooling (old),,,,,,Biomass & Waste CHP plant - NDT cooling (new),,,DRC - Rwanda EL existing and planned trade link,Tanzania - Uganda NG planned trade link
-Coal power plant - OTF/OTS cooling (new),Light Fuel Oil power plant - NDT cooling (old),Natural gas power plant (single cycle) - OTF/OTS cooling (old),,,,,,Biomass & Waste CHP plant - OTF/OTS cooling (new),,,Ethiopia - Kenya EL planned trade link,Nigeria - Benin Historic NG trade link
-,Light Fuel Oil power plant - OTF/OTS cooling (old),Natural gas power plant (single cycle) - Air cooling (new),,,,,,,,,Ethiopia - Djibouti EL existing trade link,Nigeria - Ghana Historic NG trade link
-,Light Fuel Oil power plant - Air cooling (new),Natural gas power plant (single cycle) - MDT cooling (new),,,,,,,,,Ethiopia - Sudan EL existing trade link,Nigeria - Niger Historic NG trade link
-,Light Fuel Oil power plant - MDT cooling (new),Natural gas power plant (single cycle) - NDT cooling (new),,,,,,,,,Kenya - Uganda EL existing and planned trade link,Nigeria - Togo Historic NG trade link
-,Light Fuel Oil power plant - NDT cooling (new),Natural gas power plant (single cycle) - OTF/OTS cooling (new),,,,,,,,,Kenya - Tanzania EL existing and planned trade link,Mozambique - South Africa Historic NG trade link
-,Light Fuel Oil power plant - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - CCS - Air cooling (new),,,,,,,,,Rwanda - Burundi EL existing trade link,
-,,Natural gas power plant (combined cycle) - CCS  - MDT cooling (new),,,,,,,,,Rwanda - Tanzania EL planned trade link,
-,,Natural gas power plant (combined cycle) - CCS - NDT cooling (new),,,,,,,,,Tanzania - Burundi EL planned trade link,
-,,Natural gas power plant (combined cycle) - CCS  - OTF/OTS cooling (new),,,,,,,,,Tanzania - Kenya EL planned trade link,
-,,,,,,,,,,,Tanzania - Uganda EL existing trade link,
-,,,,,,,,,,,Uganda - Kenya EL existing and planned trade link,
-,,,,,,,,,,,Uganda - Tanzania EL existing and planned trade link,
-,,,,,,,,,,,Uganda - Rwanda EL existing trade link,
-,,,,,,,,,,,Botswana - South Africa EL existing trade link,
-,,,,,,,,,,,DRC - South Africa EL planned trade link,
-,,,,,,,,,,,DRC - Zambia EL existing trade link,
-,,,,,,,,,,,Lesotho - South Africa EL existing trade link,
-,,,,,,,,,,,Mozambique - South Africa EL existing trade link,
-,,,,,,,,,,,Mozambique - Swaziland EL existing trade link,
-,,,,,,,,,,,Mozambique - Zimbabwe EL existing trade link,
-,,,,,,,,,,,Namibia - South Africa EL existing trade link,
-,,,,,,,,,,,South Africa - Swaziland EL existing trade link,
-,,,,,,,,,,,South Africa - Zimbabwe EL existing trade link,
-,,,,,,,,,,,Zambia - Zimbabwe EL existing trade link,
-,,,,,,,,,,,Angola - DRC EL planned trade link,
-,,,,,,,,,,,Botswana - Zambia EL planned trade link,
-,,,,,,,,,,,Botswana - Namibia EL planned trade link,
-,,,,,,,,,,,Botswana - Zimbabwe EL planned trade link,
-,,,,,,,,,,,Malawi - Mozambique EL planned trade link,
-,,,,,,,,,,,Malawi - Tanzania EL planned trade link,
-,,,,,,,,,,,Namibia - Zambia EL planned trade link,
-,,,,,,,,,,,Namibia - Zimbabwe EL planned trade link,
-,,,,,,,,,,,Tanzania - Zambia EL planned trade link,
-,,,,,,,,,,,Zambia - Tanzania EL planned trade link,
-,,,,,,,,,,,Benin - Niger EL planned trade link,
-,,,,,,,,,,,Benin - Ghana EL planned trade link,
-,,,,,,,,,,,Ghana - Benin EL planned trade link,
-,,,,,,,,,,,Niger - Benin EL planned trade link,
-,,,,,,,,,,,Togo - Benin EL existing trade link,
-,,,,,,,,,,,Burkina Faso - Niger EL planned trade link,
-,,,,,,,,,,,Cote dï Ivoire - Burkina Faso EL existing trade link,
-,,,,,,,,,,,Ghana - Burkina Faso EL planned trade link,
-,,,,,,,,,,,Niger - Burkina Faso EL existing and planned trade link,
-,,,,,,,,,,,Cote dï Ivoire - Sierra Leone EL planned trade link,
-,,,,,,,,,,,Cote dï Ivoire - Ghana EL planned trade link,
-,,,,,,,,,,,Cote dï Ivoire - Liberia EL planned trade link,
-,,,,,,,,,,,Ghana - Cote dï Ivoire EL existing trade link,
-,,,,,,,,,,,Mali - Cote dï Ivoire EL planned trade link,
-,,,,,,,,,,,Gambia - Guinea Bissau EL planned trade link,
-,,,,,,,,,,,Gambia - Senegal EL planned trade link,
-,,,,,,,,,,,Togo - Ghana EL planned trade link,
-,,,,,,,,,,,Ghana - Togo EL existing and planned trade link,
-,,,,,,,,,,,Ghana - Mali EL planned trade link,
-,,,,,,,,,,,Guinea - Mali EL planned trade link,
-,,,,,,,,,,,Guinea - Senegal EL planned trade link,
-,,,,,,,,,,,Senegal - Mauritania EL planned trade link,
-,,,,,,,,,,,Nigeria - Benin EL exsting and planned trade link,
-,,,,,,,,,,,Nigeria - Niger EL existing and planned trade link,
-,,,,,,,,,,,Nigeria - Togo EL planned trade link,
+Coal with ccs,Coal,Oil,Gas,Gas with ccs,Hydro,Nuclear,Solar CSP,Solar PV,Wind,Biomass with ccs,Biomass,Geothermal,power_trade,gas_trade
+Coal power plant with CCS - Air cooling (new),Coal power plant - Air cooling (old),Oil fired gas turbine (SCGT) - Air cooling (old),Natural gas power plant (combined cycle) - Air cooling (new),Natural gas power plant (combined cycle) - CCS - Air cooling (new),Large hydropower plant (Dam),Nuclear power plant - OTS/OTF cooling (old),CSP (without storage),Solar PV (utility),Wind (onshore),Biomass & Waste CHP plant with CCS - Air cooling (new),Biomass & Waste CHP plant - Air cooling (old),Geothermal power plant - Air cooling (old),Algeria - Morocco Historic EL trade link,Algeria - Italy Historic NG trade link
+Coal power plant with CCS - MDT cooling (new),Coal power plant - MDT cooling (old),Oil fired gas turbine (SCGT) - MDT cooling (old),Natural gas power plant (combined cycle) - MDT cooling (new),Natural gas power plant (combined cycle) - CCS  - MDT cooling (new),Medium hydropower plant (Run-of river),Nuclear power plant - OTS/OTF cooling (new),CSP (with storage),Solar PV (roof top),Wind (offshore),Biomass & Waste CHP plant  with CCS- MDT cooling (new),Biomass & Waste CHP plant - MDT cooling (old),Geothermal power plant - MDT cooling (old),Spain - Morocco Historic EL trade link,Algeria - Portugal Historic NG trade link
+Coal power plant with CCS - NDT cooling (new),Coal power plant - NDT cooling (old),Oil fired gas turbine (SCGT) - NDT cooling (old),Natural gas power plant (combined cycle) - NDT cooling (new),Natural gas power plant (combined cycle) - CCS - NDT cooling (new),Small hydropower plant,,,Solar PV with storage,,Biomass & Waste CHP plant with CCS - NDT cooling (new),Biomass & Waste CHP plant - NDT cooling (old),Geothermal power plant - NDT cooling (old),Egypt - Sudan Historic and Planned EL trade link,Algeria - Spain Historic and Planned NG trade link
+Coal power plant with CCS - OTF/OTS cooling (new),Coal power plant - OTF/OTS cooling (old),Oil fired gas turbine (SCGT) - OTF/OTS cooling (old),Natural gas power plant (combined cycle) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - CCS  - OTF/OTS cooling (new),,,,,,Biomass & Waste CHP plant with CCS - OTF/OTS cooling (new),Biomass & Waste CHP plant - OTF/OTS cooling (old),Geothermal power plant - OTF/OTS cooling (old),Egypt - Jordan Historic EL trade link,Algeria - Morocco Historic NG trade link
+,Coal power plant - Air cooling (new),Oil fired gas turbine (SCGT) - Air cooling (new),Natural gas power plant (combined cycle) - Air cooling (old),,,,,,,,Biomass & Waste CHP plant - Air cooling (new),Geothermal power plant - Air cooling (new),Egypt - Saudi Arabia Planned EL trade link,Algeria - Tunisia Historic NG trade link
+,Coal power plant - MDT cooling (new),Oil fired gas turbine (SCGT) - MDT cooling (new),Natural gas power plant (combined cycle) - MDT cooling (old),,,,,,,,Biomass & Waste CHP plant - MDT cooling (new),Geothermal power plant - MDT cooling (new),Libya - Egypt Historic EL trade link,Egypt - Turkey Historic NG trade link
+,Coal power plant - NDT cooling (new),Oil fired gas turbine (SCGT) - NDT cooling (new),Natural gas power plant (combined cycle) - NDT cooling (old),,,,,,,,Biomass & Waste CHP plant - NDT cooling (new),Geothermal power plant - NDT cooling (new),Morocco - Algeria Historic EL trade link,Israel - Egypt Planned NG trade link
+,Coal power plant - OTF/OTS cooling (new),Oil fired gas turbine (SCGT) - OTF/OTS cooling (new),Natural gas power plant (combined cycle) - OTF/OTS cooling (old),,,,,,,,Biomass & Waste CHP plant - OTF/OTS cooling (new),Geothermal power plant - OTF/OTS cooling (new),Tunisia - Algeria Historic EL trade link,Libya - Italy Historic NG trade link
+,,Light Fuel Oil stand alone (1kW),Natural gas power plant (single cycle) - Air cooling (old),,,,,,,,,,Burundi - Rwanda EL existing trade link,Nigeria - Algeria Planned NG trade link
+,,Light Fuel Oil power plant - Air cooling (old),Natural gas power plant (single cycle) - MDT cooling (old),,,,,,,,,,DRC - Burundi EL existing and planned trade link,Ethiopia - Djibouti NG planned trade link
+,,Light Fuel Oil power plant - MDT cooling (old),Natural gas power plant (single cycle) - NDT cooling (old),,,,,,,,,,DRC - Rwanda EL existing and planned trade link,Tanzania - Uganda NG planned trade link
+,,Light Fuel Oil power plant - NDT cooling (old),Natural gas power plant (single cycle) - OTF/OTS cooling (old),,,,,,,,,,Ethiopia - Kenya EL planned trade link,Nigeria - Benin Historic NG trade link
+,,Light Fuel Oil power plant - OTF/OTS cooling (old),Natural gas power plant (single cycle) - Air cooling (new),,,,,,,,,,Ethiopia - Djibouti EL existing trade link,Nigeria - Ghana Historic NG trade link
+,,Light Fuel Oil power plant - Air cooling (new),Natural gas power plant (single cycle) - MDT cooling (new),,,,,,,,,,Ethiopia - Sudan EL existing trade link,Nigeria - Niger Historic NG trade link
+,,Light Fuel Oil power plant - MDT cooling (new),Natural gas power plant (single cycle) - NDT cooling (new),,,,,,,,,,Kenya - Uganda EL existing and planned trade link,Nigeria - Togo Historic NG trade link
+,,Light Fuel Oil power plant - NDT cooling (new),Natural gas power plant (single cycle) - OTF/OTS cooling (new),,,,,,,,,,Kenya - Tanzania EL existing and planned trade link,Mozambique - South Africa Historic NG trade link
+,,Light Fuel Oil power plant - OTF/OTS cooling (new),,,,,,,,,,,Rwanda - Burundi EL existing trade link,
+,,,,,,,,,,,,,Rwanda - Tanzania EL planned trade link,
+,,,,,,,,,,,,,Tanzania - Burundi EL planned trade link,
+,,,,,,,,,,,,,Tanzania - Kenya EL planned trade link,
+,,,,,,,,,,,,,Tanzania - Uganda EL existing trade link,
+,,,,,,,,,,,,,Uganda - Kenya EL existing and planned trade link,
+,,,,,,,,,,,,,Uganda - Tanzania EL existing and planned trade link,
+,,,,,,,,,,,,,Uganda - Rwanda EL existing trade link,
+,,,,,,,,,,,,,Botswana - South Africa EL existing trade link,
+,,,,,,,,,,,,,DRC - South Africa EL planned trade link,
+,,,,,,,,,,,,,DRC - Zambia EL existing trade link,
+,,,,,,,,,,,,,Lesotho - South Africa EL existing trade link,
+,,,,,,,,,,,,,Mozambique - South Africa EL existing trade link,
+,,,,,,,,,,,,,Mozambique - Swaziland EL existing trade link,
+,,,,,,,,,,,,,Mozambique - Zimbabwe EL existing trade link,
+,,,,,,,,,,,,,Namibia - South Africa EL existing trade link,
+,,,,,,,,,,,,,South Africa - Swaziland EL existing trade link,
+,,,,,,,,,,,,,South Africa - Zimbabwe EL existing trade link,
+,,,,,,,,,,,,,Zambia - Zimbabwe EL existing trade link,
+,,,,,,,,,,,,,Angola - DRC EL planned trade link,
+,,,,,,,,,,,,,Botswana - Zambia EL planned trade link,
+,,,,,,,,,,,,,Botswana - Namibia EL planned trade link,
+,,,,,,,,,,,,,Botswana - Zimbabwe EL planned trade link,
+,,,,,,,,,,,,,Malawi - Mozambique EL planned trade link,
+,,,,,,,,,,,,,Malawi - Tanzania EL planned trade link,
+,,,,,,,,,,,,,Namibia - Zambia EL planned trade link,
+,,,,,,,,,,,,,Namibia - Zimbabwe EL planned trade link,
+,,,,,,,,,,,,,Tanzania - Zambia EL planned trade link,
+,,,,,,,,,,,,,Zambia - Tanzania EL planned trade link,
+,,,,,,,,,,,,,Benin - Niger EL planned trade link,
+,,,,,,,,,,,,,Benin - Ghana EL planned trade link,
+,,,,,,,,,,,,,Ghana - Benin EL planned trade link,
+,,,,,,,,,,,,,Niger - Benin EL planned trade link,
+,,,,,,,,,,,,,Togo - Benin EL existing trade link,
+,,,,,,,,,,,,,Burkina Faso - Niger EL planned trade link,
+,,,,,,,,,,,,,Cote dï Ivoire - Burkina Faso EL existing trade link,
+,,,,,,,,,,,,,Ghana - Burkina Faso EL planned trade link,
+,,,,,,,,,,,,,Niger - Burkina Faso EL existing and planned trade link,
+,,,,,,,,,,,,,Cote dï Ivoire - Sierra Leone EL planned trade link,
+,,,,,,,,,,,,,Cote dï Ivoire - Ghana EL planned trade link,
+,,,,,,,,,,,,,Cote dï Ivoire - Liberia EL planned trade link,
+,,,,,,,,,,,,,Ghana - Cote dï Ivoire EL existing trade link,
+,,,,,,,,,,,,,Mali - Cote dï Ivoire EL planned trade link,
+,,,,,,,,,,,,,Gambia - Guinea Bissau EL planned trade link,
+,,,,,,,,,,,,,Gambia - Senegal EL planned trade link,
+,,,,,,,,,,,,,Togo - Ghana EL planned trade link,
+,,,,,,,,,,,,,Ghana - Togo EL existing and planned trade link,
+,,,,,,,,,,,,,Ghana - Mali EL planned trade link,
+,,,,,,,,,,,,,Guinea - Mali EL planned trade link,
+,,,,,,,,,,,,,Guinea - Senegal EL planned trade link,
+,,,,,,,,,,,,,Senegal - Mauritania EL planned trade link,
+,,,,,,,,,,,,,Nigeria - Benin EL exsting and planned trade link,
+,,,,,,,,,,,,,Nigeria - Niger EL existing and planned trade link,
+,,,,,,,,,,,,,Nigeria - Togo EL planned trade link,
diff --git a/input_data/power_tech.csv b/input_data/power_tech.csv
index d848e97..c63340f 100644
--- a/input_data/power_tech.csv
+++ b/input_data/power_tech.csv
@@ -1,5 +1,4 @@
 power_tech
-BACKSTOP
 BMCHC01N
 BMCHC02N
 BMCHC03N
diff --git a/input_data/techcodes.csv b/input_data/techcodes.csv
index 26641e4..bde0adb 100644
--- a/input_data/techcodes.csv
+++ b/input_data/techcodes.csv
@@ -1,5 +1,4 @@
 tech_code,tech_name,colour
-BACKSTOP,Backstop technology,aliceblue
 BIOFUELX,Biofuel production,aqua
 BM00I00X,Biomass imports,azure
 BM00X00X,Biomass extraction/production/refining,bisque
@@ -112,8 +111,10 @@ WIND000X,Wind potential,yellow
 WINDP00X,Wind (onshore),beige
 WINDP01X,Wind (offshore),burlywood
 COALAGG,Coal,black
+COALCCS,Coal with ccs,wheat
 OILAGG,Oil,gray
 GASAGG,Gas,orange
+GASCCS,Gas with ccs,sienna
 HYDAGG,Hydro,aqua
 NUCAGG,Nuclear,polarbluelight
 OREAGG,Other renewables,lightgreen
@@ -127,6 +128,7 @@ SOLCSP,Solar CSP,lightgoldenrodyellow
 SOLPV,Solar PV,yellow
 WIND,Wind,navy
 BIOM,Biomass,lightgreen
+BIOMCCS,Biomass with ccs,polargreen
 CO2,CO2,black
 Transmission & Distribution,Transmission & Distribution,magenta
 NG00ELGX,Natural gas exports (Liquification terminal),indianred
@@ -220,4 +222,3 @@ CMELTDBP00,Cameroon - Chad EL planned trade link,navy
 CDELCGBP00,DRC - Congo EL existing trade link,lightgreen
 MZNGZABP00,Mozambique - South Africa Historic NG trade link,polarbluelight
 GEOTHERMAL,Geothermal,polarorange
-,,

From eeb1493612f676df10f214779fc88aff0a82c1fa Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:22:06 +0200
Subject: [PATCH 02/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index ed4b3f6..5f80611 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -29,6 +29,11 @@ CR3X,CR3,Total Crude Oil demand (for exports),Final Energy Demand,floralwhite
 DUEL,DEL,Electricity exports to non-African countries,Tertiary level fuel,fuchsia
 DULG,DLG,LNG exports to non-African countries,Tertiary level fuel,ghostwhite
 DUNG,DNG,NG exports (via pipeline) to non-African countries,Tertiary level fuel,goldenrod
+COEX,COE,Coal export,Tertiary level fuel,dark
+CREX,CRE,Crude Oil export,Tertiary level fuel,red
+HFEX,HFE,Heavy Fuel oil export,Tertiary level fuel,darkred
+LFEX,LFE,Light Fuel oil export,Tertiary level fuel,lightred
+FEWX,FEW,Firewood export,Tertiary level fuel,green
 MAGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,gray
 TNGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,greenyellow
 DZGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey01

From ccc88ac2e0f073985eca3d938e72cfc03256ee0b Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:22:42 +0200
Subject: [PATCH 03/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index 5f80611..13b8ef0 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -33,7 +33,7 @@ COEX,COE,Coal export,Tertiary level fuel,dark
 CREX,CRE,Crude Oil export,Tertiary level fuel,red
 HFEX,HFE,Heavy Fuel oil export,Tertiary level fuel,darkred
 LFEX,LFE,Light Fuel oil export,Tertiary level fuel,lightred
-FEWX,FEW,Firewood export,Tertiary level fuel,green
+FEWX,FWE,Firewood export,Tertiary level fuel,green
 MAGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,gray
 TNGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,greenyellow
 DZGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey01

From bf9483b2454fa4deeeb7cb4d57c7f93f86242770 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:25:33 +0200
Subject: [PATCH 04/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index ecaf4ad..62ae91e 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -16,7 +16,8 @@ BMCHP02N,BIOCHP02N,Biomass & Waste CHP plant - MDT cooling (new),Power_plants,cy
 BMCHP03N,BIOCHP03N,Biomass & Waste CHP plant - NDT cooling (new),Power_plants,darkcyan
 BMCHP04N,BIOCHP04N,Biomass & Waste CHP plant - OTF/OTS cooling (new),Power_plants,darkgray
 CH00I00X,CHAIMP00X,Charcoal imports,Extraction/Import,darkgrey
-CO00I00X,COAIMP00X,"Coal imports (inland transport, maritime freight)",Extraction/Import,darkmagenta
+CO00I00X,COAIMP00X,Coal imports (inland transport, maritime freight),Extraction/Import,darkmagenta
+CO00E00X,COAEMP00X,Coal exports,Exports,darkgrey
 CO00P00X,COADIP00X,Coal process (non-power sector),Conversion,darkorange
 CO00X00X,COAPRP00X,Coal extraction (mining),Extraction/Import,darkred
 COSCC01N,COASCC01N,Coal power plant with CCS - Air cooling (new),Power_plants,darkseagreen
@@ -34,6 +35,7 @@ COSCP04N,COASCP04N,Coal power plant - OTF/OTS cooling (new),Power_plants,greenye
 CR00I00X,CO1IMP00X,Crude Oil imports,Extraction/Import,grey01
 CR00P00X,CO1DIP00X,Crude Oil process (non-power sector),Conversion,grey03
 CR00X00X,CO1PRP00X,Crude Oil extraction,Extraction/Import,grey05
+CR00E00X,CO100E00X,Crude Oil exports,Exports,grey06
 CRUDPROX,CO1??????,Crude oil refinery capacity,Conversion,grey07
 CRUDRE1X,CO2??????,Crude oil refinery 1,Conversion,grey11
 CRUDRE2X,CO2??????,Crude oil refinery 2,Conversion,grey13
@@ -51,6 +53,7 @@ GOCVP03N,GEOCVP03N,Geothermal power plant - NDT cooling (new),Power_plants,light
 GOCVP04N,GEOCVP04N,Geothermal power plant - OTF/OTS cooling (new),Power_plants,lightgreen
 HE00T00X,HE2DIP00X,Heat network,Transmission&Distribution,lightivory
 HF00I00X,HFOIMP00X,Heavy Fuel Oil imports,Extraction/Import,lightsalmon
+HF00E00X,HFOEMP00X,Heavy Fuel Oil exports,Exports,blue
 HF00P00X,HFODIP00X,Heavy Fuel Oil process (non-power sector),Conversion,lightskyblue
 HFGCP01O,HFOGCP01O,Oil fired gas turbine (SCGT) - Air cooling (old),Power_plants,lightslategrey
 HFGCP02O,HFOGCP02O,Oil fired gas turbine (SCGT) - MDT cooling (old),Power_plants,lightteal
@@ -64,6 +67,7 @@ HYDMS03X,HYDLSP00X,Large hydropower plant (Dam),Power_plants,mediumpurple
 HYDMS02X,HYDMSP00X,Medium hydropower plant (Run-of river),Power_plants,mediumslateblue
 HYDMS01X,HYDSSP00X,Small hydropower plant,Power_plants,mediumturquoise
 LF00I00X,LFOIMP00X,Light Fuel Oil imports,Extraction/Import,midnightblue
+LF00E00X,LFOEMP00X,Light Fuel Oil exports,Exports,mediumturquoise
 LF00P00X,LFODIP00X,Light Fuel Oil process (non-power sector),Conversion,mistyrose
 LFRCFURX,LFORCP00X,Light Fuel Oil stand alone (1kW),Power_plants,mustard
 LFRCP01O,LFORCP01O,Light Fuel Oil power plant - Air cooling (old),Power_plants,navy
@@ -195,14 +199,14 @@ GHELBJBP00,,Ghana - Benin EL planned trade link,Exports_EL,polardark
 NEELBJBP00,,Niger - Benin EL planned trade link,Exports_EL,polardust
 TGELBJBP00,,Togo - Benin EL existing trade link,Exports_EL,polargreen
 BFELNEBP00,,Burkina Faso - Niger EL planned trade link,Exports_EL,polarpurple
-CIELBFBP00,,Cote d´ Ivoire - Burkina Faso EL existing trade link,Exports_EL,powderblue
+CIELBFBP00,,Cote d´ Ivoire - Burkina Faso EL existing trade link,Exports_EL,powderblue
 GHELBFBP00,,Ghana - Burkina Faso EL planned trade link,Exports_EL,red
 NEELBFBP00,,Niger - Burkina Faso EL existing and planned trade link,Exports_EL,rosybrown
-CIELSLBP00,,Cote d´ Ivoire - Sierra Leone EL planned trade link,Exports_EL,saddlebrown
-CIELGHBP00,,Cote d´ Ivoire - Ghana EL planned trade link,Exports_EL,sandybrown
-CIELLRBP00,,Cote d´ Ivoire - Liberia EL planned trade link,Exports_EL,seagreen
-GHELCIBP00,,Ghana - Cote d´ Ivoire EL existing trade link,Exports_EL,sienna
-MLELCIBP00,,Mali - Cote d´ Ivoire EL planned trade link,Exports_EL,skyblue
+CIELSLBP00,,Cote d´ Ivoire - Sierra Leone EL planned trade link,Exports_EL,saddlebrown
+CIELGHBP00,,Cote d´ Ivoire - Ghana EL planned trade link,Exports_EL,sandybrown
+CIELLRBP00,,Cote d´ Ivoire - Liberia EL planned trade link,Exports_EL,seagreen
+GHELCIBP00,,Ghana - Cote d´ Ivoire EL existing trade link,Exports_EL,sienna
+MLELCIBP00,,Mali - Cote d´ Ivoire EL planned trade link,Exports_EL,skyblue
 GMELGWBP00,,Gambia - Guinea Bissau EL planned trade link,Exports_EL,slategray
 GMELSNBP00,,Gambia - Senegal EL planned trade link,Exports_EL,smurf
 TGELGHBP00,,Togo - Ghana EL planned trade link,Exports_EL,springgreen

From 0676889ae72389c9337153cd2d23b6b301fcfa21 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:33:32 +0200
Subject: [PATCH 05/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 62ae91e..4398e64 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -35,10 +35,10 @@ COSCP04N,COASCP04N,Coal power plant - OTF/OTS cooling (new),Power_plants,greenye
 CR00I00X,CO1IMP00X,Crude Oil imports,Extraction/Import,grey01
 CR00P00X,CO1DIP00X,Crude Oil process (non-power sector),Conversion,grey03
 CR00X00X,CO1PRP00X,Crude Oil extraction,Extraction/Import,grey05
-CR00E00X,CO100E00X,Crude Oil exports,Exports,grey06
-CRUDPROX,CO1??????,Crude oil refinery capacity,Conversion,grey07
-CRUDRE1X,CO2??????,Crude oil refinery 1,Conversion,grey11
-CRUDRE2X,CO2??????,Crude oil refinery 2,Conversion,grey13
+CR00E00X,CO1EXP00X,Crude Oil exports,Exports,grey06
+CRUDPROX,CO1RCP00X,Crude oil refinery capacity,Conversion,grey07
+CRUDRE1X,CO2R1P00X,Crude oil refinery 1,Conversion,grey11
+CRUDRE2X,CO2R2P00X,Crude oil refinery 2,Conversion,grey13
 EL00T00X,EL1TRP00X,Transmission technology (Secondary to Tertiary),Transmission&Distribution,grey11
 EL00TDTX,EL2DIP00X,Distribution technology (Distribution to final electricity demand),Transmission&Distribution,grey13
 ETHANOLX,ETHPRP00X,Ethanol production,Extraction/Import,honeydew

From be6eed8558b53794aa93b026df6485c7674c2aaa Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:34:51 +0200
Subject: [PATCH 06/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 4398e64..34d4e3e 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -37,8 +37,8 @@ CR00P00X,CO1DIP00X,Crude Oil process (non-power sector),Conversion,grey03
 CR00X00X,CO1PRP00X,Crude Oil extraction,Extraction/Import,grey05
 CR00E00X,CO1EXP00X,Crude Oil exports,Exports,grey06
 CRUDPROX,CO1RCP00X,Crude oil refinery capacity,Conversion,grey07
-CRUDRE1X,CO2R1P00X,Crude oil refinery 1,Conversion,grey11
-CRUDRE2X,CO2R2P00X,Crude oil refinery 2,Conversion,grey13
+CRUDRE1X,CO1R1P00X,Crude oil refinery 1,Conversion,grey11
+CRUDRE2X,CO1R2P00X,Crude oil refinery 2,Conversion,grey13
 EL00T00X,EL1TRP00X,Transmission technology (Secondary to Tertiary),Transmission&Distribution,grey11
 EL00TDTX,EL2DIP00X,Distribution technology (Distribution to final electricity demand),Transmission&Distribution,grey13
 ETHANOLX,ETHPRP00X,Ethanol production,Extraction/Import,honeydew

From 70c20a2ca3dbae7e4f437b3bdcf0cf9791b2d6c2 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 09:06:54 +0200
Subject: [PATCH 07/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 34d4e3e..9a53c39 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -2,6 +2,7 @@ code (Old),code (New),Description,Group,Colour
 BACKSTOP,BACKSTOP,Backstop technology,Backstop,aliceblue
 BIOFUELX,BO3PRP00X,Biofuel production,Extraction/Import,aqua
 BM00I00X,BIOIMP00X,Biomass imports,Extraction/Import,azure
+BM00E00X,BIOEMP00X,Biomass exports,Exports,darkgreen
 BM00X00X,BIOPRP00X,Biomass extraction/production/refining,Extraction/Import,bisque
 BMCHC01N,BIOCHC01N,Biomass & Waste CHP plant with CCS - Air cooling (new),Power_plants,blanchedalmond
 BMCHC02N,BIOCHC02N,Biomass & Waste CHP plant  with CCS- MDT cooling (new),Power_plants,bluegray

From e8b3eb13a78e2c5f5de65ef4baf711a61d9db811 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 09:16:51 +0200
Subject: [PATCH 08/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 9a53c39..f9b8f13 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -81,6 +81,7 @@ LFRCP03N,LFORCP03N,Light Fuel Oil power plant - NDT cooling (new),Power_plants,p
 LFRCP04N,LFORCP04N,Light Fuel Oil power plant - OTF/OTS cooling (new),Power_plants,pearl
 NG00I00X,NGAIMP00X,Natural gas imports (inland/offshore pipeline),Extraction/Import,pearl03
 NG00ILGX,LNGIMP00X,Natural gas imports (LNG),Extraction/Import,pearl05
+NG00ELGX,LNGEXP00X,Natural gas exports (Liquification terminal),Exports_NG,indianred
 NG00P00X,NGADIP00X,Natural gas process (non-power sector),Conversion,peru
 NG00X00X,NGAPRP00X,Natural gas extraction,Extraction/Import,pinksalmon
 NGCCC01N,NGACCC01N,Natural gas power plant (combined cycle) - CCS - Air cooling (new),Power_plants,polar
@@ -135,7 +136,6 @@ WIND,TO CHECK WITH VIG,Wind,,navy
 BIOM,TO CHECK WITH VIG,Biomass,,lightgreen
 CO2,TO CHECK WITH VIG,CO2,,black
 Transmission & Distribution,TO CHECK WITH VIG,Transmission & Distribution,,magenta
-NG00ELGX,LNGEXP00X,Natural gas exports (Liquification terminal),Exports_NG,indianred
 DZELMABP00,???EL1EX????,Algeria - Morocco Historic EL trade link,Exports_EL,polarorange
 ESELMABP00,,Spain - Morocco Historic EL trade link,Exports_EL,silver
 EGELSDBP00,,Egypt - Sudan Historic and Planned EL trade link,Exports_EL,tomato

From 22396621ca58019d7785960075355d37a6193496 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:07:10 +0200
Subject: [PATCH 09/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index f9b8f13..81913df 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -42,6 +42,8 @@ CRUDRE1X,CO1R1P00X,Crude oil refinery 1,Conversion,grey11
 CRUDRE2X,CO1R2P00X,Crude oil refinery 2,Conversion,grey13
 EL00T00X,EL1TRP00X,Transmission technology (Secondary to Tertiary),Transmission&Distribution,grey11
 EL00TDTX,EL2DIP00X,Distribution technology (Distribution to final electricity demand),Transmission&Distribution,grey13
+EL3DIP00X,EL3DIP00X,Distribution technology (Distribution to final current-unelectrified demand),Transmission&Distribution,grey07
+EL4DIP00X,EL4DIP00X,Distribution technology (Distribution Mini-grid to final current-unelectrified demand),Transmission&Distribution,grey10
 ETHANOLX,ETHPRP00X,Ethanol production,Extraction/Import,honeydew
 FW00P00X,BIODIP00X,Firewood process (non-power sector),Conversion,indianred
 GOCVP01O,GEOCVP01O,Geothermal power plant - Air cooling (old),Power_plants,ivory

From c5342ac76c84db428537a1fba240a48877998c8b Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Wed, 23 Jun 2021 09:05:17 +0200
Subject: [PATCH 10/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 81913df..8d5a76f 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -121,6 +121,16 @@ WA00000X,WA2PRP00X,Water production technology,Extraction/Import,tomato
 WIND000X,WINPRP00X,Wind potential,Extraction/Import,yellow
 WINDP00X,WINONP00X,Wind (onshore),Power_plants,beige
 WINDP01X,WINOFP00X,Wind (offshore),Power_plants,burlywood
+LFOMGRID1,LFOMGRID1,Light Fuel Oil (mini-grid) Future electrified,MiniGrid,red
+LFOSALON1,LFOSALON1,Light Fuel Oil (Stand Alone) Future electrified,StandAlone,red
+SOLMGRID1,SOLMGRID1,Solar (Mini-Grid) Future electrified,MiniGrid,yellow 
+SOLPRSAL1,SOLPRSAL1,Solar (Stand Alone1) Future electrified,StandAlone,yellow 
+SOLPRSAL2,SOLPRSAL2,Solar (Stand Alone2) Future electrified,StandAlone,yellow 
+SOLPRSAL3,SOLPRSAL3,Solar (Stand Alone3) Future electrified,StandAlone,yellow 
+SOLPRSAL4,SOLPRSAL4,Solar (Stand Alone4) Future electrified,StandAlone,yellow 
+SOLPRSAL5,SOLPRSAL5,Solar (Stand Alone5) Future electrified,StandAlone,yellow 
+WINMGRID1,WINMGRID1,Wind (Mini-Grid) Future electrified,MiniGrid,lightblue
+HYDMGRID1,HYDMGRID1,Hydro (Mini-Grid) Future electrified,MiniGrid,blue
 COALAGG,TO CHECK WITH VIG,Coal,,black
 OILAGG,TO CHECK WITH VIG,Oil,,gray
 GASAGG,TO CHECK WITH VIG,Gas,,orange

From 91d67c6ccc5bfba6b0bd922426e7854b5a018b4e Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:10:08 +0200
Subject: [PATCH 11/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index 13b8ef0..8dfa8fc 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -18,7 +18,8 @@ HE2X,HE2,Heat from power plants,Secondary level fuel,darkgray
 EL02,EL2,Electricity after transmission,Secondary level fuel,darkgrey
 FW3X,FW3,Total Firewood demand (non-power sector),Final Energy Demand,darkmagenta
 HE3X,HE3,Total Heat demand,Final Energy Demand,darkorange
-EL03,EL3,Total Electricity demand,Final Energy Demand,darkred
+EL03,EL3E,Total Electricity demand (all sectors,current electrified),Final Energy Demand,darkred
+EL3U,EL3U,Total Electricity demand (newly electrified),Final Energy Demand, darkyellow
 HF3X,HF3,Total Heavy Fuel Oil demand (non-power sector),Final Energy Demand,darkseagreen
 LF3X,LF3,Total Light Fuel Oil demand (non-power sector),Final Energy Demand,darkslategray
 CH3X,CH3,Total Charcoal demand (non-power sector),Final Energy Demand,darkturquoise

From 3753a3c699ef83908a6ef7275961b93c2618a8b1 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 10:36:25 +0200
Subject: [PATCH 12/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 8d5a76f..0e5a341 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -111,7 +111,7 @@ NULWP04O,URNPWP04O,Nuclear power plant - OTS/OTF cooling (old),Power_plants,whit
 NULWP04N,URNPWP04N,Nuclear power plant - OTS/OTF cooling (new),Power_plants,yellowgreen
 SOC1P00X,SOLCNP01X,CSP (without storage),Power_plants,grey
 SOC2P00X,SOLCSP01X,CSP (with storage),Power_plants,lavender
-SOLAR00X,SOLPRP00X,Solar potential,Extraction/Import,lightgrey
+SOLAR00X,SOLARP00X,Solar potential,Extraction/Import,lightgrey
 SOU1P03X,SOLPUP00X,Solar PV (utility),Power_plants,mediumorchid
 SOV1F01X,SOLPRP00X,Solar PV (roof top),Power_plants,navajowhite
 SOV2F01X,SOLPSP00X,Solar PV with storage,Power_plants,pearl04

From 9527ec94520aed69a39b5eedffc56a978eccb206 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:15:21 +0200
Subject: [PATCH 13/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index a1ca28e..8d313ef 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -47,3 +47,4 @@ UG,UGA,Uganda
 ZM,ZMB,Zambia
 ZW,ZWE,Zimbabwe
 SS,SSD,South Sudan
+ES,ESP,Spain

From 613d75ab0f9f10c0fd8694e186344e99d442f5f6 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:16:25 +0200
Subject: [PATCH 14/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 8d313ef..6235bfd 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -48,3 +48,4 @@ ZM,ZMB,Zambia
 ZW,ZWE,Zimbabwe
 SS,SSD,South Sudan
 ES,ESP,Spain
+SA, ,Saudi Arabia

From 3db937999a8097347403ac9d20b301252971ec63 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:23:19 +0200
Subject: [PATCH 15/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 6235bfd..0ff24c2 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -48,4 +48,4 @@ ZM,ZMB,Zambia
 ZW,ZWE,Zimbabwe
 SS,SSD,South Sudan
 ES,ESP,Spain
-SA, ,Saudi Arabia
+SA,SAU,Saudi Arabia

From bf7dfa03069af63298e13a00f70736924b286896 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:25:39 +0200
Subject: [PATCH 16/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 0ff24c2..0bf82b3 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -49,3 +49,4 @@ ZW,ZWE,Zimbabwe
 SS,SSD,South Sudan
 ES,ESP,Spain
 SA,SAU,Saudi Arabia
+JO,JOR,Jordan

From 96cb67a33112655d4df37f39ecd7dff611981c01 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:44:11 +0200
Subject: [PATCH 17/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 0bf82b3..db5f1ac 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -50,3 +50,4 @@ SS,SSD,South Sudan
 ES,ESP,Spain
 SA,SAU,Saudi Arabia
 JO,JOR,Jordan
+IT,ITA,Italy

From c3c31e8e49560ffd2fcfbdb7321336bac3e9e538 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:44:59 +0200
Subject: [PATCH 18/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index db5f1ac..5efd78d 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -51,3 +51,4 @@ ES,ESP,Spain
 SA,SAU,Saudi Arabia
 JO,JOR,Jordan
 IT,ITA,Italy
+PO,PRT,Portugal

From a12c5e57317f7c29dbc0323acc6a8a929e0b7469 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:46:17 +0200
Subject: [PATCH 19/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 5efd78d..4b8e9d6 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -52,3 +52,4 @@ SA,SAU,Saudi Arabia
 JO,JOR,Jordan
 IT,ITA,Italy
 PO,PRT,Portugal
+TU,TUR,Turkey

From 44db0a374e589c55c203fe250f758baecaade1f5 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:46:52 +0200
Subject: [PATCH 20/31] Update countrycode.csv

---
 fix_naming_convention/countrycode.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/countrycode.csv b/fix_naming_convention/countrycode.csv
index 4b8e9d6..38e574e 100644
--- a/fix_naming_convention/countrycode.csv
+++ b/fix_naming_convention/countrycode.csv
@@ -53,3 +53,4 @@ JO,JOR,Jordan
 IT,ITA,Italy
 PO,PRT,Portugal
 TU,TUR,Turkey
+IS,ISR,Israel

From 0630e50e3b00f80c6619b97bb65615f39c151da7 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:53:04 +0200
Subject: [PATCH 21/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 190 ++++++++++++++--------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 0e5a341..abae189 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -148,102 +148,102 @@ WIND,TO CHECK WITH VIG,Wind,,navy
 BIOM,TO CHECK WITH VIG,Biomass,,lightgreen
 CO2,TO CHECK WITH VIG,CO2,,black
 Transmission & Distribution,TO CHECK WITH VIG,Transmission & Distribution,,magenta
-DZELMABP00,???EL1EX????,Algeria - Morocco Historic EL trade link,Exports_EL,polarorange
-ESELMABP00,,Spain - Morocco Historic EL trade link,Exports_EL,silver
-EGELSDBP00,,Egypt - Sudan Historic and Planned EL trade link,Exports_EL,tomato
-EGELJOBP00,,Egypt - Jordan Historic EL trade link,Exports_EL,yellow
-EGELSABP00,,Egypt - Saudi Arabia Planned EL trade link,Exports_EL,beige
-LYELEGBP00,,Libya - Egypt Historic EL trade link,Exports_EL,burlywood
-MAELDZBP00,,Morocco - Algeria Historic EL trade link,Exports_EL,black
-TNELDZBP00,,Tunisia - Algeria Historic EL trade link,Exports_EL,gray
-DZNGITBP00,???NGAEX????,Algeria - Italy Historic NG trade link,Exports_NG,orange
-DZNGPOBP00,,Algeria - Portugal Historic NG trade link,Exports_NG,aqua
-DZNGESBP00,,Algeria - Spain Historic and Planned NG trade link,Exports_NG,polarbluelight
-DZNGMABP00,,Algeria - Morocco Historic NG trade link,Exports_NG,lightgreen
-DZNGTNBP00,,Algeria - Tunisia Historic NG trade link,Exports_NG,blueviolet
-EGNGTUBP00,,Egypt - Turkey Historic and Planned NG trade link,Exports_NG,polarorange
-ISNGEGBP00,,Israel - Egypt Planned NG trade link,Exports_NG,silver
-LYNGITBP00,,Libya - Italy Historic NG trade link,Exports_NG,tomato
-NGNGDZBP00,,Nigeria - Algeria Planned NG trade link,Exports_NG,beige
+DZELMABP00,DZAELMARBP00,Algeria - Morocco Historic EL trade link,Exports_EL,polarorange
+ESELMABP00,ESPELMARBP00,Spain - Morocco Historic EL trade link,Exports_EL,silver
+EGELSDBP00,EGYELSDNBP00,Egypt - Sudan Historic and Planned EL trade link,Exports_EL,tomato
+EGELJOBP00,EGYELJORBP00,Egypt - Jordan Historic EL trade link,Exports_EL,yellow
+EGELSABP00,EGYELSAUBP00,Egypt - Saudi Arabia Planned EL trade link,Exports_EL,beige
+LYELEGBP00,LBYELEGYBP00,Libya - Egypt Historic EL trade link,Exports_EL,burlywood
+MAELDZBP00,MARELDZABP00,Morocco - Algeria Historic EL trade link,Exports_EL,black
+TNELDZBP00,TUNELDZABP00,Tunisia - Algeria Historic EL trade link,Exports_EL,gray
+DZNGITBP00,DZAGAITABP00 ,Algeria - Italy Historic NG trade link,Exports_NG,orange
+DZNGPOBP00,DZAGAPRTBP00,Algeria - Portugal Historic NG trade link,Exports_NG,aqua
+DZNGESBP00,DZAGAESPBP00,Algeria - Spain Historic and Planned NG trade link,Exports_NG,polarbluelight
+DZNGMABP00,DZAGAMARBP00,Algeria - Morocco Historic NG trade link,Exports_NG,lightgreen
+DZNGTNBP00,DZAGATUNBP00,Algeria - Tunisia Historic NG trade link,Exports_NG,blueviolet
+EGNGTUBP00,EGYGATURBP00,Egypt - Turkey Historic and Planned NG trade link,Exports_NG,polarorange
+ISNGEGBP00,ISRGAEGYBP00,Israel - Egypt Planned NG trade link,Exports_NG,silver
+LYNGITBP00,LBYGAITABP00,Libya - Italy Historic NG trade link,Exports_NG,tomato
+NGNGDZBP00,NGAGADZABP00,Nigeria - Algeria Planned NG trade link,Exports_NG,beige
 power_trade,TO CHECK WITH VIG,power_trade,,pinksalmon
 gas_trade,TO CHECK WITH VIG,gas_trade,,polarpurple
-BIELRWBP00,,Burundi - Rwanda EL existing trade link,Exports_EL,indianred
-CDELBIBP00,,DRC - Burundi EL existing and planned trade link,Exports_EL,polarorange
-CDELRWBP00,,DRC - Rwanda EL existing and planned trade link,Exports_EL,silver
-ETELKEBP00,,Ethiopia - Kenya EL planned trade link,Exports_EL,tomato
-ETELDJBP00,,Ethiopia - Djibouti EL existing trade link,Exports_EL,yellow
-ETELSDBP00,,Ethiopia - Sudan EL existing trade link,Exports_EL,beige
-KEELUGBP00,,Kenya - Uganda EL existing and planned trade link,Exports_EL,burlywood
-KEELTZBP00,,Kenya - Tanzania EL existing and planned trade link,Exports_EL,black
-RWELBIBP00,,Rwanda - Burundi EL existing trade link,Exports_EL,gray
-RWELTZBP00,,Rwanda - Tanzania EL planned trade link,Exports_EL,orange
-TZELBIBP00,,Tanzania - Burundi EL planned trade link,Exports_EL,aqua
-TZELKEBP00,,Tanzania - Kenya EL planned trade link,Exports_EL,polarbluelight
-TZELUGBP00,,Tanzania - Uganda EL existing trade link,Exports_EL,blueviolet
-UGELKEBP00,,Uganda - Kenya EL existing and planned trade link,Exports_EL,polarorange
-UGELTZBP00,,Uganda - Tanzania EL existing and planned trade link,Exports_EL,silver
-UGELRWBP00,,Uganda - Rwanda EL existing trade link,Exports_EL,tomato
-ETNGDJBP00,,Ethiopia - Djibouti NG planned trade link,Exports_NG,beige
-TZNGUGBP00,,Tanzania - Uganda NG planned trade link,Exports_NG,bisque
-BWELZABP00,,Botswana - South Africa EL existing trade link,Exports_EL,indianred
-CDELZABP00,,DRC - South Africa EL planned trade link,Exports_EL,polarorange
-CDELZMBP00,,DRC - Zambia EL existing trade link,Exports_EL,silver
-LSELZABP00,,Lesotho - South Africa EL existing trade link,Exports_EL,tomato
-MZELZABP00,,Mozambique - South Africa EL existing trade link,Exports_EL,yellow
-MZELSZBP00,,Mozambique - Swaziland EL existing trade link,Exports_EL,beige
-MZELZWBP00,,Mozambique - Zimbabwe EL existing trade link,Exports_EL,burlywood
-NMELZABP00,,Namibia - South Africa EL existing trade link,Exports_EL,black
-ZAELSZBP00,,South Africa - Swaziland EL existing trade link,Exports_EL,gray
-ZAELZWBP00,,South Africa - Zimbabwe EL existing trade link,Exports_EL,orange
-ZMELZWBP00,,Zambia - Zimbabwe EL existing trade link,Exports_EL,aqua
-AOELCDBP00,,Angola - DRC EL planned trade link,Exports_EL,polarbluelight
-BWELZMBP00,,Botswana - Zambia EL planned trade link,Exports_EL,blueviolet
-BWELNMBP00,,Botswana - Namibia EL planned trade link,Exports_EL,polarorange
-BWELZWBP00,,Botswana - Zimbabwe EL planned trade link,Exports_EL,silver
-MWELMZBP00,,Malawi - Mozambique EL planned trade link,Exports_EL,tomato
-MWELTZBP00,,Malawi - Tanzania EL planned trade link,Exports_EL,beige
-NMELZMBP00,,Namibia - Zambia EL planned trade link,Exports_EL,bisque
-NMELZWBP00,,Namibia - Zimbabwe EL planned trade link,Exports_EL,grey11
-TZELZMBP00,,Tanzania - Zambia EL planned trade link,Exports_EL,grey13
-ZMELTZBP00,,Zambia - Tanzania EL planned trade link,Exports_EL,pinksalmon
-BJELNEBP00,,Benin - Niger EL planned trade link,Exports_EL,polar
-BJELGHBP00,,Benin - Ghana EL planned trade link,Exports_EL,polarbluelight
-GHELBJBP00,,Ghana - Benin EL planned trade link,Exports_EL,polardark
-NEELBJBP00,,Niger - Benin EL planned trade link,Exports_EL,polardust
-TGELBJBP00,,Togo - Benin EL existing trade link,Exports_EL,polargreen
-BFELNEBP00,,Burkina Faso - Niger EL planned trade link,Exports_EL,polarpurple
-CIELBFBP00,,Cote d´ Ivoire - Burkina Faso EL existing trade link,Exports_EL,powderblue
-GHELBFBP00,,Ghana - Burkina Faso EL planned trade link,Exports_EL,red
-NEELBFBP00,,Niger - Burkina Faso EL existing and planned trade link,Exports_EL,rosybrown
-CIELSLBP00,,Cote d´ Ivoire - Sierra Leone EL planned trade link,Exports_EL,saddlebrown
-CIELGHBP00,,Cote d´ Ivoire - Ghana EL planned trade link,Exports_EL,sandybrown
-CIELLRBP00,,Cote d´ Ivoire - Liberia EL planned trade link,Exports_EL,seagreen
-GHELCIBP00,,Ghana - Cote d´ Ivoire EL existing trade link,Exports_EL,sienna
-MLELCIBP00,,Mali - Cote d´ Ivoire EL planned trade link,Exports_EL,skyblue
-GMELGWBP00,,Gambia - Guinea Bissau EL planned trade link,Exports_EL,slategray
-GMELSNBP00,,Gambia - Senegal EL planned trade link,Exports_EL,smurf
-TGELGHBP00,,Togo - Ghana EL planned trade link,Exports_EL,springgreen
-GHELTGBP00,,Ghana - Togo EL existing and planned trade link,Exports_EL,tan
-GHELMLBP00,,Ghana - Mali EL planned trade link,Exports_EL,thistle
-GNELMLBP00,,Guinea - Mali EL planned trade link,Exports_EL,turquoise
-GNELSNBP00,,Guinea - Senegal EL planned trade link,Exports_EL,wheat
-SNELMRBP00,,Senegal - Mauritania EL planned trade link,Exports_EL,whitesmoke
-NGNGBJBP00,,Nigeria - Benin Historic NG trade link,Exports_NG,lightsalmon
-NGNGGHBP00,,Nigeria - Ghana Historic NG trade link,Exports_NG,lightskyblue
-NGNGNEBP00,,Nigeria - Niger Historic NG trade link,Exports_NG,lightslategrey
-NGNGTGBP00,,Nigeria - Togo Historic NG trade link,Exports_NG,lightteal
-CMELTDBP00,,Cameroon - Chad EL planned trade link,Exports_EL,navy
-CDELCGBP00,,DRC - Congo EL existing trade link,Exports_EL,lightgreen
-MZNGZABP00,,Mozambique - South Africa Historic NG trade link,Exports_NG,polarbluelight
+BIELRWBP00,BDIELRWABP00,Burundi - Rwanda EL existing trade link,Exports_EL,indianred
+CDELBIBP00,CODELBDIBP00,DRC - Burundi EL existing and planned trade link,Exports_EL,polarorange
+CDELRWBP00,CODELRWABP00,DRC - Rwanda EL existing and planned trade link,Exports_EL,silver
+ETELKEBP00,ETHELKENBP00,Ethiopia - Kenya EL planned trade link,Exports_EL,tomato
+ETELDJBP00,ETHELDJIBP00,Ethiopia - Djibouti EL existing trade link,Exports_EL,yellow
+ETELSDBP00,ETHELSDNBP00,Ethiopia - Sudan EL existing trade link,Exports_EL,beige
+KEELUGBP00,KENELUGABP00,Kenya - Uganda EL existing and planned trade link,Exports_EL,burlywood
+KEELTZBP00,KENELTZABP00,Kenya - Tanzania EL existing and planned trade link,Exports_EL,black
+RWELBIBP00,RWAELBDIBP00,Rwanda - Burundi EL existing trade link,Exports_EL,gray
+RWELTZBP00,RWAELTZABP00,Rwanda - Tanzania EL planned trade link,Exports_EL,orange
+TZELBIBP00,TZAELBDIBP00,Tanzania - Burundi EL planned trade link,Exports_EL,aqua
+TZELKEBP00,TZAELKENBP00,Tanzania - Kenya EL planned trade link,Exports_EL,polarbluelight
+TZELUGBP00,TZAELUGABP00,Tanzania - Uganda EL existing trade link,Exports_EL,blueviolet
+UGELKEBP00,UGAELKENBP00,Uganda - Kenya EL existing and planned trade link,Exports_EL,polarorange
+UGELTZBP00,UGAELTZABP00,Uganda - Tanzania EL existing and planned trade link,Exports_EL,silver
+UGELRWBP00,UGAELRWABP00,Uganda - Rwanda EL existing trade link,Exports_EL,tomato
+ETNGDJBP00,ETHGADJIBP00,Ethiopia - Djibouti NG planned trade link,Exports_NG,beige
+TZNGUGBP00,TZAGAUGABP00,Tanzania - Uganda NG planned trade link,Exports_NG,bisque
+BWELZABP00,BWAELZAFBP00,Botswana - South Africa EL existing trade link,Exports_EL,indianred
+CDELZABP00,CODELZAFBP00,DRC - South Africa EL planned trade link,Exports_EL,polarorange
+CDELZMBP00,CODELZMBBP00,DRC - Zambia EL existing trade link,Exports_EL,silver
+LSELZABP00,LSOELZAFBP00,Lesotho - South Africa EL existing trade link,Exports_EL,tomato
+MZELZABP00,MOZELZAFBP00,Mozambique - South Africa EL existing trade link,Exports_EL,yellow
+MZELSZBP00,MOZELSWZBP00,Mozambique - Swaziland EL existing trade link,Exports_EL,beige
+MZELZWBP00,MOZELZWEBP00,Mozambique - Zimbabwe EL existing trade link,Exports_EL,burlywood
+NMELZABP00,NAMELZAFBP00,Namibia - South Africa EL existing trade link,Exports_EL,black
+ZAELSZBP00,ZAFELSWZBP00,South Africa - Swaziland EL existing trade link,Exports_EL,gray
+ZAELZWBP00,ZAFELZWEBP00,South Africa - Zimbabwe EL existing trade link,Exports_EL,orange
+ZMELZWBP00,ZMBELZWEBP00,Zambia - Zimbabwe EL existing trade link,Exports_EL,aqua
+AOELCDBP00,AGOELCODBP00,Angola - DRC EL planned trade link,Exports_EL,polarbluelight
+BWELZMBP00,BWAELZMBBP00,Botswana - Zambia EL planned trade link,Exports_EL,blueviolet
+BWELNMBP00,BWAELNAMBP00,Botswana - Namibia EL planned trade link,Exports_EL,polarorange
+BWELZWBP00,BWAELZWEBP00,Botswana - Zimbabwe EL planned trade link,Exports_EL,silver
+MWELMZBP00,MWIELMOZBP00,Malawi - Mozambique EL planned trade link,Exports_EL,tomato
+MWELTZBP00,MWIELTZABP00,Malawi - Tanzania EL planned trade link,Exports_EL,beige
+NMELZMBP00,NAMELZMBBP00,Namibia - Zambia EL planned trade link,Exports_EL,bisque
+NMELZWBP00,NAMELZWEBP00,Namibia - Zimbabwe EL planned trade link,Exports_EL,grey11
+TZELZMBP00,TZAELZMBBP00,Tanzania - Zambia EL planned trade link,Exports_EL,grey13
+ZMELTZBP00,ZMBELTZABP00,Zambia - Tanzania EL planned trade link,Exports_EL,pinksalmon
+BJELNEBP00,BENELNERBP00,Benin - Niger EL planned trade link,Exports_EL,polar
+BJELGHBP00,BENELGHABP00,Benin - Ghana EL planned trade link,Exports_EL,polarbluelight
+GHELBJBP00,GHAELBENBP00,Ghana - Benin EL planned trade link,Exports_EL,polardark
+NEELBJBP00,NERELBENBP00,Niger - Benin EL planned trade link,Exports_EL,polardust
+TGELBJBP00,TGOELBENBP00,Togo - Benin EL existing trade link,Exports_EL,polargreen
+BFELNEBP00,BFAELNERBP00,Burkina Faso - Niger EL planned trade link,Exports_EL,polarpurple
+CIELBFBP00,CIVELBFABP00,Cote d´ Ivoire - Burkina Faso EL existing trade link,Exports_EL,powderblue
+GHELBFBP00,GHAELBFABP00,Ghana - Burkina Faso EL planned trade link,Exports_EL,red
+NEELBFBP00,NERELBFABP00,Niger - Burkina Faso EL existing and planned trade link,Exports_EL,rosybrown
+CIELSLBP00,CIVELSLEBP00,Cote d´ Ivoire - Sierra Leone EL planned trade link,Exports_EL,saddlebrown
+CIELGHBP00,CIVELGHABP00,Cote d´ Ivoire - Ghana EL planned trade link,Exports_EL,sandybrown
+CIELLRBP00,CIVELLBRBP00,Cote d´ Ivoire - Liberia EL planned trade link,Exports_EL,seagreen
+GHELCIBP00,GHAELCIVBP00,Ghana - Cote d´ Ivoire EL existing trade link,Exports_EL,sienna
+MLELCIBP00,MLIELCIVBP00,Mali - Cote d´ Ivoire EL planned trade link,Exports_EL,skyblue
+GMELGWBP00,GMBELGNBBP00,Gambia - Guinea Bissau EL planned trade link,Exports_EL,slategray
+GMELSNBP00,GMBELSENBP00,Gambia - Senegal EL planned trade link,Exports_EL,smurf
+TGELGHBP00,TGOELGHABP00,Togo - Ghana EL planned trade link,Exports_EL,springgreen
+GHELTGBP00,GHAELTGOBP00,Ghana - Togo EL existing and planned trade link,Exports_EL,tan
+GHELMLBP00,GHAELMLIBP00,Ghana - Mali EL planned trade link,Exports_EL,thistle
+GNELMLBP00,GINELMLIBP00,Guinea - Mali EL planned trade link,Exports_EL,turquoise
+GNELSNBP00,GINELSENBP00,Guinea - Senegal EL planned trade link,Exports_EL,wheat
+SNELMRBP00,SENELMRTBP00,Senegal - Mauritania EL planned trade link,Exports_EL,whitesmoke
+NGNGBJBP00,NGAGABENBP00,Nigeria - Benin Historic NG trade link,Exports_NG,lightsalmon
+NGNGGHBP00,NGAGAGHABP00,Nigeria - Ghana Historic NG trade link,Exports_NG,lightskyblue
+NGNGNEBP00,NGAGANERBP00,Nigeria - Niger Historic NG trade link,Exports_NG,lightslategrey
+NGNGTGBP00,NGAGATGOBP00,Nigeria - Togo Historic NG trade link,Exports_NG,lightteal
+CMELTDBP00,CMRELTCDBP00,Cameroon - Chad EL planned trade link,Exports_EL,navy
+CDELCGBP00,CODELCOGBP00,DRC - Congo EL existing trade link,Exports_EL,lightgreen
+MZNGZABP00,MOZGAZAFBP00,Mozambique - South Africa Historic NG trade link,Exports_NG,polarbluelight
 GEOTHERMAL,TO CHECK WITH VIG,Geothermal,,polarorange
 CRUDREF,TO CHECK WITH VIG,Crude oil Refinery,,grey09
-MANG00IPIX,???NGA??????, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-TNNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-DZNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-DJNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-UGNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-BJNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-GHNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-NENG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-TGNG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
-ZANG00IPIX,, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+MANG00IPIX,MARGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+TNNG00IPIX,TUNGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+DZNG00IPIX,DZAGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+DJNG00IPIX,DJIGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+UGNG00IPIX,UGAGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+BJNG00IPIX,BENGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+GHNG00IPIX,GHAGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+NENG00IPIX,NERGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+TGNG00IPIX,TGOGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,
+ZANG00IPIX,ZAFGAS00IPIX, Intermediate technology for NG transferred through a pipeline to the imported country (input fuel MAGASP (exported by other countries) - output fuel MAGASF (the final fuel used in the country)),Intermediate_NG,

From eaa14bb4a3994d605a99b5a0b20cd08f2d9d4c15 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:56:24 +0200
Subject: [PATCH 22/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index 8dfa8fc..1fa3c05 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -35,12 +35,12 @@ CREX,CRE,Crude Oil export,Tertiary level fuel,red
 HFEX,HFE,Heavy Fuel oil export,Tertiary level fuel,darkred
 LFEX,LFE,Light Fuel oil export,Tertiary level fuel,lightred
 FEWX,FWE,Firewood export,Tertiary level fuel,green
-MAGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,gray
-TNGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,greenyellow
-DZGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey01
-DJGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey03
-UGGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey05
-BJGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey07
-GHGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey11
-NEGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey13
-TGGASP,,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,honeydew
+MAGASP,MARGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,gray
+TNGASP,TUNGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,greenyellow
+DZGASP,DZAGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey01
+DJGASP,DJIGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey03
+UGGASP,UGAGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey05
+BJGASP,BENGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey07
+GHGASP,GHAGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey11
+NEGASP,NGAGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey13
+TGGASP,TGOGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,honeydew

From e8a40aaeab5989c2b481445f1607d5077a914bf4 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 14:07:26 +0200
Subject: [PATCH 23/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index 1fa3c05..3c72cc9 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -34,7 +34,7 @@ COEX,COE,Coal export,Tertiary level fuel,dark
 CREX,CRE,Crude Oil export,Tertiary level fuel,red
 HFEX,HFE,Heavy Fuel oil export,Tertiary level fuel,darkred
 LFEX,LFE,Light Fuel oil export,Tertiary level fuel,lightred
-FEWX,FWE,Firewood export,Tertiary level fuel,green
+FWEX,FWE,Firewood export,Tertiary level fuel,green
 MAGASP,MARGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,gray
 TNGASP,TUNGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,greenyellow
 DZGASP,DZAGASP,Intermediate fuels for NG transferred through a pipeline (only countries that have NG pipelines); (Output fuel from the gas pipeline allocated in the exported country (e.g. DZNGMABP00) - Input fuel to the intermediate gas pipeline to the importing country (e.g. MANG00IPIX).),Intermediate fuel,grey01

From f8edcd635976dee3f01323cd9b96d542be6ed8b0 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 14:45:04 +0200
Subject: [PATCH 24/31] Update fuelcode.csv

---
 fix_naming_convention/fuelcode.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fix_naming_convention/fuelcode.csv b/fix_naming_convention/fuelcode.csv
index 3c72cc9..8e2917d 100644
--- a/fix_naming_convention/fuelcode.csv
+++ b/fix_naming_convention/fuelcode.csv
@@ -14,8 +14,9 @@ CHAR,CHA,Charcoal fuel,Primary level fuel,coral
 WAT1,WA1,Water withdrawal fuel,Water,cornsilk
 WAT2,WA2,Water consumption fuel,Water,cyan
 EL01,EL1,Electricity from power plants,Secondary level fuel,darkcyan
-HE2X,HE2,Heat from power plants,Secondary level fuel,darkgray
 EL02,EL2,Electricity after transmission,Secondary level fuel,darkgrey
+EL3,EL3,Electricity before distribution technology mini-grid, Secondary level fuel, darkyellow 
+HE2X,HE2,Heat from power plants,Secondary level fuel,darkgray
 FW3X,FW3,Total Firewood demand (non-power sector),Final Energy Demand,darkmagenta
 HE3X,HE3,Total Heat demand,Final Energy Demand,darkorange
 EL03,EL3E,Total Electricity demand (all sectors,current electrified),Final Energy Demand,darkred

From e5faa4b8b2a28bd1ee84f874c6074ca3798fc238 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:25:00 +0200
Subject: [PATCH 25/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index abae189..bf3a294 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -156,7 +156,7 @@ EGELSABP00,EGYELSAUBP00,Egypt - Saudi Arabia Planned EL trade link,Exports_EL,be
 LYELEGBP00,LBYELEGYBP00,Libya - Egypt Historic EL trade link,Exports_EL,burlywood
 MAELDZBP00,MARELDZABP00,Morocco - Algeria Historic EL trade link,Exports_EL,black
 TNELDZBP00,TUNELDZABP00,Tunisia - Algeria Historic EL trade link,Exports_EL,gray
-DZNGITBP00,DZAGAITABP00 ,Algeria - Italy Historic NG trade link,Exports_NG,orange
+DZNGITBP00,DZAGAITABP00,Algeria - Italy Historic NG trade link,Exports_NG,orange
 DZNGPOBP00,DZAGAPRTBP00,Algeria - Portugal Historic NG trade link,Exports_NG,aqua
 DZNGESBP00,DZAGAESPBP00,Algeria - Spain Historic and Planned NG trade link,Exports_NG,polarbluelight
 DZNGMABP00,DZAGAMARBP00,Algeria - Morocco Historic NG trade link,Exports_NG,lightgreen

From e922056daade66477658e19dda934920bc8d6efb Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:44:14 +0200
Subject: [PATCH 26/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index bf3a294..d283958 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -228,6 +228,7 @@ GHELMLBP00,GHAELMLIBP00,Ghana - Mali EL planned trade link,Exports_EL,thistle
 GNELMLBP00,GINELMLIBP00,Guinea - Mali EL planned trade link,Exports_EL,turquoise
 GNELSNBP00,GINELSENBP00,Guinea - Senegal EL planned trade link,Exports_EL,wheat
 SNELMRBP00,SENELMRTBP00,Senegal - Mauritania EL planned trade link,Exports_EL,whitesmoke
+NGELBJBP00,NGAELBENBP00,Nigeria - Benin EL existing trade link,Exports_EL,yellow
 NGNGBJBP00,NGAGABENBP00,Nigeria - Benin Historic NG trade link,Exports_NG,lightsalmon
 NGNGGHBP00,NGAGAGHABP00,Nigeria - Ghana Historic NG trade link,Exports_NG,lightskyblue
 NGNGNEBP00,NGAGANERBP00,Nigeria - Niger Historic NG trade link,Exports_NG,lightslategrey

From 685d61d33ffc152454e03bc9ff4bde893acaa599 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:45:44 +0200
Subject: [PATCH 27/31] Create techcodes.csv


From 7f756dfb5052846b2e997dcf47e3d6bcd1dfc63b Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:57:07 +0200
Subject: [PATCH 28/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index d283958..558cf99 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -229,6 +229,7 @@ GNELMLBP00,GINELMLIBP00,Guinea - Mali EL planned trade link,Exports_EL,turquoise
 GNELSNBP00,GINELSENBP00,Guinea - Senegal EL planned trade link,Exports_EL,wheat
 SNELMRBP00,SENELMRTBP00,Senegal - Mauritania EL planned trade link,Exports_EL,whitesmoke
 NGELBJBP00,NGAELBENBP00,Nigeria - Benin EL existing trade link,Exports_EL,yellow
+NGELNEBP00,NGAELNERBP00,Nigeria - Niger EL existing trade link,Exports_EL,darkyellow
 NGNGBJBP00,NGAGABENBP00,Nigeria - Benin Historic NG trade link,Exports_NG,lightsalmon
 NGNGGHBP00,NGAGAGHABP00,Nigeria - Ghana Historic NG trade link,Exports_NG,lightskyblue
 NGNGNEBP00,NGAGANERBP00,Nigeria - Niger Historic NG trade link,Exports_NG,lightslategrey

From 5415d955c81d74e3cbbcafefd0610aafbf36e489 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Thu, 15 Jul 2021 13:01:33 +0200
Subject: [PATCH 29/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 558cf99..2d2462f 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -183,6 +183,7 @@ TZELUGBP00,TZAELUGABP00,Tanzania - Uganda EL existing trade link,Exports_EL,blue
 UGELKEBP00,UGAELKENBP00,Uganda - Kenya EL existing and planned trade link,Exports_EL,polarorange
 UGELTZBP00,UGAELTZABP00,Uganda - Tanzania EL existing and planned trade link,Exports_EL,silver
 UGELRWBP00,UGAELRWABP00,Uganda - Rwanda EL existing trade link,Exports_EL,tomato
+SNELMLBP00,SENELMLIBP00,Senegal - Mali EL existing trade link,Exports_EL,navy
 ETNGDJBP00,ETHGADJIBP00,Ethiopia - Djibouti NG planned trade link,Exports_NG,beige
 TZNGUGBP00,TZAGAUGABP00,Tanzania - Uganda NG planned trade link,Exports_NG,bisque
 BWELZABP00,BWAELZAFBP00,Botswana - South Africa EL existing trade link,Exports_EL,indianred

From 7226bd8cf6bc1f22e443a98fd0bb9544a1a761ac Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Fri, 16 Jul 2021 08:28:44 +0200
Subject: [PATCH 30/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 2d2462f..98f8a7e 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -107,8 +107,8 @@ NGGCP02N,NGAGCP02N,Natural gas power plant (single cycle) - MDT cooling (new),Po
 NGGCP03N,NGAGCP03N,Natural gas power plant (single cycle) - NDT cooling (new),Power_plants,thistle
 NGGCP04N,NGAGCP04N,Natural gas power plant (single cycle) - OTF/OTS cooling (new),Power_plants,turquoise
 NPCHA00X,CHAPRP00X,Charcoal production,Extraction/Import,wheat
-NULWP04O,URNPWP04O,Nuclear power plant - OTS/OTF cooling (old),Power_plants,whitesmoke
-NULWP04N,URNPWP04N,Nuclear power plant - OTS/OTF cooling (new),Power_plants,yellowgreen
+NULWP04O,URNPWP01O,Nuclear power plant - OTS/OTF cooling (old),Power_plants,whitesmoke
+NULWP04N,URNPWP01N,Nuclear power plant - OTS/OTF cooling (new),Power_plants,yellowgreen
 SOC1P00X,SOLCNP01X,CSP (without storage),Power_plants,grey
 SOC2P00X,SOLCSP01X,CSP (with storage),Power_plants,lavender
 SOLAR00X,SOLARP00X,Solar potential,Extraction/Import,lightgrey

From 7b7b2448a90cfd222f1eb3fbdfae71333c84cb04 Mon Sep 17 00:00:00 2001
From: JoPapp <44165216+JoPapp@users.noreply.github.com>
Date: Fri, 16 Jul 2021 08:41:33 +0200
Subject: [PATCH 31/31] Update techcodes.csv

---
 fix_naming_convention/techcodes.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fix_naming_convention/techcodes.csv b/fix_naming_convention/techcodes.csv
index 98f8a7e..abec7c2 100644
--- a/fix_naming_convention/techcodes.csv
+++ b/fix_naming_convention/techcodes.csv
@@ -193,7 +193,6 @@ LSELZABP00,LSOELZAFBP00,Lesotho - South Africa EL existing trade link,Exports_EL
 MZELZABP00,MOZELZAFBP00,Mozambique - South Africa EL existing trade link,Exports_EL,yellow
 MZELSZBP00,MOZELSWZBP00,Mozambique - Swaziland EL existing trade link,Exports_EL,beige
 MZELZWBP00,MOZELZWEBP00,Mozambique - Zimbabwe EL existing trade link,Exports_EL,burlywood
-NMELZABP00,NAMELZAFBP00,Namibia - South Africa EL existing trade link,Exports_EL,black
 ZAELSZBP00,ZAFELSWZBP00,South Africa - Swaziland EL existing trade link,Exports_EL,gray
 ZAELZWBP00,ZAFELZWEBP00,South Africa - Zimbabwe EL existing trade link,Exports_EL,orange
 ZMELZWBP00,ZMBELZWEBP00,Zambia - Zimbabwe EL existing trade link,Exports_EL,aqua
@@ -203,6 +202,8 @@ BWELNMBP00,BWAELNAMBP00,Botswana - Namibia EL planned trade link,Exports_EL,pola
 BWELZWBP00,BWAELZWEBP00,Botswana - Zimbabwe EL planned trade link,Exports_EL,silver
 MWELMZBP00,MWIELMOZBP00,Malawi - Mozambique EL planned trade link,Exports_EL,tomato
 MWELTZBP00,MWIELTZABP00,Malawi - Tanzania EL planned trade link,Exports_EL,beige
+NMELAOBP00,NAMELAGOBP00,Namibia - Angola EL planned trade link,Exports_EL,bisque
+NMELZABP00,NAMELZAFBP00,Namibia - South Africa EL existing trade link,Exports_EL,black
 NMELZMBP00,NAMELZMBBP00,Namibia - Zambia EL planned trade link,Exports_EL,bisque
 NMELZWBP00,NAMELZWEBP00,Namibia - Zimbabwe EL planned trade link,Exports_EL,grey11
 TZELZMBP00,TZAELZMBBP00,Tanzania - Zambia EL planned trade link,Exports_EL,grey13