Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts: doc/Manual.txt
2013-03-12 18:44:52 +01:00
parent 6332d404d5 1ff629817f
commit 8a912603a5
92 changed files with 13893 additions and 52 deletions
--- a/python/lammps.py
+++ b/python/lammps.py
@ -106,7 +106,7 @@ class lammps:
    if type == 0:
      if style > 0: return None
      self.lib.lammps_extract_fix.restype = POINTER(c_double)
-      ptr = self.lib.lammps_extract_bix(self.lmp,id,style,type,i,j)
+      ptr = self.lib.lammps_extract_fix(self.lmp,id,style,type,i,j)
      result = ptr[0]
      self.lib.lammps_free(ptr)
      return result