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

revision 3484 by gross, Thu Apr 29 21:35:24 2010 UTC revision 3485 by gross, Thu Mar 24 22:44:40 2011 UTC
# Line 296  m=Unit("m","meter",0.,1.) Line 296  m=Unit("m","meter",0.,1.)
296  km=Kilo*m  km=Kilo*m
297  cm=Centi*m  cm=Centi*m
298  mm=Milli*m  mm=Milli*m
299    liter=(Deci*m)**3
300  #  #
301  #  time  #  time
302  #  #
# Line 315  kg=Unit("kg","kg",0.,1.) Line 316  kg=Unit("kg","kg",0.,1.)
316  gram=Milli*kg  gram=Milli*kg
317  lb=Unit("lb","pound",0.,0.45359237)  lb=Unit("lb","pound",0.,0.45359237)
318  ton=Kilo*kg  ton=Kilo*kg
319    Barrel=Unit("bbl","barrel", 0., 158.987294928e-3)
320  #  #
321  #   electric current  #   electric current
322  #  #
# Line 334  N = Unit("N","Newton",0.,1.) Line 336  N = Unit("N","Newton",0.,1.)
336  Pa = Unit("Pa","Pascal",0.,1.)  Pa = Unit("Pa","Pascal",0.,1.)
337  bar=100*Kilo*Pa  bar=100*Kilo*Pa
338  atm= Unit("atm","atmosphere",0.,101325.024)  atm= Unit("atm","atmosphere",0.,101325.024)
339    psi= Unit("psi","Psi",0.,6894.76)
340  J = Unit("J","Joule",0.,1.)  J = Unit("J","Joule",0.,1.)
341  W= Unit("W","Watt",0.,1.)  W= Unit("W","Watt",0.,1.)
342  C=Unit("C","Coulomb",0.,1.)  C=Unit("C","Coulomb",0.,1.)
# Line 346  DEG=Unit("Ohm","Ohm",0.,pi/180.) Line 349  DEG=Unit("Ohm","Ohm",0.,pi/180.)
349  #  Derived  #  Derived
350  #  #
351  Poise= gram/cm/sec  Poise= gram/cm/sec
352    cPoise=Poise*Centi
353    mPoise=Poise*Milli
354  Darcy= 9.869233e-13*m**2  Darcy= 9.869233e-13*m**2
355    mDarcy=Darcy*Milli
356  #  #
357  #  some constants  #  some constants
358  #  #
# Line 354  R_Earth_equator=6378.1370*km Line 360  R_Earth_equator=6378.1370*km
360  R_Earth_poles=6356.7523*km  R_Earth_poles=6356.7523*km
361  R_Earth=(R_Earth_equator+R_Earth_poles)/2  R_Earth=(R_Earth_equator+R_Earth_poles)/2
362  v_light=299792458.*m/sec  v_light=299792458.*m/sec
363

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