# Diff of /trunk/escript/py_src/unitsSI.py

revision 3485 by gross, Thu Mar 24 22:44:40 2011 UTC revision 3494 by gross, Tue Apr 5 04:12:08 2011 UTC
# Line 297  km=Kilo*m Line 297  km=Kilo*m
297  cm=Centi*m  cm=Centi*m
298  mm=Milli*m  mm=Milli*m
299  liter=(Deci*m)**3  liter=(Deci*m)**3
300    ft=Unit("ft", "feet", 0., 0.3048)
301
302  #  #
303  #  time  #  time
304  #  #
# Line 316  kg=Unit("kg","kg",0.,1.) Line 318  kg=Unit("kg","kg",0.,1.)
318  gram=Milli*kg  gram=Milli*kg
319  lb=Unit("lb","pound",0.,0.45359237)  lb=Unit("lb","pound",0.,0.45359237)
320  ton=Kilo*kg  ton=Kilo*kg
321  Barrel=Unit("bbl","barrel", 0., 158.987294928e-3)  Barrel=Unit("bbl","barrel", 0.,0.1589872891252)
322    Mscf=Unit("MSCF", "thousand standard cubic feet", 0., 28.174006042197338)
323    Mcf=1000. * ft**3
324  #  #
325  #   electric current  #   electric current
326  #  #
# Line 336  N = Unit("N","Newton",0.,1.) Line 340  N = Unit("N","Newton",0.,1.)
340  Pa = Unit("Pa","Pascal",0.,1.)  Pa = Unit("Pa","Pascal",0.,1.)
341  bar=100*Kilo*Pa  bar=100*Kilo*Pa
342  atm= Unit("atm","atmosphere",0.,101325.024)  atm= Unit("atm","atmosphere",0.,101325.024)
343  psi= Unit("psi","Psi",0.,6894.76)  psi= Unit("psi","Psi",0.,6894.75728034)
344  J = Unit("J","Joule",0.,1.)  J = Unit("J","Joule",0.,1.)
345  W= Unit("W","Watt",0.,1.)  W= Unit("W","Watt",0.,1.)
346  C=Unit("C","Coulomb",0.,1.)  C=Unit("C","Coulomb",0.,1.)

Legend:
 Removed from v.3485 changed lines Added in v.3494