ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make included Pizza.py code for reading dumps compatible with python 2.7

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-12-16 18:30:44 -05:00
parent f7a2cd689b
commit 5508438ba1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/python/pizza/dump.py
View File

@ -472,7 +472,7 @@ class dump:
yprdinv = 1.0 / (snap.yhi - snap.ylo) yprdinv = 1.0 / (snap.yhi - snap.ylo)
zprdinv = 1.0 / (snap.zhi - snap.zlo) zprdinv = 1.0 / (snap.zhi - snap.zlo)
atoms = snap.atoms atoms = snap.atoms
if atoms != None: if type(atoms) != types.NoneType:
atoms[:,x] = (atoms[:,x] - snap.xlo) * xprdinv atoms[:,x] = (atoms[:,x] - snap.xlo) * xprdinv
atoms[:,y] = (atoms[:,y] - snap.ylo) * yprdinv atoms[:,y] = (atoms[:,y] - snap.ylo) * yprdinv
atoms[:,z] = (atoms[:,z] - snap.zlo) * zprdinv atoms[:,z] = (atoms[:,z] - snap.zlo) * zprdinv
@ -502,7 +502,7 @@ class dump:
h4inv = (h3*h5 - h1*h4) / (h0*h1*h2) h4inv = (h3*h5 - h1*h4) / (h0*h1*h2)
h5inv = xy / (h0*h1) h5inv = xy / (h0*h1)
atoms = snap.atoms atoms = snap.atoms
if atoms != None: if type(atoms) != types.NoneType:
atoms[:,x] = (atoms[:,x] - snap.xlo)*h0inv + \ atoms[:,x] = (atoms[:,x] - snap.xlo)*h0inv + \
(atoms[:,y] - snap.ylo)*h5inv + \ (atoms[:,y] - snap.ylo)*h5inv + \
(atoms[:,z] - snap.zlo)*h4inv (atoms[:,z] - snap.zlo)*h4inv
@ -536,7 +536,7 @@ class dump:
yprd = snap.yhi - snap.ylo yprd = snap.yhi - snap.ylo
zprd = snap.zhi - snap.zlo zprd = snap.zhi - snap.zlo
atoms = snap.atoms atoms = snap.atoms
if atoms != None: if type(atoms) != types.NoneType:
atoms[:,x] = snap.xlo + atoms[:,x]*xprd atoms[:,x] = snap.xlo + atoms[:,x]*xprd
atoms[:,y] = snap.ylo + atoms[:,y]*yprd atoms[:,y] = snap.ylo + atoms[:,y]*yprd
atoms[:,z] = snap.zlo + atoms[:,z]*zprd atoms[:,z] = snap.zlo + atoms[:,z]*zprd
@ -560,7 +560,7 @@ class dump:
h4 = xz h4 = xz
h5 = xy h5 = xy
atoms = snap.atoms atoms = snap.atoms
if atoms != None: if type(atoms) != types.NoneType:
atoms[:,x] = snap.xlo + atoms[:,x]*h0 + atoms[:,y]*h5 + atoms[:,z]*h4 atoms[:,x] = snap.xlo + atoms[:,x]*h0 + atoms[:,y]*h5 + atoms[:,z]*h4
atoms[:,y] = snap.ylo + atoms[:,y]*h1 + atoms[:,z]*h3 atoms[:,y] = snap.ylo + atoms[:,y]*h1 + atoms[:,z]*h3
atoms[:,z] = snap.zlo + atoms[:,z]*h2 atoms[:,z] = snap.zlo + atoms[:,z]*h2