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

Release v2.0.3 #422

Merged
merged 78 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
642a8ef
Updated file for 2024 drafts
ysrivas08 Feb 26, 2024
531e17d
initial temporary updates to point to external data directory for zip…
bl-young Feb 28, 2024
af9cdfd
Updated EPA_GHGI.py file to reflect updated table names for 2024 release
ysrivas08 Mar 8, 2024
651d6e7
consolidate USDA_CoA modules
bl-young Mar 12, 2024
588f49a
update USGS_MYB_Lead to 2020
bl-young Mar 15, 2024
611a9ce
update CoA crosswalks with new activities in 2022
bl-young Mar 15, 2024
5129a0a
streamline Lead activity assignment; fix extra space
bl-young Mar 15, 2024
6693f0d
update table numbers and `target_naics_year` for national models 2017…
bl-young Mar 20, 2024
d6bff73
specify CoA year for 2017-2020 fbs models; update 2020 usgs_myb lead …
bl-young Mar 20, 2024
659e838
align 2018 GHGI table for EIA MECS with new number
bl-young Mar 20, 2024
57dafc8
update 3-24b with data through 2021
bl-young Mar 20, 2024
c9bc0f6
update handling of 3-22 -> 3-24
bl-young Mar 20, 2024
68930d6
update pointer to report in comment
bl-young Mar 20, 2024
02699b0
add 2021 and 2022 FBS model specs
bl-young Mar 20, 2024
90bf88c
point to more current ghg fbs for testing
bl-young Mar 20, 2024
ee0731e
:construction: temporarily turn off test for ghg fbs
bl-young Mar 20, 2024
eb955fe
update supply and use (summary 2017-2022 and detail 2017 tables) from…
bl-young Mar 22, 2024
8595c3c
minor edits for new GO file
bl-young Mar 22, 2024
1129850
drop testing for old GHG FBS methods
bl-young Mar 25, 2024
5b2c0a7
:bug: fix 4_102 -> 4_124
bl-young Mar 25, 2024
3c87ee2
update table numbers for 2012-2016 ghg models
bl-young Mar 25, 2024
75dbba9
Merge pull request #405 from USEPA/usda_coa
bl-young Mar 26, 2024
48f5c1b
Added footnotes for corrected name conversions
ysrivas08 Apr 5, 2024
73eaeef
formatting updated for `4-16`, `4-37`, `4-57`, `4-100`, no longer req…
bl-young Apr 5, 2024
7f28c4c
Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in…
bl-young Apr 5, 2024
48fd955
consolidate footnotes to fix errors in 3-13
bl-young Apr 5, 2024
a2d973a
fix footnotes
bl-young Apr 5, 2024
5859c85
minor fixes to units
bl-young Apr 5, 2024
730ae22
fix error with missing rows in some appendix tables
bl-young Apr 5, 2024
f32ff37
fix error reading in new 3_24 table
bl-young Apr 5, 2024
3022ac7
update some activity names
bl-young Apr 5, 2024
dcea037
update NAICS crosswalks from script
bl-young Apr 6, 2024
dc615a5
fix footnotes in flows for 4-122
bl-young Apr 6, 2024
66bdc84
update to use fedefl mapping file aligned with AR5-100 yr GWPs
bl-young Apr 6, 2024
e3dfcd2
Added missing table numbers in description
ysrivas08 Apr 11, 2024
eabc4e9
Added missing table numbers for descriptions
ysrivas08 Apr 11, 2024
7d8ff8c
Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in…
ysrivas08 Apr 11, 2024
5d58610
Added missing table numbers for 'desc'
ysrivas08 Apr 11, 2024
1cea324
add `3-116` to multi chem names
bl-young Apr 21, 2024
16e5c27
tag supressed data and set to 0
bl-young Apr 21, 2024
ca6bdee
add `4-61`, `4-62`, `4-132`
bl-young Apr 21, 2024
baf4bb2
add activities for 4-61 and 4-132
bl-young Apr 21, 2024
a9388a5
fix additional descriptions
bl-young Apr 21, 2024
cc60efa
post-meter no longer a subset of distribution for NG tables
bl-young Apr 21, 2024
a23a093
add missing activity for 3-13 parsing
bl-young Apr 21, 2024
f7bc809
add `4-61`, `4-62`, `4-132` to FBS methods for time series
bl-young Apr 22, 2024
6ab176a
temporarily use 2018 data for new tables due to lack of csv data for …
bl-young Apr 22, 2024
b72067f
update to 2024 csv zip files
bl-young May 7, 2024
9353337
update some table names with revises GHGI release
bl-young May 7, 2024
d38ccfe
additional table number changes in chapter 4; fix to 4-121
bl-young May 8, 2024
5885663
fix error in parsing 3-13
bl-young May 8, 2024
64ffee4
update 4-121 to include the specific activities
bl-young May 8, 2024
56c6da4
drop temporary year update
bl-young May 8, 2024
2912327
add 2012-2016 summary tables for 2017 schema
bl-young May 23, 2024
d364a7c
update notes for pulling BEA data
bl-young May 23, 2024
0d4140d
add 2012 detail SUT tables in 2017 schema
bl-young May 24, 2024
68774c0
update 2012 - 2016 FBS to use Supply/Use tables consistent with 2017-…
bl-young May 24, 2024
13722f4
update GO FBA
bl-young May 24, 2024
6b91cca
add 2012 to Detail Supply and Use fba methods
bl-young May 24, 2024
48790f8
fix typo
bl-young May 24, 2024
e5c9b4e
remove old tables
bl-young May 28, 2024
14b14ac
Merge pull request #412 from USEPA/2017tables
bl-young May 28, 2024
17a9b0c
Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in…
bl-young May 28, 2024
c01539c
Merge branch 'develop' into ghg_2024_updates
bl-young May 28, 2024
1ebb314
Merge branch 'develop' into ghg_2024_updates
bl-young May 28, 2024
a910648
ensure git version uses tags with 'v'
bl-young Jun 13, 2024
40d214c
update with 2024 annex files
bl-young Jun 13, 2024
d92df80
fix error related to some annex tables with mis aligned columns
bl-young Jun 13, 2024
c7d96b9
update `A_92` to `A_89`
bl-young Jun 13, 2024
3b6c620
add back develop tags
bl-young Jun 17, 2024
5bb0bca
Merge branch 'develop' into ghg_2024_updates
bl-young Jun 17, 2024
1e60399
update chapter names for zip file
bl-young Jul 2, 2024
dcd3a25
add appendix A-13 back in for 2012 data
bl-young Jul 2, 2024
24a3f74
adjust mapping for liming to avoid dropping of emissions data, where …
bl-young Jul 2, 2024
1cb504c
exclude more fields to avoid warnings
bl-young Jul 2, 2024
6e90441
Merge pull request #406 from USEPA/ghg_2024_updates
bl-young Jul 2, 2024
aa7ff5e
:bookmark: bump to v2.0.3
bl-young Jul 2, 2024
88290af
add back GHG testing
bl-young Jul 3, 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ external_data.yaml
*.egg*
*.cache
**/data/fbs_diff/*
flowby-old.py
flowby-old.py
.spyproject*
10 changes: 9 additions & 1 deletion flowsa/data/NAICS_2012_Crosswalk.csv
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ NAICS_2,NAICS_3,NAICS_4,NAICS_5,NAICS_6,NAICS_7
11,111,1119,11199,111998,111998K
11,111,1119,11199,111998,111998L
11,111,1119,11199,111998,111998M
11,111,1119,11199,111998,111998N
11,111,1119,11199,111998,111998O
11,111,1119,11199,111998,111998P
11,111,1119,11199,111998,111998Q
11,111,1119,11199,111998,111998R
11,111,1119,11199,111998,111998S
11,111,1119,11199,111998,111998T
11,112,1121,11211,112111,
11,112,1121,11211,112112,
11,112,1121,11212,112120,
Expand All @@ -121,7 +128,8 @@ NAICS_2,NAICS_3,NAICS_4,NAICS_5,NAICS_6,NAICS_7
11,112,1123,11239,112390,112390L
11,112,1123,11239,112390,112390M
11,112,1123,11239,112390,112390N
11,112,1124,11241,112410,
11,112,1124,11241,112410,112410A
11,112,1124,11241,112410,112410B
11,112,1124,11242,112420,
11,112,1125,11251,112511,
11,112,1125,11251,112512,
Expand Down
10 changes: 9 additions & 1 deletion flowsa/data/NAICS_2017_Crosswalk.csv
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ NAICS_2,NAICS_3,NAICS_4,NAICS_5,NAICS_6,NAICS_7
11,111,1119,11199,111998,111998K
11,111,1119,11199,111998,111998L
11,111,1119,11199,111998,111998M
11,111,1119,11199,111998,111998N
11,111,1119,11199,111998,111998O
11,111,1119,11199,111998,111998P
11,111,1119,11199,111998,111998Q
11,111,1119,11199,111998,111998R
11,111,1119,11199,111998,111998S
11,111,1119,11199,111998,111998T
11,112,1121,11211,112111,
11,112,1121,11211,112112,
11,112,1121,11212,112120,
Expand All @@ -121,7 +128,8 @@ NAICS_2,NAICS_3,NAICS_4,NAICS_5,NAICS_6,NAICS_7
11,112,1123,11239,112390,112390L
11,112,1123,11239,112390,112390M
11,112,1123,11239,112390,112390N
11,112,1124,11241,112410,
11,112,1124,11241,112410,112410A
11,112,1124,11241,112410,112410B
11,112,1124,11242,112420,
11,112,1125,11251,112511,
11,112,1125,11251,112512,
Expand Down
9 changes: 9 additions & 0 deletions flowsa/data/NAICS_Crosswalk_TimeSeries.csv
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ NAICS_2002_Code,NAICS_2007_Code,NAICS_2012_Code,NAICS_2017_Code
,,111998K,111998K
,,111998L,111998L
,,111998M,111998M
,,111998N,111998N
,,111998O,111998O
,,111998P,111998P
,,111998Q,111998Q
,,111998R,111998R
,,111998S,111998S
,,111998T,111998T
,112,112,112
,1121,1121,1121
,11211,11211,11211
Expand Down Expand Up @@ -177,6 +184,8 @@ NAICS_2002_Code,NAICS_2007_Code,NAICS_2012_Code,NAICS_2017_Code
,1124,1124,1124
,11241,11241,11241
112410,112410,112410,112410
,,112410A,112410A
,,112410B,112410B
,11242,11242,11242
112420,112420,112420,112420
,1125,1125,1125
Expand Down
14 changes: 11 additions & 3 deletions flowsa/data/activitytosectormapping/NAICS_Crosswalk_EPA_GHGI.csv
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ EPA_GHGI,N2O from Product Uses,NAICS_2012_Code,623,,,EPA_GHGI_T_2_1
EPA_GHGI,"Caprolactam, Glyoxal, and Glyoxylic Acid Production",NAICS_2012_Code,32519,,325190,EPA_GHGI_T_2_1
EPA_GHGI,Electronics Industry,NAICS_2012_Code,334413,,"334413, name change from Semiconductor Manufacture",EPA_GHGI_T_2_1
EPA_GHGI,Electrical Transmission and Distribution,NAICS_2012_Code,2211,,221100,EPA_GHGI_T_2_1
EPA_GHGI,Electrical Equipment,NAICS_2012_Code,2211,,new activity,EPA_GHGI_T_2_1
EPA_GHGI,Electric Power,NAICS_2012_Code,2211,,"Commodity: 221100 (or I: 221100, S00101, S00202)",EPA_GHGI_T_2_1
EPA_GHGI,Electric Power,NAICS_2012_Code,S00101,,,EPA_GHGI_T_2_1
EPA_GHGI,Electric Power,NAICS_2012_Code,S00202,,,EPA_GHGI_T_2_1
EPA_GHGI,Liming,NAICS_2012_Code,111,,"111, 112",EPA_GHGI_T_2_1
EPA_GHGI,Liming,NAICS_2012_Code,112,,,EPA_GHGI_T_2_1
EPA_GHGI,Liming,NAICS_2012_Code,111,,111,EPA_GHGI_T_2_1
EPA_GHGI,Urea Fertilization,NAICS_2012_Code,111,,"111, 112",EPA_GHGI_T_2_1
EPA_GHGI,Urea Fertilization,NAICS_2012_Code,112,,,EPA_GHGI_T_2_1
EPA_GHGI,Rice Cultivation,NAICS_2012_Code,11116,,1111B0,EPA_GHGI_T_2_1
Expand Down Expand Up @@ -72,7 +72,7 @@ EPA_GHGI,Transportation,NAICS_2012_Code,486110,,not mapped,"EPA_GHGI_T_3_38, EPA
EPA_GHGI,Refining,NAICS_2012_Code,324110,,324110,"EPA_GHGI_T_3_38, EPA_GHGI_T_3_40, EPA_GHGI_T_3_42"
EPA_GHGI,Crude Refining,NAICS_2012_Code,324110,,324110,"EPA_GHGI_T_3_38, EPA_GHGI_T_3_40, EPA_GHGI_T_3_42"
EPA_GHGI,Distribution,NAICS_2012_Code,221210,,221200,"EPA_GHGI_T_3_63, EPA_GHGI_T_3_65, EPA_GHGI_T_3_67"
EPA_GHGI,Distribution - Post-Meter,NAICS_2012_Code,221210,,,"EPA_GHGI_T_3_63, EPA_GHGI_T_3_65, EPA_GHGI_T_3_67"
EPA_GHGI,Post-Meter,NAICS_2012_Code,221210,,,"EPA_GHGI_T_3_63, EPA_GHGI_T_3_65, EPA_GHGI_T_3_67"
EPA_GHGI,Processing,NAICS_2012_Code,211111,,211000,"EPA_GHGI_T_3_63, EPA_GHGI_T_3_65, EPA_GHGI_T_3_67"
EPA_GHGI,Transmission and Storage,NAICS_2012_Code,486210,,486000,"EPA_GHGI_T_3_63, EPA_GHGI_T_3_65, EPA_GHGI_T_3_67"
EPA_GHGI,Chickpeas,NAICS_2012_Code,11113,,1111B0,EPA_GHGI_T_5_29
Expand Down Expand Up @@ -278,7 +278,11 @@ EPA_GHGI,Total Petroleum Commercial,NAICS_2012_Code,923110,,GSLGE,EPA_GHGI_T_A_1
EPA_GHGI,Total Petroleum Commercial,NAICS_2012_Code,923120,,GSLGH,EPA_GHGI_T_A_14
EPA_GHGI,Total (All Fuels) Residential,NAICS_2012_Code,F01000,,F0100,EPA_GHGI_T_A_14
EPA_GHGI,HCFC-22 Production,NAICS_2012_Code,325120,,325120,EPA_GHGI_T_4_50
EPA_GHGI,Fluorochemical Production,NAICS_2012_Code,325613,,,EPA_GHGI_T_4_61
EPA_GHGI,Electronics Production,NAICS_2012_Code,334413,,334413,EPA_GHGI_T_4_94
EPA_GHGI,Semiconductors,NAICS_2012_Code,334413,,,EPA_GHGI_T_4_121
EPA_GHGI,MEMS,NAICS_2012_Code,334413,,,EPA_GHGI_T_4_121
EPA_GHGI,PV,NAICS_2012_Code,334413,,,EPA_GHGI_T_4_121
EPA_GHGI,Magnesium Production and Processing,NAICS_2012_Code,331410,,"331410, 331490, 331520",EPA_GHGI_T_4_84
EPA_GHGI,Magnesium Production and Processing,NAICS_2012_Code,33149,,,EPA_GHGI_T_4_84
EPA_GHGI,Magnesium Production and Processing,NAICS_2012_Code,33152,,,EPA_GHGI_T_4_84
Expand Down Expand Up @@ -357,6 +361,10 @@ EPA_GHGI,Foams,NAICS_2012_Code,92,,,EPA_GHGI_T_4_101
EPA_GHGI,Foams,NAICS_2012_Code,F01000,,,EPA_GHGI_T_4_101
EPA_GHGI,Solvents,,,,excluded,EPA_GHGI_T_4_101
EPA_GHGI,Fire Protection,,,,excluded,EPA_GHGI_T_4_101
EPA_GHGI,AWACs,NAICS_2012_Code,928110,,,EPA_GHGI_T_4_132
EPA_GHGI,Other Military Applications,NAICS_2012_Code,928110,,,EPA_GHGI_T_4_132
EPA_GHGI,Particle Accelerators,NAICS_2012_Code,54171,,,EPA_GHGI_T_4_132
EPA_GHGI,Other Scientific Applications,NAICS_2012_Code,54171,,,EPA_GHGI_T_4_132
EPA_GHGI,Heavy-Duty Vehicles,NAICS_2012_Code,484,,484000,EPA_GHGI_T_A_97
EPA_GHGI,School and Tour Buses,NAICS_2012_Code,485,,485000,EPA_GHGI_T_A_97
EPA_GHGI,Transit Buses,,,,excluded,EPA_GHGI_T_A_97
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ USDA_CoA_Cropland,CUT CHRISTMAS TREES,NAICS_2012_Code,111421A,
USDA_CoA_Cropland,SHORT TERM WOODY CROPS,NAICS_2012_Code,111421B,
USDA_CoA_Cropland,TOBACCO,NAICS_2012_Code,11191,
USDA_CoA_Cropland,COTTON,NAICS_2012_Code,11192,
USDA_CoA_Cropland,"SUGARCANE, SUGAR & SEED",NAICS_2012_Code,111930,
USDA_CoA_Cropland,"SUGARCANE, SUGAR",NAICS_2012_Code,111930A,
USDA_CoA_Cropland,"SUGARCANE, SEED",NAICS_2012_Code,111930B,
USDA_CoA_Cropland,HAY & HAYLAGE,NAICS_2012_Code,11194,
Expand All @@ -64,5 +65,12 @@ USDA_CoA_Cropland,MISCANTHUS,NAICS_2012_Code,111998H,
USDA_CoA_Cropland,"MINT, TEA LEAVES",NAICS_2012_Code,111998K,
USDA_CoA_Cropland,SWITCHGRASS,NAICS_2012_Code,111998L,
USDA_CoA_Cropland,"FIELD CROPS, OTHER",NAICS_2012_Code,111998M,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, CLONES & TRANSPLANTS",NAICS_2012_Code,111998N,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, COMPLETE GROWS",NAICS_2012_Code,111998O,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, FIBER",NAICS_2012_Code,111998P,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, FLORAL",NAICS_2012_Code,111998Q,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, GRAIN",NAICS_2012_Code,111998R,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, OTHER USAGE",NAICS_2012_Code,111998S,
USDA_CoA_Cropland,"HEMP, INDUSTRIAL, SEED",NAICS_2012_Code,111998T,
USDA_CoA_Cropland,"AG LAND, (EXCL HARVESTED CROPLAND)",NAICS_2012_Code,112,
USDA_CoA_Cropland,"AG LAND, PASTURELAND, (EXCL CROPLAND & WOODLAND)",NAICS_2012_Code,112,
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ USDA_CoA_Livestock,PIGEONS & SQUAB,NAICS_2012_Code,112390K,
USDA_CoA_Livestock,"POULTRY, OTHER",NAICS_2012_Code,112390L,
USDA_CoA_Livestock,QUAIL,NAICS_2012_Code,112390M,
USDA_CoA_Livestock,RHEAS,NAICS_2012_Code,112390N,
USDA_CoA_Livestock,"SHEEP, INCL LAMBS",NAICS_2012_Code,11241,
USDA_CoA_Livestock,"SHEEP, INCL LAMBS",NAICS_2012_Code,112410A,
USDA_CoA_Livestock,"SHEEP, INCL LAMBS, HAIR SHEEP OR WOOL-HAIR CROSSES",NAICS_2012_Code,112410B,
USDA_CoA_Livestock,GOATS,NAICS_2012_Code,11242,
USDA_CoA_Livestock,"HONEY, BEE COLONIES",NAICS_2012_Code,112910B,
USDA_CoA_Livestock,"EQUINE, HORSES & PONIES",NAICS_2012_Code,112920A,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ActivitySourceName,Activity,SectorSourceName,Sector,SectorType,Notes
USGS_MYB_Lead,"Primary lead, refined content, domestic ores and base bullion ",NAICS_2012_Code,331410,,
USGS_MYB_Lead,"Primary lead, refined content, domestic ores and base bullion",NAICS_2012_Code,331410,,
USGS_MYB_Lead,"Secondary lead, lead content",NAICS_2012_Code,331492,,
Loading
Loading