Merge pull request #107 from macflo8/master

Merge
polca · Jul 22, 2023 · f59c940 · f59c940
2 parents fd277be + bac1b28
commit f59c940
Show file tree

Hide file tree

Showing 15 changed files with 1,162 additions and 7 deletions.
diff --git a/premise/iam_variables_mapping/MESSAGE_iso2_map.json b/premise/iam_variables_mapping/MESSAGE_iso2_map.json
@@ -0,0 +1,188 @@
+{
+    "R12_SAS": ["AF", "BD", "BT", "IN", "MV", "NP", "PK", "LK"],
+    "R12_EEU": [
+        "AL",
+        "BA",
+        "BG",
+        "HR",
+        "CZ",
+        "EE",
+        "HU",
+        "LV",
+        "LT",
+        "PL",
+        "RO",
+        "SK",
+        "SI",
+        "MK"
+    ],
+    "R12_MEA": [
+        "DZ",
+        "BH",
+        "EG",
+        "IR",
+        "IQ",
+        "IL",
+        "JO",
+        "KW",
+        "LB",
+        "LY",
+        "MA",
+        "OM",
+        "QA",
+        "SA",
+        "SD",
+        "SY",
+        "TN",
+        "AE",
+        "YE"
+    ],
+    "R12_PAS": [
+        "AS",
+        "BN",
+        "FJ",
+        "PF",
+        "KI",
+        "ID",
+        "MY",
+        "MM",
+        "NC",
+        "PG",
+        "PH",
+        "KR",
+        "SG",
+        "SB",
+        "TW",
+        "TH",
+        "TO",
+        "VU",
+        "WS"
+    ],
+    "R12_WEU": [
+        "AD",
+        "AT",
+        "BE",
+        "CY",
+        "DK",
+        "FO",
+        "FI",
+        "FR",
+        "DE",
+        "GI",
+        "GR",
+        "GL",
+        "IS",
+        "IE",
+        "IM",
+        "IT",
+        "LI",
+        "LU",
+        "MT",
+        "MC",
+        "NL",
+        "NO",
+        "PT",
+        "ES",
+        "SE",
+        "CH",
+        "TR",
+        "GB"
+    ],
+    "R12_AFR": [
+        "AO",
+        "BJ",
+        "BW",
+        "IO",
+        "BF",
+        "BI",
+        "CM",
+        "CV",
+        "CF",
+        "TD",
+        "KM",
+        "CG",
+        "CI",
+        "DJ",
+        "GQ",
+        "ER",
+        "ET",
+        "GA",
+        "GM",
+        "GH",
+        "GN",
+        "GW",
+        "KE",
+        "LS",
+        "LR",
+        "MG",
+        "MW",
+        "ML",
+        "MR",
+        "MU",
+        "MZ",
+        "NA",
+        "NE",
+        "NG",
+        "RE",
+        "RW",
+        "SH",
+        "ST",
+        "SN",
+        "SC",
+        "SL",
+        "SO",
+        "ZA",
+        "SZ",
+        "TZ",
+        "TG",
+        "UG",
+        "ZR",
+        "ZM",
+        "ZW"
+    ],
+    "R12_LAM": [
+        "AG",
+        "AR",
+        "BS",
+        "BB",
+        "BZ",
+        "BM",
+        "BO",
+        "BR",
+        "CL",
+        "CO",
+        "CR",
+        "CU",
+        "DM",
+        "DO",
+        "EC",
+        "SV",
+        "GF",
+        "GD",
+        "GP",
+        "GT",
+        "GY",
+        "HT",
+        "HN",
+        "JM",
+        "MQ",
+        "MX",
+        "ANT",
+        "NI",
+        "PA",
+        "PY",
+        "PE",
+        "KN",
+        "VC",
+        "LC",
+        "SR",
+        "TT",
+        "UY",
+        "VE"
+    ],
+    "R12_FSU": ["AM", "AZ", "BY", "GE", "KZ", "KG", "MD", "RU", "TJ", "TM", "UA", "UZ"],
+    "R12_PAO": ["AU", "JP", "NZ"],
+    "R12_RCPA": ["KH", "KP", "LA", "MN", "VN"],
+    "R12_NAM": ["CA", "GU", "PR", "US", "VI"],
+    "R12_CHN": ["CN", "HK", "MO"]
+}
diff --git a/premise/iam_variables_mapping/biomass_variables.yaml b/premise/iam_variables_mapping/biomass_variables.yaml
@@ -2,17 +2,25 @@
 # used in the IAMs regarding the origin of biomass
 # used in the production of electricity
 ---
-biomass - purpose grown:
+biomass crops - purpose grown:
   iam_aliases:
     image: Primary Energy|Biomass|Energy Crops
+    message: Primary Energy|Biomass|Energy Crops
     remind: SE|Electricity|Biomass|Energy Crops
   ecoinvent_aliases:
     name:
       - market for wood chips
     reference product:
       - wood chips
+biomass wood - purpose grown:
+  iam_aliases:
+    message: Primary Energy|Biomass|Fuelwood
+  ecoinvent_aliases:
+    name:
+    reference product:
 biomass - residual:
   iam_aliases:
+    message: Primary Energy|Biomass|Residues
     image: Primary Energy|Biomass|Residues
     remind: SE|Electricity|Biomass|Residues
   ecoinvent_aliases:

diff --git a/premise/iam_variables_mapping/carbon_capture_variables.yaml b/premise/iam_variables_mapping/carbon_capture_variables.yaml
@@ -15,6 +15,10 @@ cement - co2:
       - Production|Industry|Cement|Efficient dry feed rotary kiln + On-site CCS
       - Production|Industry|Cement|Efficient dry feed rotary kiln + Oxy-combustion CCS
       - Production|Industry|Cement|Efficient dry feed rotary kiln
+    message:
+      - Carbon Sequestration|CCS|Industrial Processes
+      - Emissions|CO2|Industrial Processes|Non-Metallic Minerals|Cement
+      - Emissions|CO2|Energy|Demand|Industry|Non-Metallic Minerals|Cement
 cement - cco2:
   iam_aliases:
     remind:
@@ -24,7 +28,8 @@ cement - cco2:
       - Production|Industry|Cement|Efficient dry feed rotary kiln + MEA CCS
       - Production|Industry|Cement|Efficient dry feed rotary kiln + On-site CCS
       - Production|Industry|Cement|Efficient dry feed rotary kiln + Oxy-combustion CCS
-
+    message:
+      - CCS|Industry|Industrial Processes|Non-Metallic Minerals
 steel - co2:
   iam_aliases:
     remind:
@@ -39,6 +44,8 @@ steel - co2:
       - Production|Industry|Iron and Steel|TGR BF/BOF BAT + CCS
       - Production|Industry|Iron and Steel|TGR BF/BOF BAT
       - Production|Industry|Iron and Steel|TGR BF/BOF
+#    message:
+#      - Emissions|CO2|Energy|Demand|Industry|Steel    # not in the model currently
 steel - cco2:
   iam_aliases:
     remind:

diff --git a/premise/iam_variables_mapping/cement_variables.yaml b/premise/iam_variables_mapping/cement_variables.yaml
@@ -5,6 +5,7 @@ cement, dry feed rotary kiln:
   iam_aliases:
     remind: Production|Industry|Cement
     image: Production|Industry|Cement|Dry feed rotary kiln
+    message: Production|Non-Metallic Minerals|Cement
   energy_use_aliases:
     remind: FE|Industry|+++|Cement
     image:
@@ -16,6 +17,17 @@ cement, dry feed rotary kiln:
       - Final Energy|Industry|Cement|Dry feed rotary kiln|Oil
       - Final Energy|Industry|Cement|Dry feed rotary kiln|Secondary Heat
       - Final Energy|Industry|Cement|Dry feed rotary kiln|Traditional Biomass
+    message:
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Electricity
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Gases
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Heat
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Hydrogen
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Liquids|Biomass
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Liquids|Oil
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Liquids|Other
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Solar
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Biomass
+      - Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Coal
 
   eff_aliases:
     remind: FE|Industry|Specific Energy Consumption|Cement

diff --git a/premise/iam_variables_mapping/constants.yaml b/premise/iam_variables_mapping/constants.yaml
@@ -12,6 +12,7 @@ SUPPORTED_EI_VERSIONS:
 SUPPORTED_MODELS:
   - remind
   - image
+  - message
 
 SUPPORTED_PATHWAYS:
   - SSP2-Base
@@ -46,6 +47,20 @@ LIST_TRANSF_FUNC:
   - update_external_scenario
   - update_emissions
 
+LIST_MESSAGE_REGIONS:
+  - AFR
+  - CHN
+  - EEU
+  - FSU
+  - LAM
+  - MEA
+  - NAM
+  - PAO
+  - PAS
+  - RCPA
+  - SAS
+  - WEU
+  - World
 
 LIST_REMIND_REGIONS:
   - CAZ