Fix nomenclature syntax (cherry-pick of #159)

Author: danielhuppmann

definitions/variable/emissions/emissions.yaml

@@ -13,8 +13,8 @@
       - Emissions|{Level-1 Species}|Capture and Removal
       - Emissions|{Level-1 Species}|Other
 - Gross Emissions|CO2:
-    definition: Gross emissions of carbon dioxide (CO2), not accounting for negative
-      emissions from bioenergy with CCS (BECCS) or agriculture, forestry
+    description: Gross emissions of fossil carbon dioxide (CO2), not accounting for
+      negative emissions from bioenergy with CCS (BECCS) or agriculture, forestry
       and other land use (AFOLU)
     unit: Mt CO2/yr
 
@@ -60,10 +60,10 @@
       - Emissions|{Level-3 Species}|Energy
       - Emissions|{Level-3 Species}|Industrial Processes
 - Gross Emissions|CO2|Energy and Industrial Processes:
-    definition: Gross emissions of carbon dioxide (CO2) from energy use in supply and demand sectors
-      (IPCC category 1A, 1B) and from industrial processes (IPCC categories 2A, B, C, E),
-      including emissions from international bunker fuels, not accounting for
-      negative emissions from bioenergy with CCS (BECCS) in these sectors
+    description: Gross emissions of fossil carbon dioxide (CO2) from energy use in supply
+      and demand sectors (IPCC category 1A, 1B) and from industrial processes
+      (IPCC categories 2A, B, C, E), including emissions from international bunker fuels,
+      not accounting for negative emissions from bioenergy with CCS (BECCS) in these sectors
     unit: Mt CO2/yr
     components:
       - Gross Emissions|CO2|Energy
@@ -74,7 +74,7 @@
       including fugitive emissions from fuels (IPCC category 1A, 1B)
     unit: "{Level-2 Species}"
 - Gross Emissions|CO2|Energy:
-    definition: Gross emissions of carbon dioxide (CO2) from energy use,
+    description: Gross emissions of fossil carbon dioxide (CO2) from energy use,
       including fugitive emissions from fuels (IPCC category 1A, 1B), not accounting for
       negative emissions from bioenergy with CCS (BECCS) in these sectors
     unit: Mt CO2/yr
@@ -87,7 +87,7 @@
       transport and storage (IPCC category 1C)
     unit: "{Level-2 Species}"
 - Gross Emissions|CO2|Energy|Supply:
-    definition: Gross emissions of carbon dioxide (CO2) from fuel combustion and fugitive emissions
+    description: Gross emissions of fossil carbon dioxide (CO2) from fuel combustion and fugitive emissions
       from fuels, including electricity and heat production and distribution (IPCC category 1A1a),
       other energy conversion (e.g., refineries, synfuel production, solid fuel processing,
       IPCC category 1Ab, 1Ac), incl. pipeline transportation (IPCC category 1A3ei),

definitions/variable/energy/final-energy.yaml

@@ -84,7 +84,7 @@
     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
+    description: 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

definitions/variable/energy/secondary-energy-electricity.yaml

@@ -1,18 +1,18 @@
 - Secondary Energy|Electricity:
-    definition: Total net electricity generation
+    description: Total net electricity generation
     unit: EJ/yr
 
 - Secondary Energy|Electricity|Biomass:
-    definition: Net electricity generation from purpose-grown bioenergy crops, biogas,
+    description: Net electricity generation from purpose-grown bioenergy crops, biogas,
       crop and forestry residue, municipal solid waste bioenergy and traditional biomass
     unit: EJ/yr
 - Secondary Energy|Electricity|Biomass|{CCS}:
-    definition: Net electricity generation from purpose-grown bioenergy crops, crop and
+    description: Net electricity generation from purpose-grown bioenergy crops, crop and
       forestry residue, municipal solid waste bioenergy and traditional biomass {CCS}
     unit: EJ/yr
 
 - Secondary Energy|Electricity|Non-Biomass Renewables:
-    definition: Net electricity generation from hydro, wind, solar, geothermal, ocean,
+    description: Net electricity generation from hydro, wind, solar, geothermal, ocean,
       and other renewable sources excluding biomass
     unit: EJ/yr
 - Secondary Energy|Electricity|{Non-Biomass Renewables}:
@@ -23,10 +23,10 @@
     description: Net electricity generation from nuclear power
     unit: EJ/yr
 - Secondary Energy|Electricity|Hydrogen:
-    definition: Net electricity generation from hydrogen
+    description: Net electricity generation from hydrogen
     unit: EJ/yr
 - Secondary Energy|Electricity|Ammonia:
-    definition: Net electricity generation from ammonia
+    description: Net electricity generation from ammonia
     unit: EJ/yr
 
 - Secondary Energy|Electricity|{Primary Fossil Fuel}:

definitions/variable/energy/secondary-energy-non-electricity.yaml

@@ -1,5 +1,5 @@
 - Secondary Energy|Liquids:
-    definition: Total production of refined liquid fuels from all energy sources,
+    description: Total production of refined liquid fuels from all energy sources,
       including oil products, synthetic fossil fuels from gas and coal, and biofuels
     unit: EJ/yr
 - Secondary Energy|Liquids|Biomass:
@@ -16,7 +16,7 @@
     unit: EJ/yr
 
 - Secondary Energy|Solids:
-    definition: Total production of solid energy carriers, including coal, briquettes,
+    description: Total production of solid energy carriers, including coal, briquettes,
       coke, and wood pellets
     unit: EJ/yr
 - Secondary Energy|Solids|Biomass:
@@ -30,7 +30,7 @@
     unit: EJ/yr
 
 - Secondary Energy|Gases:
-    definition: Total production of gaseous fuels, including natural gas and biogas,
+    description: Total production of gaseous fuels, including natural gas and biogas,
       not including hydrogen
     unit: EJ/yr
 - Secondary Energy|Gases|Biomass:
@@ -53,7 +53,9 @@
     unit: EJ/yr
 
 - Secondary Energy|Hydrogen:
-    definition: Total production of hydrogen
+    description: Total production of hydrogen including hydrogen used as an intermediate
+      product, e.g. for e-fuel production (if hydrogen is explicitly modeled as a
+      commodity and not an implicit intermediate product of the transformation technologies)
     unit: EJ/yr
 - Secondary Energy|Hydrogen|Biomass:
     description: Production of hydrogen from biomass
@@ -83,7 +85,7 @@
     unit: EJ/yr
 
 - Secondary Energy|Heat:
-    definition: Total production of centralized heat
+    description: Total production of centralized heat
     unit: EJ/yr
 - Secondary Energy|Heat|Biomass:
     description: Centralized heat generation from biomass, including biogas

definitions/variable/macro-economy/consumption.yaml

@@ -2,4 +2,4 @@
     description: total consumption of all goods, by all consumers in a region
     unit: billion USD_2010/yr
     tier: 1
-    min: 0
+    lower_bound: 0

definitions/variable/macro-economy/gdp.yaml

@@ -1,9 +1,9 @@
 - GDP|MER:
-    definition: GDP converted to USD at market exchange rate (MER)
+    description: GDP converted to USD at market exchange rate (MER)
     unit: billion USD_2010/yr
     tier: 1
 - GDP|PPP:
-    definition: GDP converted to USD using purchasing power parity (PPP)
+    description: GDP converted to USD using purchasing power parity (PPP)
     unit: billion USD_2010/yr
     tier: 1
 - Value Added|{Economic Sectors}:

definitions/variable/macro-economy/labor-force.yaml

@@ -3,17 +3,17 @@
       (part of the active labor force)
     unit: million
     tier: 1
-    min: 0
+    lower_bound: 0
     navigate: "{Employment Status}"
 - Labor Force|Inactive:
     description: Inhabitants which are not part of the labor force, including
       working-age people neither employed nor unemployed, and people not
       in a working-age cohort (e.g., children, retirees)
     unit: million
     tier: 1
-    min: 0
+    lower_bound: 0
 - Labor Force|Unemployment [Rate]:
-    definition: Fraction of unemployed inhabitants (based on ILO classification)
+    description: Fraction of unemployed inhabitants (based on ILO classification)
     unit: '%'
-    range: 0, 100
+    range: [ 0, 100 ]
     navigate: Unemployment|Rate

definitions/variable/population/population.yaml

@@ -1,24 +1,24 @@
 - Population:
-    definition: Total population
+    description: Total population
     unit: million
     tier: 1
 - Population|Urban:
-    definition: Total population living in urban areas
+    description: Total population living in urban areas
     unit: million
     tier: 2
 - Population|{Gender}:
-    definition: Total {Gender} population
+    description: Total {Gender} population
     unit: million
     tier: 2
 - Population|{Gender}|{Age}:
-    definition: Total {Gender} population {Age}
+    description: Total {Gender} population {Age}
     unit: million
     tier: 3
 - Population|{Gender}|{Age}|{Education}:
-    definition: Total {Gender} population {Age} with {Education}
+    description: Total {Gender} population {Age} with {Education}
     unit: million
     tier: 3
 - Mean Years of Education|{Gender}|{Age}:
-    definition: Mean years of formal education of the {Gender} population {Age}
+    description: Mean years of formal education of the {Gender} population {Age}
     unit: years
     tier: 3

definitions/variable/population/tag_age.yaml

@@ -1,43 +1,43 @@
 - Age:
     - Age 0-4:
-        definition: aged 0-4 years
+        description: aged 0-4 years
     - Age 5-9:
-        definition: aged 5-9 years
+        description: aged 5-9 years
     - Age 10-14:
-        definition: aged 10-14 years
+        description: aged 10-14 years
     - Age 15-19:
-        definition: aged 15-19 years
+        description: aged 15-19 years
     - Age 20-24:
-        definition: aged 20-24 years
+        description: aged 20-24 years
     - Age 25-29:
-        definition: aged 25-29 years
+        description: aged 25-29 years
     - Age 30-34:
-        definition: aged 30-34 years
+        description: aged 30-34 years
     - Age 35-39:
-        definition: aged 35-39 years
+        description: aged 35-39 years
     - Age 40-44:
-        definition: aged 40-44 years
+        description: aged 40-44 years
     - Age 45-49:
-        definition: aged 45-49 years
+        description: aged 45-49 years
     - Age 50-54:
-        definition: aged 50-54 years
+        description: aged 50-54 years
     - Age 55-59:
-        definition: aged 55-59 years
+        description: aged 55-59 years
     - Age 60-64:
-        definition: aged 60-64 years
+        description: aged 60-64 years
     - Age 65-69:
-        definition: aged 65-69 years
+        description: aged 65-69 years
     - Age 70-74:
-        definition: aged 70-74 years
+        description: aged 70-74 years
     - Age 75-79:
-        definition: aged 75-79 years
+        description: aged 75-79 years
     - Age 80-84:
-        definition: aged 80-84 years
+        description: aged 80-84 years
     - Age 85-89:
-        definition: aged 85-89 years
+        description: aged 85-89 years
     - Age 90-94:
-        definition: aged 90-94 years
+        description: aged 90-94 years
     - Age 95-99:
-        definition: aged 95-99 years
+        description: aged 95-99 years
     - Age 100+:
-        definition: aged 100 years and older
+        description: aged 100 years and older

definitions/variable/population/tag_education.yaml

@@ -1,13 +1,13 @@
 - Education:
     - No Education:
-        definition: without formal education
+        description: without formal education
     - Incomplete Primary Education:
-        definition: with incomplete primary education
+        description: with incomplete primary education
     - Primary Education:
-        definition: with completed primary education
+        description: with completed primary education
     - Lower Secondary Education:
-        definition: with completed lower secondary education
+        description: with completed lower secondary education
     - Upper Secondary Education:
-        definition: with completed upper secondary education
+        description: with completed upper secondary education
     - Post Secondary Education:
-        definition: with completed post secondary education
+        description: with completed post secondary education