/[escript]/trunk/escript/py_src/unitsSI.py
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3566 by gross, Tue Aug 30 07:37:55 2011 UTC revision 3648 by gross, Thu Nov 3 08:13:31 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)  ft=Unit("ft", "feet", 0., 0.3048 * m)
301  Barrel=Unit("bbl","barrel", 0.,0.1589872891252)  Barrel=Unit("bbl","barrel", 0., 0.158987294928 * m**3)
302  Mscf=Unit("MSCF", "thousand standard cubic feet", 0., 28.31685)  Mscf=Unit("MSCF", "thousand standard cubic feet", 0., 28.31685 * m**3)
303  Mcf=1000. * ft**3  Mcf=1000. * ft**3
304  #  #
305  #  time  #  time
306  #  #
307  sec=Unit("sec","second",0.,1.)  sec=Unit("sec","second",0.,1.)
308  minute=Unit("min","minute",0.,60.)  minute=Unit("min","minute",0.,60.)
309  hour=Unit("h","hour",0.,60.*60.)  hour=Unit("h","hour",0.,60.* minute)
310  h=hour  h=hour
311  day=Unit("d","day",0.,60.*60.*24.)  day=Unit("d","day",0., 24. * h)
312  yr=Unit("yr","year",0.,60.*60.*24.*365.2425)  yr=Unit("yr","year",0.,365.2425 * day)
313  year=yr  year=yr
314  Myr=Mega*yr  Myr=Mega*yr
315  Gyr=Giga*yr  Gyr=Giga*yr
# Line 318  Gyr=Giga*yr Line 318  Gyr=Giga*yr
318  #  #
319  kg=Unit("kg","kg",0.,1.)  kg=Unit("kg","kg",0.,1.)
320  gram=Milli*kg  gram=Milli*kg
321  lb=Unit("lb","pound",0.,0.45359237)  lb=Unit("lb","pound",0.,0.45359237 * kg)
322  ton=Kilo*kg  ton=Kilo*kg
323  #  #
324  #   electric current  #   electric current
# Line 338  Hz=one/sec Line 338  Hz=one/sec
338  N = Unit("N","Newton",0.,1.)  N = Unit("N","Newton",0.,1.)
339  Pa = Unit("Pa","Pascal",0.,1.)  Pa = Unit("Pa","Pascal",0.,1.)
340  bar=100*Kilo*Pa  bar=100*Kilo*Pa
341  atm= Unit("atm","atmosphere",0.,101325.024)  atm= Unit("atm","atmosphere",0.,101325.024 * Pa)
342  psi= Unit("psi","Psi",0.,6894.75728034)  psi= Unit("psi","Psi",0.,6894.75728034 * Pa)
343  J = Unit("J","Joule",0.,1.)  J = Unit("J","Joule",0.,1.)
344  W= Unit("W","Watt",0.,1.)  W= Unit("W","Watt",0.,1.)
345  C=Unit("C","Coulomb",0.,1.)  C=Unit("C","Coulomb",0.,1.)

Legend:
Removed from v.3566  
changed lines
  Added in v.3648

  ViewVC Help
Powered by ViewVC 1.1.26