From 61c64b30784d6b0d1f8bf81c202917f6fb350551 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Fri, 2 Feb 2018 14:04:12 -0600 Subject: [PATCH] Some of Trick's unit conversions have too many significant digits #557 Changed the conversion factors for lb, slug, and oz (force) to match the accepted values. --- trick_source/trick_utils/units/src/units_conv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trick_source/trick_utils/units/src/units_conv.c b/trick_source/trick_utils/units/src/units_conv.c index f335617f..e5c581f5 100644 --- a/trick_source/trick_utils/units/src/units_conv.c +++ b/trick_source/trick_utils/units/src/units_conv.c @@ -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 }} },