From f02cbc78925e843c22565e5f008c4545f87c56d4 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 4 Oct 2023 15:49:39 -0400 Subject: [PATCH 1/6] add back develop tags --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a576b047..113f137c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/USEPA/esupy.git#egg=esupy +git+https://github.com/USEPA/esupy.git@develop#egg=esupy pandas>=1.3 # Powerful data structures for data analysis, time series, and statistics. numpy>=1.20.1 # NumPy is the fundamental package for array computing with Python requests>=2.20 # Python HTTP for Humans; used for webservice calls diff --git a/setup.py b/setup.py index 0d45c6c4..bc299a1e 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ include_package_data=True, python_requires=">=3.8", install_requires=[ - 'esupy @ git+https://github.com/USEPA/esupy.git#egg=esupy', + 'esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy', 'numpy>=1.20.1', 'pandas>=1.3', 'requests>=2.20', From f53899032783f1f8213c438efc8fb8e22259fdf0 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Thu, 15 Feb 2024 20:39:10 -0500 Subject: [PATCH 2/6] resolve FutureWarning: Setting an item of incompatible dtype is deprecated --- stewi/globals.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stewi/globals.py b/stewi/globals.py index 4eb79704..b040395e 100644 --- a/stewi/globals.py +++ b/stewi/globals.py @@ -14,6 +14,7 @@ from pathlib import Path import pandas as pd +import numpy as np import yaml from esupy.processed_data_mgmt import Paths, FileMeta,\ @@ -117,7 +118,9 @@ def unit_convert(df, coln1, coln2, unit, conversion_factor, coln3): """Convert values in coln3 if coln2 == unit, based on the conversion factor, and assigns to coln1. """ - df.loc[df[coln2] == unit, coln1] = conversion_factor * df[coln3] + df[coln1] = np.where(df[coln2] == unit, + conversion_factor * df[coln3], + coln1) return df From c41189a631cd7c1d359817cdd5cc41d00b1c491a Mon Sep 17 00:00:00 2001 From: Ben Young Date: Thu, 15 Feb 2024 20:42:39 -0500 Subject: [PATCH 3/6] resolve FutureWarning: Setting an item of incompatible dtype is deprecated --- stewi/DMR.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stewi/DMR.py b/stewi/DMR.py index 7dfc2b08..0beb3c42 100644 --- a/stewi/DMR.py +++ b/stewi/DMR.py @@ -19,6 +19,7 @@ """ import pandas as pd +import numpy as np import argparse import urllib import time @@ -192,10 +193,10 @@ def standardize_df(input_df): dmr_flows = flows[['FlowName', 'FlowID'] ].drop_duplicates(subset=['FlowName']) output_df = output_df.merge(dmr_flows, on='FlowName', how='left') - output_df.loc[output_df.FlowID_x.isin( - flows.PARAMETER_CODE), ['FlowID']] = output_df['FlowID_x'] - output_df.loc[~output_df.FlowID_x.isin( - flows.PARAMETER_CODE), ['FlowID']] = output_df['FlowID_y'] + output_df['FlowID'] = np.where( + output_df.FlowID_x.isin(flows.PARAMETER_CODE), + output_df['FlowID_x'], + output_df['FlowID_y']) output_df = output_df.drop(columns=['FlowID_x', 'FlowID_y']) return output_df From 7eea07358eaa4400ac9b7d182deda91a314ffbac Mon Sep 17 00:00:00 2001 From: Ben Young Date: Thu, 15 Feb 2024 21:04:09 -0500 Subject: [PATCH 4/6] fix typo --- stewi/globals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stewi/globals.py b/stewi/globals.py index b040395e..102a33db 100644 --- a/stewi/globals.py +++ b/stewi/globals.py @@ -120,7 +120,7 @@ def unit_convert(df, coln1, coln2, unit, conversion_factor, coln3): """ df[coln1] = np.where(df[coln2] == unit, conversion_factor * df[coln3], - coln1) + df[coln1]) return df From ddfdde06da63de5f85179f14daceb5b0af99e58e Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 29 May 2024 15:47:39 -0400 Subject: [PATCH 5/6] add RCRA 2021 validation data #159; update 2017 and 2019 validation datasets --- README.md | 2 +- stewi/data/RCRAInfo/RCRA_state_totals.csv | 120 +++++++++++----------- stewi/data/RCRAInfo_2017_StateTotals.csv | 12 +-- stewi/data/RCRAInfo_2019_StateTotals.csv | 38 +++---- stewi/data/RCRAInfo_2021_StateTotals.csv | 51 +++++++++ stewi/data/ValidationSets_Sources.csv | 5 +- 6 files changed, 140 insertions(+), 88 deletions(-) create mode 100644 stewi/data/RCRAInfo_2021_StateTotals.csv diff --git a/README.md b/README.md index a417c444..8dfa962d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ An article describing StEWI was published in a special issue of Applied Sciences |[Greenhouse Gas Reporting Program](https://www.epa.gov/ghgreporting) |x|x|x|x|x|x|x|x|x|x|x| |[Emissions & Generation Resource Integrated Database](https://www.epa.gov/energy/emissions-generation-resource-integrated-database-egrid) | | | |x| |x| |x|x|x|x| |[National Emissions Inventory](https://www.epa.gov/air-emissions-inventories/national-emissions-inventory-nei)** |x|i|i|x|i|i|x|i|i|x| | -|[RCRA Biennial Report](https://www.epa.gov/hwgenerators/biennial-hazardous-waste-report)* |x| |x| |x| |x| |x| | | +|[RCRA Biennial Report](https://www.epa.gov/hwgenerators/biennial-hazardous-waste-report)* |x| |x| |x| |x| |x| |x| |[Toxic Release Inventory](https://www.epa.gov/toxics-release-inventory-tri-program)* |x|x|x|x|x|x|x|x|x|x|x| *Earlier data exist and are accessible but have not been validated diff --git a/stewi/data/RCRAInfo/RCRA_state_totals.csv b/stewi/data/RCRAInfo/RCRA_state_totals.csv index 8dd2458d..41617119 100644 --- a/stewi/data/RCRAInfo/RCRA_state_totals.csv +++ b/stewi/data/RCRAInfo/RCRA_state_totals.csv @@ -1,60 +1,60 @@ -Location Name,Units,2001,2003,2005,2007,2009,2011,2013,2015,2017,2019 -WYOMING, Tot. Generation (Tons):,37544,2446,3067,4011,3502,4002,3564,7250,4737,5953 -WISCONSIN, Tot. Generation (Tons):,294754,369829,108327,310293,223441,289401,206043,172716,190391,273992 -WEST VIRGINIA, Tot. Generation (Tons):,101195,87315,72602,76577,92502,62334,52584,52168,65992,52814 -WASHINGTON, Tot. Generation (Tons):,240795,91883,141918,157369,317217,333960,258998,135461,107014,117878 -VIRGINIA, Tot. Generation (Tons):,209447,152515,134416,95050,51065,74812,59315,62434,61045,73001 -VIRGIN ISLANDS, Tot. Generation (Tons):,1971,1943,2628,3154,2620,1251,10064,299,2597,1380 -VERMONT, Tot. Generation (Tons):,4099,2924,3451,2951,1536,1978,2085,288019,2136,2593 -UTAH, Tot. Generation (Tons):,88664,50231,78101,82829,59448,49695,40334,34100,34355,53991 -TRUST TERRITORIES, Tot. Generation (Tons):,8999,12156,8,1,2,3,1,0,0,0 -TEXAS, Tot. Generation (Tons):,7555883,6585970,15224251,13406665,13462042,15683432,15628132,16288707,17764940,17566703 -TENNESSEE, Tot. Generation (Tons):,629834,572329,538162,130143,78595,89352,96251,47756,162342,80989 -SOUTH DAKOTA, Tot. Generation (Tons):,950,1254,992,750,1214,1347,1475,1917,1966,2106 -SOUTH CAROLINA, Tot. Generation (Tons):,142510,156358,177734,151431,102034,140496,136225,154595,164504,148377 -RHODE ISLAND, Tot. Generation (Tons):,9435,6776,6292,4631,4505,8619,6871,7252,7638,8502 -REGION 06 PURVIEW, Tot. Generation (Tons):,0,2,0,0,0,0,0,0,0,0 -PUERTO RICO, Tot. Generation (Tons):,176555,217762,87501,60041,42996,37335,35912,20297,19124,17273 -PENNSYLVANIA, Tot. Generation (Tons):,398403,388662,360820,388782,290820,308720,262883,293947,307897,256845 -OREGON, Tot. Generation (Tons):,49945,55703,40332,74965,61876,93180,56150,52830,52502,88544 -OKLAHOMA, Tot. Generation (Tons):,887643,242664,211939,134426,41874,44294,100595,105306,104265,117471 -OHIO, Tot. Generation (Tons):,1889067,1800170,2198821,1612560,1300804,1627192,1531251,1711570,1594823,1560541 -NORTHERN MARIANAS, Tot. Generation (Tons):,0,0,0,0,0,11,0,2,0,0 -NORTH DAKOTA, Tot. Generation (Tons):,574614,633735,549686,538611,530504,455868,375752,265051,421766,402938 -NORTH CAROLINA, Tot. Generation (Tons):,329731,112595,91923,96928,71763,83114,79240,81153,80726,87502 -NEW YORK, Tot. Generation (Tons):,3534290,1130623,1124198,1267648,1032626,186483,234393,281259,145620,489148 -NEW MEXICO, Tot. Generation (Tons):,962808,727272,944636,944581,1078672,1042387,887703,5631,4333,6607 -NEW JERSEY, Tot. Generation (Tons):,586210,1236150,326194,596130,555806,290456,386251,333804,243569,215960 -NEW HAMPSHIRE, Tot. Generation (Tons):,12269,8141,6126,5432,4538,3949,3813,3714,4942,3921 -NEVADA, Tot. Generation (Tons):,6610,9704,12947,10041,11143,9839,15123,13141,21857,19909 -NEBRASKA, Tot. Generation (Tons):,31382,43541,30901,38720,28187,34915,29309,26839,29715,24028 -NAVAJO NATIONS, Tot. Generation (Tons):,188,6,91,35,34,23,3,45,0,2 -MONTANA, Tot. Generation (Tons):,6877,18859,7218,29520,38017,5883,7068,6773,36772,7437 -MISSOURI, Tot. Generation (Tons):,101782,192933,223719,228109,238215,251022,285118,291067,284485,295852 -MISSISSIPPI, Tot. Generation (Tons):,2165758,2004580,1599450,2239718,1702446,1828886,1589984,1946349,2259065,1577700 -MINNESOTA, Tot. Generation (Tons):,1662632,550256,249503,94437,106804,357412,349887,120901,84786,89569 -MICHIGAN, Tot. Generation (Tons):,649244,448232,295862,340550,284291,283161,585128,408227,392806,394460 -MASSACHUSETTS, Tot. Generation (Tons):,1121752,69109,218724,185555,32471,35554,32924,39108,31896,60479 -MARYLAND, Tot. Generation (Tons):,17577,55379,39715,43606,33684,44250,47987,125807,43780,39826 -MAINE, Tot. Generation (Tons):,6168,7259,4130,5305,3687,2406,2992,2606,2128,5264 -LOUISIANA, Tot. Generation (Tons):,3883563,4559668,5460262,5010814,3878843,4399520,4790163,5010182,5015920,5366964 -KENTUCKY, Tot. Generation (Tons):,2686583,2441400,1152075,139878,132710,142116,133696,135106,111802,124883 -KANSAS, Tot. Generation (Tons):,1571598,104177,131835,292688,222838,1238262,1348416,1280076,1210536,1007843 -IOWA, Tot. Generation (Tons):,47147,48282,52708,50787,40444,51002,51691,56946,56392,53460 -INDIANA, Tot. Generation (Tons):,1127542,988323,923431,990483,778454,888054,1024748,924961,948325,998968 -ILLINOIS, Tot. Generation (Tons):,1412100,1125485,1164127,1122937,1045420,675534,615433,601566,616552,610075 -IDAHO, Tot. Generation (Tons):,214409,5447,25924,5638,4808,3742,4967,7049,10564,5597 -HAWAII, Tot. Generation (Tons):,464857,1139,1458,1138,987,425644,466384,484634,499156,531820 -GUAM, Tot. Generation (Tons):,412,174,139,135,421,86,167,140,209,205 -GEORGIA, Tot. Generation (Tons):,760043,203298,480269,102636,4024468,211127,280227,172752,86330,71087 -FLORIDA, Tot. Generation (Tons):,400107,356859,237078,144157,168912,198406,103768,90982,141181,236620 -DISTRICT OF COLUMBIA, Tot. Generation (Tons):,2113,1124,281,765,870,1137,552,1078,772,1017 -DELAWARE, Tot. Generation (Tons):,17512,19070,14441,19743,19817,43307,15007,12577,11054,8458 -CONNECTICUT, Tot. Generation (Tons):,62524,38396,43980,28472,21148,24967,19739,35939,42359,40262 -COLORADO, Tot. Generation (Tons):,66791,86702,95475,53485,41535,31801,37398,40440,28947,42442 -CALIFORNIA, Tot. Generation (Tons):,807297,445317,747233,534752,696067,1203326,354288,318050,321979,257765 -ARKANSAS, Tot. Generation (Tons):,857910,419385,443735,495754,273137,922732,345700,338703,334882,391215 -ARIZONA, Tot. Generation (Tons):,96544,28720,24294,56708,21059,27040,69585,38696,37570,45890 -ALASKA, Tot. Generation (Tons):,5094,4804,2356,2532,1890,2524,2350,3965,2154,1857 -ALABAMA, Tot. Generation (Tons):,1569675,1252012,742853,898086,2063609,578348,702009,709666,706263,953713 -* National *, Tot. Generation (Tons):,40551403,30177049,36860339,33313145,35328419,34835696,33767691,33651608,34919461,34899693 +Location Name,Units,2001,2003,2005,2007,2009,2011,2013,2015,2017,2019,2021 +WYOMING, Tot. Generation (Tons):,37544,2446,3067,4011,3502,4002,3564,7250,4737,5958,9009 +WISCONSIN, Tot. Generation (Tons):,294754,369829,108327,310293,223441,289401,206043,172716,190391,273992,211778 +WEST VIRGINIA, Tot. Generation (Tons):,101195,87315,72602,76577,92502,62334,52584,52168,65992,52814,45796 +WASHINGTON, Tot. Generation (Tons):,240795,91883,141918,157369,317217,333960,258998,135461,107014,117894,114278 +VIRGINIA, Tot. Generation (Tons):,209447,152515,134416,95050,51065,74812,59315,62434,61045,73014,66465 +VIRGIN ISLANDS, Tot. Generation (Tons):,1971,1943,2628,3154,2620,1251,10064,299,2597,1380,669 +VERMONT, Tot. Generation (Tons):,4099,2924,3451,2951,1536,1978,2085,288019,2136,2593,1773 +UTAH, Tot. Generation (Tons):,88664,50231,78101,82829,59448,49695,40334,34100,34355,54021,44913 +TRUST TERRITORIES, Tot. Generation (Tons):,8999,12156,8,1,2,3,1,0,0,0,0 +TEXAS, Tot. Generation (Tons):,7555883,6585970,15224251,13406665,13462042,15683432,15628132,16288707,17764940,17566703,17937418 +TENNESSEE, Tot. Generation (Tons):,629834,572329,538162,130143,78595,89352,96251,47756,162342,80989,212051 +SOUTH DAKOTA, Tot. Generation (Tons):,950,1254,992,750,1214,1347,1475,1917,1966,2106,2205 +SOUTH CAROLINA, Tot. Generation (Tons):,142510,156358,177734,151431,102034,140496,136225,154595,164504,148377,174039 +RHODE ISLAND, Tot. Generation (Tons):,9435,6776,6292,4631,4505,8619,6871,7252,7638,8502,7566 +REGION 06 PURVIEW, Tot. Generation (Tons):,0,2,0,0,0,0,0,0,0,0,471 +PUERTO RICO, Tot. Generation (Tons):,176555,217762,87501,60041,42996,37335,35912,20297,19124,17273,12908 +PENNSYLVANIA, Tot. Generation (Tons):,398403,388662,360820,388782,290820,308720,262883,293947,307897,256942,213933 +OREGON, Tot. Generation (Tons):,49945,55703,40332,74965,61876,93180,56150,52830,52502,88544,64876 +OKLAHOMA, Tot. Generation (Tons):,887643,242664,211939,134426,41874,44294,100595,105306,104265,117453,82727 +OHIO, Tot. Generation (Tons):,1889067,1800170,2198821,1612560,1300804,1627192,1531251,1711570,1594858,1576264,1486412 +NORTHERN MARIANAS, Tot. Generation (Tons):,0,0,0,0,0,11,0,2,0,0,0 +NORTH DAKOTA, Tot. Generation (Tons):,574614,633735,549686,538611,530504,455868,375752,265051,421766,402938,351197 +NORTH CAROLINA, Tot. Generation (Tons):,329731,112595,91923,96928,71763,83114,79240,81153,80726,87486,137705 +NEW YORK, Tot. Generation (Tons):,3534290,1130623,1124198,1267648,1032626,186483,234393,281259,145620,489148,266578 +NEW MEXICO, Tot. Generation (Tons):,962808,727272,944636,944581,1078672,1042387,887703,5631,4333,6607,3814 +NEW JERSEY, Tot. Generation (Tons):,586210,1236150,326194,596130,555806,290456,386251,333804,252267,227917,221561 +NEW HAMPSHIRE, Tot. Generation (Tons):,12269,8141,6126,5432,4538,3949,3813,3714,4942,3921,3206 +NEVADA, Tot. Generation (Tons):,6610,9704,12947,10041,11143,9839,15123,13141,21857,19914,19186 +NEBRASKA, Tot. Generation (Tons):,31382,43541,30901,38720,28187,34915,29309,26839,29715,24028,27683 +NAVAJO NATIONS, Tot. Generation (Tons):,188,6,91,35,34,23,3,45,0,2,0 +MONTANA, Tot. Generation (Tons):,6877,18859,7218,29520,38017,5883,7068,6773,36772,7437,6581 +MISSOURI, Tot. Generation (Tons):,101782,192933,223719,228109,238215,251022,285118,291067,284485,295852,139417 +MISSISSIPPI, Tot. Generation (Tons):,2165758,2004580,1599450,2239718,1702446,1828886,1589984,1946349,2259065,1577700,2143855 +MINNESOTA, Tot. Generation (Tons):,1662632,550256,249503,94437,106804,357412,349887,120901,84790,89602,80048 +MICHIGAN, Tot. Generation (Tons):,649244,448232,295862,340550,284291,283161,585128,408227,393048,395063,338817 +MASSACHUSETTS, Tot. Generation (Tons):,1121752,69109,218724,185555,32471,35554,32924,39108,31896,60504,50737 +MARYLAND, Tot. Generation (Tons):,17577,55379,39715,43606,33684,44250,47987,125807,43780,39826,32298 +MAINE, Tot. Generation (Tons):,6168,7259,4130,5305,3687,2406,2992,2606,2128,5264,2659 +LOUISIANA, Tot. Generation (Tons):,3883563,4559668,5460262,5010814,3878843,4399520,4790163,5010182,5015920,5366964,5274809 +KENTUCKY, Tot. Generation (Tons):,2686583,2441400,1152075,139878,132710,142116,133696,135106,111802,124883,813593 +KANSAS, Tot. Generation (Tons):,1571598,104177,131835,292688,222838,1238262,1348416,1280076,1210536,1007839,1031787 +IOWA, Tot. Generation (Tons):,47147,48282,52708,50787,40444,51002,51691,56946,56392,53469,53671 +INDIANA, Tot. Generation (Tons):,1127542,988323,923431,990483,778454,888054,1024748,924961,948325,998989,943051 +ILLINOIS, Tot. Generation (Tons):,1412100,1125485,1164127,1122937,1045420,675534,615433,601566,616618,610217,379091 +IDAHO, Tot. Generation (Tons):,214409,5447,25924,5638,4808,3742,4967,7049,10564,5597,5593 +HAWAII, Tot. Generation (Tons):,464857,1139,1458,1138,987,425644,466384,484634,499156,531820,541888 +GUAM, Tot. Generation (Tons):,412,174,139,135,421,86,167,140,209,205,313 +GEORGIA, Tot. Generation (Tons):,760043,203298,480269,102636,4024468,211127,280227,172752,86330,71087,63993 +FLORIDA, Tot. Generation (Tons):,400107,356859,237078,144157,168912,198406,103768,90982,141181,236657,62955 +DISTRICT OF COLUMBIA, Tot. Generation (Tons):,2113,1124,281,765,870,1137,552,1078,772,1017,973 +DELAWARE, Tot. Generation (Tons):,17512,19070,14441,19743,19817,43307,15007,12577,11054,8458,5953 +CONNECTICUT, Tot. Generation (Tons):,62524,38396,43980,28472,21148,24967,19739,35939,42359,40262,35007 +COLORADO, Tot. Generation (Tons):,66791,86702,95475,53485,41535,31801,37398,40440,28947,42442,63495 +CALIFORNIA, Tot. Generation (Tons):,807297,445317,747233,534752,696067,1203326,354288,318050,321988,260410,219550 +ARKANSAS, Tot. Generation (Tons):,857910,419385,443735,495754,273137,922732,345700,338703,334882,391215,888205 +ARIZONA, Tot. Generation (Tons):,96544,28720,24294,56708,21059,27040,69585,38696,37570,45890,72461 +ALASKA, Tot. Generation (Tons):,5094,4804,2356,2532,1890,2524,2350,3965,2154,1857,5342 +ALABAMA, Tot. Generation (Tons):,1569675,1252012,742853,898086,2063609,578348,702009,709666,706263,953713,888265 +* National *, Tot. Generation (Tons):,40551403,30177049,36860339,33313145,35328419,34835696,33767691,33651608,34928515,34931096,35864676 diff --git a/stewi/data/RCRAInfo_2017_StateTotals.csv b/stewi/data/RCRAInfo_2017_StateTotals.csv index af65f995..bf790eb9 100644 --- a/stewi/data/RCRAInfo_2017_StateTotals.csv +++ b/stewi/data/RCRAInfo_2017_StateTotals.csv @@ -14,20 +14,20 @@ RHODE ISLAND,6929077.044120001,RI PENNSYLVANIA,279319459.89178,PA OREGON,47629013.21948,OR OKLAHOMA,94587616.91610001,OK -OHIO,1446799088.60102,OH +OHIO,1446830840.06692,OH NORTH DAKOTA,382619679.05084,ND NORTH CAROLINA,73233395.32124001,NC NEW YORK,132104241.8388,NY NEW MEXICO,3930831.47842,NM -NEW JERSEY,220962079.93706,NJ +NEW JERSEY,228852772.80558002,NJ NEW HAMPSHIRE,4483306.98508,NH NEVADA,19828336.862180002,NV NEBRASKA,26956994.5491,NE MONTANA,33358997.25928,MT MISSOURI,258080450.75890002,MO MISSISSIPPI,2049389294.6681,MS -MINNESOTA,76916565.36564,MN -MICHIGAN,356347608.98044,MI +MINNESOTA,76920194.1046,MN +MICHIGAN,356567147.68752,MI MASSACHUSETTS,28935564.467040002,MA MARYLAND,39716547.9172,MD MAINE,1930489.12672,ME @@ -36,7 +36,7 @@ KENTUCKY,101425068.30148001,KY KANSAS,1098179786.42064,KS IOWA,51157961.85808,IA INDIANA,860305968.5605,IN -ILLINOIS,559326565.81648,IL +ILLINOIS,559386440.00932,IL IDAHO,9583499.593360001,ID HAWAII,452826706.07944,HI GEORGIA,78317258.6042,GA @@ -44,7 +44,7 @@ FLORIDA,128077248.77794,FL DELAWARE,10028020.11596,DE CONNECTICUT,38427438.40166,CT COLORADO,26260276.668780003,CO -CALIFORNIA,292094435.40046,CA +CALIFORNIA,292102600.06312,CA ARKANSAS,303799840.10068,AR ARIZONA,34082930.6818,AZ ALASKA,1954075.92996,AK diff --git a/stewi/data/RCRAInfo_2019_StateTotals.csv b/stewi/data/RCRAInfo_2019_StateTotals.csv index 9e0b997d..adebed42 100644 --- a/stewi/data/RCRAInfo_2019_StateTotals.csv +++ b/stewi/data/RCRAInfo_2019_StateTotals.csv @@ -1,50 +1,50 @@ state_name,FlowAmount_kg,State -WYOMING,5400470.75722,WY +WYOMING,5405006.68092,WY WISCONSIN,248561361.28208,WI WEST VIRGINIA,47912054.85836,WV -WASHINGTON,106937122.78172,WA -VIRGINIA,66225393.20474,VA +WASHINGTON,106951637.73756,WA +VIRGINIA,66237186.60636,VA VERMONT,2352330.03082,VT -UTAH,48979811.29734,UT +UTAH,49007026.839540005,UT TEXAS,15936244893.712221,TX TENNESSEE,73471984.90786,TN SOUTH DAKOTA,1910531.06244,SD SOUTH CAROLINA,134605350.16698,SC RHODE ISLAND,7712884.65948,RI -PENNSYLVANIA,233005864.5453,PA +PENNSYLVANIA,233093861.46508002,PA OREGON,80325765.61856,OR -OKLAHOMA,106567898.59254001,OK -OHIO,1415698981.34434,OH +OKLAHOMA,106551569.26722,OK +OHIO,1429962647.0113602,OH NORTH DAKOTA,365539204.76612,ND -NORTH CAROLINA,79380479.11948,NC +NORTH CAROLINA,79365964.16364,NC NEW YORK,443747601.20152,NY NEW MEXICO,5993769.57718,NM -NEW JERSEY,195915616.4504,NJ +NEW JERSEY,206762824.38658002,NJ NEW HAMPSHIRE,3557071.36554,NH -NEVADA,18061140.98866,NV +NEVADA,18065676.91236,NV NEBRASKA,21797834.93272,NE MONTANA,6746732.91138,MT MISSOURI,268392419.69848,MO MISSISSIPPI,1431265364.298,MS -MINNESOTA,81255629.97706,MN -MICHIGAN,357848092.5404,MI -MASSACHUSETTS,54865625.89046,MA +MINNESOTA,81285567.07348001,MN +MICHIGAN,358395124.93862003,MI +MASSACHUSETTS,54888305.50896,MA MARYLAND,36129539.455240004,MD MAINE,4775420.47136,ME LOUISIANA,4868827840.92936,LA KENTUCKY,113291951.88542001,KY -KANSAS,914299789.91582,KS -IOWA,48498096.2004,IA -INDIANA,906248525.34832,IN -ILLINOIS,553450730.2555001,IL +KANSAS,914296161.17686,KS +IOWA,48506260.863060005,IA +INDIANA,906267576.22786,IN +ILLINOIS,553579550.48858,IL IDAHO,5077512.98978,ID HAWAII,482458988.4268,HI GEORGIA,64489041.612380005,GA -FLORIDA,214658053.17880002,FL +FLORIDA,214691619.01418,FL DELAWARE,7672968.530920001,DE CONNECTICUT,36525072.001880005,CT COLORADO,38502734.735080004,CO -CALIFORNIA,233840474.5061,CA +CALIFORNIA,236239978.1434,CA ARKANSAS,354904278.05910003,AR ARIZONA,41630707.718600005,AZ ALASKA,1684642.0621800001,AK diff --git a/stewi/data/RCRAInfo_2021_StateTotals.csv b/stewi/data/RCRAInfo_2021_StateTotals.csv new file mode 100644 index 00000000..3845baf1 --- /dev/null +++ b/stewi/data/RCRAInfo_2021_StateTotals.csv @@ -0,0 +1,51 @@ +state_name,FlowAmount_kg,State +WYOMING,8172827.32266,WY +WISCONSIN,192121769.86772,WI +WEST VIRGINIA,41545432.35304,WV +WASHINGTON,103671257.71772,WA +VIRGINIA,60296033.744100004,VA +VERMONT,1608438.5440200001,VT +UTAH,40744388.22762,UT +TEXAS,16272551884.60132,TX +TENNESSEE,192369431.30174002,TN +SOUTH DAKOTA,2000342.3517,SD +SOUTH CAROLINA,157885524.96486,SC +RHODE ISLAND,6863759.74284,RI +PENNSYLVANIA,194076752.98242,PA +OREGON,58854517.19224,OR +OKLAHOMA,75048671.98598,OK +OHIO,1348450283.75288,OH +NORTH DAKOTA,318600559.13378,ND +NORTH CAROLINA,124923874.6217,NC +NEW YORK,241835493.61972,NY +NEW MEXICO,3460002.59836,NM +NEW JERSEY,200996758.17914,NJ +NEW HAMPSHIRE,2908434.27644,NH +NEVADA,17405246.42164,NV +NEBRASKA,25113595.157420002,NE +MONTANA,5970182.773940001,MT +MISSOURI,126476974.89658001,MO +MISSISSIPPI,1944872540.7727,MS +MINNESOTA,72618324.06752001,MN +MICHIGAN,307369612.05258,MI +MASSACHUSETTS,46027832.15338,MA +MARYLAND,29300252.732520003,MD +MAINE,2412204.22366,ME +LOUISIANA,4785226231.214661,LA +KENTUCKY,738079154.17082,KY +KANSAS,936021421.3303801,KS +IOWA,48689512.18054,IA +INDIANA,855521476.24174,IN +ILLINOIS,343905570.27134,IL +IDAHO,5073884.25082,ID +HAWAII,491592524.38912004,HI +GEORGIA,58053473.06682,GA +FLORIDA,57111815.3067,FL +DELAWARE,5400470.75722,DE +CONNECTICUT,31757816.193180002,CT +COLORADO,57601695.066300005,CO +CALIFORNIA,199172409.667,CA +ARKANSAS,805766021.9917,AR +ARIZONA,65735513.445140004,AZ +ALASKA,4846180.88108,AK +ALABAMA,805820453.0761,AL diff --git a/stewi/data/ValidationSets_Sources.csv b/stewi/data/ValidationSets_Sources.csv index f2c0cae1..3896891c 100644 --- a/stewi/data/ValidationSets_Sources.csv +++ b/stewi/data/ValidationSets_Sources.csv @@ -28,8 +28,9 @@ RCRAInfo,,2003,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/mod RCRAInfo,,2005,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: National, Metric: Generation, Generators To Include: All Generators Included In The NBR",16-Jun-2021 RCRAInfo,,2007,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: National, Metric: Generation, Generators To Include: All Generators Included In The NBR",16-Jun-2021 RCRAInfo,,2009,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: National, Metric: Generation, Generators To Include: All Generators Included In The NBR",16-Jun-2021 -RCRAInfo,,2017,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: National, Metric: Generation, Generators To Include: All Generators Included In The NBR",16-Jun-2021 -RCRAInfo,,2019,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: National, Metric: Generation, Generators To Include: All Generators Included In The NBR",16-Jun-2021 +RCRAInfo,,2017,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: State, Metric: Generation, Generators To Include: All Generators Included In The NBR",03-Nov-2022 +RCRAInfo,,2019,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: State, Metric: Generation, Generators To Include: All Generators Included In The NBR",03-Nov-2022 +RCRAInfo,,2021,Trends Analysis,https://rcrapublic.epa.gov/rcrainfoweb/action/modules/br/trends/view,"Location: State, Metric: Generation, Generators To Include: All Generators Included In The NBR",29-May-2024 DMR,,2011,State statistics,https://echo.epa.gov/trends/loading-tool/get-data/state-statistics,Check totals by state,09-Jun-2023 DMR,,2012,State statistics,https://echo.epa.gov/trends/loading-tool/get-data/state-statistics,Check totals by state,09-Jun-2023 DMR,,2013,State statistics,https://echo.epa.gov/trends/loading-tool/get-data/state-statistics,Check totals by state,11-Jun-2023 From 7b5e312543de3f8451735a820a9474bf8f675473 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Sun, 9 Jun 2024 22:15:53 -0400 Subject: [PATCH 6/6] :bookmark: bump to v1.1.3 --- README.md | 1 + requirements.txt | 2 +- setup.py | 4 ++-- stewi/globals.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8dfa962d..1d4a0fb3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Standardized Emission and Waste Inventories (StEWI) [![DOI - 10.3390/app12073447](https://img.shields.io/badge/DOI-10.3390%2Fapp12073447-blue)](https://doi.org/10.3390/app12073447) +[![DOI](https://zenodo.org/badge/101654522.svg)](https://zenodo.org/doi/10.5281/zenodo.1342761) [![DOI - 10.23719/1526441](https://img.shields.io/badge/v1.0%20DataProducts-10.23719%2F1526441-blue)](https://doi.org/10.23719/1526441) [![build](https://github.com/USEPA/standardizedinventories/actions/workflows/python-package.yml/badge.svg)](https://github.com/USEPA/standardizedinventories/actions/workflows/python-package.yml) diff --git a/requirements.txt b/requirements.txt index 113f137c..a576b047 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/USEPA/esupy.git@develop#egg=esupy +git+https://github.com/USEPA/esupy.git#egg=esupy pandas>=1.3 # Powerful data structures for data analysis, time series, and statistics. numpy>=1.20.1 # NumPy is the fundamental package for array computing with Python requests>=2.20 # Python HTTP for Humans; used for webservice calls diff --git a/setup.py b/setup.py index bc299a1e..afdb46a3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="StEWI", - version="1.1.2", + version="1.1.3", author="Ben Young, Wesley Ingwersen, Matthew Bergmann, Jose Hernandez-Betancur, Tapajyoti Ghosh, Eric Bell", author_email="ingwersen.wesley@epa.gov", description="Standardized Emission And Waste Inventories (StEWI)" @@ -15,7 +15,7 @@ include_package_data=True, python_requires=">=3.8", install_requires=[ - 'esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy', + 'esupy @ git+https://github.com/USEPA/esupy.git#egg=esupy', 'numpy>=1.20.1', 'pandas>=1.3', 'requests>=2.20', diff --git a/stewi/globals.py b/stewi/globals.py index 102a33db..9dc8c337 100644 --- a/stewi/globals.py +++ b/stewi/globals.py @@ -30,7 +30,7 @@ DATA_PATH = MODULEPATH / 'data' log.basicConfig(level=log.INFO, format='%(levelname)s %(message)s') -STEWI_VERSION = '1.1.2' +STEWI_VERSION = '1.1.3' # Conversion factors USton_kg = 907.18474