Merge branch 'fba_hotfix' into develop

USEPA · Dec 12, 2023 · 1d39802 · 1d39802
2 parents e91bb2c + 0e448d8
commit 1d39802
Show file tree

Hide file tree

Showing 44 changed files with 1,305 additions and 1,492 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -18,21 +18,7 @@
             "affiliation": "US Bureau of Economic Analysis", 
             "name": "Matthew Chambers",
             "orcid": "https://orcid.org/0000-0001-6382-3344"
-        },  
-        {
-            "affiliation": "Global Quality Corp.", 
-            "name": "Melissa Conner"
-        }, 
-        {
-            "affiliation": "Global Quality Corp.", 
-            "name": "Jacob Specht"
-        }, 
-
-        {
-            "affiliation": "General Dynamics Information Technology, Inc.",
-            "name": "Mo Li",
-            "orcid": "https://orcid.org/0000-0002-3672-1622"
-        }, 
+        },
         {
             "affiliation": "US Environmental Protection Agency", 
             "name": "Wesley Ingwersen",

diff --git a/flowsa/__init__.py b/flowsa/__init__.py
@@ -10,7 +10,7 @@
 https://github.com/USEPA/flowsa/wiki/Data-Storage#local-storage
 
 or can be downloaded from a remote repository
-https://edap-ord-data-commons.s3.amazonaws.com/index.html?prefix=flowsa/
+https://dmap-data-commons-ord.s3.amazonaws.com/index.html?prefix=flowsa/
 
 The most recent version (based on timestamp) of Flow-By-Activity and
 Flow-By-Sector files are loaded when running these functions

diff --git a/flowsa/common.py b/flowsa/common.py
@@ -346,7 +346,7 @@ def seeAvailableFlowByModels(flowbytype, print_method=True):
     fb_names = [os.path.splitext(f)[0] for f in fb_dir if f.endswith('.yaml')]
 
     # further reduce list of file names by excluding common and summary_target
-    exclude = ["_common", "_target"]
+    exclude = ["_common", "_Common", "_target"]
     fb_names = [f for f in fb_names if all(s not in f for s in exclude)]
 
     if flowbytype == 'FBA':

diff --git a/flowsa/data/Sector_2012_Names.csv b/flowsa/data/Sector_2012_Names.csv
@@ -1805,16 +1805,19 @@ NAICS_2012_Code,NAICS_2012_Name
 562211,Hazardous Waste Treatment and Disposal
 562212,Solid Waste Landfill
 5622121,MSW Landfill
+5622122,Industrial Waste Landfills
 562213,Solid Waste Combustors and Incinerators
 562219,Other Nonhazardous Waste Treatment and Disposal
-5622191,Codigestion/Anaerobic Digestion
-5622192,Composting/Aerobic Processes
+5622191,Anaerobic Digestion
+5622192,MSW Composting
 5629,Remediation and Other Waste Management Services
 56291,Remediation Services
 562910,Remediation Services
 56292,Materials Recovery Facilities
 562920,Materials Recovery Facilities
 5629201,MSW Recycling
+5629202,Mixed CDD MRFs
+5629203,Single material MRFs
 56299,All Other Waste Management Services
 562991,Septic Tank and Related Services
 562998,All Other Miscellaneous Waste Management Services

diff --git a/flowsa/data/Sector_2017_Names.csv b/flowsa/data/Sector_2017_Names.csv
@@ -1792,16 +1792,19 @@ NAICS_2017_Code,NAICS_2017_Name
 562211,Hazardous Waste Treatment and Disposal
 562212,Solid Waste Landfill
 5622121,MSW Landfill
+5622122,Industrial Waste Landfills
 562213,Solid Waste Combustors and Incinerators
 562219,Other Nonhazardous Waste Treatment and Disposal
-5622191,Codigestion/Anaerobic Digestion
-5622192,Composting/Aerobic Processes
+5622191,Anaerobic Digestion
+5622192,MSW Composting
 5629,Remediation and Other Waste Management Services
 56291,Remediation Services
 562910,Remediation Services
 56292,Materials Recovery Facilities
 562920,Materials Recovery Facilities
 5629201,MSW Recycling
+5629202,Mixed CDD MRFs
+5629203,Single material MRFs
 56299,All Other Waste Management Services
 562991,Septic Tank and Related Services
 562998,All Other Miscellaneous Waste Management Services

diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_IWMS.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USDA_IWMS.csv
@@ -21,7 +21,7 @@ USDA_IWMS,ORCHARDS,NAICS_2012_Code,11131,
 USDA_IWMS,ORCHARDS,NAICS_2012_Code,11132,
 USDA_IWMS,ORCHARDS,NAICS_2012_Code,111331,
 USDA_IWMS,ORCHARDS,NAICS_2012_Code,111332,
-USDA_IWMS,ORCHARDS,NAICS_2012_Code,111333,
+USDA_IWMS,BERRY TOTALS,NAICS_2012_Code,111333,
 USDA_IWMS,BERRY TOTALS,NAICS_2012_Code,111334,
 USDA_IWMS,ORCHARDS,NAICS_2012_Code,111335,
 USDA_IWMS,ORCHARDS,NAICS_2012_Code,111336,

diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_WU_Coef.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_WU_Coef.csv
@@ -1,6 +1,7 @@
 ActivitySourceName,Activity,SectorSourceName,Sector,SectorType
 USGS_WU_Coef,"Beef and other cattle, including calves",NAICS_2012_Code,11211,
 USGS_WU_Coef,Dairy cows,NAICS_2012_Code,11212,
+USGS_WU_Coef,"Beef and other cattle, including calves",NAICS_2012_Code,11213,
 USGS_WU_Coef,Hogs and pigs,NAICS_2012_Code,1122,
 USGS_WU_Coef,Laying hens,NAICS_2012_Code,11231,
 USGS_WU_Coef,Broilers and other chickens,NAICS_2012_Code,11232,

diff --git a/flowsa/data/external_data/AEOseriesIDs.csv b/flowsa/data/external_data/AEOseriesIDs.csv
diff --git a/flowsa/data/external_data/NOAA_FisheriesLandings.csv b/flowsa/data/external_data/NOAA_FisheriesLandings.csv
diff --git a/flowsa/data/external_data/foss_landings.csv b/flowsa/data/external_data/foss_landings.csv