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.

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

Adds IEFs for GLORIA #59

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3b4a481
concordance for gloria sectors to USEEIO
Jnamovich Nov 18, 2024
2685224
initial draft gloria parsing
bl-young Nov 19, 2024
16e0d4e
access satellite multipliers from GLORIA
bl-young Nov 20, 2024
8463aab
skip download of standard deviation files
bl-young Nov 22, 2024
8db6cc5
add new gdrive link
bl-young Dec 2, 2024
319b3ab
Merge branch 'issue_45' into gloria
bl-young Dec 2, 2024
7b4cab2
Created GLORIA to US Trade data concordance file. Deleted Exiobase ve…
Jnamovich Dec 6, 2024
d37e913
restored exiobase country concordance
Jnamovich Dec 6, 2024
74c51bc
Merge branch 'ceda' into gloria
bl-young Dec 6, 2024
569a971
add initial draft gloria config and helpers; resolve duplicate regions
bl-young Dec 6, 2024
49c8914
add gloria as option; don't allow None price_type
bl-young Dec 6, 2024
51e2095
Updates to config file for GLORIA MRIO
Jnamovich Dec 13, 2024
49edc96
add `reference_currency` to config; enable use of mapping file
bl-young Dec 15, 2024
c6e4529
Updated satellite mapping file for GLORIA
Jnamovich Dec 17, 2024
9840cca
Added units to GLORIA satellite mapping file
Jnamovich Dec 17, 2024
b55ae7b
add units, UUIDs, and conversions to flow mapping; implement into code
bl-young Dec 18, 2024
b5d719f
Merge branch 'master' into gloria
bl-young Dec 18, 2024
af2340b
drop `Region` from concordance file after #54
bl-young Dec 18, 2024
2a0ded5
fix typos in mapping
bl-young Dec 18, 2024
1a15b97
Updated GLORIA mapping files (sectors & flowables)
Jnamovich Dec 20, 2024
b000572
drop additional multiple mappings
bl-young Jan 3, 2025
99b38fd
add year parameter to clean_mrio function; drop select gloria sectors…
bl-young Jan 3, 2025
514a3d1
update country names
bl-young Jan 3, 2025
4016b77
Merge branch 'master' into gloria
bl-young Jan 24, 2025
7d22802
update list of yellowthroat models
bl-young Mar 3, 2025
60a1091
Merge branch 'master' into gloria
bl-young Mar 20, 2025
27d8519
Imrpove GLORIA-USEEIO commodity matching. Assume ISIC v4 for mapping …
WesIngwersen Mar 27, 2025
eabccea
- Move radio, television to Publishing and add Sound recording and mo…
WesIngwersen Mar 31, 2025
8b4e076
Add script check_for_missing_USEEIO_sectors_in_crosswalk.py
WesIngwersen Mar 31, 2025
db6f9f5
fix check of missing countries
bl-young Apr 8, 2025
fb807d0
add warning for additional country checks after merge
bl-young Apr 8, 2025
08ff188
add additoinal check for missing sectors
bl-young Apr 8, 2025
d90b3e0
add back S00101 and 491000, use the same mapping as s00102 to align w…
bl-young Apr 8, 2025
82cac1b
add check for final df for missing contributions
bl-young Apr 8, 2025
de58bfd
drop specific sector/country combinations; isntead use an output base…
bl-young Apr 8, 2025
f56eca2
Merge pull request #60 from USEPA/gloria_edits
bl-young Apr 8, 2025
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
2 changes: 1 addition & 1 deletion import_emission_factors/ceda_helpers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
""" Functions to support the processing of CEDA MRIO models"""

def clean_ceda_M_matrix(M, fields_to_rename):
def clean_ceda_M_matrix(M, fields_to_rename, **kwargs):
M = M.rename(columns=fields_to_rename)
M_melted = M.melt(
id_vars=['CountryCode', 'MRIO Sector'], value_name='EF', var_name='flow'
Expand Down
257 changes: 257 additions & 0 deletions import_emission_factors/concordances/GLORIA_country_concordance.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
Country,ISO Code,CountryCode
Afghanistan,AF,AFG
Africa,,
Albania,AL,ALB
Algeria,DZ,DZA
All countries,,
Andorra,AD,XEU
Angola,AO,AGO
Anguilla,AI,XAM
Antigua and Barbuda,AG,XAM
Argentina,AR,ARG
Armenia,AM,ARM
Aruba,AW,XAM
Asia and Pacific,,
Australia,AU,AUS
Austria,AT,AUT
Azerbaijan,AZ,AZE
Bahamas,BS,BHS
Bahrain,BH,BHR
Bangladesh,BD,BGD
Barbados,BB,XAM
Belarus,BY,BLR
Belgium,BE,BEL
Belize,BZ,BLZ
Benin,BJ,BEN
Bermuda,BM,XAM
Bhutan,BT,BTN
Bolivia,BO,BOL
Bosnia and Herzegovina,BA,BIH
Botswana,BW,BWA
Brazil,BR,BRA
British Indian Ocean Territory,IO,XAS
British Virgin Islands,VG,XAM
Brunei,BN,XAS
Bulgaria,BG,BGR
Burkina Faso,BF,BFA
Burma (Myanmar),MM,XAS
Burundi,BI,BDI
Cabo Verde,CV,XAF
CAFTA-DR countries,,
Cambodia,KH,KHM
Cameroon,CM,CMR
Canada,CA,CAN
Cayman Islands,KY,XAM
Central African Republic,CF,CAF
Chad,TD,TCD
Chile,CL,CHL
China,CN,CHN
Christmas Island (in the Indian Ocean),CX,XAS
Cocos (Keeling) Islands,CC,XAS
Colombia,CO,COL
Comoros,KM,XAF
"Congo, Democratic Republic of the Congo (formerly Za",rCD,COD
"Congo, Republic of the Congo",CG,COG
Cook Islands,CK,XAS
Costa Rica,CR,CRI
Cote d'Ivoire,CI,CIV
Croatia,HR,HRV
Cuba,CU,CUB
Curacao,CW,XAM
Cyprus,CY,CYP
Czech Republic,CZ,CZE
Denmark,DK,DNK
"Denmark, except Greenland",DK,DNK
Djibouti,DJ,DJI
Dominica,DM,XAM
Dominican Republic,DO,DOM
Ecuador,EC,ECU
Egypt,EG,EGY
El Salvador,SV,SLV
Equatorial Guinea,GQ,GNQ
Eritrea,ER,ERI
Estonia,EE,EST
Eswatini,SZ,XAF
Ethiopia,ET,ETH
Euro area,,
Europe,,
European Union,,
Falkland Islands (Islas Malvinas),FK,XAM
Faroe Islands,FO,XEU
Fiji,FJ,XAS
Finland,FI,FIN
France,FR,FRA
French Guiana,GF,XAM
French Polynesia,PF,XAS
French Southern and Antarctic Lands,TF,XAF
Gabon,GA,GAB
Gambia,GM,GMB
Gaza Strip administered by Israel,GZ,XAS
Georgia,GE,GEO
Germany,DE,DEU
Germany (Federal Republic of Germany),DE,DEU
Ghana,GH,GHA
Gibraltar,GI,XEU
Greece,GR,GRC
Greenland,GL,XEU
Grenada,GD,XAM
Guadeloupe,GP,XAM
Guatemala,GT,GTM
Guinea,GN,GIN
Guinea-Bissau,GW,XAF
Guyana,GY,XAM
Haiti,HT,HTI
Heard Island and McDonald Islands,HM,XAS
Holy See (Vatican City),VA,XEU
Honduras,HN,HND
Hong Kong,HK,HKG
Hungary,HU,HUN
Iceland,IS,ISL
India,IN,IND
Indonesia,ID,IDN
International organizations and unallocated,,
Iran,IR,IRN
Iraq,IQ,IRQ
Ireland,IE,IRL
Israel,IL,ISR
Italy,IT,ITA
Jamaica,JM,JAM
Japan,JP,JPN
Jordan,JO,JOR
Kazakhstan,KZ,KAZ
Kenya,KE,KEN
Kiribati,KI,XAS
Kosovo,KV,XEU
Kuwait,KW,KWT
Kyrgyzstan,KG,KGZ
Laos (Lao People's Democratic Republic),LA,LAO
Latin America and Other Western Hemisphere,,
Latvia,LV,LVA
Lebanon,LB,LBN
Lesotho,LS,XAF
Liberia,LR,LBR
Libya,LY,LBY
Liechtenstein,LI,XEU
Lithuania,LT,LTU
Luxembourg,LU,LUX
Macao,MO,XAS
Madagascar,MG,MDG
Malawi,MW,MWI
Malaysia,MY,MYS
Maldives,MV,XAS
Mali,ML,MLI
Malta,MT,MLT
Marshall Islands,MH,XAS
Martinique,MQ,XAM
Mauritania,MR,MRT
Mauritius,MU,XAF
Mayotte,YT,XAF
Mexico,MX,MEX
"Micronesia, Federated States of",FM,XAS
Middle East,,
Moldova (Republic of Moldova),MD,XEU
Monaco,MC,XEU
Mongolia,MN,MNG
Montenegro,ME,XEU
Montserrat,MS,XEU
Morocco,MA,MAR
Mozambique,MZ,MOZ
Namibia,NA,NAM
Nauru,NR,XAS
Nepal,NP,NPL
Netherlands,NL,NLD
New Caledonia,NC,XAS
New Zealand,NZ,NZL
Nicaragua,NI,NIC
Niger,NE,NER
Nigeria,NG,NGA
Niue,NU,XAS
Norfolk Island,NF,XAS
North Korea (Democratic People's Republic of Korea),KP,PRK
North Macedonia,MK,XEU
Norway,NO,NOR
Oman,OM,OMN
Other Africa (International Services Trade),,XAF
Other Asia and Pacific (International Services Trade),,XAS
Other Europe (International Services Trade),,XEU
Other Middle East (International Services Trade),,XAS
Other South And Central America (International Services Trade),,XAM
Other Western Hemisphere,,XAM
"Other Western Hemisphere, Other (International Services Trade)",,XAM
Pakistan,PK,PAK
Palau,PW,XAS
Panama,PA,PAN
Papua New Guinea,PG,PNG
Paraguay,PY,PRY
Peru,PE,PER
Philippines,PH,PHL
Pitcairn Islands,PN,XAS
Poland,PL,POL
Portugal,PT,PRT
Qatar,QA,QAT
Reunion,RE,XAF
Romania,RO,ROU
Russia,RU,RUS
Rwanda,RW,RWA
Saint Helena,SH,XAF
Saint Kitts and Nevis,KN,XAM
Saint Lucia,LC,XAM
Saint Pierre and Miquelon,PM,XAM
Saint Vincent and the Grenadines,VC,XAM
Samoa (Western Samoa),WS,XAS
San Marino,SM,XEU
Sao Tome and Principe,ST,XAF
Saudi Arabia,SA,SAU
Senegal,SN,SEN
Serbia,RS,SRB
Seychelles,SC,XAS
Sierra Leone,SL,SLE
Singapore,SG,SGP
Sint Maarten,SX,XAM
Slovakia,SK,SVK
Slovenia,SI,SVN
Solomon Islands,SB,XAS
Somalia,SO,SOM
South Africa,ZA,ZAF
South and Central America,,
South Korea,KR,KOR
South Korea (Republic of Korea),KR,KOR
South Sudan,SS,SDS
Spain,ES,ESP
Sri Lanka,LK,LKA
Sudan,SD,SDN
Suriname,SR,XAM
Svalbard and Jan Mayen,SJ,XEU
Sweden,SE,SWE
Switzerland,CH,CHE
Syria (Syrian Arab Republic),SY,SYR
Taiwan,TW,XAS
Tajikistan,TJ,TJK
Tanzania (United Republic of Tanzania),TZ,TZA
Thailand,TH,THA
Timor-Leste,TL,XAS
Togo,TG,TGO
Tokelau,TK,XAS
Tonga,TO,XAS
Trinidad and Tobago,TT,XAM
Tunisia,TN,TUN
Turkey,TR,TUR
Turkmenistan,TM,TKM
Turks and Caicos Islands,TC,XAM
Tuvalu,TV,XAS
Uganda,UG,UGA
Ukraine,UA,UKR
United Arab Emirates,AE,ARE
United Kingdom,GB,GBR
"United Kingdom Islands, Caribbean",,
United States,US,USA
Uruguay,UY,URY
Uzbekistan,UZ,UZB
Vanuatu,VU,XAM
Venezuela,VE,VEN
Vietnam,VN,VNM
Wallis and Futuna,WF,XAS
West Bank administered by Israel,WE,XAS
Yemen (Republic of Yemen),YE,YEM
Zambia,ZM,ZMB
Zimbabwe,ZW,ZWE
Loading