--- loncom/homework/capa.units	2000/09/11 21:14:58	1.1
+++ loncom/homework/capa.units	2006/11/20 20:38:59	1.15
@@ -1,3 +1,30 @@
+# The LearningOnline Network with CAPA
+# Physical Unit definitions
+#
+# $Id: capa.units,v 1.15 2006/11/20 20:38:59 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 
 # ======================= Unit section =============
 # Base Unit
@@ -12,6 +39,7 @@ ampere          A      # electric curren
 kelvin          K      # thermodynamic temperature
 mole            mol    # amount of substance
 candela         cd     # luminous intensity
+decibel         dB     # log of pressure amplitude
 
 #   Prefix     symbol     factor
 << Prefix >>
@@ -25,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
@@ -46,10 +75,14 @@ yocto            y         10^{-24}
 <<Derived Unit>>
 
 gram            g      0.001 kg      # mass
-hour            hr     3600. s       # time
 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
 pound           lb     0.45359237 kg # mass
-ounce           oz     1.77185E-3 kg # mass
+ounce   	oz     2.83495E-2 kg # mass
 inch            in     2.54 cm       # length
 foot            ft     12 in         # length
 mile            mi     5280 ft       # length
@@ -58,7 +91,7 @@ nautical_mile   n_mi   6080 ft       # l
 rood            rood   1210 yd^2     # area, rood
 acre            acre   4840 yd^2     # area, acre
 hertz           Hz     1/s           # frequency
-litre           L      10^3/cm^3     # volume
+litre           L      10^3*cm^3     # volume
 newton          N      m*kg/s^2      # force
 pound_force     lbf    4.44822 N     # force
 dyne            dyn    1E-5 N        # force
@@ -78,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
@@ -89,9 +126,13 @@ 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
+molarity        M      mol/L         # chemisty
+amu             amu    1.66053873e-27 kg # atomic mass unit
+amu             u      1.66053873e-27 kg # atomic mass unit