Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quickfix for AIM 3.0 #119

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Quickfix for AIM 3.0 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64e9785
Add `EU & UK` aggregate to G20 member
danielhuppmann Sep 2, 2024
f446a1b
Add sub-headings to list of G20 members
danielhuppmann Sep 2, 2024
a626ba8
Fix AIM 3.0 countries definitions
danielhuppmann Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions definitions/region/g20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- G20 members:
# individual countries
- Argentina
- Australia
- Brazil
Expand All @@ -18,5 +19,9 @@
- Turkey
- United Kingdom
- United States
# organisations that are part of the G20
- African Union
- European Union
- European Union and United Kingdom:
note: This region is used for models that do not have a distinct regional
resolution for the United Kingdom and the European Union.
8 changes: 4 additions & 4 deletions definitions/region/native_regions/AIM_3.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
Equatorial Guinea, Eritrea, Eswatini, Ethiopia, Gabon, Gambia,
Ghana, Guinea, Guinea-Bissau, Kenya, Lesotho, Liberia, Madagascar,
Malawi, Mali, Mauritania, Mauritius, Mayotte, Mozambique, Namibia,
Niger, Nigeria, Rwanda, Réunion, Saint Helena, Ascension and Tristan da Cunha,
Sao Tome and Principe, Senegal, Seychelles, Sierra Leone, Somalia,
South Africa, Sudan, Tanzania, Togo, Uganda, Western Sahara, Zambia, Zimbabwe
Niger, Nigeria, Rwanda, Réunion, Sao Tome and Principe, Senegal, Seychelles,
Sierra Leone, Somalia, South Africa, Sudan, Tanzania, Togo, Uganda,
Western Sahara, Zambia, Zimbabwe
]
- AIM 3.0|EU:
- AIM 3.0|EU & UK:
countries: [
Austria, Belgium, Cyprus, Czechia, Denmark, Estonia, Finland, France, Germany,
Greece, Hungary, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta,
Expand Down
4 changes: 2 additions & 2 deletions mappings/AIM_3.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ native_regions:
- TUR: AIM 3.0|Turkey
- USA: AIM 3.0|USA
- XAF: AIM 3.0|Other Africa
- XE25: AIM 3.0|EU
- XE25: AIM 3.0|EU & UK
- XER: AIM 3.0|Rest of Europe
- XLM: AIM 3.0|Rest of Latin America
- XME: AIM 3.0|Middle East
Expand Down Expand Up @@ -108,5 +108,5 @@ common_regions:
- African Union:
- XAF
- XNF
- European Union:
- European Union and United Kingdom:
- XE25
Loading