Harmonization of attributes and description quickfixes (#23)

IAMconsortium · Aug 30, 2023 · bb5a4f2 · bb5a4f2
1 parent c93bc5c
commit bb5a4f2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/definitions/region/common.yaml b/definitions/region/common.yaml
@@ -71,21 +71,21 @@
         Finland, France, Germany, Greece, Hungary, Ireland, Italy, Latvia, Lithuania,
         Luxembourg, Malta, Netherlands, Poland, Portugal, Romania, Slovakia, Slovenia,
         Spain, Sweden
-      note: Depending on the spatial resolution, reporting by some models may differ
+      notes: Depending on the spatial resolution, reporting by some models may differ
         from the current list of EU27 members (2023).
   - USA (R9):
       description: United States of America
       navigate: R9USA
       countries: United States
-      note: Depending on the spatial resolution, some models report Canada as part of
+      notes: Depending on the spatial resolution, some models report Canada as part of
         the USA region.
   - Other OECD (R9):
       description: Other OECD (membership status 1990) and EU canditate countries
       navigate: R9OTHEROECD
       countries: Albania, Australia, Bosnia and Herzegovina, Canada, Guam, Iceland,
         Japan, Montenegro, New Zealand, North Macedonia, Norway, Puerto Rico, Serbia,
         United Kingdom, Switzerland, Turkey
-      note: This region is defined as 'OECD & EU (R5)' excluding EU and USA
+      notes: This region is defined as 'OECD & EU (R5)' excluding EU and USA
   - China (R9):
       description: China
       navigate: R9CHINA
@@ -149,7 +149,7 @@
         Mozambique, Namibia, Niger, Nigeria, Rwanda, Réunion, Sao Tome and Principe,
         Senegal, Sierra Leone, Somalia, South Africa, South Sudan, Sudan, Eswatini,
         Togo, Tunisia, Uganda, Tanzania, Western Sahara, Zambia, Zimbabwe
-      note: Depending on the spatial resolution, some models report Northern Africa
+      notes: Depending on the spatial resolution, some models report Northern Africa
         as part of the Middle East region.
   - China+ (R10):
       description: Centrally-planned Asia, primarily China
@@ -182,7 +182,7 @@
       ar6: R10MIDDLE_EAST
       countries: Bahrain, Iraq, Iran, Israel, Jordan, Kuwait, Lebanon, Oman, Palestine,
         Qatar, Saudi Arabia, Syria, United Arab Emirates, Yemen
-      note: Depending on the spatial resolution, some models report Northern Africa
+      notes: Depending on the spatial resolution, some models report Northern Africa
         as part of the Middle East region.
   - North America (R10):
       description: United States and Canada

diff --git a/definitions/variable/emissions/tag_tier1_species.yaml b/definitions/variable/emissions/tag_tier1_species.yaml
@@ -4,7 +4,7 @@
         unit: Mt CO2/yr
     - Kyoto Gases:
         description: Kyoto GHG emissions, including CO2, CH4, N2O and F-gases
-        note: preferably use AR4 100-year GWPs for aggregation of different gases
+        notes: Preferably use AR4 100-year GWPs for aggregation of different gases
         unit: Mt CO2-equiv/yr
     - CH4:
         description: methane (CH4)
@@ -39,7 +39,7 @@
     - F-Gases:
         description: F-gas emissions, including sulfur hexafluoride (SF6), hydrofluorocarbons
           (HFCs), perfluorocarbons (PFCs)
-        note: preferably use AR4 100-year GWPs for aggregation of different F-gases
+        notes: Preferably use AR4 100-year GWPs for aggregation of different F-gases
         unit: Mt CO2-equiv/yr
     - SF6:
         description: sulfur hexafluoride (SF6)

diff --git a/definitions/variable/emissions/tag_tier2_species.yaml b/definitions/variable/emissions/tag_tier2_species.yaml
@@ -5,7 +5,7 @@
         unit: Mt CO2/yr
     - Kyoto Gases:
         description: Kyoto GHG emissions, including CO2, CH4, N2O and F-gases
-        note: preferably use AR4 100-year GWPs for aggregation of different gases
+        notes: Preferably use AR4 100-year GWPs for aggregation of different gases
         unit: Mt CO2-equiv/yr
     - CH4:
         description: methane (CH4)

diff --git a/definitions/variable/emissions/tag_tier3_species.yaml b/definitions/variable/emissions/tag_tier3_species.yaml
@@ -5,7 +5,7 @@
         unit: Mt CO2/yr
     - Kyoto Gases:
         description: Kyoto GHG emissions, including CO2, CH4, N2O and F-gases
-        note: preferably use AR4 100-year GWPs for aggregation of different gases
+        notes: Preferably use AR4 100-year GWPs for aggregation of different gases
         unit: Mt CO2-equiv/yr
     - CH4:
         description: methane (CH4)

diff --git a/definitions/variable/energy/final-energy.yaml b/definitions/variable/energy/final-energy.yaml
@@ -66,19 +66,22 @@
     description: Final energy consumption by the {Sector}
     unit: EJ/yr
 - Final Energy|{Sector}|Electricity:
-    description: Final energy consumption by the agriculture sector of electricity
+    description: Final energy consumption by the {Sector} of electricity
     unit: EJ/yr
 - Final Energy|{Sector}|{Secondary Fuel}:
-    description: Final energy consumption by the agriculture sector of {Secondary Fuel}
+    description: Final energy consumption by the {Sector} of {Secondary Fuel}
     unit: EJ/yr
 - Final Energy|{Sector}|Other:
-    description: Final energy consumption by the industrial sector of other energy sources
+    description: Final energy consumption by the {Sector} of other energy sources
     unit: EJ/yr
 
 # additional combinations of sector and energy-carriers not included in {Sector} x {Secondary Fuel}
 - Final Energy|Industry|Geothermal:
     description: Final energy consumption by the industrial sector of geothermal heat
     unit: EJ/yr
+- Final Energy|Industry|Solar:
+    definition: Final energy consumption by the industrial sector of solar thermal heat
+    unit: EJ/yr
 - Final Energy|Industry|Waste:
     description: Final energy consumption of non-renewable waste by the industrial sector
     unit: EJ/yr

diff --git a/definitions/variable/energy/primary-energy.yaml b/definitions/variable/energy/primary-energy.yaml
@@ -83,7 +83,7 @@
     description: Primary energy consumption from trade in secondary energy carriers that
       cannot be unambiguoulsy mapped to one of the existing primary energy categories,
       e.g. electricity, hydrogen
-    note: Negative values indicate net exports of an energy carrier
+    notes: Negative values indicate net exports of an energy carrier
     unit: EJ/yr
 
 - Primary Energy|Other: