ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some of Trick's unit conversions have too many significant digits #557

Browse Source 
Changed the conversion factors for lb, slug, and oz (force) to match
the accepted values.
This commit is contained in:
Alex Lin 2018-02-02 14:10:39 -06:00
parent cc7e3ea128
commit 940a275192
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
trick_source/trick_utils/units/src/units_conv.c
View File

@ -462,10 +462,10 @@ struct {
{ Mass , "Tg", "kg", "tera-grams", 7,Metric, {{ 0.0 , MILLI * TERA }} },
{ Mass , "mt", "kg", "metric-tons", 1,Metric, {{ 0.0 , 1000.0 }} },
{ Mass , "t", "kg", "metric-tons", 1,Metric, {{ 0.0 , 1000.0 }} },
{ Mass , "sl", "kg", "slugs", 1,English, {{ 0.0 , 14.5939029372064 }} },
{ Mass , "slug", "kg", "slugs", 1,English, {{ 0.0 , 14.5939029372064 }} },
{ Mass , "lbm", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.4535923697760192 }} },
{ Mass , "lb", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.4535923697760192 }} },
{ Mass , "sl", "kg", "slugs", 1,English, {{ 0.0 , 14.59390 }} },
{ Mass , "slug", "kg", "slugs", 1,English, {{ 0.0 , 14.59390 }} },
{ Mass , "lbm", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.45359237 }} },
{ Mass , "lb", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.45359237 }} },
{ Force , "N", "N", "newtons", 1,Metric, {{ 0.0 , 1.0 }} },
{ Force , "pN", "N", "pico-newtons", 7,Metric, {{ 0.0 , PICO }} },
@ -480,9 +480,9 @@ struct {
{ Force , "MN", "N", "mega-newtons", 7,Metric, {{ 0.0 , MEGA }} },
{ Force , "GN", "N", "giga-newtons", 7,Metric, {{ 0.0 , GIGA }} },
{ Force , "TN", "N", "tera-newtons", 7,Metric, {{ 0.0 , TERA }} },
{ Force , "oz", "N", "ounces", 1,English, {{ 0.0 , 0.27801385 }} },
{ Force , "ozf", "N", "ounces", 1,English, {{ 0.0 , 0.27801385 }} },
{ Force , "lbf", "N", "pound(force)", 1,English, {{ 0.0 , 4.4482216152605 }} },
{ Force , "oz", "N", "ounces", 1,English, {{ 0.0 , 0.2780139 }} },
{ Force , "ozf", "N", "ounces", 1,English, {{ 0.0 , 0.2780139 }} },
{ Force , "lbf", "N", "pound(force)", 1,English, {{ 0.0 , 4.4482216152605 }} },
{ Voltage , "v", "v", "volts", 1,Standard, {{ 0.0 , 1.0 }} },
{ Voltage , "V", "v", "volts", 1,Standard, {{ 0.0 , 1.0 }} },