Merge in region files

definitions/region/model_native_regions/GCAM-PR_5.3.yaml

@@ -1,36 +1,73 @@
 - GCAM-PR 5.3:
-  - GCAM-PR 5.3|Africa_Eastern
-  - GCAM-PR 5.3|Africa_Northern
-  - GCAM-PR 5.3|Africa_Southern
-  - GCAM-PR 5.3|Africa_Western
-  - GCAM-PR 5.3|Argentina
-  - GCAM-PR 5.3|Australia_NZ
-  - GCAM-PR 5.3|Brazil
-  - GCAM-PR 5.3|Canada
-  - GCAM-PR 5.3|Central America and Caribbean
-  - GCAM-PR 5.3|Central Asia
-  - GCAM-PR 5.3|China
-  - GCAM-PR 5.3|Colombia
+  - GCAM-PR 5.3|Africa_Eastern:
+      countries: BDI, COM, DJI, ERI, ETH, KEN, MDG, MUS, REU, RWA, SDN, SOM, SSD,
+        UGA
+  - GCAM-PR 5.3|Africa_Northern:
+      countries: DZA, EGY, ESH, LBY, MAR, TUN
+  - GCAM-PR 5.3|Africa_Southern:
+      countries: AGO, BWA, LSO, MOZ, MWI, NAM, SWZ, TZA, ZMB, ZWE
+  - GCAM-PR 5.3|Africa_Western:
+      countries: BEN, BFA, CAF, CIV, CMR, COD, COG, CPV, GAB, GHA, GIN, GMB, GNB,
+        GNQ, LBR, MLI, MRT, NER, NGA, SEN, SLE, STP, TCD, TGO
+  - GCAM-PR 5.3|Argentina:
+      countries: ARG
+  - GCAM-PR 5.3|Australia_NZ:
+      countries: AUS, NZL
+  - GCAM-PR 5.3|Brazil:
+      countries: BRA
+  - GCAM-PR 5.3|Canada:
+      countries: CAN
+  - GCAM-PR 5.3|Central America and Caribbean:
+      countries: ABW, AIA, ANT, ATG, BHS, BLZ, BMU, BRB, CRI, CUB, CYM, DMA, DOM,
+        GLP, GRD, GTM, HND, HTI, JAM, KNA, LCA, MSR, MTQ, NIC, PAN, SLV, TTO, VCT
+  - GCAM-PR 5.3|Central Asia:
+      countries: ARM, AZE, GEO, KAZ, KGZ, MNG, TJK, TKM, UZB
+  - GCAM-PR 5.3|China:
+      countries: CHN, HKG, MAC
+  - GCAM-PR 5.3|Colombia:
+      countries: COL
   - GCAM-PR 5.3|Eastern EU:
-      countries: BGR, CYP, CZE, EST, HUN, LTU, LVA, MLT, POL, ROU, SVN, SVK
+      countries: BGR, CYP, CZE, EST, HUN, LTU, LVA, MLT, POL, ROU, SVK, SVN
       notes: does not include Croatia
   - GCAM-PR 5.3|Western EU & UK:
-      countries: AUT, BEL, DEU, DNK, GRC, ESP, FIN, FRA, IRL, ITA, LUX, NLD, PRT, SWE, GBR
-  - GCAM-PR 5.3|Europe_Eastern
-  - GCAM-PR 5.3|Europe_Non_EU
-  - GCAM-PR 5.3|European Free Trade Association
-  - GCAM-PR 5.3|India
-  - GCAM-PR 5.3|Indonesia
-  - GCAM-PR 5.3|Japan
-  - GCAM-PR 5.3|Mexico
-  - GCAM-PR 5.3|Middle East
-  - GCAM-PR 5.3|Pakistan
-  - GCAM-PR 5.3|Russia
-  - GCAM-PR 5.3|South Africa
-  - GCAM-PR 5.3|South America_Northern
-  - GCAM-PR 5.3|South America_Southern
-  - GCAM-PR 5.3|South Asia
-  - GCAM-PR 5.3|South Korea
-  - GCAM-PR 5.3|Southeast Asia
-  - GCAM-PR 5.3|Taiwan
-  - GCAM-PR 5.3|USA
+      countries: AND, AUT, BEL, DEU, DNK, ESP, FIN, FLK, FRA, FRO, GBR, GIB, GRC,
+        GRL, IRL, ITA, LUX, MCO, NLD, PRT, SHN, SMR, SPM, SWE, TCA, VAT, VGB, WLF
+  - GCAM-PR 5.3|Europe_Eastern:
+      countries: BLR, MDA, UKR
+  - GCAM-PR 5.3|Europe_Non_EU:
+      countries: ALB, BIH, HRV, MKD, MNE, SRB, TUR
+  - GCAM-PR 5.3|European Free Trade Association:
+      countries: CHE, ISL, LIE, NOR, SJM
+  - GCAM-PR 5.3|India:
+      countries: IND
+  - GCAM-PR 5.3|Indonesia:
+      countries: IDN
+  - GCAM-PR 5.3|Japan:
+      countries: JPN
+  - GCAM-PR 5.3|Mexico:
+      countries: MEX
+  - GCAM-PR 5.3|Middle East:
+      countries: ARE, BHR, IRN, IRQ, ISR, JOR, KWT, LBN, OMN, PSE, QAT, SAU, SYR,
+        YEM
+  - GCAM-PR 5.3|Pakistan:
+      countries: PAK
+  - GCAM-PR 5.3|Russia:
+      countries: RUS
+  - GCAM-PR 5.3|South Africa:
+      countries: ZAF
+  - GCAM-PR 5.3|South America_Northern:
+      countries: GUF, GUY, SUR, VEN
+  - GCAM-PR 5.3|South America_Southern:
+      countries: BOL, CHL, ECU, PER, PRY, URY
+  - GCAM-PR 5.3|South Asia:
+      countries: AFG, ASM, BGD, BTN, LAO, LKA, MDV, NPL
+  - GCAM-PR 5.3|South Korea:
+      countries: KOR
+  - GCAM-PR 5.3|Southeast Asia:
+      countries: BRN, CCK, COK, CXR, FJI, FSM, GUM, KHM, KIR, MHL, MMR, MNP, MYS,
+        MYT, NCL, NFK, NIU, NRU, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, SYC, THA,
+        TKL, TLS, TON, TUV, VNM, VUT, WSM
+  - GCAM-PR 5.3|Taiwan:
+      countries: TWN
+  - GCAM-PR 5.3|USA:
+      countries: PRI, USA, VIR

definitions/region/model_native_regions/GCAM_5.3.yaml

@@ -1,36 +1,73 @@
 - GCAM 5.3:
-  - GCAM 5.3|Africa_Eastern
-  - GCAM 5.3|Africa_Northern
-  - GCAM 5.3|Africa_Southern
-  - GCAM 5.3|Africa_Western
-  - GCAM 5.3|Argentina
-  - GCAM 5.3|Australia and New Zealand
-  - GCAM 5.3|Brazil
-  - GCAM 5.3|Canada
-  - GCAM 5.3|Central America and Caribbean
-  - GCAM 5.3|Central Asia
-  - GCAM 5.3|China
-  - GCAM 5.3|Colombia
+  - GCAM 5.3|Africa_Eastern:
+      countries: BDI, COM, DJI, ERI, ETH, KEN, MDG, MUS, REU, RWA, SDN, SOM, SSD,
+        UGA
+  - GCAM 5.3|Africa_Northern:
+      countries: DZA, EGY, ESH, LBY, MAR, TUN
+  - GCAM 5.3|Africa_Southern:
+      countries: AGO, BWA, LSO, MOZ, MWI, NAM, SWZ, TZA, ZMB, ZWE
+  - GCAM 5.3|Africa_Western:
+      countries: BEN, BFA, CAF, CIV, CMR, COD, COG, CPV, GAB, GHA, GIN, GMB, GNB,
+        GNQ, LBR, MLI, MRT, NER, NGA, SEN, SLE, STP, TCD, TGO
+  - GCAM 5.3|Argentina:
+      countries: ARG
+  - GCAM 5.3|Australia and New Zealand:
+      countries: AUS, NZL
+  - GCAM 5.3|Brazil:
+      countries: BRA
+  - GCAM 5.3|Canada:
+      countries: CAN
+  - GCAM 5.3|Central America and Caribbean:
+      countries: ABW, AIA, ANT, ATG, BHS, BLZ, BMU, BRB, CRI, CUB, CYM, DMA, DOM,
+        GLP, GRD, GTM, HND, HTI, JAM, KNA, LCA, MSR, MTQ, NIC, PAN, SLV, TTO, VCT
+  - GCAM 5.3|Central Asia:
+      countries: ARM, AZE, GEO, KAZ, KGZ, MNG, TJK, TKM, UZB
+  - GCAM 5.3|China:
+      countries: CHN, HKG, MAC
+  - GCAM 5.3|Colombia:
+      countries: COL
   - GCAM 5.3|Eastern EU:
-      countries: BGR, CYP, CZE, EST, HUN, LTU, LVA, MLT, POL, ROU, SVN, SVK
+      countries: BGR, CYP, CZE, EST, HUN, LTU, LVA, MLT, POL, ROU, SVK, SVN
       notes: does not include Croatia
   - GCAM 5.3|Western EU & UK:
-      countries: AUT, BEL, DEU, DNK, GRC, ESP, FIN, FRA, IRL, ITA, LUX, NLD, PRT, SWE, GBR
-  - GCAM 5.3|Europe_Eastern
-  - GCAM 5.3|Europe_Non_EU
-  - GCAM 5.3|European Free Trade Association
-  - GCAM 5.3|India
-  - GCAM 5.3|Indonesia
-  - GCAM 5.3|Japan
-  - GCAM 5.3|Mexico
-  - GCAM 5.3|Middle East
-  - GCAM 5.3|Pakistan
-  - GCAM 5.3|Russia
-  - GCAM 5.3|South Africa
-  - GCAM 5.3|South America_Northern
-  - GCAM 5.3|South America_Southern
-  - GCAM 5.3|South Asia
-  - GCAM 5.3|South Korea
-  - GCAM 5.3|Southeast Asia
-  - GCAM 5.3|Taiwan
-  - GCAM 5.3|USA
+      countries: AND, AUT, BEL, DEU, DNK, ESP, FIN, FLK, FRA, FRO, GBR, GIB, GRC,
+        GRL, IRL, ITA, LUX, MCO, NLD, PRT, SHN, SMR, SPM, SWE, TCA, VAT, VGB, WLF
+  - GCAM 5.3|Europe_Eastern:
+      countries: BLR, MDA, UKR
+  - GCAM 5.3|Europe_Non_EU:
+      countries: ALB, BIH, HRV, MKD, MNE, SRB, TUR
+  - GCAM 5.3|European Free Trade Association:
+      countries: CHE, ISL, LIE, NOR, SJM
+  - GCAM 5.3|India:
+      countries: IND
+  - GCAM 5.3|Indonesia:
+      countries: IDN
+  - GCAM 5.3|Japan:
+      countries: JPN
+  - GCAM 5.3|Mexico:
+      countries: MEX
+  - GCAM 5.3|Middle East:
+      countries: ARE, BHR, IRN, IRQ, ISR, JOR, KWT, LBN, OMN, PSE, QAT, SAU, SYR,
+        YEM
+  - GCAM 5.3|Pakistan:
+      countries: PAK
+  - GCAM 5.3|Russia:
+      countries: RUS
+  - GCAM 5.3|South Africa:
+      countries: ZAF
+  - GCAM 5.3|South America_Northern:
+      countries: GUF, GUY, SUR, VEN
+  - GCAM 5.3|South America_Southern:
+      countries: BOL, CHL, ECU, PER, PRY, URY
+  - GCAM 5.3|South Asia:
+      countries: AFG, ASM, BGD, BTN, LAO, LKA, MDV, NPL
+  - GCAM 5.3|South Korea:
+      countries: KOR
+  - GCAM 5.3|Southeast Asia:
+      countries: BRN, CCK, COK, CXR, FJI, FSM, GUM, KHM, KIR, MHL, MMR, MNP, MYS,
+        MYT, NCL, NFK, NIU, NRU, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, SYC, THA,
+        TKL, TLS, TON, TUV, VNM, VUT, WSM
+  - GCAM 5.3|Taiwan:
+      countries: TWN
+  - GCAM 5.3|USA:
+      countries: PRI, USA, VIR

definitions/region/model_native_regions/ICES_1.0.yaml

@@ -2,19 +2,20 @@
   - ICES-XPS 1.0|Germany:
       countries: DEU
   - ICES-XPS 1.0|Benelux:
-      countries: BEL, NLD, LUX
+      countries: BEL, LUX, NLD
   - ICES-XPS 1.0|Greece:
       countries: GRC
   - ICES-XPS 1.0|Finland:
-      countries: FIN
+      countries: ALA, FIN
   - ICES-XPS 1.0|Czech Republic:
       countries: CZE
   - ICES-XPS 1.0|Italy:
       countries: ITA
   - ICES-XPS 1.0|France:
-      countries: FRA
+      countries: FRA, GLP, MTQ, REU
   - ICES-XPS 1.0|Rest of EU:
-      countries: AUT, BGR, CYP, DNK, EST, HRV, HUN, IRL, LTU, LVA, MLT, PRT, ROU, SVN, SVK
+      countries: AUT, BGR, CYP, DNK, EST, HRV, HUN, IRL, LTU, LVA, MLT, PRT, ROU,
+        SVK, SVN
   - ICES-XPS 1.0|United Kingdom:
       countries: GBR
   - ICES-XPS 1.0|Spain:

definitions/region/model_native_regions/MESSAGEix-GLOBIOM_1.1-R12.yaml

@@ -1,13 +1,35 @@
 - MESSAGEix-GLOBIOM 1.1-R12:
-  - MESSAGEix-GLOBIOM 1.1-R12|China
-  - MESSAGEix-GLOBIOM 1.1-R12|Eastern Europe
-  - MESSAGEix-GLOBIOM 1.1-R12|Former Soviet Union
-  - MESSAGEix-GLOBIOM 1.1-R12|Latin America and the Caribbean
-  - MESSAGEix-GLOBIOM 1.1-R12|Middle East and North Africa
-  - MESSAGEix-GLOBIOM 1.1-R12|North America
-  - MESSAGEix-GLOBIOM 1.1-R12|Other Pacific Asia
-  - MESSAGEix-GLOBIOM 1.1-R12|Pacific OECD
-  - MESSAGEix-GLOBIOM 1.1-R12|Rest Centrally Planned Asia
-  - MESSAGEix-GLOBIOM 1.1-R12|South Asia
-  - MESSAGEix-GLOBIOM 1.1-R12|Sub-Saharan Africa
-  - MESSAGEix-GLOBIOM 1.1-R12|Western Europe
+  - MESSAGEix-GLOBIOM 1.1-R12|China:
+      countries: CHN
+  - MESSAGEix-GLOBIOM 1.1-R12|Eastern Europe:
+      countries: ALB, BIH, BGR, HRV, CZE, EST, HUN, LVA, LTU, MKD, MNE, POL, ROU,
+        SRB, SVK, SVN
+  - MESSAGEix-GLOBIOM 1.1-R12|Former Soviet Union:
+      countries: ARM, AZE, BLR, GEO, KAZ, KGZ, MDA, RUS, TJK, TKM, UKR, UZB
+  - MESSAGEix-GLOBIOM 1.1-R12|Latin America and the Caribbean:
+      countries: ATG, ARG, BHS, BRB, BLZ, BMU, BOL, BRA, CHL, COL, CRI, CUB, DOM,
+        ECU, SLV, GNQ, FLK, GLP, GTM, GUY, HTI, HND, JAM, MTQ, MEX, ANT, NIC, PAN,
+        PRY, PER, SUR, TTO, URY, VEN
+  - MESSAGEix-GLOBIOM 1.1-R12|Middle East and North Africa:
+      countries: DZA, BHR, EGY, IRN, IRQ, ISR, JOR, KWT, LBN, LBY, MAR, OMN, QAT,
+        SAU, SYR, TUN, ARE, ESH, YEM
+  - MESSAGEix-GLOBIOM 1.1-R12|North America:
+      countries: CAN, GUM, PRI, USA
+  - MESSAGEix-GLOBIOM 1.1-R12|Other Pacific Asia:
+      countries: BRN, TLS, FJI, PYF, IDN, KOR, MYS, MMR, NCL, PNG, PHL, WSM, SGP,
+        SLB, THA, VUT
+  - MESSAGEix-GLOBIOM 1.1-R12|Pacific OECD:
+      countries: AUS, JPN, NZL
+  - MESSAGEix-GLOBIOM 1.1-R12|Rest Centrally Planned Asia:
+      countries: KHM, HKG, PRK, LAO, MAC, MNG, TWN, VNM
+  - MESSAGEix-GLOBIOM 1.1-R12|South Asia:
+      countries: AFG, BGD, BTN, IND, MDV, NPL, PAK, LKA
+  - MESSAGEix-GLOBIOM 1.1-R12|Sub-Saharan Africa:
+      countries: AGO, BEN, BWA, BFA, BDI, CMR, CPV, CAF, TCD, COM, COG, COD, CIV,
+        DJI, ERI, ETH, GAB, GMB, GHA, GIN, GNB, KEN, LSO, LBR, MDG, MWI, MLI, MRT,
+        MUS, MOZ, NAM, NER, NGA, REU, RWA, SEN, SLE, SOM, ZAF, SDN, SWZ, TZA, TGO,
+        UGA, ZMB, ZWE
+  - MESSAGEix-GLOBIOM 1.1-R12|Western Europe:
+      countries: AND, AUT, BEL, CYP, DNK, FRO, FIN, FRA, ATF, DEU, GIB, GRC, GRL,
+        ISL, IRL, ITA, LIE, LUX, MLT, MCO, NLD, NOR, PRT, SMR, ESP, SWE, CHE, TUR,
+        GBR

definitions/region/model_native_regions/MESSAGEix-GLOBIOM_1.1.yaml

@@ -1,12 +1,33 @@
 - MESSAGEix-GLOBIOM 1.1:
-  - MESSAGEix-GLOBIOM 1.1|Sub-Saharan Africa
-  - MESSAGEix-GLOBIOM 1.1|Centrally Planned Asia and China
-  - MESSAGEix-GLOBIOM 1.1|Eastern Europe
-  - MESSAGEix-GLOBIOM 1.1|Former Soviet Union
-  - MESSAGEix-GLOBIOM 1.1|Latin America and the Caribbean
-  - MESSAGEix-GLOBIOM 1.1|Middle East and North Africa
-  - MESSAGEix-GLOBIOM 1.1|North America
-  - MESSAGEix-GLOBIOM 1.1|Pacific OECD
-  - MESSAGEix-GLOBIOM 1.1|Other Pacific Asia
-  - MESSAGEix-GLOBIOM 1.1|South Asia
-  - MESSAGEix-GLOBIOM 1.1|Western Europe
+  - MESSAGEix-GLOBIOM 1.1|Sub-Saharan Africa:
+      countries: AGO, BEN, BWA, BFA, BDI, CMR, CPV, CAF, TCD, COM, COG, COD, CIV,
+        DJI, ERI, ETH, GAB, GMB, GHA, GIN, GNB, KEN, LSO, LBR, MDG, MWI, MLI, MRT,
+        MUS, MOZ, NAM, NER, NGA, REU, RWA, SEN, SLE, SOM, ZAF, SDN, SWZ, TZA, TGO,
+        UGA, ZMB, ZWE
+  - MESSAGEix-GLOBIOM 1.1|Centrally Planned Asia and China:
+      countries: KHM, CHN, HKG, PRK, LAO, MAC, MNG, TWN, VNM
+  - MESSAGEix-GLOBIOM 1.1|Eastern Europe:
+      countries: ALB, BIH, BGR, HRV, CZE, EST, HUN, LVA, LTU, MKD, MNE, POL, ROU,
+        SRB, SVK, SVN
+  - MESSAGEix-GLOBIOM 1.1|Former Soviet Union:
+      countries: ARM, AZE, BLR, GEO, KAZ, KGZ, MDA, RUS, TJK, TKM, UKR, UZB
+  - MESSAGEix-GLOBIOM 1.1|Latin America and the Caribbean:
+      countries: ATG, ARG, BHS, BRB, BLZ, BMU, BOL, BRA, CHL, COL, CRI, CUB, DOM,
+        ECU, SLV, GNQ, FLK, GLP, GTM, GUY, HTI, HND, JAM, MTQ, MEX, ANT, NIC, PAN,
+        PRY, PER, SUR, TTO, URY, VEN
+  - MESSAGEix-GLOBIOM 1.1|Middle East and North Africa:
+      countries: DZA, BHR, EGY, IRN, IRQ, ISR, JOR, KWT, LBN, LBY, MAR, OMN, QAT,
+        SAU, SYR, TUN, ARE, ESH, YEM
+  - MESSAGEix-GLOBIOM 1.1|North America:
+      countries: CAN, GUM, PRI, USA
+  - MESSAGEix-GLOBIOM 1.1|Pacific OECD:
+      countries: AUS, JPN, NZL
+  - MESSAGEix-GLOBIOM 1.1|Other Pacific Asia:
+      countries: BRN, TLS, FJI, PYF, IDN, KOR, MYS, MMR, NCL, PNG, PHL, WSM, SGP,
+        SLB, THA, VUT
+  - MESSAGEix-GLOBIOM 1.1|South Asia:
+      countries: AFG, BGD, BTN, IND, MDV, NPL, PAK, LKA
+  - MESSAGEix-GLOBIOM 1.1|Western Europe:
+      countries: AND, AUT, BEL, CYP, DNK, FRO, FIN, FRA, ATF, DEU, GIB, GRC, GRL,
+        ISL, IRL, ITA, LIE, LUX, MLT, MCO, NLD, NOR, PRT, SMR, ESP, SWE, CHE, TUR,
+        GBR

definitions/region/model_native_regions/REMIND_2.0.yml

@@ -10,7 +10,7 @@
   - REMIND 2.0|Other Asia:
       countries: AFG, ASM, ATF, BGD, BRN, BTN, CCK, COK, CXR, FJI, FSM, GUM, IDN,
         IOT, KHM, KIR, KOR, LAO, LKA, MDV, MHL, MMR, MNG, MNP, MYS, NCL, NFK, NIU,
-        NPL, NRU, PAK, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, TKL, TLS, TON, THA
+        NPL, NRU, PAK, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, TJK, TKL, TLS, TON,
         TUV, UMI, VNM, VUT, WLF, WSM
   - REMIND 2.0|Latin America and the Caribbean:
       countries: ABW, AIA, ANT, ARG, ATA, ATG, BHS, BLM, BLZ, BMU, BOL, BRA, BRB,
@@ -63,4 +63,4 @@
 # exogenously aggregated regions
   - REMIND 2.0|EU 27:
       countries: ALA, AUT, BEL, BGR, HRV, CYP, CZE, DNK, EST, FRO, FIN, FRA, DEU, GRC,
-        HUN, ITA, LVA, LTU, LUX, MLT, NLD, POL, PRT, ROU, SVK, SVN, ESP, SWE
+        HUN, ITA, LVA, LTU, LUX, MLT, NLD, POL, PRT, ROU, SVK, SVN, ESP, SWE

definitions/region/model_native_regions/REMIND_2.1.yml

@@ -10,17 +10,17 @@
   - REMIND 2.1|Other Asia:
       countries: AFG, ASM, ATF, BGD, BRN, BTN, CCK, COK, CXR, FJI, FSM, GUM, IDN,
         IOT, KHM, KIR, KOR, LAO, LKA, MDV, MHL, MMR, MNG, MNP, MYS, NCL, NFK, NIU,
-        NPL, NRU, PAK, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, TKL, TLS, TON, THA
+        NPL, NRU, PAK, PCN, PHL, PLW, PNG, PRK, PYF, SGP, SLB, TJK, TKL, TLS, TON,
         TUV, UMI, VNM, VUT, WLF, WSM
   - REMIND 2.1|Latin America and the Caribbean:
       countries: ABW, AIA, ANT, ARG, ATA, ATG, BHS, BLM, BLZ, BMU, BOL, BRA, BRB,
         BVT, CHL, COL, CRI, CUB, CYM, DMA, DOM, ECU, FLK, GLP, GRD, GTM, GUF, GUY,
         HND, HTI, JAM, KNA, LCA, MAF, MEX, MSR, MTQ, NIC, PAN, PER, PRI, PRY, SGS,
         SLV, SUR, TTO, URY, VCT, VEN, VGB, VIR, BES, CUW, SXM, TCA
-  - REMIND 2.1|Middle East and North Africa:
+  - REMIND 2.0|Middle East and North Africa:
       countries: ARE, BHR, DZA, EGY, ESH, IRN, IRQ, ISR, JOR, KWT, LBN, LBY, MAR,
         OMN, PSE, QAT, SAU, SDN, TUN, YEM, SYR
-  - REMIND 2.1|Russia and Reforming Economies:
+  - REMIND 2.0|Russia and Reforming Economies:
       countries: ARM, AZE, BLR, GEO, KAZ, KGZ, MDA, RUS, TKM, UKR, UZB, TJK
   - REMIND 2.1|Sub-Saharan Africa:
       countries: AGO, BDI, BEN, BFA, BWA, CAF, CIV, CMR, COD, COG, COM, CPV, DJI,

definitions/region/model_native_regions/REMIND_3.0.yml

@@ -17,10 +17,10 @@
         BVT, CHL, COL, CRI, CUB, CYM, DMA, DOM, ECU, FLK, GLP, GRD, GTM, GUF, GUY,
         HND, HTI, JAM, KNA, LCA, MAF, MEX, MSR, MTQ, NIC, PAN, PER, PRI, PRY, SGS,
         SLV, SUR, TTO, URY, VCT, VEN, VGB, VIR, BES, CUW, SXM, TCA
-  - REMIND 3.0|Middle East and North Africa:
+  - REMIND 3.1|Middle East and North Africa:
       countries: ARE, BHR, DZA, EGY, ESH, IRN, IRQ, ISR, JOR, KWT, LBN, LBY, MAR,
         OMN, PSE, QAT, SAU, SDN, TUN, YEM, SYR
-  - REMIND 3.0|Russia and Reforming Economies:
+  - REMIND 3.1|Russia and Reforming Economies:
       countries: ARM, AZE, BLR, GEO, KAZ, KGZ, MDA, RUS, TKM, UKR, UZB, TJK
   - REMIND 3.0|Sub-Saharan Africa:
       countries: AGO, BDI, BEN, BFA, BWA, CAF, CIV, CMR, COD, COG, COM, CPV, DJI,
@@ -63,4 +63,4 @@
 # exogenously aggregated regions
   - REMIND 3.0|EU 27:
       countries: ALA, AUT, BEL, BGR, HRV, CYP, CZE, DNK, EST, FRO, FIN, FRA, DEU, GRC,
-        HUN, ITA, LVA, LTU, LUX, MLT, NLD, POL, PRT, ROU, SVK, SVN, ESP, SWE
+        HUN, ITA, LVA, LTU, LUX, MLT, NLD, POL, PRT, ROU, SVK, SVN, ESP, SWE