Skip to content

Commit ab19d82

Browse files
add atm and torr units (#62)
2 parents 66d0d97 + a8ca4be commit ab19d82

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

tunits/core/cython/derived_unit_data.pyx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ __OTHER_UNITS = [
116116
# Pressure.
117117
DerivedUnitData('psi', 'pounds_per_square_inch', 'Pa', 6894.75729317),
118118
DerivedUnitData('bar', 'barometric_pressure', 'Pa', 1e5),
119+
DerivedUnitData('atm', 'atmospheric_pressure', 'Pa', 101325.0),
120+
DerivedUnitData('torr', 'mm_of_mercury', 'Pa', 101325.0/760),
119121
]
120122

121123
# Units that aren't technically exact, but close enough for our purposes.

tunits/units.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
Tlx = core.default_unit_database.known_units['Tlx']
174174
Tm = core.default_unit_database.known_units['Tm']
175175
Tmol = core.default_unit_database.known_units['Tmol']
176+
torr = core.default_unit_database.known_units['torr']
176177
Trad = core.default_unit_database.known_units['Trad']
177178
Ts = core.default_unit_database.known_units['Ts']
178179
Tsr = core.default_unit_database.known_units['Tsr']
@@ -290,6 +291,7 @@
290291
attovolt = core.default_unit_database.known_units['attovolt']
291292
attowatt = core.default_unit_database.known_units['attowatt']
292293
attoweber = core.default_unit_database.known_units['attoweber']
294+
atm = core.default_unit_database.known_units['atm']
293295
avogadro_constant = core.default_unit_database.known_units['avogadro_constant']
294296
b = core.default_unit_database.known_units['b']
295297
bar = core.default_unit_database.known_units['bar']
@@ -1397,6 +1399,7 @@
13971399
"Tlx",
13981400
"Tm",
13991401
"Tmol",
1402+
"torr",
14001403
"Trad",
14011404
"Ts",
14021405
"Tsr",
@@ -1514,6 +1517,7 @@
15141517
"attovolt",
15151518
"attowatt",
15161519
"attoweber",
1520+
"atm",
15171521
"avogadro_constant",
15181522
"b",
15191523
"bar",

tunits/units_with_dimension.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
Tlx = core.Illuminance(core.default_unit_database.known_units['Tlx'])
174174
Tm = core.Length(core.default_unit_database.known_units['Tm'])
175175
Tmol = core.Quantity(core.default_unit_database.known_units['Tmol'])
176+
torr = core.Pressure(core.default_unit_database.known_units['torr'])
176177
Trad = core.Angle(core.default_unit_database.known_units['Trad'])
177178
Ts = core.Time(core.default_unit_database.known_units['Ts'])
178179
Tsr = core.Angle(core.default_unit_database.known_units['Tsr'])
@@ -290,6 +291,7 @@
290291
attovolt = core.ElectricPotential(core.default_unit_database.known_units['attovolt'])
291292
attowatt = core.Power(core.default_unit_database.known_units['attowatt'])
292293
attoweber = core.MagneticFlux(core.default_unit_database.known_units['attoweber'])
294+
atm = core.Pressure(core.default_unit_database.known_units['atm'])
293295
avogadro_constant = core.default_unit_database.known_units['avogadro_constant']
294296
b = core.Area(core.default_unit_database.known_units['b'])
295297
bar = core.Pressure(core.default_unit_database.known_units['bar'])
@@ -1399,6 +1401,7 @@
13991401
"Tlx",
14001402
"Tm",
14011403
"Tmol",
1404+
"torr",
14021405
"Trad",
14031406
"Ts",
14041407
"Tsr",
@@ -1516,6 +1519,7 @@
15161519
"attovolt",
15171520
"attowatt",
15181521
"attoweber",
1522+
"atm",
15191523
"avogadro_constant",
15201524
"b",
15211525
"bar",

0 commit comments

Comments
 (0)