Merge pull request #182 from USEPA/develop

Drop fossil methane mapping for IPCC
USEPA · Nov 3, 2023 · 8aa0b10 · 8aa0b10
2 parents e57a542 + 41db8a7
commit 8aa0b10
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/fedelemflowlist/flowmapping/IPCC.csv b/fedelemflowlist/flowmapping/IPCC.csv
@@ -3586,23 +3586,6 @@ IPCC,"Formic acid;1,1,1,3,3,3-hexafluoropropan-2-ol",,air,kg,=,1,"1,1,1,3,3,3-He
 IPCC,"Formic acid;1,1,1,3,3,3-hexafluoropropan-2-ol",,air,kg,=,1,"1,1,1,3,3,3-Hexafluoropropan-2-yl formate",2fe593df-c971-37ec-b2f7-c35b0165a62b,emission/air/troposphere/rural/ground-level,kg,Edelen,,8/23/2022
 IPCC,"Formic acid;1,1,1,3,3,3-hexafluoropropan-2-ol",,air,kg,=,1,"1,1,1,3,3,3-Hexafluoropropan-2-yl formate",7279dd30-ff85-386d-b6e9-10bb83f6b8c3,emission/air/indoor,kg,Edelen,,8/23/2022
 IPCC,"Formic acid;1,1,1,3,3,3-hexafluoropropan-2-ol",,air,kg,=,1,"1,1,1,3,3,3-Hexafluoropropan-2-yl formate",2a966227-8437-3edf-bad9-599085ff58c1,emission/air/stratosphere,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,aab83476-ec6c-3742-af85-15d320b7ce80,emission/air,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,be7b7ec1-c39a-376b-a50f-682256b29299,emission/air/troposphere/low,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,1f96ace5-cd65-3075-9d18-0db2fff6163f,emission/air/troposphere/high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,492f8145-f4fc-39a1-83e5-c3d0c67e9b4d,emission/air/troposphere/very high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,49a128b1-4b4c-3c0b-9acd-c20765a82fe3,emission/air/troposphere/ground-level,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,b0d0c60e-2add-3607-999c-04db866b8c3a,emission/air/troposphere/urban,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,a81e5ff3-ddea-3521-854e-3d0ec0912182,emission/air/troposphere/rural,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,85287ad0-3263-3555-a598-2aedee9a182b,emission/air/troposphere/urban/low,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,08f8b6fb-ecf8-397b-af11-61ec6531aff2,emission/air/troposphere/rural/low,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,46b9c7a7-7bc0-371a-a254-75d73b798286,emission/air/troposphere/urban/high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,e421589d-1fcc-3ec4-87a1-527db9bb1897,emission/air/troposphere/rural/high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,f762d983-8d8f-37b1-84a2-d8477370c56f,emission/air/troposphere/urban/very high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,5b950bc8-e7ab-3c08-b3d9-fc8772df9323,emission/air/troposphere/rural/very high,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,c31a4412-446a-32f3-935c-986c002fe6ac,emission/air/troposphere/urban/ground-level,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,be0fa1ff-98da-35d7-ab96-78ef2107339c,emission/air/troposphere/rural/ground-level,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,3557fccf-14aa-3ed2-877a-e1aa4441e46a,emission/air/indoor,kg,Edelen,,8/23/2022
-IPCC,Fossil methane,,air,kg,=,1,Methane,fb3d727a-5156-32e0-8f62-da4e00e6ace8,emission/air/stratosphere,kg,Edelen,,8/23/2022
 IPCC,HCFC-122,,air,kg,=,1,HCFC-122,fdf3b4c5-2ed1-3079-ac71-d0ff465d5381,emission/air,kg,Edelen,,8/23/2022
 IPCC,HCFC-122,,air,kg,=,1,HCFC-122,ba3d5c84-71d4-3562-8df6-e7203757f606,emission/air/troposphere/low,kg,Edelen,,8/23/2022
 IPCC,HCFC-122,,air,kg,=,1,HCFC-122,01488936-a338-39f4-8aad-35bb1aae674d,emission/air/troposphere/high,kg,Edelen,,8/23/2022

diff --git a/fedelemflowlist/globals.py b/fedelemflowlist/globals.py
@@ -53,7 +53,7 @@
                 stream=sys.stdout)
 
 flow_list_specs = {
-    "list_version": "1.2.0",
+    "list_version": "1.2.1",
     "flow_classes": ["Biological", "Chemicals", "Energy", "Geological",
                      "Groups", "Land", "Other", "Water"],
     "primary_context_classes": ["Directionality", "Environmental Media"],

diff --git a/fedelemflowlist/input/mapping input/IPCCFlowableMappings.csv b/fedelemflowlist/input/mapping input/IPCCFlowableMappings.csv
@@ -210,7 +210,7 @@ Fluoroethene,kg,75-02-5,HFO-1141,CH2=CHF,=,Vinyl fluoride,kg,Edelen,CAS Number,,
 Fluoromethane,kg,593-53-3,HFC-41,CH3F,=,HFC-41,kg,Edelen,CAS Number,,,8/23/2022
 Fluoroxene,kg,406-90-6,,CF3CH2OCH=CH2,=,"Ethene, (2,2,2-trifluoroethoxy)-",kg,Edelen,CAS Number,,,8/23/2022
 "Formic acid;1,1,1,3,3,3-hexafluoropropan-2-ol",kg,856766-70-6,,(CF3)2CHOCHO,=,"1,1,1,3,3,3-Hexafluoropropan-2-yl formate",kg,Edelen,CAS Number,,,8/23/2022
-Fossil methane,kg,74-82-8,,CH4,=,Methane,kg,Edelen,CAS Number,,,8/23/2022
+Fossil methane,kg,74-82-8,,CH4,,,,,,,,
 Halon-1201,kg,1511-62-2,,CHBrF2,=,Bromodifluoromethane,kg,Edelen,CAS Number,,,8/23/2022
 Halon-1202,kg,75-61-6,,CBr2F2,=,Dibromodifluoromethane,kg,Edelen,CAS Number,,,8/23/2022
 Halon-1211,kg,353-59-3,,CBrClF2,=,Halon 1211,kg,Young,,,,9/9/2022

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='fedelemflowlist',
-    version='1.2.0',
+    version='1.2.1',
     packages=['fedelemflowlist'],
     package_dir={'fedelemflowlist': 'fedelemflowlist'},
     package_data={'fedelemflowlist': [