From 11c4716c615a601aae2332189ac5da166445db90 Mon Sep 17 00:00:00 2001 From: James Vega Date: Fri, 3 Sep 2004 16:10:59 +0000 Subject: [PATCH] liter is L not l and since we have the MiB, etc., let's change MB, etc., to use 1000 as the factor instead of 1024 --- others/convertcore.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/others/convertcore.py b/others/convertcore.py index 503800cef..4d7b62297 100755 --- a/others/convertcore.py +++ b/others/convertcore.py @@ -377,15 +377,15 @@ bit = ! kilobit = 1000 bit # # based on power of 10 byte = 8 bit B = byte # byte -kilobyte = 1024 byte # # based on power of 2 +kilobyte = 1000 byte # # based on power of 2 kB = kilobyte # kilobyte # based on power of 2 -megabyte = 1024 kB # # based on power of 2 +megabyte = 1000 kB # # based on power of 2 MB = megabyte # megabyte # based on power of 2 -gigabyte = 1024 MB # # based on power of 2 +gigabyte = 1000 MB # # based on power of 2 GB = gigabyte # gigabyte # based on power of 2 -terabyte = 1024 GB # # based on power of 2 +terabyte = 1000 GB # # based on power of 2 TB = terabyte # terabyte # based on power of 2 -petabyte = 1024 TB # # based on power of 2 +petabyte = 1000 TB # # based on power of 2 PB = petabyte # petabyte # based on power of 2 kibibyte = 1024 byte @@ -482,16 +482,16 @@ circular mil = 1/4.0 pi*mil^2 # # area of 1 mil circle cc = cm^3 # cubic centimeter cubic centimeter = cc liter = 1000 cc -l = liter # liter +L = liter # liter litre = liter deciliter = 0.1 liter centiliter = 0.01 liter milliliter = cc -ml = milliliter # milliliter +mL = milliliter # milliliter dekaliter = 10 liter hectoliter = 100 liter kiloliter = 1000 liter -kl = kiloliter # kiloliter +kL = kiloliter # kiloliter cubic meter = kiloliter megaliter = 1000 kiloliter gallon = 231 in^3 @@ -512,7 +512,7 @@ barrel = 42 gallon bbl = barrel # barrel shot = 1.5 fl oz fifth = 1/5.0 gallon # # alcohol -wine bottle = 750 ml +wine bottle = 750 mL magnum = 1.5 liter # # alcohol keg = 15.5 gallon # # beer bushel = 2150.42 in^3 @@ -545,12 +545,12 @@ gph = gal/hr # gallons/hour gpm = gal/min # gallons/minute cfs = ft^3/sec # cu ft/second cfm = ft^3/min # cu ft/minute -lpm = l/min # liter/min +lpm = L/min # liter/min [gas flow] sccm = atm*cc/min # std cc/min # pressure * flow sccs = atm*cc/sec # std cc/sec # pressure * flow -slpm = atm*l/min # std liter/min # pressure * flow -slph = atm*l/hr # std liter/hour # pressure * flow +slpm = atm*L/min # std liter/min # pressure * flow +slph = atm*L/hr # std liter/hour # pressure * flow scfh = atm*ft^3/hour # std cu ft/hour # pressure * flow scfm = atm*ft^3/min # std cu ft/min # pressure * flow