--- loncom/homework/capa.units	2002/04/23 22:30:40	1.7
+++ 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.7 2002/04/23 22:30:40 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,11 +75,12 @@ yocto            y         10^{-24}
 <<Derived Unit>>
 
 gram            g      0.001 kg      # mass
-day             day    24.0 hr       # time
-year            yr     365.24 day    # time
+minute          min    60 s          # time
 hour            hr     3600. s       # time
 hour            h      3600. s       # time
-minute          min    60 s          # time
+day             day    24.0 hr       # time
+day             days   24.0 hr       # time
+year            yr     365.24 day    # time
 pound           lb     0.45359237 kg # mass
 ounce   	oz     2.83495E-2 kg # mass
 inch            in     2.54 cm       # length
@@ -109,6 +111,10 @@ ohm             ohm    V/A           # e
 ohm             ohms   V/A           # electric resistance
 ohm             Ohm    V/A           # electric resistance
 ohm             Ohms   V/A           # electric resistance
+mho             mho    1/ohm         # electric conductance
+mho             mhos   1/ohm         # electric conductance
+mho             Mho    1/ohm         # electric conductance
+mho             Mhos   1/ohm         # electric conductance
 siemens         S      1/Ohm         # electric conductance
 farad           F      C/V           # electric capacitance
 tesla           T      V*s/m^2       # magnetic flux density
@@ -125,5 +131,7 @@ sievert         Sv     J/kg          # d
 astroUnit       AU     1.49598E11 m  # mean distance earth to sun
 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