cleaning merge request from wrong rebase: rebase to 193222a (origin o…

…f the branch) and cherry-pick commits made to the branch and pull request (e689d53 to def42d7)
IAMconsortium · Mar 3, 2025 · e59ff08 · e59ff08
1 parent f1cb5fb
commit e59ff08
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/definitions/variable/macro-economy/finance.yaml b/definitions/variable/macro-economy/finance.yaml
@@ -0,0 +1,8 @@
+- Debt:
+    description: Total net external debt
+    unit: billion USD_2010/yr
+    tier: 2
+- Debt|Public:
+    description: Total net external public debt
+    unit: billion USD_2010/yr
+    tier: 2
diff --git a/definitions/variable/macro-economy/gdp.yaml b/definitions/variable/macro-economy/gdp.yaml
@@ -24,3 +24,10 @@
     unit: billion USD_2010/yr
     tier: 1
     navigate: Expenditure|Household
+- Revenue|Government:
+    description: Government revenue
+    unit: billion USD_2010/yr
+    tier: 1
+    engage: Revenue|government
+    navigate: Revenue|government
+
diff --git a/definitions/variable/macro-economy/macroeconomic_other.yaml b/definitions/variable/macro-economy/macroeconomic_other.yaml
@@ -1,15 +1,4 @@
-- Price|Carbon:
-    description: Price of carbon
-    unit: USD_2010/t CO2
-    tier: 1
-    drop_negative_weights: false
-    weight: Emissions|CO2
 - Capital Stock:
     description: Macroeconomic capital stock
     unit: billion USD_2010/yr
-- Revenue|Government:
-    description: Government revenue
-    unit: billion USD_2010/yr
-    tier: 1
-    engage: Revenue|government
-    navigate: Revenue|government
+    tier: 2
diff --git a/definitions/variable/macro-economy/price.yaml b/definitions/variable/macro-economy/price.yaml
@@ -0,0 +1,6 @@
+- Price|Carbon:
+    description: Price of carbon
+    unit: USD_2010/t CO2
+    tier: 1
+    drop_negative_weights: false
+    weight: Emissions|CO2