From 696c7e33f89a74478ada31a46fc73f64194d77f3 Mon Sep 17 00:00:00 2001
From: Daniel Huppmann <dh@dergelbesalon.at>
Date: Wed, 8 Nov 2023 11:40:34 +0100
Subject: [PATCH] Rename tag-lists for the transportation sector (#35)

---
 definitions/variable/emissions/emissions.yaml    |  4 ++--
 definitions/variable/energy/final-energy.yaml    | 16 +++++++++-------
 .../{tag_bunkers.yaml => tag_bunker_sector.yaml} |  2 +-
 ...sport.yaml => tag_transportation_sector.yaml} |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename definitions/variable/energy/{tag_bunkers.yaml => tag_bunker_sector.yaml} (89%)
 rename definitions/variable/energy/{tag_transport.yaml => tag_transportation_sector.yaml} (81%)

diff --git a/definitions/variable/emissions/emissions.yaml b/definitions/variable/emissions/emissions.yaml
index 929a57c5..3c262cae 100644
--- a/definitions/variable/emissions/emissions.yaml
+++ b/definitions/variable/emissions/emissions.yaml
@@ -147,9 +147,9 @@
     definition: Emissions of carbon dioxide (CO2) from international bunker fuels
       (IPCC category 1A3ai and 1A3di)
     unit: Mt CO2/yr
-- Emissions|CO2|Energy|Demand|Bunkers|{Bunkers}:
+- Emissions|CO2|Energy|Demand|Bunkers|{Bunker Sector}:
     definition: Emissions of carbon dioxide (CO2) from international bunker fuels
-        for {Bunkers}
+        for {Bunker Sector}
     unit: Mt CO2/yr
 - Emissions|{Tier-2 Species}|Energy|Demand|Other Sector:
     description: Emissions of {Tier-2 Species} from fuel combustion in other sectors
diff --git a/definitions/variable/energy/final-energy.yaml b/definitions/variable/energy/final-energy.yaml
index 0bb0820e..8cdb8b12 100644
--- a/definitions/variable/energy/final-energy.yaml
+++ b/definitions/variable/energy/final-energy.yaml
@@ -91,16 +91,18 @@
     unit: EJ/yr
 
 # additional variable for bunkers
-- Final Energy|Bunkers|{Bunkers}:
-    description: Final energy consumption of bunker fuels for {Bunkers}
+- Final Energy|Bunkers|{Bunker Sector}:
+    description: Final energy consumption of bunker fuels for {Bunker Sector}
     unit: EJ/yr
-- Final Energy|Bunkers|{Transport}:
-    description: Final energy consumption of bunker fuels for {Transport}
+- Final Energy|Bunkers|{Transportation Sector}:
+    description: Final energy consumption of bunker fuels for {Transportation Sector}
     unit: EJ/yr
-- Final Energy|Bunkers|{Transport}|{Bunkers}:
-    description: Final energy consumption of bunker fuels for {Transport}
-      on {Bunkers}
+- Final Energy|Bunkers|{Bunker Sector}|{Transportation Sector}:
+    description: Final energy consumption of bunker fuels for {Transportation Sector}
+      on {Bunker Sector}
     unit: EJ/yr
+    engage: Final Energy|Bunkers|{Transportation Sector}|{Bunker Sector}
+    navigate: Final Energy|Bunkers|{Transportation Sector}|{Bunker Sector}
 
 # additional variables for the water sector
 - Final Energy|Commercial|Water|Desalination:
diff --git a/definitions/variable/energy/tag_bunkers.yaml b/definitions/variable/energy/tag_bunker_sector.yaml
similarity index 89%
rename from definitions/variable/energy/tag_bunkers.yaml
rename to definitions/variable/energy/tag_bunker_sector.yaml
index f41d1373..974068be 100644
--- a/definitions/variable/energy/tag_bunkers.yaml
+++ b/definitions/variable/energy/tag_bunker_sector.yaml
@@ -1,4 +1,4 @@
-- Bunkers:
+- Bunker Sector:
     - International Shipping:
         description: international shipping
     - International Aviation:
diff --git a/definitions/variable/energy/tag_transport.yaml b/definitions/variable/energy/tag_transportation_sector.yaml
similarity index 81%
rename from definitions/variable/energy/tag_transport.yaml
rename to definitions/variable/energy/tag_transportation_sector.yaml
index 61d6f2a2..77562483 100644
--- a/definitions/variable/energy/tag_transport.yaml
+++ b/definitions/variable/energy/tag_transportation_sector.yaml
@@ -1,4 +1,4 @@
-- Transport:
+- Transportation Sector:
     - Passenger:
         description: passenger transport
     - Freight: