--- loncom/homework/capa.units	2003/05/09 22:19:03	1.10
+++ loncom/homework/capa.units	2005/06/06 22:21:38	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Physical Unit definitions
 #
-# $Id: capa.units,v 1.10 2003/05/09 22:19:03 albertel Exp $
+# $Id: capa.units,v 1.14 2005/06/06 22:21:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@ giga             G         10^9
 mega             M         10^6
 kilo             k         10^3
 hecto            h         10^2
+deca             D         10^1
 
 deci             d         10^-1
 centi            c         10^-2
@@ -74,12 +75,12 @@ yocto            y         10^{-24}
 <<Derived Unit>>
 
 gram            g      0.001 kg      # mass
+minute          min    60 s          # time
+hour            hr     3600. s       # time
+hour            h      3600. s       # time
 day             day    24.0 hr       # time
 day             days   24.0 hr       # time
 year            yr     365.24 day    # time
-hour            hr     3600. s       # time
-hour            h      3600. s       # time
-minute          min    60 s          # time
 pound           lb     0.45359237 kg # mass
 ounce   	oz     2.83495E-2 kg # mass
 inch            in     2.54 cm       # length
@@ -131,4 +132,6 @@ astroUnit       AU     1.49598E11 m  # m
 celcius         degC   1 K           # multiplicatively OK
 farenheight     degF   .5555555555 K # multiplicatively OK
 molarity        M      mol/L         # chemisty
+amu             amu    1.66053873e-27 kg # atomic mass unit
+amu             u      1.66053873e-27 kg # atomic mass unit