From 8dcc6a9d43f5ffa2569de1626cdfd2bb3e4e79c2 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Sat, 6 Apr 2024 15:08:37 -0400 Subject: [PATCH 01/13] add version of GHGI mapping file aligned with AR5 as of 2024 ghgi release --- fedelemflowlist/flowmapping/GHGI_AR5_100.csv | 85 ++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 fedelemflowlist/flowmapping/GHGI_AR5_100.csv diff --git a/fedelemflowlist/flowmapping/GHGI_AR5_100.csv b/fedelemflowlist/flowmapping/GHGI_AR5_100.csv new file mode 100644 index 00000000..62d6fd1d --- /dev/null +++ b/fedelemflowlist/flowmapping/GHGI_AR5_100.csv @@ -0,0 +1,85 @@ +SourceListName,SourceFlowName,SourceFlowUUID,SourceFlowContext,SourceUnit,MatchCondition,ConversionFactor,TargetFlowName,TargetFlowUUID,TargetFlowContext,TargetUnit,Mapper,Verifier,LastUpdated +GHGI,C2F6,,air,kg,=,,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,C3F8,,air,kg,=,,Perfluoropropane,d7bc2a19-d1a1-3cbb-b19b-758691f823c1,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,C4F8,,air,kg,=,,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,CF4,,air,kg,=,,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,CH4,,air,kg,=,,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,CO2,,air,kg,=,,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-125,,air,kg,=,,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-134a,,air,kg,=,,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-143a,,air,kg,=,,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-23,,air,kg,=,,HFC-23,b7bab095-d0bf-3d7b-9c8e-c247d71a8f85,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-236fa,,air,kg,=,,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,HFC-32,,air,kg,=,,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,N2O,,air,kg,=,,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,NF3,,air,kg,=,,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,SF6,,air,kg,=,,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Edelen,Young,12/18/2020 +GHGI,C2F6,,air,MMT CO2e,=,90090,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Young,11100,4/5/2024 +GHGI,C3F8,,air,MMT CO2e,=,112360,Perfluoropropane,d7bc2a19-d1a1-3cbb-b19b-758691f823c1,emission/air,kg,Young,8900,4/5/2024 +GHGI,CF4,,air,MMT CO2e,=,150830,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,6630,4/5/2024 +GHGI,CH4,,air,MMT CO2e,=,35714285.71,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,4/5/2024 +GHGI,CO2,,air,MMT CO2e,=,1000000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,1,12/2/2021 +GHGI,HFC-23,,air,MMT CO2e,=,80645,HFC-23,b7bab095-d0bf-3d7b-9c8e-c247d71a8f85,emission/air,kg,Young,12400,4/5/2024 +GHGI,HFC-23,,air,kt,=,1000000,HFC-23,b7bab095-d0bf-3d7b-9c8e-c247d71a8f85,emission/air,kg,Young,,12/2/2021 +GHGI,N2O,,air,MMT CO2e,=,3773585,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,4/5/2024 +GHGI,NF3,,air,MMT CO2e,=,62112,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,16100,4/5/2024 +GHGI,SF6,,air,MMT CO2e,=,42553,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,23500,4/5/2024 +GHGI,c-C4F8,,air,MMT CO2e,=,104822,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Young,9540,4/5/2024 +GHGI,C-C4F8,,air,MMT CO2e,=,104822,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Young,9540,4/5/2024 +GHGI,C4F8,,air,MMT CO2e,=,104822,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Young,9540,4/5/2024 +GHGI,HFC-125,,air,MMT CO2e,=,315457,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Young,3170,4/5/2024 +GHGI,HFC-134a,,air,MMT CO2e,=,769231,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Young,1300,4/5/2024 +GHGI,HFC-143a,,air,MMT CO2e,=,208333,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Young,4800,4/5/2024 +GHGI,HFC-236fa,,air,MMT CO2e,=,124069,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Young,8060,4/5/2024 +GHGI,HFC-32,,air,MMT CO2e,=,1477105,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Young,677,4/5/2024 +GHGI,N2O,,air,MT CO2e,=,3.774,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,4/5/2024 +GHGI,Carbon Dioxide,,air,MMT CO2e,=,1000000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,1,4/5/2024 +GHGI,Methane,,air,MMT CO2e,=,35714286,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,4/5/2024 +GHGI,Nitrous Oxide,,air,MMT CO2e,=,3773585,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,4/5/2024 +GHGI,Carbon Dioxide - biogenic,,air,MMT CO2e,=,1000000000,Biogenic carbon dioxide,n.a.,emission/air,kg,Young,,6/15/2022 +GHGI,Nitrogen trifluoride,,air,MMT CO2e,=,62112,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,16100,4/5/2024 +GHGI,PFC-218 ,,air,MMT CO2e,=,112360,Perfluoropropane,d7bc2a19-d1a1-3cbb-b19b-758691f823c1,emission/air,kg,Young,8900,4/5/2024 +GHGI,Perfluorocyclobutane,,air,MMT CO2e,=,104822,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Young,9540,4/5/2024 +GHGI,Sulfur hexafluoride,,air,MMT CO2e,=,42553,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,23500,4/5/2024 +GHGI,Biogenic CH4,,air,MT,=,1000,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Bell,,9/28/2022 +GHGI,Biogenic CO2,,air,MT,=,1000,Biogenic carbon dioxide,n.a.,emission/air,kg,Bell,,9/28/2022 +GHGI,Biogenic N2O,,air,MT,=,1000,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Bell,,9/28/2022 +GHGI,C2F6,,air,MTCO2e,=,0.081967,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Bell,,9/28/2022 +GHGI,C3F8,,air,MTCO2e,=,0.11325,Perfluoropropane,d7bc2a19-d1a1-3cbb-b19b-758691f823c1,emission/air,kg,Bell,,9/28/2022 +GHGI,c-C4F8,,air,MTCO2e,=,0.097087,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Bell,,9/28/2022 +GHGI,CF4,,air,MTCO2e,=,0.135318,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Bell,,9/28/2022 +GHGI,CH4,,air,MT,=,1000,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Bell,,9/28/2022 +GHGI,HFC-125,,air,MMTCO2e,=,285714,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Bell,,10/20/2022 +GHGI,HFC-134a,,air,MMTCO2e,=,699301,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Bell,,10/20/2022 +GHGI,HFC-143a,,air,MMTCO2e,=,223714,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Bell,,10/20/2022 +GHGI,HFC-23,,air,MTCO2e,=,0.067568,HFC-23,b7bab095-d0bf-3d7b-9c8e-c247d71a8f85,emission/air,kg,Bell,,9/28/2022 +GHGI,HFC-236fa,,air,MMTCO2e,=,101937,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Bell,,10/20/2022 +GHGI,HFC-32,,air,MMTCO2e,=,1481481,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Bell,,10/20/2022 +GHGI,NF3,,air,MTCO2e,=,0.05814,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Bell,,9/28/2022 +GHGI,SF6,,air,MTCO2e,=,0.04386,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Bell,,9/28/2022 +GHGI,PFC-116 ,,air,MMT CO2e,=,81967,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Young,,10/18/2022 +GHGI,PFC-14 ,,air,MMT CO2e,=,135318,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,,10/18/2022 +GHGI,C2F6,,air,MT,=,1000,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Bell,,11/16/2022 +GHGI,C3F8,,air,MT,=,1000,Perfluoropropane,d7bc2a19-d1a1-3cbb-b19b-758691f823c1,emission/air,kg,Bell,,11/16/2022 +GHGI,c-C4F8,,air,MT,=,1000,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Bell,,11/16/2022 +GHGI,CF4,,air,MT,=,1000,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Bell,,11/16/2022 +GHGI,CO2,,air,MT,=,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-125,,air,MT,=,1000,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-134a,,air,MT,=,1000,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-143a,,air,MT,=,1000,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-23,,air,MT,=,1000,HFC-23,b7bab095-d0bf-3d7b-9c8e-c247d71a8f85,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-236fa,,air,MT,=,1000,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Bell,,11/16/2022 +GHGI,HFC-32,,air,MT,=,1000,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Bell,,11/16/2022 +GHGI,N2O,,air,MT,=,1000,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Bell,,11/16/2022 +GHGI,NF3,,air,MT,=,1000,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Bell,,11/16/2022 +GHGI,SF6,,air,MT,=,1000,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Bell,,11/16/2022 +GHGI,Others,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,Others,,air,MTCO2e,=,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,CO2e,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,Unspecified mix of HFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,Unspecified mix of PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,Unspecified mix of HFCs and PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,HFC-41,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,C4F6,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,Other Saturated HFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/5/2024 +GHGI,Other PFCs and HFOs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/5/2024 From 0a5de48630aa0e1c2c0e3069c75dfd8e7344387d Mon Sep 17 00:00:00 2001 From: Ben Young Date: Fri, 19 Apr 2024 21:22:52 -0400 Subject: [PATCH 02/13] add additional flows for new tables 4-61, 4-62, 4-132 --- fedelemflowlist/flowmapping/GHGI_AR5_100.csv | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fedelemflowlist/flowmapping/GHGI_AR5_100.csv b/fedelemflowlist/flowmapping/GHGI_AR5_100.csv index 62d6fd1d..d8ab4b7a 100644 --- a/fedelemflowlist/flowmapping/GHGI_AR5_100.csv +++ b/fedelemflowlist/flowmapping/GHGI_AR5_100.csv @@ -83,3 +83,13 @@ GHGI,HFC-41,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emissio GHGI,C4F6,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 GHGI,Other Saturated HFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/5/2024 GHGI,Other PFCs and HFOs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/5/2024 +GHGI,"1H,4H-Perfluorobutane",,air,MT,=,1000,Perfluorobutane,b79859f9-9979-3708-9390-a3d6c0690561,emission/air,kg,Young,,4/19/2024 +GHGI,"1H,6H-Perfluorohexane",,air,MT,=,1000,Perfluorohexane,abbacdaf-9d6d-3805-bd10-d35905d7dff8,emission/air,kg,Young,,4/19/2024 +GHGI,Perfluorocyclobutane,,air,MT,=,1000,Perfluorocyclobutane,8dbc9ab8-994d-3120-a843-bdbd98c41047,emission/air,kg,Young,,4/19/2024 +GHGI,PFC-14 (Perfluoromethane),,air,MT,=,1000,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,,4/19/2024 +GHGI,Sulfur hexafluoride,,air,MT,=,1000,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,,4/19/2024 +GHGI,Nitrogen trifluoride,,air,MT,=,1000,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,,4/19/2024 +GHGI,PFC-14,,air,MMT CO2e,=,135318,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,,4/19/2024 +GHGI,PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/19/2024 +GHGI,Other HFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/19/2024 +GHGI,Other PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/19/2024 From ffe14f9261f4cce3cf6dff2566f3d52402e186e6 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Mon, 13 May 2024 16:38:00 -0400 Subject: [PATCH 03/13] 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 dc9ebd24..d072bc4b 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 olca-schema>=0.0.11 pandas>=0.22 # Powerful data structures for data analysis, time series, and statistics. pip>=9 # The PyPA recommended tool for installing Python packages. diff --git a/setup.py b/setup.py index fe50ba14..c93c7d20 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ install_requires = [ 'pandas>=0.22', 'olca-schema>=0.0.11', - 'esupy @ git+https://github.com/USEPA/esupy.git#egg=esupy', + 'esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy', ], url='https://github.com/USEPA/fedelemflowlist', license='CC0', From 18c3b68618c4f6b2ded101b5b2bcda83836320d9 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Mon, 13 May 2024 16:54:53 -0400 Subject: [PATCH 04/13] add zenodo metadata #192 --- .zenodo.json | 28 ++++++++++++++++++++++++++++ README.md | 7 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 .zenodo.json diff --git a/.zenodo.json b/.zenodo.json new file mode 100644 index 00000000..c464d291 --- /dev/null +++ b/.zenodo.json @@ -0,0 +1,28 @@ +{ + "description": "Generates and provides a standardized elementary flow list for use in life cycle assessment (LCA) data as well as mappings to convert data from other sources.", + "license": "MIT", + "title": "fedelemflowlist", + "upload_type": "software", + "creators": [ + { + "affiliation": "US Environmental Protection Agency", + "name": "Wesley Ingwersen", + "orcid": "https://orcid.org/0000-0002-9614-701X" + }, + { + "affiliation": "Eastern Research Group, Inc.", + "name": "Ben Young", + "orcid": "https://orcid.org/0000-0001-6276-8670" + }, + { + "affiliation": "Eastern Research Group, Inc.", + "name": "Ashley Edelen" + }, + { + "affiliation": "Eastern Research Group, Inc.", + "name": "Sarah Cashman", + "orcid": "https://orcid.org/0000-0001-9859-9557" + } + ], + "access_right": "open" +} diff --git a/README.md b/README.md index b32eb61a..4dd7f7af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Applied Sciences](http://img.shields.io/badge/Applied%20Sciences-10.3390/app12199687-blue.svg)](https://doi.org/10.3390/app12199687) +[![DOI](https://zenodo.org/badge/120324037.svg)](https://zenodo.org/doi/10.5281/zenodo.6604309) # fedelemflowlist @@ -12,9 +13,9 @@ and a [Flow Mapping](./format%20specs/FlowMapping.md) are defined and provided by `fedelemflowlist`. They are implemented as [pandas](https://pandas.pydata.org/) dataframes. Standard formats are also described for the input files used in building the flow list, and implemented as .csv files - in the [input](https://github.com/USEPA/Federal-LCA-Commons-Elementary-Flow-List/tree/master/fedelemflowlist/input) directory. + in the [input](https://github.com/USEPA/fedelemflowlist/tree/master/fedelemflowlist/input) directory. - The version of the package (see [Releases](https://github.com/USEPA/Federal-LCA-Commons-Elementary-Flow-List/releases/)) + The version of the package (see [Releases](https://github.com/USEPA/fedelemflowlist/releases/)) corresponds to the version of the flow list that it provides. The complete or 'master' list contains all valid flows, where the 'preferred' flows are the recommended flows for use in LCA data. @@ -25,7 +26,7 @@ The background and methodology behind creation of the flow list, as well as a su ['The Federal LCA Commons Elementary Flow List: Background, Approach, Description and Recommendations for Use'](https://cfpub.epa.gov/si/si_public_record_report.cfm?Lab=NRMRL&dirEntryId=347251). Definitions for terms used in the flow list can be found in on EPA's Terminology Services in the [Federal LCA Commons Elementary Flow List for Life Cycle Assessment vocabulary](https://sor.epa.gov/sor_internet/registry/termreg/searchandretrieve/glossariesandkeywordlists/search.do?details=&vocabName=FEDEFL). -See the [Wiki](https://github.com/USEPA/Federal-LCA-Commons-Elementary-Flow-List/wiki/) for installation, more info on repository +See the [Wiki](https://github.com/USEPA/fedelemflowlist/wiki/) for installation, more info on repository contents, use examples, and for instructions on how to contribute to the flow list through additions or edits to flows or flow mappings. ## Disclaimer From bca6a7ad65db06f12fe6b4debb298605580b750b Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 12 Jun 2024 17:20:29 -0400 Subject: [PATCH 05/13] add MER flows in original energy units --- fedelemflowlist/flowmapping/EIA_MER.csv | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedelemflowlist/flowmapping/EIA_MER.csv b/fedelemflowlist/flowmapping/EIA_MER.csv index afad67c8..e5025fdb 100644 --- a/fedelemflowlist/flowmapping/EIA_MER.csv +++ b/fedelemflowlist/flowmapping/EIA_MER.csv @@ -9,3 +9,7 @@ EIA_MER,Primary energy - biomass,,resource,MJ,=,0.0612,Biomass,7feeb363-fbeb-37a EIA_MER,Primary energy - hydro,,resource/in water,MJ,=,1,"Energy, hydro",5af7a834-bf92-32eb-a0b2-2f2dcdc9f3d9,resource/water,MJ,Young,Edelen,2/2/2021 EIA_MER,Primary energy - solar,,resource/in air,MJ,=,1,"Energy, solar",4d1571a6-ffff-3a36-82df-224ed975a094,resource/air,MJ,Young,Edelen,2/2/2021 EIA_MER,Primary energy - wind,,resource/in air,MJ,=,1,"Energy, wind",35962866-662b-3817-a2a7-39375c7e6a3c,resource/air,MJ,Young,Edelen,2/2/2021 +EIA_MER,Coal,,,Quadrillion Btu,=,1.06E+12,Coal,39a07dad-33e8-3644-b6a5-2054c3d53fa9,resource/ground,MJ,Young,,5/15/2024 +EIA_MER,"Natural Gas, Dry",,,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 +EIA_MER,Natural Gas Plant Liquids,,,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 +EIA_MER,Crude Oil,,,Quadrillion Btu,=,1.06E+12,Crude oil,4aca0c2c-6e1a-3d90-956c-7141ca8932ce,resource/water,MJ,Young,,5/15/2024 From a29ae8d84aa0aedfc5fc3555840c7bc3b8ea00bf Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 12 Jun 2024 17:21:53 -0400 Subject: [PATCH 06/13] add GHG flows w/ AR specified specific to NY --- fedelemflowlist/flowmapping/GHGI.csv | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fedelemflowlist/flowmapping/GHGI.csv b/fedelemflowlist/flowmapping/GHGI.csv index c269c903..79a8407c 100644 --- a/fedelemflowlist/flowmapping/GHGI.csv +++ b/fedelemflowlist/flowmapping/GHGI.csv @@ -81,3 +81,10 @@ GHGI,Unspecified mix of PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecif GHGI,Unspecified mix of HFCs and PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 GHGI,HFC-41,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 GHGI,C4F6,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 +GHGI,CO2,,air,MT CO2e (AR5-20),,1000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/12/2024 +GHGI,CH4,,air,MT CO2e (AR5-20),,11904.7619,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,,6/12/2024 +GHGI,N2O,,air,MT CO2e (AR5-20),,3787.88,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,,6/12/2024 +GHGI,HFCs,,air,MT CO2e (AR5-20),,1000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/12/2024 +GHGI,SF6,,air,MT CO2e (AR5-20),,57.143,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,,6/12/2024 +GHGI,NF3,,air,MT CO2e (AR5-20),,78.125,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,,6/12/2024 +GHGI,PFCs,,air,MT CO2e (AR5-20),,1000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/12/2024 From e27f26fa92b61854ea2ddf0606304823307df9ac Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 19 Jun 2024 10:59:21 -0400 Subject: [PATCH 07/13] additional mappings for VT --- fedelemflowlist/flowmapping/GHGI.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedelemflowlist/flowmapping/GHGI.csv b/fedelemflowlist/flowmapping/GHGI.csv index 79a8407c..bd5c9090 100644 --- a/fedelemflowlist/flowmapping/GHGI.csv +++ b/fedelemflowlist/flowmapping/GHGI.csv @@ -57,6 +57,8 @@ GHGI,HFC-236fa,,air,MMTCO2e,=,101937,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e GHGI,HFC-32,,air,MMTCO2e,=,1481481,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Bell,,10/20/2022 GHGI,NF3,,air,MTCO2e,=,0.05814,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Bell,,9/28/2022 GHGI,SF6,,air,MTCO2e,=,0.04386,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Bell,,9/28/2022 +GHGI,N2O,,air,MTCO2e,=,3.356,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,,6/19/2024 +GHGI,HFE,,air,MTCO2e,=,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/19/2024 GHGI,PFC-116 ,,air,MMT CO2e,=,81967,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Young,,10/18/2022 GHGI,PFC-14 ,,air,MMT CO2e,=,135318,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,,10/18/2022 GHGI,C2F6,,air,MT,=,1000,Hexafluoroethane,b24a2de2-da9b-30b8-ae33-3d4ffa692029,emission/air,kg,Bell,,11/16/2022 From c36c02d70c47eb1aecbdcfad953010d2b7e38042 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 19 Jun 2024 21:22:14 -0400 Subject: [PATCH 08/13] fix error in NY flows --- fedelemflowlist/flowmapping/GHGI.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fedelemflowlist/flowmapping/GHGI.csv b/fedelemflowlist/flowmapping/GHGI.csv index bd5c9090..8b08e175 100644 --- a/fedelemflowlist/flowmapping/GHGI.csv +++ b/fedelemflowlist/flowmapping/GHGI.csv @@ -83,10 +83,10 @@ GHGI,Unspecified mix of PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecif GHGI,Unspecified mix of HFCs and PFCs,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 GHGI,HFC-41,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 GHGI,C4F6,,air,MMT CO2e,=,1000000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,4/25/2023 -GHGI,CO2,,air,MT CO2e (AR5-20),,1000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/12/2024 -GHGI,CH4,,air,MT CO2e (AR5-20),,11904.7619,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,,6/12/2024 -GHGI,N2O,,air,MT CO2e (AR5-20),,3787.88,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,,6/12/2024 -GHGI,HFCs,,air,MT CO2e (AR5-20),,1000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/12/2024 -GHGI,SF6,,air,MT CO2e (AR5-20),,57.143,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,,6/12/2024 -GHGI,NF3,,air,MT CO2e (AR5-20),,78.125,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,,6/12/2024 -GHGI,PFCs,,air,MT CO2e (AR5-20),,1000000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/12/2024 +GHGI,CO2,,air,MT CO2e (AR5-20),,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/19/2024 +GHGI,CH4,,air,MT CO2e (AR5-20),,11.9047619,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,,6/19/2024 +GHGI,N2O,,air,MT CO2e (AR5-20),,3.78788,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,,6/19/2024 +GHGI,HFCs,,air,MT CO2e (AR5-20),,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/19/2024 +GHGI,SF6,,air,MT CO2e (AR5-20),,0.057143,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,,6/19/2024 +GHGI,NF3,,air,MT CO2e (AR5-20),,0.078125,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Young,,6/19/2024 +GHGI,PFCs,,air,MT CO2e (AR5-20),,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/19/2024 From 963c03501f79754b56777d92831b4b42570f947b Mon Sep 17 00:00:00 2001 From: Ben Young Date: Fri, 21 Jun 2024 14:12:40 -0400 Subject: [PATCH 09/13] add SIT flows for different ARs --- fedelemflowlist/flowmapping/SIT.csv | 38 +++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/fedelemflowlist/flowmapping/SIT.csv b/fedelemflowlist/flowmapping/SIT.csv index 54463805..b679a81b 100644 --- a/fedelemflowlist/flowmapping/SIT.csv +++ b/fedelemflowlist/flowmapping/SIT.csv @@ -30,3 +30,41 @@ SIT,HFC-32,,air,MTCO2e,=,1.481481,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,em SIT,NF3,,air,MTCO2e,=,0.05814,Nitrogen trifluoride,80d4ef62-ca97-37d6-87ac-83233956c063,emission/air,kg,Bell,,10/17/2022 SIT,SF6,,air,MTCO2e,=,0.04386,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Bell,,10/17/2022 SIT,Others,,air,MTCO2e,=,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,5/1/2023 +SIT,CO2,,air,MMTCO2e (AR5-100),=,1000000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,CO2,,air,MTCO2e (AR5-100),=,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,Carbon Dioxide Emissions,,air,MTCO2e (AR5-100),=,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,CH4,,air,MTCO2e (AR5-100),=,35.714,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,6/21/2024 +SIT,CH4,,air,MMTCO2e (AR5-100),=,35714285.71,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,6/21/2024 +SIT,Industrial CH4,,air,MMTCO2e (AR5-100),=,35714285.71,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,6/21/2024 +SIT,Municipal CH4,,air,MMTCO2e (AR5-100),=,35714285.71,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,28,6/21/2024 +SIT,N2O,,air,MTCO2e (AR5-100),=,3.774,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,6/21/2024 +SIT,Nitrous Oxide Emissions,,air,MTCO2e (AR5-100),=,3.774,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,6/21/2024 +SIT,N2O,,air,MMTCO2e (AR5-100),=,3773584.9,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,6/21/2024 +SIT,Municipal N2O,,air,MMTCO2e (AR5-100),=,3773584.9,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,265,6/21/2024 +SIT,CF4,,air,MTCO2e (AR5-100),=,0.15083,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,6630,6/21/2024 +SIT,HFC-125,,air,MTCO2e (AR5-100),=,0.31546,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Young,3170,6/21/2024 +SIT,HFC-134a,,air,MTCO2e (AR5-100),=,0.76923,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Young,1300,6/21/2024 +SIT,HFC-143a,,air,MTCO2e (AR5-100),=,0.20833,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Young,4800,6/21/2024 +SIT,HFC-236fa,,air,MTCO2e (AR5-100),=,0.12407,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Young,8060,6/21/2024 +SIT,HFC-32,,air,MTCO2e (AR5-100),=,1.47710,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Young,677,6/21/2024 +SIT,Others,,air,MTCO2e (AR5-100),=,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/21/2024 +SIT,SF6,,air,MTCO2e (AR5-100),=,0.04255,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,23500,6/21/2024 +SIT,CO2,,air,MMTCO2e (AR6-100),=,1000000000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,CO2,,air,MTCO2e (AR6-100),=,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,Carbon Dioxide Emissions,,air,MTCO2e (AR6-100),=,1000,Carbon dioxide,b6f010fb-a764-3063-af2d-bcb8309a97b7,emission/air,kg,Young,,6/21/2024 +SIT,CH4,,air,MTCO2e (AR6-100),=,35.842,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,27.9,6/21/2024 +SIT,CH4,,air,MMTCO2e (AR6-100),=,35842293.91,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,27.9,6/21/2024 +SIT,Industrial CH4,,air,MMTCO2e (AR6-100),=,35842293.91,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,27.9,6/21/2024 +SIT,Municipal CH4,,air,MMTCO2e (AR6-100),=,35842293.91,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Young,27.9,6/21/2024 +SIT,N2O,,air,MTCO2e (AR6-100),=,3.663,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,273,6/21/2024 +SIT,Nitrous Oxide Emissions,,air,MTCO2e (AR6-100),=,3.663,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,273,6/21/2024 +SIT,N2O,,air,MMTCO2e (AR6-100),=,3663003.7,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,273,6/21/2024 +SIT,Municipal N2O,,air,MMTCO2e (AR6-100),=,3663003.7,Nitrous oxide,cfee0524-7ad6-300b-b050-6249135a2492,emission/air,kg,Young,273,6/21/2024 +SIT,CF4,,air,MTCO2e (AR6-100),=,0.13550,Carbon tetrafluoride,fbfa508b-f3c9-3977-a47d-1138e96914a3,emission/air,kg,Young,7380,6/21/2024 +SIT,HFC-125,,air,MTCO2e (AR6-100),=,0.26738,HFC-125,44be3f68-dee3-3228-adb4-04b003485c5f,emission/air,kg,Young,3740,6/21/2024 +SIT,HFC-134a,,air,MTCO2e (AR6-100),=,0.65359,HFC-134a,4fd60c2c-8625-3b10-8618-e3eacc121bbb,emission/air,kg,Young,1530,6/21/2024 +SIT,HFC-143a,,air,MTCO2e (AR6-100),=,0.17212,HFC-143a,3c29f66a-2dd8-3f9b-a05c-c8cb3d93f0f1,emission/air,kg,Young,5810,6/21/2024 +SIT,HFC-236fa,,air,MTCO2e (AR6-100),=,0.11507,HFC-236fa,32057bc6-6839-3dbc-b33d-5b72e542e3fc,emission/air,kg,Young,8690,6/21/2024 +SIT,HFC-32,,air,MTCO2e (AR6-100),=,1.29702,HFC-32,747fa9a4-559b-37a4-ac9b-5ca630274739,emission/air,kg,Young,771,6/21/2024 +SIT,Others,,air,MTCO2e (AR6-100),=,1000,"HFCs and PFCs, unspecified",n.a.,emission/air,kg CO2e,Young,,6/21/2024 +SIT,SF6,,air,MTCO2e (AR6-100),=,0.03968,Sulfur hexafluoride,8334c424-1603-3274-bec1-15a7bd5c8e86,emission/air,kg,Young,25200,6/21/2024 From d68664dbb07cd75855e90cea92aa889aae7f7e73 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 26 Jun 2024 10:04:42 -0400 Subject: [PATCH 10/13] fix error in downloading mapping files from jupyter notebook #133 --- Jupyter/run_mappings.ipynb | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/Jupyter/run_mappings.ipynb b/Jupyter/run_mappings.ipynb index 53766b9c..0c19d4ae 100644 --- a/Jupyter/run_mappings.ipynb +++ b/Jupyter/run_mappings.ipynb @@ -15,9 +15,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "scrolled": false - }, + "metadata": {}, "outputs": [], "source": [ "## Step 1\n", @@ -25,6 +23,7 @@ "import fedelemflowlist\n", "from fedelemflowlist.globals import flowmappingpath, flowmapping_fields\n", "import os\n", + "from pathlib import Path\n", "import ipywidgets as widgets\n", "from IPython.display import display, FileLink\n", "\n", @@ -32,8 +31,8 @@ " os.mkdir('./scratch')\n", "\n", "uploader = widgets.FileUpload(\n", - " accept = '.csv'\n", - " ,multiple = False\n", + " accept = '.csv',\n", + " multiple = False\n", ")\n", "\n", "display(uploader)" @@ -59,14 +58,14 @@ "if not uploader.value:\n", " raise ValueError('Input Excel file is required to continue. Make sure to select the Upload button above before continuing.')\n", "\n", - "input_file = next(iter(uploader.value))\n", - "input_full = r\"./scratch/\" + input_file\n", + "input_file = uploader.value[0]\n", + "input_full = r\"./scratch/\" + input_file['name']\n", "\n", "if os.path.exists(input_full):\n", " os.remove(input_full)\n", " \n", "with open(input_full,\"wb\") as fp:\n", - " fp.write(uploader.value[input_file]['content'])\n", + " fp.write(input_file['content'])\n", "\n", "mapping = pd.read_csv(input_full)\n", "mapping_length = len(mapping)\n", @@ -126,17 +125,27 @@ "#Subset all flows to get just those used in selected mapping\n", "flows_used_in_mapping = pd.merge(all_flows,mapping_flow_uuids)\n", "\n", - "fedelemflowlist.write_jsonld(flows_used_in_mapping,output_full,mapping_w_conversion)\n", - "print(\"mapping file created as json\")\n", - "download = FileLink(output_full,result_html_prefix=\"Click here to download: \")\n", - "display(download)\n" + "fedelemflowlist.write_jsonld(flows = flows_used_in_mapping,\n", + " path = Path(output_full),\n", + " mappings = mapping_w_conversion)\n", + "print(\"mapping file created as json\")\n" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "%%html\n", + "Download Mapping File" ] } ], "metadata": { "celltoolbar": "Tags", "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -150,7 +159,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.5" + "version": "3.12.3" } }, "nbformat": 4, From c05d23a321b883aab9fc40c7312df556a4b85a7b Mon Sep 17 00:00:00 2001 From: "Ben Young (ERG)" <44471635+bl-young@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:09:16 -0400 Subject: [PATCH 11/13] use develop branch for binder --- Jupyter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jupyter/README.md b/Jupyter/README.md index 865ff6e3..d7baf54f 100644 --- a/Jupyter/README.md +++ b/Jupyter/README.md @@ -1,3 +1,3 @@ # Create a mapping file for use in openLCA through Binder -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/USEPA/Federal-LCA-Commons-Elementary-Flow-List/HEAD?labpath=Jupyter%2Frun_mappings.ipynb) +[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/USEPA/fedelemflowlist/develop?labpath=Jupyter%2Frun_mappings.ipynb) From e48485748ac3137bea8bf553958e7ba05023e1e7 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Tue, 2 Jul 2024 22:04:30 -0400 Subject: [PATCH 12/13] :checkmark: add compartment to fix testing error --- fedelemflowlist/flowmapping/EIA_MER.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fedelemflowlist/flowmapping/EIA_MER.csv b/fedelemflowlist/flowmapping/EIA_MER.csv index e5025fdb..6dfaae49 100644 --- a/fedelemflowlist/flowmapping/EIA_MER.csv +++ b/fedelemflowlist/flowmapping/EIA_MER.csv @@ -9,7 +9,7 @@ EIA_MER,Primary energy - biomass,,resource,MJ,=,0.0612,Biomass,7feeb363-fbeb-37a EIA_MER,Primary energy - hydro,,resource/in water,MJ,=,1,"Energy, hydro",5af7a834-bf92-32eb-a0b2-2f2dcdc9f3d9,resource/water,MJ,Young,Edelen,2/2/2021 EIA_MER,Primary energy - solar,,resource/in air,MJ,=,1,"Energy, solar",4d1571a6-ffff-3a36-82df-224ed975a094,resource/air,MJ,Young,Edelen,2/2/2021 EIA_MER,Primary energy - wind,,resource/in air,MJ,=,1,"Energy, wind",35962866-662b-3817-a2a7-39375c7e6a3c,resource/air,MJ,Young,Edelen,2/2/2021 -EIA_MER,Coal,,,Quadrillion Btu,=,1.06E+12,Coal,39a07dad-33e8-3644-b6a5-2054c3d53fa9,resource/ground,MJ,Young,,5/15/2024 -EIA_MER,"Natural Gas, Dry",,,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 -EIA_MER,Natural Gas Plant Liquids,,,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 -EIA_MER,Crude Oil,,,Quadrillion Btu,=,1.06E+12,Crude oil,4aca0c2c-6e1a-3d90-956c-7141ca8932ce,resource/water,MJ,Young,,5/15/2024 +EIA_MER,Coal,,resource,Quadrillion Btu,=,1.06E+12,Coal,39a07dad-33e8-3644-b6a5-2054c3d53fa9,resource/ground,MJ,Young,,5/15/2024 +EIA_MER,"Natural Gas, Dry",,resource,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 +EIA_MER,Natural Gas Plant Liquids,,resource,Quadrillion Btu,=,1.06E+12,Natural gas,ae604834-c49a-3ebb-b15b-06e6e89e427e,resource/air,MJ,Young,,5/15/2024 +EIA_MER,Crude Oil,,resource,Quadrillion Btu,=,1.06E+12,Crude oil,4aca0c2c-6e1a-3d90-956c-7141ca8932ce,resource/water,MJ,Young,,5/15/2024 From 8eef846142a6fa688fd093533a29c66f1e15a0c7 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Tue, 2 Jul 2024 22:07:31 -0400 Subject: [PATCH 13/13] :bookmark: bump to v1.2.4 --- Jupyter/README.md | 2 +- fedelemflowlist/globals.py | 2 +- requirements.txt | 2 +- setup.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jupyter/README.md b/Jupyter/README.md index d7baf54f..852b0b51 100644 --- a/Jupyter/README.md +++ b/Jupyter/README.md @@ -1,3 +1,3 @@ # Create a mapping file for use in openLCA through Binder -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/USEPA/fedelemflowlist/develop?labpath=Jupyter%2Frun_mappings.ipynb) +[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/USEPA/fedelemflowlist/HEAD?labpath=Jupyter%2Frun_mappings.ipynb) diff --git a/fedelemflowlist/globals.py b/fedelemflowlist/globals.py index 3e831271..659f1f48 100644 --- a/fedelemflowlist/globals.py +++ b/fedelemflowlist/globals.py @@ -53,7 +53,7 @@ stream=sys.stdout) flow_list_specs = { - "list_version": "1.2.3", + "list_version": "1.2.4", "flow_classes": ["Biological", "Chemicals", "Energy", "Geological", "Groups", "Land", "Other", "Water"], "primary_context_classes": ["Directionality", "Environmental Media"], diff --git a/requirements.txt b/requirements.txt index d072bc4b..dc9ebd24 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 olca-schema>=0.0.11 pandas>=0.22 # Powerful data structures for data analysis, time series, and statistics. pip>=9 # The PyPA recommended tool for installing Python packages. diff --git a/setup.py b/setup.py index c93c7d20..7fce73b0 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='fedelemflowlist', - version='1.2.3', + version='1.2.4', packages=['fedelemflowlist'], package_dir={'fedelemflowlist': 'fedelemflowlist'}, package_data={'fedelemflowlist': [ @@ -14,7 +14,7 @@ install_requires = [ 'pandas>=0.22', 'olca-schema>=0.0.11', - 'esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy', + 'esupy @ git+https://github.com/USEPA/esupy.git#egg=esupy', ], url='https://github.com/USEPA/fedelemflowlist', license='CC0',