From 17355f967a383968d7f618afde28b38ecbe4bce4 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 3 Apr 2021 11:11:18 -0400 Subject: [PATCH] address spelling and manual processing issues --- doc/src/Library_scatter.rst | 2 +- doc/src/Python_neighbor.rst | 2 +- doc/utils/sphinx-config/false_positives.txt | 1 + python/lammps/core.py | 4 ++-- src/library.cpp | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/src/Library_scatter.rst b/doc/src/Library_scatter.rst index 40a79c2d9b..b45f45f6fb 100644 --- a/doc/src/Library_scatter.rst +++ b/doc/src/Library_scatter.rst @@ -76,7 +76,7 @@ It documents the following functions: ----------------------- -.. doxygenfunction:: lammps_create_atoms(void *handle, int n, int *id, int *type, double *x, double *v, int *image, int bexpand) +.. doxygenfunction:: lammps_create_atoms(void *handle, int n, const int *id, const int *type, const double *x, const double *v, const int *image, int bexpand) :project: progguide diff --git a/doc/src/Python_neighbor.rst b/doc/src/Python_neighbor.rst index 416fcb30a8..00c4cc8996 100644 --- a/doc/src/Python_neighbor.rst +++ b/doc/src/Python_neighbor.rst @@ -5,7 +5,7 @@ Access to neighbor lists is handled through a couple of wrapper classes that allows to treat it like either a python list or a NumPy array. The access procedure is similar to that of the C-library interface: use one of the "find" functions to look up the index of the neighbor list in the -global table of neighbor lists and then get access to the neigbor list +global table of neighbor lists and then get access to the neighbor list data. The code sample below demonstrates reading the neighbor list data using the NumPy access method. diff --git a/doc/utils/sphinx-config/false_positives.txt b/doc/utils/sphinx-config/false_positives.txt index 38a6971f4c..c10e978428 100644 --- a/doc/utils/sphinx-config/false_positives.txt +++ b/doc/utils/sphinx-config/false_positives.txt @@ -2681,6 +2681,7 @@ representable Reproducibility reproducibility repuls +reqid rescale rescaled rescales diff --git a/python/lammps/core.py b/python/lammps/core.py index 11adecdca1..1f606f67f4 100644 --- a/python/lammps/core.py +++ b/python/lammps/core.py @@ -1753,9 +1753,9 @@ class lammps(object): Search for a neighbor list requested by a pair style instance that matches "style". If exact is True, the pair style name must match exactly. If exact is False, the pair style name is matched against - "style" as regular expression or substring. If the pair style is a + "style" as regular expression or sub-string. If the pair style is a hybrid pair style, the style is instead matched against the hybrid - sub-styles. If the same pair style is used as substyle multiple + sub-styles. If the same pair style is used as sub-style multiple types, you must set nsub to a value n > 0 which indicates the nth instance of that sub-style to be used (same as for the pair_coeff command). The default value of 0 will fail to match in that case. diff --git a/src/library.cpp b/src/library.cpp index 8f23ffcb6c..b72c8d7220 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -3926,7 +3926,7 @@ int lammps_create_atoms(void *handle, int n, const tagint *id, const int *type, * This function determines which of the available neighbor lists for * pair styles matches the given conditions. It first matches the style * name. If exact is 1 the name must match exactly, if exact is 0, a - * regular expression or substring match is done. If the pair style is + * regular expression or sub-string match is done. If the pair style is * hybrid or hybrid/overlay the style is matched against the sub styles * instead. * If a the same pair style is used multiple times as a sub-style, the @@ -3941,7 +3941,7 @@ int lammps_create_atoms(void *handle, int n, const tagint *id, const int *type, * \param handle pointer to a previously created LAMMPS instance cast to ``void *``. * \param style String used to search for pair style instance * \param exact Flag to control whether style should match exactly or only - * a regular expression / substring match is applied. + * a regular expression / sub-string match is applied. * \param nsub match nsub-th hybrid sub-style instance of the same style * \param reqid request id to identify neighbor list in case there are * multiple requests from the same pair style instance