From 8cfc4be4e6f5ef9ae7cab49fc35469ba560c1d16 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Tue, 26 Sep 2023 16:01:29 +0200 Subject: [PATCH 1/5] updating remind 3 regions definition --- mappings/remind_3.0.yaml | 139 ++++++++++++++++++++++++++------------- 1 file changed, 92 insertions(+), 47 deletions(-) diff --git a/mappings/remind_3.0.yaml b/mappings/remind_3.0.yaml index 8c6333a4..053fcde0 100644 --- a/mappings/remind_3.0.yaml +++ b/mappings/remind_3.0.yaml @@ -1,11 +1,24 @@ model: - REMIND 3.0.0 + - REMIND 3.2 - REMIND-Buildings 3.0.0 - REMIND-Industry 3.0.0 - EDGE-T 0.15.0 native_regions: - CAZ: REMIND 3.0|CAZ - CHA: REMIND 3.0|CHA + - IND: REMIND 3.0|IND + - JPN: REMIND 3.0|JPN + - LAM: REMIND 3.0|LAM + - MEA: REMIND 3.0|MEA + - OAS: REMIND 3.0|OAS + - REF: REMIND 3.0|REF + - SSA: REMIND 3.0|SSA + - USA: REMIND 3.0|USA + # 12-region version of REMIND + - EUR: EU27 & UK + - NEU: REMIND 3.0|NEU + # 21-region version of REMIND - DEU: REMIND 3.0|DEU - ECE: REMIND 3.0|ECE - ECS: REMIND 3.0|ECS @@ -14,74 +27,106 @@ native_regions: - ESW: REMIND 3.0|ESW - EWN: REMIND 3.0|EWN - FRA: REMIND 3.0|FRA - - IND: REMIND 3.0|IND - - JPN: REMIND 3.0|JPN - - LAM: REMIND 3.0|LAM - - MEA: REMIND 3.0|MEA + - UKI: REMIND 3.0|UKI - NEN: REMIND 3.0|NEN - NES: REMIND 3.0|NES - - OAS: REMIND 3.0|OAS - - REF: REMIND 3.0|REF - - SSA: REMIND 3.0|SSA - - UKI: REMIND 3.0|UKI - - USA: REMIND 3.0|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 (*): - - 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 From a69fae11a73daee01c661503fe49fbdc5a1c7eb2 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Tue, 26 Sep 2023 16:05:45 +0200 Subject: [PATCH 2/5] updating remind 2.1 regions aggregations --- mappings/remind_2.1.yaml | 138 ++++++++++++++++++++++++++------------- 1 file changed, 91 insertions(+), 47 deletions(-) diff --git a/mappings/remind_2.1.yaml b/mappings/remind_2.1.yaml index 9e4299cc..3d09e2eb 100644 --- a/mappings/remind_2.1.yaml +++ b/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: EU27 & UK + - 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,106 @@ 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 (*): - - 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 From 268af8676bf0ab19f9646dccc97a3cfab42bf656 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Tue, 26 Sep 2023 16:23:04 +0200 Subject: [PATCH 3/5] adding support for REMIND #.#|NEU --- definitions/region/model_native_regions/remind_2.1.yaml | 1 + definitions/region/model_native_regions/remind_3.0.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/definitions/region/model_native_regions/remind_2.1.yaml b/definitions/region/model_native_regions/remind_2.1.yaml index 7fcfde9f..3474fa77 100644 --- a/definitions/region/model_native_regions/remind_2.1.yaml +++ b/definitions/region/model_native_regions/remind_2.1.yaml @@ -17,6 +17,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 diff --git a/definitions/region/model_native_regions/remind_3.0.yaml b/definitions/region/model_native_regions/remind_3.0.yaml index 7979b106..76637217 100644 --- a/definitions/region/model_native_regions/remind_3.0.yaml +++ b/definitions/region/model_native_regions/remind_3.0.yaml @@ -15,6 +15,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 From d1624b57026d7e1b65ccb4345055d4a35b004b6f Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Thu, 28 Sep 2023 10:12:13 +0200 Subject: [PATCH 4/5] adding REMIND #.#|EUR as suggested by the reviewer --- .../region/model_native_regions/remind_2.1.yaml | 1 + .../region/model_native_regions/remind_3.0.yaml | 1 + mappings/remind_2.1.yaml | 15 ++++++++++++++- mappings/remind_3.0.yaml | 15 ++++++++++++++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/definitions/region/model_native_regions/remind_2.1.yaml b/definitions/region/model_native_regions/remind_2.1.yaml index 3474fa77..3c240d25 100644 --- a/definitions/region/model_native_regions/remind_2.1.yaml +++ b/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 3.0|EUR - REMIND 2.1|DEU - REMIND 2.1|ECE - REMIND 2.1|ECS diff --git a/definitions/region/model_native_regions/remind_3.0.yaml b/definitions/region/model_native_regions/remind_3.0.yaml index 76637217..ff6ff362 100644 --- a/definitions/region/model_native_regions/remind_3.0.yaml +++ b/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 diff --git a/mappings/remind_2.1.yaml b/mappings/remind_2.1.yaml index 3d09e2eb..0dfb354f 100644 --- a/mappings/remind_2.1.yaml +++ b/mappings/remind_2.1.yaml @@ -11,7 +11,7 @@ native_regions: - SSA: REMIND 2.1|SSA - USA: REMIND 2.1|USA # 12-region version of REMIND - - EUR: EU27 & UK + - EUR: REMIND 2.1|EUR - NEU: REMIND 2.1|NEU # 21-region version of REMIND - DEU: REMIND 2.1|DEU @@ -54,6 +54,19 @@ common_regions: - 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 (*): # 12-region version of REMIND - EUR diff --git a/mappings/remind_3.0.yaml b/mappings/remind_3.0.yaml index 053fcde0..f07c69be 100644 --- a/mappings/remind_3.0.yaml +++ b/mappings/remind_3.0.yaml @@ -16,7 +16,7 @@ native_regions: - SSA: REMIND 3.0|SSA - USA: REMIND 3.0|USA # 12-region version of REMIND - - EUR: EU27 & UK + - EUR: REMIND 3.0|EUR - NEU: REMIND 3.0|NEU # 21-region version of REMIND - DEU: REMIND 3.0|DEU @@ -59,6 +59,19 @@ common_regions: - 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 (*): # 12-region version of REMIND - EUR From 005b1b2749aa90efa019bfc849c710218ced0c3a Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Thu, 28 Sep 2023 10:14:23 +0200 Subject: [PATCH 5/5] fixing mistake on version number --- definitions/region/model_native_regions/remind_2.1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/region/model_native_regions/remind_2.1.yaml b/definitions/region/model_native_regions/remind_2.1.yaml index 3c240d25..0df658b3 100644 --- a/definitions/region/model_native_regions/remind_2.1.yaml +++ b/definitions/region/model_native_regions/remind_2.1.yaml @@ -3,7 +3,7 @@ - REMIND 2.1: - REMIND 2.1|CAZ - REMIND 2.1|CHA - - REMIND 3.0|EUR + - REMIND 2.1|EUR - REMIND 2.1|DEU - REMIND 2.1|ECE - REMIND 2.1|ECS