--- loncom/homework/capa.units	2003/05/19 22:16:51	1.11
+++ loncom/homework/capa.units	2011/06/08 20:29:04	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Physical Unit definitions
 #
-# $Id: capa.units,v 1.11 2003/05/19 22:16:51 albertel Exp $
+# $Id: capa.units,v 1.17 2011/06/08 20:29:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,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
@@ -126,10 +126,20 @@ steradian       sr     m^2 /m^2        #
 lumen           lm     cd*sr         # luminous flux
 lux             lx     cd*sr/m^2     # illuminance
 becquerel       Bq     1/s           # activity (radioactive)
+curie           Ci     3.70E10 Bq    # activity (radioactive)
 gray            Gy     J/kg          # absorbed dose (of radiation)
 sievert         Sv     J/kg          # dose equivalent (dose equivalent index)
 astroUnit       AU     1.49598E11 m  # mean distance earth to sun
 celcius         degC   1 K           # multiplicatively OK
-farenheight     degF   .5555555555 K # multiplicatively OK
+fahrenheit	degF   0.555555555 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
+lightspeed      c      299792458 m/s     # speed of light
+cubiccentimeter cc     cm^3              # cubic centimeter
+electroncharge  e      1.6021892E-19 C   # elementary charge
+hbar            hbar   1.05457148E-34 m^2*kg/s # Planck constant
+milesperhour    mph    0.44704 m/s   # miles per hour
+rpm             rpm    0.0166666667/s  # rounds per minute
+rpm             rpms   0.0166666667/s  # rounds per minute
+parsec          pc     3.08568025E16 m   # parsec