Merge branch 'python-lint' into collected-small-changes
This commit is contained in:
@ -18,12 +18,20 @@ from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
from ctypes import * # lgtm [py/polluting-import]
|
||||
from os.path import dirname,abspath,join
|
||||
from ctypes import CDLL, POINTER, RTLD_GLOBAL, CFUNCTYPE, py_object, byref, cast, sizeof, \
|
||||
create_string_buffer, c_int, c_int32, c_int64, c_double, c_void_p, c_char_p, pythonapi
|
||||
from os.path import dirname, abspath, join
|
||||
from inspect import getsourcefile
|
||||
|
||||
from .constants import * # lgtm [py/polluting-import]
|
||||
from .data import * # lgtm [py/polluting-import]
|
||||
from lammps.constants import LAMMPS_AUTODETECT, LAMMPS_STRING, \
|
||||
LAMMPS_INT, LAMMPS_INT_2D, LAMMPS_DOUBLE, LAMMPS_DOUBLE_2D, LAMMPS_INT64, LAMMPS_INT64_2D, \
|
||||
LMP_STYLE_GLOBAL, LMP_STYLE_ATOM, LMP_STYLE_LOCAL, \
|
||||
LMP_TYPE_SCALAR, LMP_TYPE_VECTOR, LMP_TYPE_ARRAY, \
|
||||
LMP_SIZE_VECTOR, LMP_SIZE_ROWS, LMP_SIZE_COLS, \
|
||||
LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING, \
|
||||
get_ctypes_int
|
||||
|
||||
from lammps.data import NeighList
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
@ -2258,7 +2266,6 @@ class lammps(object):
|
||||
:param caller: reference to some object passed to the callback function
|
||||
:type: object, optional
|
||||
"""
|
||||
import numpy as np
|
||||
|
||||
def callback_wrapper(caller, ntimestep, nlocal, tag_ptr, x_ptr, fext_ptr):
|
||||
tag = self.numpy.iarray(self.c_tagint, tag_ptr, nlocal, 1)
|
||||
|
||||
@ -18,11 +18,15 @@
|
||||
|
||||
from ctypes import POINTER, c_void_p, c_char_p, c_double, c_int, c_int32, c_int64, cast
|
||||
|
||||
from .constants import LAMMPS_AUTODETECT, LAMMPS_INT, LAMMPS_INT_2D, \
|
||||
LAMMPS_DOUBLE, LAMMPS_DOUBLE_2D, LAMMPS_INT64, LAMMPS_INT64_2D, \
|
||||
LMP_STYLE_GLOBAL, LMP_STYLE_ATOM, LMP_STYLE_LOCAL, \
|
||||
LMP_TYPE_SCALAR, LMP_TYPE_VECTOR, LMP_TYPE_ARRAY, \
|
||||
LMP_SIZE_VECTOR, LMP_SIZE_ROWS, LMP_SIZE_COLS, \
|
||||
LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING
|
||||
|
||||
from .constants import * # lgtm [py/polluting-import]
|
||||
from .data import NeighList
|
||||
|
||||
|
||||
class numpy_wrapper:
|
||||
"""lammps API NumPy Wrapper
|
||||
|
||||
|
||||
@ -27,8 +27,8 @@ import sys
|
||||
import tempfile
|
||||
from collections import namedtuple
|
||||
|
||||
from .core import lammps
|
||||
from .constants import * # lgtm [py/polluting-import]
|
||||
from lammps.core import lammps
|
||||
from lammps.constants import LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user