USEPA · bl-young · Jul 4, 2024 · Feb 26, 2024 · Feb 28, 2024 · Mar 8, 2024
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ external_data.yaml
 *.egg*
 *.cache
 **/data/fbs_diff/*
-flowby-old.py
+flowby-old.py
+.spyproject*
diff --git a/flowsa/data/NAICS_2012_Crosswalk.csv b/flowsa/data/NAICS_2012_Crosswalk.csv
@@ -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,
@@ -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,

diff --git a/flowsa/data/NAICS_2017_Crosswalk.csv b/flowsa/data/NAICS_2017_Crosswalk.csv
@@ -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,
@@ -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,

diff --git a/flowsa/data/NAICS_Crosswalk_TimeSeries.csv b/flowsa/data/NAICS_Crosswalk_TimeSeries.csv
@@ -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
@@ -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

diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_EPA_GHGI.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_EPA_GHGI.csv
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_CoA_Cropland.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_CoA_Cropland.csv
@@ -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,
@@ -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,
diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_CoA_Livestock.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_CoA_Livestock.csv
@@ -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,

diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_MYB_Lead.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_MYB_Lead.csv
@@ -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,,