Skip to content

Commit 165f34b

Browse files
authored
Merge pull request lammps#4571 from akohlmey/collected-small-fixes
Collected small fixes
2 parents 440e24c + 2ab7eda commit 165f34b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2376
-2076
lines changed

cmake/Modules/Packages/SCAFACOS.cmake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,16 @@ endif()
1414
option(DOWNLOAD_SCAFACOS "Download ScaFaCoS library instead of using an already installed one" ${DOWNLOAD_SCAFACOS_DEFAULT})
1515
if(DOWNLOAD_SCAFACOS)
1616
message(STATUS "ScaFaCoS download requested - we will build our own")
17-
set(SCAFACOS_URL "https://github.com/scafacos/scafacos/releases/download/v1.0.1/scafacos-1.0.1.tar.gz" CACHE STRING "URL for SCAFACOS tarball")
18-
set(SCAFACOS_MD5 "bd46d74e3296bd8a444d731bb10c1738" CACHE STRING "MD5 checksum of SCAFACOS tarball")
17+
set(SCAFACOS_URL "https://github.com/scafacos/scafacos/releases/download/v1.0.4/scafacos-1.0.4.tar.gz" CACHE STRING "URL for SCAFACOS tarball")
18+
set(SCAFACOS_MD5 "23867540ec32e63ce71d6ecc105278d2" CACHE STRING "MD5 checksum of SCAFACOS tarball")
1919
mark_as_advanced(SCAFACOS_URL)
2020
mark_as_advanced(SCAFACOS_MD5)
2121
GetFallbackURL(SCAFACOS_URL SCAFACOS_FALLBACK)
2222

23-
24-
# version 1.0.1 needs a patch to compile and linke cleanly with GCC 10 and later.
25-
file(DOWNLOAD ${LAMMPS_THIRDPARTY_URL}/scafacos-1.0.1-fix.diff ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
26-
EXPECTED_HASH MD5=4baa1333bb28fcce102d505e1992d032)
27-
28-
find_program(HAVE_PATCH patch)
29-
if(NOT HAVE_PATCH)
30-
message(FATAL_ERROR "The 'patch' program is required to build the ScaFaCoS library")
31-
endif()
32-
3323
include(ExternalProject)
3424
ExternalProject_Add(scafacos_build
3525
URL ${SCAFACOS_URL} ${SCAFACOS_FALLBACK}
3626
URL_MD5 ${SCAFACOS_MD5}
37-
PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
3827
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-doc
3928
--enable-fcs-solvers=fmm,p2nfft,direct,ewald,p3m
4029
--with-internal-fftw --with-internal-pfft

doc/graphviz/lammps-releases.dot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ digraph releases {
55
github -> develop [label="Merge commits"];
66
{
77
rank = "same";
8-
work [shape="none" label="Development branches:"]
8+
work [shape="none" label="Development branches:" fontname="bold"]
99
develop [label="'develop' branch" height=0.75];
1010
maintenance [label="'maintenance' branch" height=0.75];
1111
};
1212
{
1313
rank = "same";
14-
upload [shape="none" label="Release branches:"]
14+
upload [shape="none" label="Release branches:" fontname="bold"]
1515
release [label="'release' branch" height=0.75];
1616
stable [label="'stable' branch" height=0.75];
1717
};
@@ -22,7 +22,7 @@ digraph releases {
2222
maintenance -> stable [label="Updates to stable release"];
2323
{
2424
rank = "same";
25-
tag [shape="none" label="Applied tags:"];
25+
tag [shape="none" label="Applied tags:" fontname="bold"];
2626
patchtag [shape="box" label="patch_<date>"];
2727
stabletag [shape="box" label="stable_<date>"];
2828
updatetag [shape="box" label="stable_<date>_update<num>"];

doc/src/Build.rst

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,10 @@ As an alternative, you can download a package with pre-built executables
1414
or automated build trees, as described in the :doc:`Install <Install>`
1515
section of the manual.
1616

17-
Prerequisites
18-
-------------
19-
20-
Which software you need to compile and use LAMMPS strongly depends on
21-
which :doc:`features and settings <Build_settings>` and which
22-
:doc:`optional packages <Packages_list>` you are trying to include.
23-
Common to all is that you need a C++ and C compiler, where the C++
24-
compiler has to support at least the C++11 standard (note that some
25-
compilers require command-line flag to activate C++11 support).
26-
Furthermore, if you are building with CMake, you need at least CMake
27-
version 3.20 and a compatible build tool (make or ninja-build); if you
28-
are building the the legacy GNU make based build system you need GNU
29-
make (other make variants are not going to work since the build system
30-
uses features unique to GNU make) and a Unix-like build environment with
31-
a Bourne shell, and shell tools like "sed", "grep", "touch", "test",
32-
"tr", "cp", "mv", "rm", "ln", "diff" and so on. Parts of LAMMPS
33-
interface with or use Python version 3.6 or later.
34-
35-
The LAMMPS developers aim to keep LAMMPS very portable and usable -
36-
at least in parts - on most operating systems commonly used for
37-
running MD simulations. Please see the :doc:`section on portablility
38-
<Intro_portability>` for more details.
39-
4017
.. toctree::
4118
:maxdepth: 1
4219

20+
Build_prerequisites
4321
Build_cmake
4422
Build_make
4523
Build_link

doc/src/Build_prerequisites.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Prerequisites
2+
-------------
3+
4+
Which software you need to compile and use LAMMPS strongly depends on
5+
which :doc:`features and settings <Build_settings>` and which
6+
:doc:`optional packages <Packages_list>` you are trying to include.
7+
Common to all is that you need a C++ and C compiler, where the C++
8+
compiler has to support at least the C++11 standard (note that some
9+
compilers require command-line flag to activate C++11 support).
10+
Furthermore, if you are building with CMake, you need at least CMake
11+
version 3.20 and a compatible build tool (make or ninja-build); if you
12+
are building the the legacy GNU make based build system you need GNU
13+
make (other make variants are not going to work since the build system
14+
uses features unique to GNU make) and a Unix-like build environment with
15+
a Bourne shell, and shell tools like "sed", "grep", "touch", "test",
16+
"tr", "cp", "mv", "rm", "ln", "diff" and so on. Parts of LAMMPS
17+
interface with or use Python version 3.6 or later.
18+
19+
The LAMMPS developers aim to keep LAMMPS very portable and usable -
20+
at least in parts - on most operating systems commonly used for
21+
running MD simulations. Please see the :doc:`section on portablility
22+
<Intro_portability>` for more details.

doc/src/Commands_removed.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Removed commands and packages
22
=============================
33

4-
.. contents:: \
4+
.. contents::
55

66
------
77

@@ -15,15 +15,15 @@ with the direct alternative (if available) and print a warning.
1515
LAMMPS shell
1616
------------
1717

18-
.. versionchanged:: 29Aug2024
18+
.. deprecated:: 29Aug2024
1919

2020
The LAMMPS shell has been removed from the LAMMPS distribution. Users
2121
are encouraged to use the :ref:`LAMMPS-GUI <lammps_gui>` tool instead.
2222

2323
i-PI tool
2424
---------
2525

26-
.. versionchanged:: 27Jun2024
26+
.. deprecated:: 27Jun2024
2727

2828
The i-PI tool has been removed from the LAMMPS distribution. Instead,
2929
instructions to install i-PI from PyPI via pip are provided.

doc/src/Errors_details.rst

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,17 @@ angle, dihedral, or improper with just one atom in the actual
159159
sub-domain. Typically, this cutoff is set to the largest cutoff from
160160
the :doc:`pair style(s) <pair_style>` plus the :doc:`neighbor list skin
161161
distance <neighbor>` and will typically be sufficient for all bonded
162-
interactions. But if the pair style cutoff is small, this may not be
163-
enough. LAMMPS will print a warning in this case using some heuristic
164-
based on the equilibrium bond length, but that still may not be
165-
sufficient for cases where the force constants are small and thus bonds
166-
may be stretched very far. The communication cutoff can be adjusted
167-
with :doc:`comm_modify cutoff \<value\> <comm_modify>`, but setting this
168-
too large will waste CPU time and memory.
162+
interactions. But if the pair style cutoff is small (e.g. with a
163+
repulsive-only Lennard-Jones potential) this may not be enough. It is
164+
even worse if there is no pair style defined (or the pair style is set
165+
to "none"), since then there will be no ghost atoms created at all.
166+
167+
The communication cutoff can be set or adjusted with :doc:`comm_modify
168+
cutoff \<value\> <comm_modify>`, but setting this too large will waste
169+
CPU time and memory. LAMMPS will print warnings in these cases. For
170+
bonds it uses some heuristic based on the equilibrium bond length, but
171+
that still may not be sufficient for cases where the force constants are
172+
small and thus bonds may be stretched very far.
169173

170174
.. _hint09:
171175

doc/src/Howto_lammps_gui.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ of the *Output* window showing how many warnings and errors were
308308
detected and how many lines the entire output has. By clicking on the
309309
button on the right with the warning symbol or by using the keyboard
310310
shortcut `Ctrl-N` (`Command-N` on macOS), you can jump to the next
311-
line with a warning or error.
311+
line with a warning or error. If there is a URL pointing to additional
312+
explanations in the online manual, that URL will be highlighted and
313+
double-clicking on it shall open the corresponding manual page in
314+
the web browser. The option is also available from the context menu.
312315

313316
By default, the *Output* window is replaced each time a run is started.
314317
The runs are counted and the run number for the current run is displayed

doc/src/JPG/lammps-releases.png

1.38 KB
Loading

doc/src/pair_lj_pirani.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ electrostatic interactions. If these are desired, this pair style
7474
should be used along with a Coulomb pair style like
7575
:doc:`pair styles coul/cut or coul/long <pair_coul>` by using
7676
:doc:`pair style hybrid/overlay <pair_hybrid>` and a suitable
77-
kspace style :doc:`<kspace_style>`, if needed.
77+
:doc:`kspace style <kspace_style>`, if needed.
7878

7979
As discussed in :ref:`(Pirani) <Pirani>`, analysis of a variety of
8080
systems showed that :math:`\alpha= 4` generally works very well. In

examples/COUPLE/plugin/liblammpsplugin.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ liblammpsplugin_t *liblammpsplugin_load(const char *lib)
144144
ADDSYM(find_pair_neighlist);
145145
ADDSYM(find_fix_neighlist);
146146
ADDSYM(find_compute_neighlist);
147+
ADDSYM(request_single_neighlist);
147148
ADDSYM(neighlist_num_elements);
148149
ADDSYM(neighlist_element_neighbors);
149150

0 commit comments

Comments
 (0)