Skip to content

Commit

Permalink
Merge pull request #38 from danielhuppmann/gwp/update-v0.9.3
Browse files Browse the repository at this point in the history
Update GWP factors to use globalwarmingpotentials v0.9.3
  • Loading branch information
khaeru committed Jun 14, 2022
2 parents 5b9eebd + 270e24d commit b9e1533
Show file tree
Hide file tree
Showing 12 changed files with 318 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Unit definitions for integrated-assessment research
:target: https://github.com/IAMconsortium/units/actions/workflows/test.yaml
:alt: Build status

© 2020–2021 `IAM-units authors`_; licensed under the `GNU GPL version 3`_.
© 2020–2022 `IAM-units authors`_; licensed under the `GNU GPL version 3`_.

The file `definitions.txt`_ gives `Pint`_-compatible definitions of energy, climate, and related units to supplement the SI and other units included in Pint's `default_en.txt`_.
These definitions are used by:
Expand Down
1 change: 0 additions & 1 deletion iam_units/data/emissions/AR4GWP100.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
a_HFE347pcf2 = 580.0
a_HFE356pcc3 = 110.0
a_HFE4310pccc124 = 1870.0
a_HFE449sl = 297.0
a_HFE569sf2 = 59.0
a_Halon1211 = 1890.0
a_Halon1301 = 7140.0
Expand Down
1 change: 0 additions & 1 deletion iam_units/data/emissions/AR5CCFGWP100.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
a_HFE365mcf3 = 1
a_HFE374pc2 = 758
a_HFE4310pccc124 = 3353
a_HFE449sl = 509
a_HFE569sf2 = 69
a_Halon1201 = 454
a_Halon1202 = 280
Expand Down
2 changes: 0 additions & 2 deletions iam_units/data/emissions/AR5GWP100.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@
a_HFE356pcc3 = 413.0
a_HFE356pcf2 = 719.0
a_HFE356pcf3 = 446.0
a_HFE365mcf3 = 1.0
a_HFE374pc2 = 627.0
a_HFE4310pccc124 = 2820.0
a_HFE449sl = 421.0
a_HFE569sf2 = 57.0
a_Halon1201 = 376.0
a_Halon1211 = 1750.0
Expand Down
100 changes: 100 additions & 0 deletions iam_units/data/emissions/AR6GTP100.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# This file was generated using:
# python -m iam_units.update emissions
# DO NOT ALTER THIS FILE MANUALLY!

@context(_a=NaN) AR6GTP100
[mass] -> [_GWP]: value * (_a * _gwp / kg)
[_GWP] -> [mass]: value / (_a * _gwp / kg)
[mass] / [time] -> [_GWP] / [time]: value * (_a * _gwp / kg)
[_GWP] / [time] -> [mass] / [time]: value / (_a * _gwp / kg)
[mass] / [time] / [area] -> [_GWP] / [time] / [area]: value * (_a * _gwp / kg)
[_GWP] / [time] / [area] -> [mass] / [time] / [area]: value / (_a * _gwp / kg)


a_C10F18 = 9010.0
a_C2F6 = 15200.0
a_C3F8 = 11200.0
a_C4F10 = 12100.0
a_C5F12 = 11200.0
a_C6F14 = 10500.0
a_C7F16 = 10200.0
a_C8F18 = 10000.0
a_CCl4 = 810.0
a_CF4 = 9050.0
a_CFC11 = 3540.0
a_CFC113 = 5210.0
a_CFC114 = 9410.0
a_CFC115 = 11000.0
a_CFC12 = 10400.0
a_CFC13 = 18800.0
a_CH2Cl2 = 2.01
a_CH3Br = 0.438
a_CH3CCl3 = 29.7
a_CH3Cl = 1.0
a_CH4 = 5.38
a_CHCl3 = 3.72
a_HCFC123 = 16.4
a_HCFC124 = 110.0
a_HCFC141b = 162.0
a_HCFC142b = 514.0
a_HCFC21 = 29.0
a_HCFC22 = 379.0
a_HCFC225ca = 24.8
a_HCFC225cb = 105.0
a_HCFE235da2 = 98.4
a_HFC125 = 1300.0
a_HFC134 = 239.0
a_HFC134a = 306.0
a_HFC143 = 66.6
a_HFC143a = 3250.0
a_HFC152 = 3.89
a_HFC152a = 29.8
a_HFC161 = 0.872
a_HFC227ea = 1490.0
a_HFC23 = 15100.0
a_HFC236cb = 268.0
a_HFC236ea = 288.0
a_HFC236fa = 8870.0
a_HFC245ca = 146.0
a_HFC245fa = 180.0
a_HFC32 = 142.0
a_HFC365mfc = 172.0
a_HFC41 = 24.6
a_HFC4310mee = 347.0
a_HFE125 = 13100.0
a_HFE134 = 2060.0
a_HFE143a = 113.0
a_HFE227ea = 4440.0
a_HFE236ca12 = 1860.0
a_HFE236ea2 = 521.0
a_HFE236fa = 205.0
a_HFE245cb2 = 137.0
a_HFE245fa1 = 173.0
a_HFE245fa2 = 162.0
a_HFE329mcc2 = 1090.0
a_HFE338mcf2 = 194.0
a_HFE338pcc13 = 657.0
a_HFE347mcc3 = 106.0
a_HFE347mcf2 = 179.0
a_HFE347pcf2 = 181.0
a_HFE356mec3 = 48.0
a_HFE356pcc3 = 50.4
a_HFE356pcf2 = 154.0
a_HFE356pcf3 = 88.4
a_HFE365mcf3 = 0.289
a_HFE374pc2 = 2.25
a_HFE4310pccc124 = 647.0
a_HFE569sf2 = 11.0
a_Halon1201 = 69.8
a_Halon1202 = 39.3
a_Halon1211 = 406.0
a_Halon1301 = 5060.0
a_Halon2402 = 702.0
a_N2O = 233.0
a_NF3 = 20000.0
a_PFPMIE = 12000.0
a_SF5CF3 = 21600.0
a_SF6 = 30600.0
a_SO2F2 = 1920.0
a_cC4F8 = 12400.0
@end
5 changes: 2 additions & 3 deletions iam_units/data/emissions/AR6GWP100.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
a_C8F18 = 8260.0
a_CCl4 = 2200.0
a_CF4 = 7380.0
a_CFC11 = 5560.0
a_CFC11 = 6230.0
a_CFC113 = 6520.0
a_CFC114 = 9430.0
a_CFC115 = 9600.0
a_CFC12 = 11200.0
a_CFC12 = 12500.0
a_CFC13 = 16200.0
a_CH2Cl2 = 11.2
a_CH3Br = 2.43
Expand Down Expand Up @@ -84,7 +84,6 @@
a_HFE365mcf3 = 1.6
a_HFE374pc2 = 12.5
a_HFE4310pccc124 = 3220.0
a_HFE449sl = 460.0
a_HFE569sf2 = 60.7
a_Halon1201 = 380.0
a_Halon1202 = 216.0
Expand Down
100 changes: 100 additions & 0 deletions iam_units/data/emissions/AR6GWP20.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# This file was generated using:
# python -m iam_units.update emissions
# DO NOT ALTER THIS FILE MANUALLY!

@context(_a=NaN) AR6GWP20
[mass] -> [_GWP]: value * (_a * _gwp / kg)
[_GWP] -> [mass]: value / (_a * _gwp / kg)
[mass] / [time] -> [_GWP] / [time]: value * (_a * _gwp / kg)
[_GWP] / [time] -> [mass] / [time]: value / (_a * _gwp / kg)
[mass] / [time] / [area] -> [_GWP] / [time] / [area]: value * (_a * _gwp / kg)
[_GWP] / [time] / [area] -> [mass] / [time] / [area]: value / (_a * _gwp / kg)


a_C10F18 = 5480.0
a_C2F6 = 8940.0
a_C3F8 = 6770.0
a_C4F10 = 7300.0
a_C5F12 = 6680.0
a_C6F14 = 6260.0
a_C7F16 = 6120.0
a_C8F18 = 6010.0
a_CCl4 = 3810.0
a_CF4 = 5300.0
a_CFC11 = 8320.0
a_CFC113 = 6860.0
a_CFC114 = 8260.0
a_CFC115 = 7410.0
a_CFC12 = 12700.0
a_CFC13 = 12400.0
a_CH2Cl2 = 40.2
a_CH3Br = 8.74
a_CH3CCl3 = 567.0
a_CH3Cl = 19.9
a_CH4 = 81.2
a_CHCl3 = 74.2
a_HCFC123 = 325.0
a_HCFC124 = 2070.0
a_HCFC141b = 2710.0
a_HCFC142b = 5510.0
a_HCFC21 = 575.0
a_HCFC22 = 5690.0
a_HCFC225ca = 491.0
a_HCFC225cb = 1960.0
a_HCFE235da2 = 1930.0
a_HFC125 = 6740.0
a_HFC134 = 3900.0
a_HFC134a = 4140.0
a_HFC143 = 1300.0
a_HFC143a = 7840.0
a_HFC152 = 77.6
a_HFC152a = 591.0
a_HFC161 = 17.4
a_HFC227ea = 5850.0
a_HFC23 = 12400.0
a_HFC236cb = 3750.0
a_HFC236ea = 4420.0
a_HFC236fa = 7450.0
a_HFC245ca = 2680.0
a_HFC245fa = 3170.0
a_HFC32 = 2690.0
a_HFC365mfc = 2920.0
a_HFC41 = 485.0
a_HFC4310mee = 3960.0
a_HFE125 = 13500.0
a_HFE134 = 12700.0
a_HFE143a = 2170.0
a_HFE227ea = 9800.0
a_HFE236ca12 = 11700.0
a_HFE236ea2 = 7020.0
a_HFE236fa = 3670.0
a_HFE245cb2 = 2630.0
a_HFE245fa1 = 3170.0
a_HFE245fa2 = 3060.0
a_HFE329mcc2 = 7550.0
a_HFE338mcf2 = 3460.0
a_HFE338pcc13 = 9180.0
a_HFE347mcc3 = 2020.0
a_HFE347mcf2 = 3270.0
a_HFE347pcf2 = 3370.0
a_HFE356mec3 = 949.0
a_HFE356pcc3 = 995.0
a_HFE356pcf2 = 2870.0
a_HFE356pcf3 = 1730.0
a_HFE365mcf3 = 5.77
a_HFE374pc2 = 45.0
a_HFE4310pccc124 = 8720.0
a_HFE569sf2 = 219.0
a_Halon1201 = 1340.0
a_Halon1202 = 775.0
a_Halon1211 = 4920.0
a_Halon1301 = 8320.0
a_Halon2402 = 4070.0
a_N2O = 273.0
a_NF3 = 13400.0
a_PFPMIE = 7750.0
a_SF5CF3 = 13900.0
a_SF6 = 18300.0
a_SO2F2 = 7510.0
a_cC4F8 = 7400.0
@end
100 changes: 100 additions & 0 deletions iam_units/data/emissions/AR6GWP500.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# This file was generated using:
# python -m iam_units.update emissions
# DO NOT ALTER THIS FILE MANUALLY!

@context(_a=NaN) AR6GWP500
[mass] -> [_GWP]: value * (_a * _gwp / kg)
[_GWP] -> [mass]: value / (_a * _gwp / kg)
[mass] / [time] -> [_GWP] / [time]: value * (_a * _gwp / kg)
[_GWP] / [time] -> [mass] / [time]: value / (_a * _gwp / kg)
[mass] / [time] / [area] -> [_GWP] / [time] / [area]: value * (_a * _gwp / kg)
[_GWP] / [time] / [area] -> [mass] / [time] / [area]: value / (_a * _gwp / kg)


a_C10F18 = 9780.0
a_C2F6 = 17500.0
a_C3F8 = 12400.0
a_C4F10 = 13400.0
a_C5F12 = 12700.0
a_C6F14 = 11600.0
a_C7F16 = 11300.0
a_C8F18 = 11100.0
a_CCl4 = 658.0
a_CF4 = 10600.0
a_CFC11 = 2090.0
a_CFC113 = 2830.0
a_CFC114 = 6150.0
a_CFC115 = 9880.0
a_CFC12 = 5710.0
a_CFC13 = 17500.0
a_CH2Cl2 = 3.18
a_CH3Br = 0.692
a_CH3CCl3 = 46.0
a_CH3Cl = 1.58
a_CH4 = 7.95
a_CHCl3 = 5.87
a_HCFC123 = 25.8
a_HCFC124 = 170.0
a_HCFC141b = 246.0
a_HCFC142b = 658.0
a_HCFC21 = 45.6
a_HCFC22 = 560.0
a_HCFC225ca = 39.0
a_HCFC225cb = 162.0
a_HCFE235da2 = 154.0
a_HFC125 = 1110.0
a_HFC134 = 361.0
a_HFC134a = 436.0
a_HFC143 = 104.0
a_HFC143a = 1940.0
a_HFC152 = 6.14
a_HFC152a = 46.8
a_HFC161 = 1.38
a_HFC227ea = 1100.0
a_HFC23 = 10500.0
a_HFC236cb = 387.0
a_HFC236ea = 428.0
a_HFC236fa = 6040.0
a_HFC245ca = 225.0
a_HFC245fa = 274.0
a_HFC32 = 220.0
a_HFC365mfc = 261.0
a_HFC41 = 38.6
a_HFC4310mee = 458.0
a_HFE125 = 7680.0
a_HFE134 = 1940.0
a_HFE143a = 176.0
a_HFE227ea = 2570.0
a_HFE236ca12 = 1770.0
a_HFE236ea2 = 741.0
a_HFE236fa = 315.0
a_HFE245cb2 = 213.0
a_HFE245fa1 = 266.0
a_HFE245fa2 = 251.0
a_HFE329mcc2 = 1100.0
a_HFE338mcf2 = 297.0
a_HFE338pcc13 = 948.0
a_HFE347mcc3 = 164.0
a_HFE347mcf2 = 275.0
a_HFE347pcf2 = 279.0
a_HFE356mec3 = 75.3
a_HFE356pcc3 = 79.0
a_HFE356pcf2 = 237.0
a_HFE356pcf3 = 138.0
a_HFE365mcf3 = 0.457
a_HFE374pc2 = 3.56
a_HFE4310pccc124 = 920.0
a_HFE569sf2 = 17.3
a_Halon1201 = 108.0
a_Halon1202 = 61.5
a_Halon1211 = 552.0
a_Halon1301 = 2750.0
a_Halon2402 = 639.0
a_N2O = 130.0
a_NF3 = 18200.0
a_PFPMIE = 11700.0
a_SF5CF3 = 21100.0
a_SF6 = 34100.0
a_SO2F2 = 1410.0
a_cC4F8 = 13800.0
@end
3 changes: 3 additions & 0 deletions iam_units/data/emissions/metrics.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
@import AR5GWP100.txt
@import AR5CCFGWP100.txt
@import AR6GWP100.txt
@import AR6GWP20.txt
@import AR6GWP500.txt
@import AR6GTP100.txt
1 change: 0 additions & 1 deletion iam_units/data/emissions/species.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ a_HFE356pcf3 = NaN
a_HFE365mcf3 = NaN
a_HFE374pc2 = NaN
a_HFE4310pccc124 = NaN
a_HFE449sl = NaN
a_HFE569sf2 = NaN
a_Halon1201 = NaN
a_Halon1202 = NaN
Expand Down

0 comments on commit b9e1533

Please sign in to comment.