From 38874c5aaaf52fccaa8760929416d12bcacbd954 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 18 Apr 2024 00:27:38 -0400 Subject: [PATCH] make more consistent --- python/lammps/core.py | 6 ++---- python/lammps/pylammps.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/python/lammps/core.py b/python/lammps/core.py index 626ece0770..ae488dc241 100644 --- a/python/lammps/core.py +++ b/python/lammps/core.py @@ -23,16 +23,15 @@ from ctypes import CDLL, POINTER, RTLD_GLOBAL, CFUNCTYPE, py_object, byref, cast from os.path import dirname, abspath, join from inspect import getsourcefile -from .constants import LAMMPS_AUTODETECT, LAMMPS_STRING, \ +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_ERROR_WARNING, LMP_ERROR_ONE, LMP_ERROR_ALL, LMP_ERROR_WORLD, LMP_ERROR_UNIVERSE, \ LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING, \ get_ctypes_int -from .data import NeighList +from lammps.data import NeighList # ------------------------------------------------------------------------- @@ -2081,7 +2080,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) diff --git a/python/lammps/pylammps.py b/python/lammps/pylammps.py index 4b740f35ff..b5eabd6436 100644 --- a/python/lammps/pylammps.py +++ b/python/lammps/pylammps.py @@ -27,8 +27,8 @@ import sys import tempfile from collections import namedtuple -from .core import lammps -from .constants import LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING +from lammps.core import lammps +from lammps.constants import LMP_VAR_EQUAL, LMP_VAR_ATOM, LMP_VAR_VECTOR, LMP_VAR_STRING # -------------------------------------------------------------------------