Skip to content

Commit

Permalink
Fix syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
rieder committed Mar 6, 2023
1 parent e63737b commit 5fad1db
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions src/amuse/units/units.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@

# misc every day
minute = named('minute', 'min', 60.0 * s)
hour = named('hour', 'hr', 60.0 * minute)
day = named('day', 'day', 24.0 * hour)
yr = named('year', 'yr', 365.242199 * day)
julianyr = named('julian yr','julianyr',365.25* day)
hour = named('hour', 'hr', 60.0 * minute)
day = named('day', 'day', 24.0 * hour)
yr = named('year', 'yr', 365.242199 * day)
julianyr = named('julian yr', 'julianyr', 365.25 * day)
ms = named('meter per seconds', 'ms', m / s)
kms = named('kilometer per seconds', 'kms', km / s)

# units based on measured quantities
e = named('electron charge', 'e', constants.elementary_charge.as_unit())
eV=named('electron volt','eV', e*V)
MeV=named('mega electron volt','MeV', 1e6*eV)
GeV=named('giga electron volt','GeV', 1e9*eV)
eV = named('electron volt', 'eV', e*V)
MeV = named('mega electron volt', 'MeV', 1e6*eV)
GeV = named('giga electron volt', 'GeV', 1e9*eV)
E_h = named('hartree energy', 'E_h', constants.Hartree_energy.as_unit())
amu = named('atomic mass unit', 'amu', constants.u.as_unit())
Ry = named('rydberg unit', 'Ry', (constants.Rydberg_constant * constants.h * constants.c).as_quantity_in(eV).as_unit())

# astronomical units
angstrom = named('angstrom', 'angstrom', 1e-10*m)
AU = named('astronomical unit', 'AU', 149597870691.0 * m)
au = named('astronomical unit', 'au', 149597870691.0 * m)
AUd = named('AU per day','AUd', 149597870691.0 * m / day)
parsec=named('parsec','parsec', AU / numpy.tan(numpy.pi/(180*60*60)))
kpc=named('kilo parsec','kpc',10**3 * parsec)
Mpc=named('mega parsec','Mpc',10**6 * parsec)
Gpc=named('giga parsec','Gpc',10**9 * parsec)
AU = named('astronomical unit', 'AU', 149597870691.0 * m)
au = named('astronomical unit', 'au', 149597870691.0 * m)
AUd = named('AU per day', 'AUd', 149597870691.0 * m / day)
parsec = named('parsec', 'parsec', AU / numpy.tan(numpy.pi/(180*60*60)))
kpc = named('kilo parsec', 'kpc', 10**3 * parsec)
Mpc = named('mega parsec', 'Mpc', 10**6 * parsec)
Gpc = named('giga parsec', 'Gpc', 10**9 * parsec)
lightyear = named('light year', 'ly', 9460730472580.8 * km)
#lightyear = named('light year', 'ly', c*julianyr)
# lightyear = named('light year', 'ly', c*julianyr)
LSun = named('solar luminosity', 'LSun', 3.839e26 * W)
MSun = named('solar mass', 'MSun', 1.98892e30 * kg)
MJupiter = named('jupiter mass', 'MJupiter', 1.8987e27 * kg)
Expand All @@ -48,9 +48,9 @@
pc = parsec

# cgs units
g = named('gram','g', 1e-3 * kg)
cm = named('centimeter','cm',0.01*m)
erg = named('erg','erg', 1e-7 * J)
g = named('gram', 'g', 1e-3 * kg)
cm = named('centimeter', 'cm', 0.01*m)
erg = named('erg', 'erg', 1e-7 * J)
barye = named('barye', 'Ba', 0.1*Pa)

# imperial distance units
Expand Down Expand Up @@ -91,13 +91,13 @@
]
)

#special unit for keys of particles
object_key = core.key_unit('object_key','key')
# special unit for keys of particles
object_key = core.key_unit('object_key', 'key')

#angles
#rad=named('radian','rad',m/m) (defined in derivedsi.py)
pi=numpy.pi | rad
rev=named('revolutions','rev',(2*numpy.pi) * rad)
deg=named('degree','deg',(numpy.pi/180) * rad)
arcmin=named('arcminutes', 'arcmin', (1./60) * deg)
arcsec=named('arcseconds', 'arcsec', (1./3600) * deg)
# angles
# rad=named('radian','rad',m/m) (defined in derivedsi.py)
pi = numpy.pi | rad
rev = named('revolutions', 'rev', (2*numpy.pi) * rad)
deg = named('degree', 'deg', (numpy.pi/180) * rad)
arcmin = named('arcminutes', 'arcmin', (1./60) * deg)
arcsec = named('arcseconds', 'arcsec', (1./3600) * deg)

0 comments on commit 5fad1db

Please sign in to comment.