Skip to content

Commit

Permalink
Merge branch 'develop' into traci
Browse files Browse the repository at this point in the history
  • Loading branch information
bl-young committed Dec 28, 2024
2 parents 09db516 + 84c884c commit 4f225ed
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
10 changes: 0 additions & 10 deletions fedelemflowlist/flowmapping/openLCA.csv
Original file line number Diff line number Diff line change
Expand Up @@ -37810,16 +37810,6 @@ openLCA,Manganese-54,dcf5005b-16a3-49ed-ae93-960a320f52db,Elementary flows/Emiss
openLCA,Manganese-54,9a12a4c4-c03e-43fb-a448-4d911f539e64,Elementary flows/Emission to water/surface water,kBq,=,1.0,Manganese-54,204e3a2a-1fb5-38ad-b417-04cb01fde161,emission/water,kBq,Hottle,,2/4/2020
openLCA,Manganese-54,729eac4f-0339-4d0f-8956-a71ebe20a527,Elementary flows/Emission to water/unspecified,kBq,=,1.0,Manganese-54,204e3a2a-1fb5-38ad-b417-04cb01fde161,emission/water,kBq,Hottle,,2/4/2020
openLCA,Manganese-54,147b91df-513b-4784-923a-180c2a5b1434,Elementary flows/Emission to water/ocean,kBq,=,1.0,Manganese-54,0e01238b-87e1-3e55-90b7-4d302cba88fb,emission/water/saline water body/ocean,kBq,Hottle,,2/4/2020
openLCA,Manganese-55,b84517bc-e83c-43fa-aac2-942c4d7c3a59,"Elementary flows/Emission to water/river, long-term",kBq,=,1.0,Manganese-55,b3596475-a604-3f8b-a1c0-843263f3f639,emission/water/fresh water body/river,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,fbd94a05-2e4c-444a-8902-37209c6ba6d5,Elementary flows/Emission to water/river,kBq,=,1.0,Manganese-55,b3596475-a604-3f8b-a1c0-843263f3f639,emission/water/fresh water body/river,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,7310067c-fce4-4c9a-a8a3-d7f6afe7ad08,Elementary flows/Emission to water/lake,kBq,=,1.0,Manganese-55,01dcb046-4646-332e-8aa9-08ced56a3436,emission/water/fresh water body/lake,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,460dff77-d35b-4400-bb82-dd895ea20bb2,Elementary flows/Emission to water/fresh water,kBq,=,1.0,Manganese-55,0e880135-1623-391b-8964-21930bc50cc1,emission/water/fresh water body,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,4590f1e5-d30f-40e6-a3c3-586ec48423e0,Elementary flows/Emission to water/fossil-,kBq,=,1.0,Manganese-55,539fa9d7-8091-3b42-8d00-e8e86fc7c846,emission/water/subterranean,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,957d4d94-9f88-4f40-9755-cfc3918882bb,"Elementary flows/Emission to water/ground water, long-term",kBq,=,1.0,Manganese-55,539fa9d7-8091-3b42-8d00-e8e86fc7c846,emission/water/subterranean,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,583eec00-1480-4cd7-8670-31eaf94053ad,Elementary flows/Emission to water/ground water,kBq,=,1.0,Manganese-55,539fa9d7-8091-3b42-8d00-e8e86fc7c846,emission/water/subterranean,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,32299af9-3432-470b-8f90-5d06df12b062,Elementary flows/Emission to water/surface water,kBq,=,1.0,Manganese-55,775fe780-6f20-3133-bca4-dc7539210a11,emission/water,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,06ee87f5-4946-4ecd-9615-b4723595fbaf,Elementary flows/Emission to water/unspecified,kBq,=,1.0,Manganese-55,775fe780-6f20-3133-bca4-dc7539210a11,emission/water,kBq,Hottle,,4/2/2020
openLCA,Manganese-55,6ed06a59-4fd1-422e-a397-4c3274596701,Elementary flows/Emission to water/ocean,kBq,=,1.0,Manganese-55,813263c0-6a52-32f9-8129-9ce4e7f67bf7,emission/water/saline water body/ocean,kBq,Hottle,,4/2/2020
openLCA,M-bromobenzamide,e335bdb4-ea82-3169-b9a9-e705ca680511,Elementary flows/Emission to air/lower stratosphere + upper troposphere,kg,=,1.0,3-Bromobenzamide,b91f7df1-e44a-3801-990d-dbd1bbae83a6,emission/air/stratosphere,kg,Hottle,,2/14/2020
openLCA,M-bromobenzamide,2cfc4caf-4334-3a7c-9c09-5853b58ab41c,Elementary flows/Emission to air/high population density,kg,=,1.0,3-Bromobenzamide,1524d54e-f16c-309a-8747-c177133dc74c,emission/air/troposphere/urban,kg,Hottle,,2/14/2020
openLCA,M-bromobenzamide,e97c9699-58b7-31a2-97b0-f03a1ef27a8a,Elementary flows/Emission to soil/industrial,kg,=,1.0,3-Bromobenzamide,b0a09e9f-6b52-3552-9828-1463dbb60c49,emission/ground/human-dominated/industrial,kg,Hottle,,2/14/2020
Expand Down
2 changes: 1 addition & 1 deletion fedelemflowlist/input/ChemicalsFlowables.csv
Original file line number Diff line number Diff line change
Expand Up @@ -4644,7 +4644,7 @@ Terbium,7440-27-9,Tb,,kg,https://ofmpub.epa.gov/sor_internet/registry/substreg/s
Holmium,7440-60-0,Ho,,kg,https://ofmpub.epa.gov/sor_internet/registry/substreg/searchandretrieve/substancesearch/search.do?details=displayDetails&selectedSubstanceId=36820,1
Tin dioxide,18282-10-5,SnO2,,kg,https://ofmpub.epa.gov/sor_internet/registry/substreg/searchandretrieve/substancesearch/search.do?details=displayDetails&selectedSubstanceId=62603,1
Sodium tetrathiocarbonate,7345-69-9,CNa2S4,,kg,https://comptox.epa.gov/dashboard/dsstoxdb/results?search=sodium%20tetrathiocarbonate,1
Manganese-55,,,,kBq,,1
Manganese-55,,,,kg,,1
Iridium,7439-88-5,Ir,,kg,https://ofmpub.epa.gov/sor_internet/registry/substreg/searchandretrieve/substancesearch/search.do?details=displayDetails&selectedSubstanceId=37016,0
Hydrogen bromide,11071-85-5,Br2H,,kg,https://ofmpub.epa.gov/sor_internet/registry/substreg/searchandretrieve/substancesearch/search.do?details=displayDetails&selectedSubstanceId=76586,1
Tin(II),22541-90-8,Sn,,kg,https://comptox.epa.gov/dashboard/dsstoxdb/results?search=DTXSID90896833,1
Expand Down
2 changes: 1 addition & 1 deletion scripts/compare_old_flowlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# get the current list

# Enter name of old version here. Must be in output folder
old_version = '1.1.1'
old_version = '1.2.0'

if __name__ == '__main__':
ver = flow_list_specs['list_version']
Expand Down

0 comments on commit 4f225ed

Please sign in to comment.