Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface

This commit is contained in:
Richard Berger
2016-06-08 14:26:14 -04:00
888 changed files with 19903 additions and 52924 deletions

View File

@ -87,6 +87,9 @@ class lammps:
if cmdargs:
cmdargs.insert(0, "lammps.py")
narg = len(cmdargs)
for i in range(narg):
if type(cmdargs[i]) is str:
cmdargs[i] = cmdargs[i].encode()
cargs = (c_char_p * narg)(*cmdargs)
self.lib.lammps_open.argtypes = [c_int, c_char_p * narg, \
MPI_Comm, c_void_p()]
@ -106,6 +109,9 @@ class lammps:
if cmdargs:
cmdargs.insert(0, "lammps.py")
narg = len(cmdargs)
for i in range(narg):
if type(cmdargs[i]) is str:
cmdargs[i] = cmdargs[i].encode()
cargs = (c_char_p * narg)(*cmdargs)
self.lmp = c_void_p()
self.lib.lammps_open_no_mpi(narg, cargs, byref(self.lmp))