Updates to REMIND regions mapping (#311)

definitions/region/model_native_regions/remind_2.1.yaml

@@ -3,6 +3,7 @@
 - REMIND 2.1:
   - REMIND 2.1|CAZ
   - REMIND 2.1|CHA
+  - REMIND 2.1|EUR
   - REMIND 2.1|DEU
   - REMIND 2.1|ECE
   - REMIND 2.1|ECS
@@ -17,6 +18,7 @@
   - REMIND 2.1|MEA
   - REMIND 2.1|NEN
   - REMIND 2.1|NES
+  - REMIND 2.1|NEU
   - REMIND 2.1|OAS
   - REMIND 2.1|REF
   - REMIND 2.1|SSA

definitions/region/model_native_regions/remind_3.0.yaml

@@ -3,6 +3,7 @@
 - REMIND 3.0:
   - REMIND 3.0|CAZ
   - REMIND 3.0|CHA
+  - REMIND 3.0|EUR
   - REMIND 3.0|DEU
   - REMIND 3.0|ECE
   - REMIND 3.0|ECS
@@ -15,6 +16,7 @@
   - REMIND 3.0|JPN
   - REMIND 3.0|LAM
   - REMIND 3.0|MEA
+  - REMIND 3.0|NEU
   - REMIND 3.0|NEN
   - REMIND 3.0|NES
   - REMIND 3.0|OAS

mappings/remind_2.1.yaml

@@ -2,6 +2,18 @@ model: REMIND 2.1
 native_regions:
   - CAZ: REMIND 2.1|CAZ
   - CHA: REMIND 2.1|CHA
+  - IND: REMIND 2.1|IND
+  - JPN: REMIND 2.1|JPN
+  - LAM: REMIND 2.1|LAM
+  - MEA: REMIND 2.1|MEA
+  - OAS: REMIND 2.1|OAS
+  - REF: REMIND 2.1|REF
+  - SSA: REMIND 2.1|SSA
+  - USA: REMIND 2.1|USA
+  # 12-region version of REMIND
+  - EUR: REMIND 2.1|EUR
+  - NEU: REMIND 2.1|NEU
+  # 21-region version of REMIND
   - DEU: REMIND 2.1|DEU
   - ECE: REMIND 2.1|ECE
   - ECS: REMIND 2.1|ECS
@@ -10,74 +22,119 @@ native_regions:
   - ESW: REMIND 2.1|ESW
   - EWN: REMIND 2.1|EWN
   - FRA: REMIND 2.1|FRA
-  - IND: REMIND 2.1|IND
-  - JPN: REMIND 2.1|JPN
-  - LAM: REMIND 2.1|LAM
-  - MEA: REMIND 2.1|MEA
+  - UKI: REMIND 2.1|UKI
   - NEN: REMIND 2.1|NEN
   - NES: REMIND 2.1|NES
-  - OAS: REMIND 2.1|OAS
-  - REF: REMIND 2.1|REF
-  - SSA: REMIND 2.1|SSA
-  - UKI: REMIND 2.1|UKI
-  - USA: REMIND 2.1|USA
-  - EUR: EU27 & UK
+# exogenously aggregated regions that should appear with the same name as uploaded in the IIASA database
   - EU27
-  - World
 common_regions:
+  - World:
+    - CAZ
+    - CHA
+    - IND
+    - JPN
+    - OAS
+    - LAM
+    - MEA
+    - REF
+    - SSA
+    - USA
+    # 12-region version of REMIND
+    - EUR
+    - NEU
+    # 21-region version of REMIND
+    - DEU
+    - FRA
+    - UKI
+    - ECE
+    - ECS
+    - ENC
+    - ESC
+    - ESW
+    - EWN
+    - NEN
+    - NES
+  - EU27 & UK: 
+    # 12-region version of REMIND
+    - EUR
+    # 21-region version of REMIND
+    - DEU
+    - FRA
+    - UKI
+    - ECE
+    - ECS
+    - ENC
+    - ESC
+    - ESW
+    - EWN
   - EU27 & UK (*): 
-      - EUR
+    # 12-region version of REMIND
+    - EUR
+    # 21-region version of REMIND
+    - DEU
+    - FRA
+    - UKI
+    - ECE
+    - ECS
+    - ENC
+    - ESC
+    - ESW
+    - EWN
   - EU27 (*): 
-      - EU27
+    - EU27
   - Germany:
-      - DEU
+    - DEU
   - France:
-      - FRA
+    - FRA
   - Asia (R5):
-      - CHA
-      - IND
-      - OAS
+    - CHA
+    - IND
+    - OAS
   - Latin America (R5):
-      - LAM
+    - LAM
   - Middle East & Africa (R5):
-      - SSA
-      - MEA
+    - SSA
+    - MEA
   - OECD & EU (R5):
-      - DEU
-      - ECE
-      - ENC
-      - ECS
-      - ESC
-      - ESW
-      - EWN
-      - FRA
-      - UKI
-      - JPN
-      - USA
-      - CAZ
-      - NEN
-      - NES
+    - JPN
+    - USA
+    - CAZ
+    # 12-region version of REMIND
+    - EUR
+    - NEU
+    # 21-region version of REMIND
+    - DEU
+    - FRA
+    - UKI
+    - ECE
+    - ECS
+    - ENC
+    - ESC
+    - ESW
+    - EWN
+    - NEN
+    - NES
   - Reforming Economies (R5):
-      - REF
+    - REF
   - Germany (IP):
-      - DEU  
+    - DEU  
   - Eastern Europe (IP):
-      - ECE
+    - ECE
   - Scandinavia (IP):
-      - ENC
+    - ENC
   - South-East Europe (IP):
-      - ECS
+    - ECS
   - Southern Europe (IP):
-      - ESC
+    - ESC
   - Iberian Peninsula (IP):
-      - ESW
+    - ESW
   - Central Europe (IP):
-      - EWN
+    - EWN
   - France (IP):
-      - FRA
+    - FRA
   - United Kingdom & Ireland (IP):
-      - UKI
+    - UKI
   - Northern non-EU Europe (IP):
-      - NEN
+    - NEN
   - Southern non-EU Europe (IP):
-      - NES
+    - NES