Merge branch 'master' into lammps-icms

2012-11-26 08:47:57 -05:00
parent 880e389dfb 0a5d5cd8f9
commit e5cc471307
65 changed files with 3181 additions and 1209 deletions
--- a/python/lammps.py
+++ b/python/lammps.py
@ -153,7 +153,7 @@ class lammps:
  def gather_atoms(self,name,type,count):
    natoms = self.lib.lammps_get_natoms(self.lmp)
    if type == 0:
-      data = ((count*natoms)*c_double)()
+      data = ((count*natoms)*c_int)()
      self.lib.lammps_gather_atoms(self.lmp,name,type,count,data)
    elif type == 1:
      data = ((count*natoms)*c_double)()