From 385eaea4f32b04a9cc9fefbf49dcd03ed93e37db Mon Sep 17 00:00:00 2001 From: Patrick R Date: Tue, 14 Apr 2026 14:37:14 +0200 Subject: [PATCH] Removes the rest item from the 21_EU11 mapping, adapts CES file lists correspondingly --- config/gdx-files/files | 4 +- config/regionmapping_21_EU11.csv | 398 ++++++++++----------- modules/29_CES_parameters/load/input/files | 4 +- 3 files changed, 203 insertions(+), 203 deletions(-) diff --git a/config/gdx-files/files b/config/gdx-files/files index 97507b170c..3bc4178124 100644 --- a/config/gdx-files/files +++ b/config/gdx-files/files @@ -1,7 +1,7 @@ indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_62eff8f7.gdx -indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_2b1450bc.gdx +indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_9151890a.gdx indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_62eff8f7.gdx -indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_2b1450bc.gdx +indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_9151890a.gdx indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP3-En_SSP3-Kap_debt_limit-Reg_62eff8f7.gdx indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP3-En_SSP3-Kap_imperfect-Reg_62eff8f7.gdx indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP5-En_SSP5-Kap_debt_limit-Reg_62eff8f7.gdx diff --git a/config/regionmapping_21_EU11.csv b/config/regionmapping_21_EU11.csv index 44a3dc82c2..c2fa0af04b 100644 --- a/config/regionmapping_21_EU11.csv +++ b/config/regionmapping_21_EU11.csv @@ -1,250 +1,250 @@ X;CountryCode;RegionCode;missingH12 -Afghanistan;AFG;OAS;rest +Afghanistan;AFG;OAS; Aland Islands;ALA;ENC;EUR Albania;ALB;NES;NEU -Algeria;DZA;MEA;rest -American Samoa;ASM;OAS;rest +Algeria;DZA;MEA; +American Samoa;ASM;OAS; Andorra;AND;NES;NEU -Angola;AGO;SSA;rest -Anguilla;AIA;LAM;rest -Antarctica;ATA;LAM;rest -Antigua and Barbuda;ATG;LAM;rest -Argentina;ARG;LAM;rest -Armenia;ARM;REF;rest -Aruba;ABW;LAM;rest -Australia;AUS;CAZ;rest +Angola;AGO;SSA; +Anguilla;AIA;LAM; +Antarctica;ATA;LAM; +Antigua and Barbuda;ATG;LAM; +Argentina;ARG;LAM; +Armenia;ARM;REF; +Aruba;ABW;LAM; +Australia;AUS;CAZ; Austria;AUT;EWN;EUR -Azerbaijan;AZE;REF;rest -Bahamas;BHS;LAM;rest -Bahrain;BHR;MEA;rest -Bangladesh;BGD;OAS;rest -Barbados;BRB;LAM;rest -Belarus;BLR;REF;rest +Azerbaijan;AZE;REF; +Bahamas;BHS;LAM; +Bahrain;BHR;MEA; +Bangladesh;BGD;OAS; +Barbados;BRB;LAM; +Belarus;BLR;REF; Belgium;BEL;EWN;EUR -Belize;BLZ;LAM;rest -Benin;BEN;SSA;rest -Bermuda;BMU;LAM;rest -Bhutan;BTN;OAS;rest -Bolivia, Plurinational State of;BOL;LAM;rest -Bonaire, Sint Eustatius and Saba;BES;LAM;rest +Belize;BLZ;LAM; +Benin;BEN;SSA; +Bermuda;BMU;LAM; +Bhutan;BTN;OAS; +Bolivia, Plurinational State of;BOL;LAM; +Bonaire, Sint Eustatius and Saba;BES;LAM; Bosnia and Herzegovina;BIH;NES;NEU -Botswana;BWA;SSA;rest -Bouvet Island;BVT;LAM;rest -Brazil;BRA;LAM;rest -British Indian Ocean Territory;IOT;OAS;rest -Brunei Darussalam;BRN;OAS;rest +Botswana;BWA;SSA; +Bouvet Island;BVT;LAM; +Brazil;BRA;LAM; +British Indian Ocean Territory;IOT;OAS; +Brunei Darussalam;BRN;OAS; Bulgaria;BGR;ECS;EUR -Burkina Faso;BFA;SSA;rest -Burundi;BDI;SSA;rest -Cambodia;KHM;OAS;rest -Cameroon;CMR;SSA;rest -Canada;CAN;CAZ;rest -Cape Verde;CPV;SSA;rest -Cayman Islands;CYM;LAM;rest -Central African Republic;CAF;SSA;rest -Chad;TCD;SSA;rest -Chile;CHL;LAM;rest -China;CHN;CHA;rest -Christmas Island;CXR;OAS;rest -Cocos (Keeling) Islands;CCK;OAS;rest -Colombia;COL;LAM;rest -Comoros;COM;SSA;rest -Congo;COG;SSA;rest -Congo, the Democratic Republic of the;COD;SSA;rest -Cook Islands;COK;OAS;rest -Costa Rica;CRI;LAM;rest -Cote d Ivoire;CIV;SSA;rest +Burkina Faso;BFA;SSA; +Burundi;BDI;SSA; +Cambodia;KHM;OAS; +Cameroon;CMR;SSA; +Canada;CAN;CAZ; +Cape Verde;CPV;SSA; +Cayman Islands;CYM;LAM; +Central African Republic;CAF;SSA; +Chad;TCD;SSA; +Chile;CHL;LAM; +China;CHN;CHA; +Christmas Island;CXR;OAS; +Cocos (Keeling) Islands;CCK;OAS; +Colombia;COL;LAM; +Comoros;COM;SSA; +Congo;COG;SSA; +Congo, the Democratic Republic of the;COD;SSA; +Cook Islands;COK;OAS; +Costa Rica;CRI;LAM; +Cote d Ivoire;CIV;SSA; Croatia;HRV;ECS;EUR -Cuba;CUB;LAM;rest -Curacao;CUW;LAM;rest +Cuba;CUB;LAM; +Curacao;CUW;LAM; Cyprus;CYP;ESC;EUR Czech Republic;CZE;ECE;EUR Denmark;DNK;ENC;EUR -Djibouti;DJI;SSA;rest -Dominica;DMA;LAM;rest -Dominican Republic;DOM;LAM;rest -Ecuador;ECU;LAM;rest -Egypt;EGY;MEA;rest -El Salvador;SLV;LAM;rest -Equatorial Guinea;GNQ;SSA;rest -Eritrea;ERI;SSA;rest +Djibouti;DJI;SSA; +Dominica;DMA;LAM; +Dominican Republic;DOM;LAM; +Ecuador;ECU;LAM; +Egypt;EGY;MEA; +El Salvador;SLV;LAM; +Equatorial Guinea;GNQ;SSA; +Eritrea;ERI;SSA; Estonia;EST;ECE;EUR -Ethiopia;ETH;SSA;rest -Falkland Islands (Malvinas);FLK;LAM;rest +Ethiopia;ETH;SSA; +Falkland Islands (Malvinas);FLK;LAM; Faroe Islands;FRO;ENC;EUR -Fiji;FJI;OAS;rest +Fiji;FJI;OAS; Finland;FIN;ENC;EUR France;FRA;FRA;EUR -French Guiana;GUF;LAM;rest -French Polynesia;PYF;OAS;rest -French Southern Territories;ATF;OAS;rest -Gabon;GAB;SSA;rest -Gambia;GMB;SSA;rest -Georgia;GEO;REF;rest +French Guiana;GUF;LAM; +French Polynesia;PYF;OAS; +French Southern Territories;ATF;OAS; +Gabon;GAB;SSA; +Gambia;GMB;SSA; +Georgia;GEO;REF; Germany;DEU;DEU;EUR -Ghana;GHA;SSA;rest +Ghana;GHA;SSA; Gibraltar;GIB;UKI;EUR Greece;GRC;ESC;EUR Greenland;GRL;NEN;NEU -Grenada;GRD;LAM;rest -Guadeloupe;GLP;LAM;rest -Guam;GUM;OAS;rest -Guatemala;GTM;LAM;rest +Grenada;GRD;LAM; +Guadeloupe;GLP;LAM; +Guam;GUM;OAS; +Guatemala;GTM;LAM; Guernsey;GGY;UKI;EUR -Guinea;GIN;SSA;rest -Guinea-Bissau;GNB;SSA;rest -Guyana;GUY;LAM;rest -Haiti;HTI;LAM;rest -Heard Island and McDonald Islands;HMD;CAZ;rest +Guinea;GIN;SSA; +Guinea-Bissau;GNB;SSA; +Guyana;GUY;LAM; +Haiti;HTI;LAM; +Heard Island and McDonald Islands;HMD;CAZ; Holy See (Vatican City State);VAT;NES;NEU -Honduras;HND;LAM;rest -Hong Kong;HKG;CHA;rest +Honduras;HND;LAM; +Hong Kong;HKG;CHA; Hungary;HUN;ECS;EUR Iceland;ISL;NEN;NEU -India;IND;IND;rest -Indonesia;IDN;OAS;rest -Iran, Islamic Republic of;IRN;MEA;rest -Iraq;IRQ;MEA;rest +India;IND;IND; +Indonesia;IDN;OAS; +Iran, Islamic Republic of;IRN;MEA; +Iraq;IRQ;MEA; Ireland;IRL;UKI;EUR Isle of Man;IMN;UKI;EUR -Israel;ISR;MEA;rest +Israel;ISR;MEA; Italy;ITA;ESC;EUR -Jamaica;JAM;LAM;rest -Japan;JPN;JPN;rest +Jamaica;JAM;LAM; +Japan;JPN;JPN; Jersey;JEY;UKI;EUR -Jordan;JOR;MEA;rest -Kazakhstan;KAZ;REF;rest -Kenya;KEN;SSA;rest -Kiribati;KIR;OAS;rest -Korea, Democratic People's Republic of;PRK;OAS;rest -Korea, Republic of;KOR;OAS;rest -Kuwait;KWT;MEA;rest -Kyrgyzstan;KGZ;REF;rest -Lao People's Democratic Republic;LAO;OAS;rest +Jordan;JOR;MEA; +Kazakhstan;KAZ;REF; +Kenya;KEN;SSA; +Kiribati;KIR;OAS; +Korea, Democratic People's Republic of;PRK;OAS; +Korea, Republic of;KOR;OAS; +Kuwait;KWT;MEA; +Kyrgyzstan;KGZ;REF; +Lao People's Democratic Republic;LAO;OAS; Latvia;LVA;ECE;EUR -Lebanon;LBN;MEA;rest -Lesotho;LSO;SSA;rest -Liberia;LBR;SSA;rest -Libya;LBY;MEA;rest +Lebanon;LBN;MEA; +Lesotho;LSO;SSA; +Liberia;LBR;SSA; +Libya;LBY;MEA; Liechtenstein;LIE;NEN;NEU Lithuania;LTU;ECE;EUR Luxembourg;LUX;EWN;EUR -Macao;MAC;CHA;rest +Macao;MAC;CHA; Macedonia, the former Yugoslav Republic of;MKD;NES;NEU -Madagascar;MDG;SSA;rest -Malawi;MWI;SSA;rest -Malaysia;MYS;OAS;rest -Maldives;MDV;OAS;rest -Mali;MLI;SSA;rest +Madagascar;MDG;SSA; +Malawi;MWI;SSA; +Malaysia;MYS;OAS; +Maldives;MDV;OAS; +Mali;MLI;SSA; Malta;MLT;ESC;EUR -Marshall Islands;MHL;OAS;rest -Martinique;MTQ;LAM;rest -Mauritania;MRT;SSA;rest -Mauritius;MUS;SSA;rest -Mayotte;MYT;SSA;rest -Mexico;MEX;LAM;rest -Micronesia, Federated States of;FSM;OAS;rest -Moldova, Republic of;MDA;REF;rest +Marshall Islands;MHL;OAS; +Martinique;MTQ;LAM; +Mauritania;MRT;SSA; +Mauritius;MUS;SSA; +Mayotte;MYT;SSA; +Mexico;MEX;LAM; +Micronesia, Federated States of;FSM;OAS; +Moldova, Republic of;MDA;REF; Monaco;MCO;NES;NEU -Mongolia;MNG;OAS;rest +Mongolia;MNG;OAS; Montenegro;MNE;NES;NEU -Montserrat;MSR;LAM;rest -Morocco;MAR;MEA;rest -Mozambique;MOZ;SSA;rest -Myanmar;MMR;OAS;rest -Namibia;NAM;SSA;rest -Nauru;NRU;OAS;rest -Nepal;NPL;OAS;rest +Montserrat;MSR;LAM; +Morocco;MAR;MEA; +Mozambique;MOZ;SSA; +Myanmar;MMR;OAS; +Namibia;NAM;SSA; +Nauru;NRU;OAS; +Nepal;NPL;OAS; Netherlands;NLD;EWN;EUR -New Caledonia;NCL;OAS;rest -New Zealand;NZL;CAZ;rest -Nicaragua;NIC;LAM;rest -Niger;NER;SSA;rest -Nigeria;NGA;SSA;rest -Niue;NIU;OAS;rest -Norfolk Island;NFK;OAS;rest -Northern Mariana Islands;MNP;OAS;rest +New Caledonia;NCL;OAS; +New Zealand;NZL;CAZ; +Nicaragua;NIC;LAM; +Niger;NER;SSA; +Nigeria;NGA;SSA; +Niue;NIU;OAS; +Norfolk Island;NFK;OAS; +Northern Mariana Islands;MNP;OAS; Norway;NOR;NEN;NEU -Oman;OMN;MEA;rest -Pakistan;PAK;OAS;rest -Palau;PLW;OAS;rest -Palestine, State of;PSE;MEA;rest -Panama;PAN;LAM;rest -Papua New Guinea;PNG;OAS;rest -Paraguay;PRY;LAM;rest -Peru;PER;LAM;rest -Philippines;PHL;OAS;rest -Pitcairn;PCN;OAS;rest +Oman;OMN;MEA; +Pakistan;PAK;OAS; +Palau;PLW;OAS; +Palestine, State of;PSE;MEA; +Panama;PAN;LAM; +Papua New Guinea;PNG;OAS; +Paraguay;PRY;LAM; +Peru;PER;LAM; +Philippines;PHL;OAS; +Pitcairn;PCN;OAS; Poland;POL;ECE;EUR Portugal;PRT;ESW;EUR -Puerto Rico;PRI;LAM;rest -Qatar;QAT;MEA;rest -Reunion;REU;SSA;rest +Puerto Rico;PRI;LAM; +Qatar;QAT;MEA; +Reunion;REU;SSA; Romania;ROU;ECS;EUR -Russian Federation;RUS;REF;rest -Rwanda;RWA;SSA;rest -Saint Barthelemy;BLM;LAM;rest -Saint Helena, Ascension and Tristan da Cunha;SHN;SSA;rest -Saint Kitts and Nevis;KNA;LAM;rest -Saint Lucia;LCA;LAM;rest -Saint Martin (French part);MAF;LAM;rest -Saint Pierre and Miquelon;SPM;CAZ;rest -Saint Vincent and the Grenadines;VCT;LAM;rest -Samoa;WSM;OAS;rest +Russian Federation;RUS;REF; +Rwanda;RWA;SSA; +Saint Barthelemy;BLM;LAM; +Saint Helena, Ascension and Tristan da Cunha;SHN;SSA; +Saint Kitts and Nevis;KNA;LAM; +Saint Lucia;LCA;LAM; +Saint Martin (French part);MAF;LAM; +Saint Pierre and Miquelon;SPM;CAZ; +Saint Vincent and the Grenadines;VCT;LAM; +Samoa;WSM;OAS; San Marino;SMR;NES;NEU -Sao Tome and Principe;STP;SSA;rest -Saudi Arabia;SAU;MEA;rest -Senegal;SEN;SSA;rest +Sao Tome and Principe;STP;SSA; +Saudi Arabia;SAU;MEA; +Senegal;SEN;SSA; Serbia;SRB;NES;NEU -Seychelles;SYC;SSA;rest -Sierra Leone;SLE;SSA;rest -Singapore;SGP;OAS;rest -Sint Maarten (Dutch part);SXM;LAM;rest +Seychelles;SYC;SSA; +Sierra Leone;SLE;SSA; +Singapore;SGP;OAS; +Sint Maarten (Dutch part);SXM;LAM; Slovakia;SVK;ECE;EUR Slovenia;SVN;ECS;EUR -Solomon Islands;SLB;OAS;rest -Somalia;SOM;SSA;rest -South Africa;ZAF;SSA;rest -South Georgia and the South Sandwich Islands;SGS;LAM;rest -South Sudan;SSD;SSA;rest +Solomon Islands;SLB;OAS; +Somalia;SOM;SSA; +South Africa;ZAF;SSA; +South Georgia and the South Sandwich Islands;SGS;LAM; +South Sudan;SSD;SSA; Spain;ESP;ESW;EUR -Sri Lanka;LKA;OAS;rest -Sudan;SDN;MEA;rest -Suriname;SUR;LAM;rest +Sri Lanka;LKA;OAS; +Sudan;SDN;MEA; +Suriname;SUR;LAM; Svalbard and Jan Mayen;SJM;NEN;NEU -Swaziland;SWZ;SSA;rest +Swaziland;SWZ;SSA; Sweden;SWE;ENC;EUR Switzerland;CHE;NEN;NEU -Syrian Arab Republic;SYR;MEA;rest -Taiwan, Province of China;TWN;CHA;rest -Tajikistan;TJK;REF;rest -Tanzania, United Republic of;TZA;SSA;rest -Thailand;THA;OAS;rest -Timor-Leste;TLS;OAS;rest -Togo;TGO;SSA;rest -Tokelau;TKL;OAS;rest -Tonga;TON;OAS;rest -Trinidad and Tobago;TTO;LAM;rest -Tunisia;TUN;MEA;rest +Syrian Arab Republic;SYR;MEA; +Taiwan, Province of China;TWN;CHA; +Tajikistan;TJK;REF; +Tanzania, United Republic of;TZA;SSA; +Thailand;THA;OAS; +Timor-Leste;TLS;OAS; +Togo;TGO;SSA; +Tokelau;TKL;OAS; +Tonga;TON;OAS; +Trinidad and Tobago;TTO;LAM; +Tunisia;TUN;MEA; Turkey;TUR;NES;NEU -Turkmenistan;TKM;REF;rest -Turks and Caicos Islands;TCA;LAM;rest -Tuvalu;TUV;OAS;rest -Uganda;UGA;SSA;rest -Ukraine;UKR;REF;rest -United Arab Emirates;ARE;MEA;rest +Turkmenistan;TKM;REF; +Turks and Caicos Islands;TCA;LAM; +Tuvalu;TUV;OAS; +Uganda;UGA;SSA; +Ukraine;UKR;REF; +United Arab Emirates;ARE;MEA; United Kingdom;GBR;UKI;EUR -United States;USA;USA;rest -United States Minor Outlying Islands;UMI;OAS;rest -Uruguay;URY;LAM;rest -Uzbekistan;UZB;REF;rest -Vanuatu;VUT;OAS;rest -Venezuela, Bolivarian Republic of;VEN;LAM;rest -Viet Nam;VNM;OAS;rest -Virgin Islands, British;VGB;LAM;rest -Virgin Islands, U.S.;VIR;LAM;rest -Wallis and Futuna;WLF;OAS;rest -Western Sahara;ESH;MEA;rest -Yemen;YEM;MEA;rest -Zambia;ZMB;SSA;rest -Zimbabwe;ZWE;SSA;rest +United States;USA;USA; +United States Minor Outlying Islands;UMI;OAS; +Uruguay;URY;LAM; +Uzbekistan;UZB;REF; +Vanuatu;VUT;OAS; +Venezuela, Bolivarian Republic of;VEN;LAM; +Viet Nam;VNM;OAS; +Virgin Islands, British;VGB;LAM; +Virgin Islands, U.S.;VIR;LAM; +Wallis and Futuna;WLF;OAS; +Western Sahara;ESH;MEA; +Yemen;YEM;MEA; +Zambia;ZMB;SSA; +Zimbabwe;ZWE;SSA; diff --git a/modules/29_CES_parameters/load/input/files b/modules/29_CES_parameters/load/input/files index 9fb50836eb..46774d115e 100644 --- a/modules/29_CES_parameters/load/input/files +++ b/modules/29_CES_parameters/load/input/files @@ -1,7 +1,7 @@ indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_62eff8f7.inc -indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_2b1450bc.inc +indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP2-En_SSP2-Kap_debt_limit-Reg_9151890a.inc indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_62eff8f7.inc -indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_2b1450bc.inc +indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP1-En_SSP1-Kap_debt_limit-Reg_9151890a.inc indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP3-En_SSP3-Kap_debt_limit-Reg_62eff8f7.inc indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP3-En_SSP3-Kap_imperfect-Reg_62eff8f7.inc indu_subsectors-buil_simple-tran_edge_esm-GDPpop_SSP5-En_SSP5-Kap_debt_limit-Reg_62eff8f7.inc