Commit d6ebf3cd authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Merge branch 'reset-molecules' of github.com:lammps/lammps into reset-molecules

parents fcc6ed3a de7f02e4
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ class lammps(object):
    self.lib.lammps_neighlist_element_neighbors.argtypes = [c_void_p, c_int, c_int, POINTER(c_int), POINTER(c_int), POINTER(POINTER(c_int))]
    self.lib.lammps_neighlist_element_neighbors.restype  = None

    self.lib.lammps_has_error.argtypes = [c_void_p]
    self.lib.lammps_has_error.restype = c_bool

    self.lib.lammps_get_last_error_message.argtypes = [c_void_p, c_char_p, c_int]
    self.lib.lammps_get_last_error_message.restype = c_int

    # if no ptr provided, create an instance of LAMMPS
    #   don't know how to pass an MPI communicator from PyPar
    #   but we can pass an MPI communicator from mpi4py v2.0.0 and later
+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void Input::file()

    // execute the command

    if (execute_command())
    if (execute_command() && line)
      error->all(FLERR,fmt::format("Unknown command: {}",line));
  }
}