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

version 1.2, 2001/08/02 14:17:01 version 1.5, 2001/12/04 15:17:56
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 46  yocto            y         10^{-24} Line 73  yocto            y         10^{-24}
 <<Derived Unit>>  <<Derived Unit>>
   
 gram            g      0.001 kg      # mass  gram            g      0.001 kg      # mass
   day             day    24.0 hr       # time
   year            yr     365.24 day    # time
 hour            hr     3600. s       # time  hour            hr     3600. s       # time
 minute          min    60 s          # time  minute          min    60 s          # time
 pound           lb     0.45359237 kg # mass  pound           lb     0.45359237 kg # mass
Line 92  becquerel       Bq     1/s           # a Line 121  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
   
   

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


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