Diff for /loncom/homework/capa.units between versions 1.2 and 1.12

version 1.2, 2001/08/02 14:17:01 version 1.12, 2004/04/06 19:01:19
Line 1 Line 1
   # The LearningOnline Network with CAPA
   # Physical Unit definitions
   #
   # $Id$
   #
   # 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 =============  # ======================= Unit section =============
 # Base Unit  # Base Unit
Line 12  ampere          A      # electric curren Line 39  ampere          A      # electric curren
 kelvin          K      # thermodynamic temperature  kelvin          K      # thermodynamic temperature
 mole            mol    # amount of substance  mole            mol    # amount of substance
 candela         cd     # luminous intensity  candela         cd     # luminous intensity
   decibel         dB     # log of pressure amplitude
   
 #   Prefix     symbol     factor  #   Prefix     symbol     factor
 << Prefix >>  << Prefix >>
Line 25  giga             G         10^9 Line 53  giga             G         10^9
 mega             M         10^6  mega             M         10^6
 kilo             k         10^3  kilo             k         10^3
 hecto            h         10^2  hecto            h         10^2
   deca             D         10^1
   
 deci             d         10^-1  deci             d         10^-1
 centi            c         10^-2  centi            c         10^-2
Line 46  yocto            y         10^{-24} Line 75  yocto            y         10^{-24}
 <<Derived Unit>>  <<Derived Unit>>
   
 gram            g      0.001 kg      # mass  gram            g      0.001 kg      # mass
 hour            hr     3600. s       # time  
 minute          min    60 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  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  inch            in     2.54 cm       # length
 foot            ft     12 in         # length  foot            ft     12 in         # length
 mile            mi     5280 ft       # length  mile            mi     5280 ft       # length
Line 78  ohm             ohm    V/A           # e Line 111  ohm             ohm    V/A           # e
 ohm             ohms   V/A           # electric resistance  ohm             ohms   V/A           # electric resistance
 ohm             Ohm    V/A           # electric resistance  ohm             Ohm    V/A           # electric resistance
 ohm             Ohms   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  siemens         S      1/Ohm         # electric conductance
 farad           F      C/V           # electric capacitance  farad           F      C/V           # electric capacitance
 tesla           T      V*s/m^2       # magnetic flux density  tesla           T      V*s/m^2       # magnetic flux density
Line 92  becquerel       Bq     1/s           # a Line 129  becquerel       Bq     1/s           # a
 gray            Gy     J/kg          # absorbed dose (of radiation)  gray            Gy     J/kg          # absorbed dose (of radiation)
 sievert         Sv     J/kg          # dose equivalent (dose equivalent index)  sievert         Sv     J/kg          # dose equivalent (dose equivalent index)
 astroUnit       AU     1.49598E11 m  # mean distance earth to sun  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
   

Removed from v.1.2  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>