Merge pull request #4613 from akohlmey/next_release

Set version date for next feature release

.github/CODEOWNERS

@@ -71,7 +71,10 @@ src/EXTRA-COMMAND/group_ndx.*       @akohlmey
 src/EXTRA-COMMAND/ndx_group.*       @akohlmey
 src/EXTRA-COMPUTE/compute_stress_mop*.* @RomainVermorel
 src/EXTRA-COMPUTE/compute_born_matrix.* @Bibobu @athomps
+src/EXTRA-DUMP/dump_extxyz.*          @fxcoudert
 src/EXTRA-FIX/fix_deform_pressure.* @jtclemm
+src/EXTRA-PAIR/pair_dispersion_d3.* @soniasolomoni @arthurfl
+src/EXTRA-PAIR/d3_parameters.h      @soniasolomoni @arthurfl
 src/MISC/*_tracker.*                @jtclemm
 src/MC/fix_gcmc.*                   @athomps
 src/MC/fix_sgcmc.*                  @athomps

.github/release_steps.md

@@ -28,14 +28,14 @@ Create a 'next\_release' branch off 'develop' and make the following changes:
   ..versionadded:: or ..versionchanged:: are missing and need to be
   added
 
-Submit this pull request, rebase if needed.  This is the last pull
-request merged for the release and should not contain any other
-changes. (Exceptions: this document, last minute trivial(!) changes).
+Submit this pull request.  This is the last pull request merged for the
+release and should not contain any other changes. (Exceptions: this
+document, last minute trivial(!) changes).
 
 This PR shall not be merged before **all** pending tests have completed
 and cleared.  We currently use a mix of automated tests running on
 either Temple's Jenkins cluster or GitHub workflows.  Those include time
-consuming tests not run on pull requests.  If needed, a bugfix pull
+consuming tests not run on pull requests.  If needed, a bug-fix pull
 request should be created and merged to clear all tests.
 
 ### Create release on GitHub
@@ -56,7 +56,7 @@ git pull
 git checkout release
 git pull
 git merge --ff-only develop
-git tag -s -m "LAMMPS feature release 19 November 2024" patch_19Nov2024
+git tag -s -m "LAMMPS feature release 4 February 2025" patch_4Feb2025
 git push git@github.com:lammps/lammps.git --tags develop release
 ```
 
@@ -77,7 +77,7 @@ release page with a summary of all the changes included and references
 to the pull requests they were merged from or check the existing draft
 for any necessary changes from pull requests that were merged but are
 not listed.  Then select the applied tag for the release in the "Choose
-a tag" dropdown list. Go to the bottom of the list and select the "Set
+a tag" drop-down list. Go to the bottom of the list and select the "Set
 as pre-release" checkbox.  The "Set as the latest release" button is
 reserved for stable releases and updates to them.
 
@@ -87,67 +87,197 @@ you can return to edit the release page and publish it.
 
 ### Prepare pre-compiled packages, update packages to GitHub
 
-Build a fully static LAMMPS installation using a musl-libc
-cross-compiler, install into a lammps-static folder, and create a
-tarball called lammps-linux-x86_64-19Nov2024.tar.gz (or using a
-corresponding date with a future release) from the lammps-static folder.
 A suitable build environment is provided with the
-https://download.lammps.org/static/fedora37_musl.sif container image.
+https://download.lammps.org/static/fedora41_musl_mingw.sif container
+image.  The corresponding container build definition file is maintained
+in the tools/singularity folder of the LAMMPS source distribution.
+
+#### Fully portable static Linux x86_64 non-MPI binaries
+
+The following commands use the Fedora container to build a fully static
+LAMMPS installation using a musl-libc cross-compiler, install it into a
+`lammps-static` folder, and create a tarball called
+`lammps-linux-x86_64-4Feb2025.tar.gz` (or using a corresponding date
+with a future release) from the `lammps-static` folder.
 
 ``` sh
 rm -rf release-packages
 mkdir release-packages
 cd release-packages
-wget https://download.lammps.org/static/fedora41_musl.sif
-apptainer shell fedora41_musl.sif
+wget https://download.lammps.org/static/fedora41_musl_mingw.sif
+apptainer shell fedora41_musl_mingw.sif
 git clone -b release --depth 10 https://github.com/lammps/lammps.git lammps-release
 cmake -S lammps-release/cmake -B build-release -G Ninja -D CMAKE_INSTALL_PREFIX=$PWD/lammps-static -D CMAKE_TOOLCHAIN_FILE=/usr/musl/share/cmake/linux-musl.cmake -C lammps-release/cmake/presets/most.cmake -C lammps-release/cmake/presets/kokkos-openmp.cmake -D DOWNLOAD_POTENTIALS=OFF -D BUILD_MPI=OFF -D BUILD_TESTING=OFF -D CMAKE_BUILD_TYPE=Release -D PKG_ATC=ON -D PKG_AWPMD=ON -D PKG_MANIFOLD=ON -D PKG_MESONT=ON -D PKG_MGPT=ON -D PKG_ML-PACE=ON -D PKG_ML-RANN=ON -D PKG_MOLFILE=ON -D PKG_PTM=ON -D PKG_QTB=ON -D PKG_SMTBQ=ON
 cmake --build build-release --target all
 cmake --build build-release --target install
 /usr/musl/bin/x86_64-linux-musl-strip lammps-static/bin/*
-tar -czvvf lammps-linux-x86_64-19Nov2024.tar.gz lammps-static
+tar -czvvf ../lammps-linux-x86_64-4Feb2025.tar.gz lammps-static
 exit # fedora 41 container
+cd ..
 ```
 
 The resulting tar archive can be uploaded to the GitHub release page with:
 
-```
-gh release upload patch_19Nov2024 lammps-linux-x86_64-19Nov2024.tar.gz
+``` sh
+gh release upload patch_4Feb2025 lammps-linux-x86_64-4Feb2025.tar.gz
 ```
 
+#### Linux x86_64 Flatpak bundle with GUI included
+
 Make sure you have the `flatpak` and `flatpak-builder` packages
-installed locally (they cannot be used from the container) and build a
+installed locally (they require binaries that run with elevated
+privileges and thus cannot be used from the container) and build a
 LAMMPS and LAMMPS-GUI flatpak bundle in the `release-packages` folder
 with:
 
 ``` sh
+cd release-packages
 flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak-builder  --force-clean --verbose --repo=$PWD/flatpak-repo --install-deps-from=flathub --state-dir=$PWD --user --ccache --default-branch=release flatpak-build lammps-release/tools/lammps-gui/org.lammps.lammps-gui.yml
-flatpak build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo --verbose $PWD/flatpak-repo LAMMPS-Linux-x86_64-GUI-19Nov2024.flatpak org.lammps.lammps-gui release
+flatpak build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo --verbose $PWD/flatpak-repo ../LAMMPS-Linux-x86_64-GUI-4Feb2025.flatpak org.lammps.lammps-gui release
+cd ..
 ```
 
 The resulting flatpak bundle file can be uploaded to the GitHub release page with:
 
-```
-gh release upload patch_19Nov2024 LAMMPS-Linux-x86_64-GUI-19Nov2024.flatpak
+``` sh
+gh release upload patch_4Feb2025 LAMMPS-Linux-x86_64-GUI-4Feb2025.flatpak
 ```
 
-Also build serial executable packages that also include LAMMPS-GUI for
-Linux, macOS, and Windows, and upload them to the GitHub release.
+#### LAMMPS Source tarball
 
-Clean up:
+The container for the static binary can also be used to prepare the source
+tarball including the HTML and PDF manual (this is currently done automatically
+when the releases is created and the tarball uploaded to https://download.lammps.org/tars/).
+The steps are as follows:
+
+``` sh
+cd release-packages
+apptainer shell fedora41_musl_mingw.sif
+cd lammps-release
+rm -f ../release.tar*
+git archive --output=../release.tar --prefix=lammps-4Feb2025/ HEAD
+cd doc
+make clean-all
+make html pdf
+tar -rf ../../release.tar --transform 's,^,lammps-4Feb2025/doc/,' html Manual.pdf
+gzip -9v ../../release.tar
+mv ../../release.tar.gz ../../lammps-src-4Feb2025.tar.gz
+exit # fedora41 container
+cd ..
+```
+
+The resulting source tarball can be uploaded to the GitHub release page with:
+
+``` sh
+gh release upload patch_4Feb2025 lammps-src-4Feb2025.tar.gz
+```
+
+#### Build Windows Installer Packages with MinGW Linux-to-Windows Cross-compiler
+
+The various Windows installer packages can also be built with
+apptainer container image.
+
+``` sh
+cd release-packages
+apptainer shell fedora41_musl_mingw.sif
+git clone --depth 10 https://github.com/lammps/lammps-packages.git lammps-packages
+cd lammps-packages/mingw-cross
+ln -sf ../../lammps-release lammps
+./buildall.sh release >& mk.log & less +F mk.log
+```
+
+The installer with the GUI included can be uploaded to the GitHub release page with:
+
+``` sh
+ln -sf LAMMPS-64bit-GUI-4Feb2025.exe LAMMPS-Win10-64bit-GUI-4Feb2025.exe
+gh release upload patch_4Feb2025 LAMMPS-Win10-64bit-GUI-4Feb2025.exe
+```
+
+The symbolic link is used to have a consistent naming scheme for the packages
+attached to the GitHub release page.
+
+#### Clean up:
 
 ``` sh
 cd ..
 rm -r release-packages
 ```
 
-TODO:
-- add detailed commands for building GUI packages on Ubuntu 20.04LTS (move to 22.04LTS?),
-  macOS, and Windows cross-compiler and upload to GitHub
-- build all Windows cross-compiled installer packages using lammps-packages repo
+#### Build Multi-arch App-bundle with GUI for macOS
 
-### Update download website
+Building app-bundles for macOS is not as easily automated and portable
+as some of the other steps.  It requires a machine actually running
+macOS.  In that machine the Xcode compiler package needs to be
+installed. This also includes tools for building and manipulating disk
+images.  This compiler supports building executables for both, the
+x86_64 and the arm64 architectures.  This requires building with CMake
+and using the CMake settings:
+
+``` sh
+-D CMAKE_OSX_ARCHITECTURES=arm64;x86_64
+-D CMAKE_OSX_DEPLOYMENT_TARGET=11.0
+```
+
+This will add the compiler flags `-arch arm64 -arch x86_64
+-mmacosx-version-min=11.0` and thus produce object for both
+architectures and support for macOS versions back to version 11 (aka Big
+Sur).  With these settings the following libraries should be compiled
+and installed (e.g. to `$HOME/.local`) as static libraries only:
+- libomp taken from the LLVM/Clang source distribution (to support OpenMP)
+- jpeg
+- zlib
+- png
+- Qt (for LAMMPS-GUI)
+
+When configuring LAMMPS the `cmake/presets/clang.cmake` should be used
+and as many packages as possible enabled. For LAMMPS-GUI, MPI should be
+disabled with `-D BUILD_MPI=OFF` and LAMMPS-GUI enabled with 
+`-D BUILD_LAMMPS_GUI=ON`.  If the CMake configuration is successful,
+settings for building a macOS app-bundle are enabled and with `cmake
+--build build --target dmg` extra steps will be executed that will build
+a macOS application installer image under the name
+`LAMMPS_GUI-macOS-multiarch-4Feb2025.dmg`
+
+The application image can be uploaded to the GitHub release page with:
+
+``` sh
+ln -sf LAMMPS_GUI-macOS-multiarch-4Feb2025.dmg LAMMPS-macOS-multiarch-GUI-4Feb2025.dmg
+gh release upload patch_4Feb2025 LAMMPS-macOS-multiarch-GUI-4Feb2025.dmg
+```
+
+The symbolic link is used to have a consistent naming scheme for the packages
+attached to the GitHub release page.
+
+We are currently building the application images on macOS 12 (aka Monterey).
+
+#### Build Linux x86_64 binary tarball with GUI on Ubuntu 20.04LTS
+
+While the flatpak Linux version uses portable runtime libraries provided
+by the flatpak environment, we also build regular Linux executables that
+use a wrapper script and matching shared libraries in a tarball.  To be
+compatible with many Linux distributions, one has to build this on a
+very old Linux distribution, since most Linux system libraries are
+usually backward compatible but not forward compatible.  This is
+currently done on an Ubuntu 20.04LTS system. Once LAMMPS moves to
+require CMake 3.20 and C++17, we will have to move to Ubuntu 22.04LTS.
+This installation (either on a real or a virtual machine) should have
+the packages installed that are indicated in
+`tools/singularity/ubuntu20.04.def` plus Qt version 5.x with development
+headers, so that LAMMPS-GUI can be compiled.
+
+Also the building of the binary tarball and setup of the bundled
+libraries and wrapper scripts is automated and can executed with `cmake
+--build build --target tgz`.  This should produce a file
+`LAMMPS_GUI-Linux-amd64-4Feb2025.tar.gz` which can be uploaded to the
+GitHub release page with:
+
+``` sh
+ln -sf LAMMPS_GUI-Linux-amd64-4Feb2025.tar.gz LAMMPS-Linux-x86_64-GUI-4Feb2025.tar.gz
+gh release upload patch_4Feb2025 LAMMPS-Linux-x86_64-GUI-4Feb2025.tar.gz
+```
+
+### Update download page on LAMMPS website
 
 Check out the LAMMPS website repo
 https://github.com/lammps/lammps-website.git and edit the file
@@ -156,7 +286,7 @@ html` and review `html/download.html` Then add and commit to git and
 push the changes to GitHub.  The Temple Jenkis cluster will
 automatically update https://www.lammps.org/download.html accordingly.
 
-Notify Steve of the release so he can update `src/bug.txt` on the
+Also notify Steve of the release so he can update `src/bug.txt` on the
 website from the available release notes.
 
 ## LAMMPS Stable Release
@@ -194,6 +324,47 @@ At this point it should be possible to do a fast-forward merge of
 
 ### Push branches and tags
 
-
-
 ## LAMMPS Stable Update Release
+
+After making a stable release, bugfixes from the 'develop' branch
+are selectively backported to the 'maintenance' branch.  This is
+done with "git cherry-pick \<commit hash\>' wherever possible.
+The LAMMPS\_UPDATE define in "src/version.h" is set to "Maintenance".
+
+### Prerequesites
+
+When a sufficient number of bugfixes has accumulated or an urgent
+or important bugfix needs to be distributed a new stable update
+release is made.  To make this publicly visible a pull request
+is submitted that will merge 'maintenance' into 'stable'.  Before
+merging, set LAMMPS\_UPDATE in "src/version.h" to "Update #" with
+"#" indicating the update count (1, 2, and so on).
+Also draft suitable release notes under https://github.com/lammps/lammps/releases
+
+### Fast-forward merge of 'maintenance' into 'stable', apply tag, and publish
+
+Do a fast-forward merge of 'maintenance' to 'stable' and then
+apply the stable\_DMmmYYYY\_update# tag and push branch and tag
+to GitHub. The corresponding pull request will be automatically
+closed.   Example:
+
+```
+git checkout maintenance
+git pull
+git checkout stable
+git pull
+git merge --ff-only maintenance
+git tag -s -m 'Update 2 for Stable LAMMPS version 29 August 2024' stable_29Aug2024_update2
+git push git@github.com:lammps/lammps.git --tags maintenance stable
+```
+
+Associate draft release notes with new tag and publish as "latest release".
+
+On https://ci.lammps.org/ go to "dev", "stable" and manually execute
+the "update\_release" task. This will update https://docs.lammps.org/stable
+and prepare a stable tarball.
+
+### Build and upload binary packages and source tarball to GitHub
+
+The build procedure is the same as for the feature releases, only
+that packages are built from the 'stable' branch.

.github/workflows/check-cpp23.yml

@@ -1,4 +1,4 @@
-# GitHub action to build LAMMPS on Linux with gcc and C++23
+# GitHub action to build LAMMPS on Linux with gcc or clang and C++23
 name: "Check for C++23 Compatibility"
 
 on:
@@ -11,11 +11,19 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
 jobs:
   build:
     name: Build with C++23 support enabled
     if: ${{ github.repository == 'lammps/lammps' }}
     runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 2
+      matrix:
+        idx: [ gcc, clang ]
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
 
@@ -29,8 +37,11 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y ccache \
-                                libeigen3-dev \
+                                clang \
                                 libcurl4-openssl-dev \
+                                libeigen3-dev \
+                                libfftw3-dev \
+                                libomp-dev \
                                 mold \
                                 mpi-default-bin \
                                 mpi-default-dev \
@@ -58,14 +69,14 @@ jobs:
         cmake -S cmake -B build \
               -C cmake/presets/most.cmake \
               -C cmake/presets/kokkos-openmp.cmake \
+              -C cmake/presets/${{ matrix.idx }}.cmake \
               -D CMAKE_CXX_STANDARD=23 \
-              -D CMAKE_CXX_COMPILER=g++ \
-              -D CMAKE_C_COMPILER=gcc \
               -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
               -D CMAKE_C_COMPILER_LAUNCHER=ccache \
               -D CMAKE_BUILD_TYPE=Debug \
               -D CMAKE_CXX_FLAGS_DEBUG="-Og -g" \
               -D DOWNLOAD_POTENTIALS=off \
+              -D FFT=KISS \
               -D BUILD_MPI=on \
               -D BUILD_SHARED_LIBS=on \
               -D BUILD_TOOLS=off \

.github/workflows/check-vla.yml

@@ -77,7 +77,7 @@ jobs:
               -D PKG_MDI=on \
               -D PKG_MANIFOLD=on \
               -D PKG_ML-PACE=on \
-              -D PKG_ML-RANN=off \
+              -D PKG_ML-RANN=on \
               -D PKG_MOLFILE=on \
               -D PKG_RHEO=on \
               -D PKG_PTM=on \

README

@@ -23,17 +23,21 @@ more information about the code and its uses.
 The LAMMPS distribution includes the following files and directories:
 
 README                     this file
-LICENSE                    the GNU General Public License (GPL)
-bench                      benchmark problems
+LICENSE                    the GNU General Public License (GPLv2)
+CITATION.cff               Citation information for LAMMPS in CFF format
+bench                      benchmark inputs
 cmake                      CMake build files
 doc                        documentation
-examples                   simple test problems
-fortran                    Fortran wrapper for LAMMPS
+examples                   example inputs for many LAMMPS commands
+fortran                    Fortran 2003 module for LAMMPS
 lib                        additional provided or external libraries
 potentials                 interatomic potential files
-python                     Python wrappers for LAMMPS
+python                     Python module for LAMMPS
 src                        source files
+third_party                Copies of thirdparty software bundled with LAMMPS
 tools                      pre- and post-processing tools
+unittest                   test programs for use with CTest
+.github                    Git and GitHub related files and tools
 
 Point your browser at any of these files to get started:
 
@@ -42,6 +46,8 @@ https://docs.lammps.org/Intro.html          hi-level introduction
 https://docs.lammps.org/Build.html          how to build LAMMPS
 https://docs.lammps.org/Run_head.html       how to run LAMMPS
 https://docs.lammps.org/Commands_all.html   Table of available commands
+https://docs.lammps.org/Howto.html          Short tutorials and HowTo discussions
+https://docs.lammps.org/Errors.html         How to interpret and debug errors
 https://docs.lammps.org/Library.html        LAMMPS library interfaces
 https://docs.lammps.org/Modify.html         how to modify and extend LAMMPS
 https://docs.lammps.org/Developer.html      LAMMPS developer info

cmake/CMakeLists.txt

@@ -7,6 +7,10 @@ if(CMAKE_VERSION VERSION_LESS 3.20)
   message(WARNING "LAMMPS is planning to require at least CMake version 3.20 by Summer 2025. Please upgrade!")
 endif()
 ########################################
+# initialize version variables with project command
+if(POLICY CMP0048)
+  cmake_policy(SET CMP0048 NEW)
+endif()
 # set policy to silence warnings about ignoring <PackageName>_ROOT but use it
 if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
@@ -27,7 +31,10 @@ endif()
 
 ########################################
 
-project(lammps CXX)
+project(lammps
+        DESCRIPTION "The LAMMPS Molecular Dynamics Simulator"
+        HOMEPAGE_URL "https://www.lammps.org"
+        LANGUAGES CXX C)
 set(SOVERSION 0)
 get_property(BUILD_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
@@ -44,6 +51,7 @@ set(LAMMPS_DOC_DIR        ${LAMMPS_DIR}/doc)
 set(LAMMPS_TOOLS_DIR      ${LAMMPS_DIR}/tools)
 set(LAMMPS_PYTHON_DIR     ${LAMMPS_DIR}/python)
 set(LAMMPS_POTENTIALS_DIR ${LAMMPS_DIR}/potentials)
+set(LAMMPS_THIRDPARTY_DIR ${LAMMPS_DIR}/third_party)
 
 set(LAMMPS_DOWNLOADS_URL "https://download.lammps.org" CACHE STRING "Base URL for LAMMPS downloads")
 set(LAMMPS_POTENTIALS_URL "${LAMMPS_DOWNLOADS_URL}/potentials")
@@ -105,46 +113,35 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qrestrict")
     endif()
     if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
-      set(CMAKE_TUNE_DEFAULT "/QxCOMMON-AVX512")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /QxCOMMON-AVX512")
     else()
-      set(CMAKE_TUNE_DEFAULT "/QxHost")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /QxHost")
     endif()
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
-      set(CMAKE_TUNE_DEFAULT "-xCOMMON-AVX512")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xCOMMON-AVX512")
     else()
-      set(CMAKE_TUNE_DEFAULT "-xHost -fp-model fast=2 -no-prec-div -qoverride-limits -diag-disable=10441 -diag-disable=11074 -diag-disable=11076 -diag-disable=2196")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost -fp-model fast=2 -no-prec-div -qoverride-limits -diag-disable=10441 -diag-disable=11074 -diag-disable=11076 -diag-disable=2196")
     endif()
   endif()
 endif()
 
 # silence excessive warnings for new Intel Compilers
 if(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
-  set(CMAKE_TUNE_DEFAULT "-fp-model precise -Wno-tautological-constant-compare -Wno-unused-command-line-argument")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model precise -Wno-tautological-constant-compare -Wno-unused-command-line-argument")
 endif()
 
 # silence excessive warnings for PGI/NVHPC compilers
 if((CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_CXX_COMPILER_ID STREQUAL "PGI"))
-  set(CMAKE_TUNE_DEFAULT "-Minform=severe")
-endif()
-
-# this hack is required to compile fmt lib with CrayClang version 15.0.2
-# CrayClang is only directly recognized by version 3.28 and later
-if(CMAKE_VERSION VERSION_LESS 3.28)
-  get_filename_component(_exe "${CMAKE_CXX_COMPILER}" NAME)
-  if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (_exe STREQUAL "crayCC"))
-    set(CMAKE_TUNE_DEFAULT "-DFMT_STATIC_THOUSANDS_SEPARATOR")
-  endif()
-else()
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "CrayClang")
-    set(CMAKE_TUNE_DEFAULT "-DFMT_STATIC_THOUSANDS_SEPARATOR")
-  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Minform=severe")
 endif()
 
 # silence nvcc warnings
-if((PKG_KOKKOS) AND (Kokkos_ENABLE_CUDA) AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
-  set(CMAKE_TUNE_DEFAULT "${CMAKE_TUNE_DEFAULT}" "-Xcudafe --diag_suppress=unrecognized_pragma,--diag_suppress=128")
+if((PKG_KOKKOS) AND (Kokkos_ENABLE_CUDA) AND NOT
+    ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    OR (CMAKE_CXX_COMPILER_ID STREQUAL "XLClang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "CrayClang")))
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xcudafe --diag_suppress=unrecognized_pragma,--diag_suppress=128")
 endif()
 
 # we *require* C++11 without extensions but prefer C++17.
@@ -206,10 +203,14 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND BUILD_SHARED_LIBS)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()
 
+# do not include the (obsolete) MPI C++ bindings which makes for leaner object files
+# and avoids namespace conflicts. Put this early to increase its visbility.
+set(MPI_CXX_SKIP_MPICXX TRUE CACHE BOOL "Skip MPI C++ Bindings" FORCE)
+
 ########################################################################
 # User input options                                                   #
 ########################################################################
-# backward compatibility with CMake before 3.12 and older LAMMPS documentation
+# backward compatibility with older LAMMPS documentation
 if (PYTHON_EXECUTABLE)
   set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
 endif()
@@ -225,6 +226,12 @@ if(DEFINED ENV{VIRTUAL_ENV} AND NOT Python_EXECUTABLE)
     "   Setting Python interpreter to: ${Python_EXECUTABLE}")
 endif()
 
+find_package(Python COMPONENTS Interpreter QUIET)
+# NOTE: RHEL 8.0 and Ubuntu 18.04LTS ship with Python 3.6, Python 3.8 was EOL in 2024
+if(Python_VERSION VERSION_LESS 3.6)
+  message(FATAL_ERROR "LAMMPS requires Python 3.6 or later")
+endif()
+
 set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary (WON'T enable any features automatically")
 mark_as_advanced(LAMMPS_MACHINE)
 if(LAMMPS_MACHINE)
@@ -377,12 +384,12 @@ endforeach()
 # packages with special compiler needs or external libs
 ######################################################
 target_include_directories(lammps PUBLIC $<BUILD_INTERFACE:${LAMMPS_SOURCE_DIR}>)
+target_include_directories(lammps PUBLIC $<BUILD_INTERFACE:${LAMMPS_THIRDPARTY_DIR}>)
 
 if(PKG_ADIOS)
   # The search for ADIOS2 must come before MPI because
   # it includes its own MPI search with the latest FindMPI.cmake
   # script that defines the MPI::MPI_C target
-  enable_language(C)
   find_package(ADIOS2 REQUIRED)
   if(BUILD_MPI)
     if(NOT ADIOS2_HAVE_MPI)
@@ -397,21 +404,18 @@ if(PKG_ADIOS)
 endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  find_package(MPI QUIET)
+  find_package(MPI QUIET COMPONENTS CXX)
   option(BUILD_MPI "Build MPI version" ${MPI_FOUND})
 else()
   option(BUILD_MPI "Build MPI version" OFF)
 endif()
 
 if(BUILD_MPI)
-  # do not include the (obsolete) MPI C++ bindings which makes
-  # for leaner object files and avoids namespace conflicts
-  set(MPI_CXX_SKIP_MPICXX TRUE)
   # We use a non-standard procedure to cross-compile with MPI on Windows
   if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING)
     include(MPI4WIN)
   else()
-    find_package(MPI REQUIRED)
+    find_package(MPI REQUIRED COMPONENTS CXX)
     option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
     if(LAMMPS_LONGLONG_TO_LONG)
       target_compile_definitions(lammps PRIVATE -DLAMMPS_LONGLONG_TO_LONG)
@@ -425,8 +429,8 @@ else()
   target_link_libraries(lammps PUBLIC mpi_stubs)
 endif()
 
-set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallsmall: all 32-bit, smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)")
-set(LAMMPS_SIZES_VALUES smallbig bigbig smallsmall)
+set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)")
+set(LAMMPS_SIZES_VALUES smallbig bigbig)
 set_property(CACHE LAMMPS_SIZES PROPERTY STRINGS ${LAMMPS_SIZES_VALUES})
 validate_option(LAMMPS_SIZES LAMMPS_SIZES_VALUES)
 string(TOUPPER ${LAMMPS_SIZES} LAMMPS_SIZES)
@@ -444,6 +448,19 @@ if(NOT ${LAMMPS_MEMALIGN} STREQUAL "0")
   target_compile_definitions(lammps PRIVATE -DLAMMPS_MEMALIGN=${LAMMPS_MEMALIGN})
 endif()
 
+# this hack is required to compile fmt lib with CrayClang version 15.0.2
+# CrayClang is only directly recognized by CMake version 3.28 and later
+if(CMAKE_VERSION VERSION_LESS 3.28)
+  get_filename_component(_exe "${CMAKE_CXX_COMPILER}" NAME)
+  if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (_exe STREQUAL "crayCC"))
+    target_compile_definitions(lammps PRIVATE -DFMT_STATIC_THOUSANDS_SEPARATOR)
+  endif()
+else()
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "CrayClang")
+    target_compile_definitions(lammps PRIVATE -DFMT_STATIC_THOUSANDS_SEPARATOR)
+  endif()
+endif()
+
 # "hard" dependencies between packages resulting
 # in an error instead of skipping over files
 pkg_depends(ML-IAP ML-SNAP)
@@ -501,13 +518,13 @@ if(BUILD_OMP)
   if(CMAKE_VERSION VERSION_LESS 3.28)
     get_filename_component(_exe "${CMAKE_CXX_COMPILER}" NAME)
     if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (_exe STREQUAL "crayCC"))
-      set(CMAKE_SHARED_LINKER_FLAGS_${BTYPE} "${CMAKE_SHARED_LINKER_FLAGS_${BTYPE}} -fopenmp")
-      set(CMAKE_STATIC_LINKER_FLAGS_${BTYPE} "${CMAKE_STATIC_LINKER_FLAGS_${BTYPE}} -fopenmp")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fopenmp")
+      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -fopenmp")
     endif()
   else()
     if(CMAKE_CXX_COMPILER_ID STREQUAL "CrayClang")
-      set(CMAKE_SHARED_LINKER_FLAGS_${BTYPE} "${CMAKE_SHARED_LINKER_FLAGS_${BTYPE}} -fopenmp")
-      set(CMAKE_STATIC_LINKER_FLAGS_${BTYPE} "${CMAKE_STATIC_LINKER_FLAGS_${BTYPE}} -fopenmp")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fopenmp")
+      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -fopenmp")
     endif()
   endif()
 endif()
@@ -525,7 +542,6 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "Intel") AND (CMAKE_CXX_STANDARD GREATER_EQUA
 endif()
 
 if(PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_ELECTRODE OR PKG_RHEO OR BUILD_TOOLS)
-  enable_language(C)
   if (NOT USE_INTERNAL_LINALG)
     find_package(LAPACK)
     find_package(BLAS)
@@ -622,10 +638,6 @@ if(WITH_SWIG)
   add_subdirectory(${LAMMPS_SWIG_DIR} swig)
 endif()
 
-set(CMAKE_TUNE_FLAGS "${CMAKE_TUNE_DEFAULT}" CACHE STRING "Compiler and machine specific optimization flags (compilation only)")
-separate_arguments(CMAKE_TUNE_FLAGS)
-target_compile_options(lammps PRIVATE ${CMAKE_TUNE_FLAGS})
-target_compile_options(lmp PRIVATE ${CMAKE_TUNE_FLAGS})
 ########################################################################
 # Basic system tests (standard libraries, headers, functions, types)   #
 ########################################################################
@@ -930,7 +942,7 @@ endif()
 include(Testing)
 include(CodeCoverage)
 include(CodingStandard)
-find_package(ClangFormat 11.0)
+find_package(ClangFormat 11.0 QUIET)
 
 if(ClangFormat_FOUND)
   add_custom_target(format-src

cmake/Modules/CodeCoverage.cmake

@@ -7,76 +7,76 @@
 # For Python coverage the coverage package needs to be installed
 ###############################################################################
 if(ENABLE_COVERAGE)
-    find_program(GCOVR_BINARY gcovr)
-    find_package_handle_standard_args(GCOVR DEFAULT_MSG GCOVR_BINARY)
+  find_program(GCOVR_BINARY gcovr)
+  find_package_handle_standard_args(GCOVR DEFAULT_MSG GCOVR_BINARY)
 
-    find_program(COVERAGE_BINARY coverage)
-    find_package_handle_standard_args(COVERAGE DEFAULT_MSG COVERAGE_BINARY)
+  find_program(COVERAGE_BINARY coverage)
+  find_package_handle_standard_args(COVERAGE DEFAULT_MSG COVERAGE_BINARY)
 
-    if(GCOVR_FOUND)
-        get_filename_component(ABSOLUTE_LAMMPS_SOURCE_DIR ${LAMMPS_SOURCE_DIR} ABSOLUTE)
+  if(GCOVR_FOUND)
+    get_filename_component(ABSOLUTE_LAMMPS_SOURCE_DIR ${LAMMPS_SOURCE_DIR} ABSOLUTE)
 
-        add_custom_target(
-            gen_coverage_xml
-            COMMAND ${GCOVR_BINARY} -s -x -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMENT "Generating XML coverage report..."
-        )
+    add_custom_target(
+        gen_coverage_xml
+        COMMAND ${GCOVR_BINARY} -s -x -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Generating XML coverage report..."
+    )
 
-        set(COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/coverage_html)
+    set(COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/coverage_html)
 
-        add_custom_target(coverage_html_folder
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${COVERAGE_HTML_DIR})
+    add_custom_target(coverage_html_folder
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${COVERAGE_HTML_DIR})
 
-        add_custom_target(
-            gen_coverage_html
-            COMMAND ${GCOVR_BINARY} -s  --html --html-details -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o ${COVERAGE_HTML_DIR}/index.html
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMENT "Generating HTML coverage report..."
-        )
-        add_dependencies(gen_coverage_html coverage_html_folder)
+    add_custom_target(
+        gen_coverage_html
+        COMMAND ${GCOVR_BINARY} -s  --html --html-details -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o ${COVERAGE_HTML_DIR}/index.html
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Generating HTML coverage report..."
+    )
+    add_dependencies(gen_coverage_html coverage_html_folder)
 
-        add_custom_target(clean_coverage_html
-            ${CMAKE_COMMAND} -E remove_directory ${COVERAGE_HTML_DIR}
-            COMMENT "Deleting HTML coverage report..."
-        )
+    add_custom_target(clean_coverage_html
+        ${CMAKE_COMMAND} -E remove_directory ${COVERAGE_HTML_DIR}
+        COMMENT "Deleting HTML coverage report..."
+    )
 
-        add_custom_target(reset_coverage
-            ${CMAKE_COMMAND} -E remove -f */*.gcda */*/*.gcda */*/*/*.gcda
-                              */*/*/*/*.gcda */*/*/*/*/*.gcda */*/*/*/*/*/*.gcda
-                              */*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*.gcda
-                              */*/*/*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*/*/*.gcda
-            WORKIND_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMENT "Deleting coverage data files..."
-        )
-        add_dependencies(reset_coverage clean_coverage_html)
-    endif()
+    add_custom_target(reset_coverage
+        ${CMAKE_COMMAND} -E remove -f */*.gcda */*/*.gcda */*/*/*.gcda
+                          */*/*/*/*.gcda */*/*/*/*/*.gcda */*/*/*/*/*/*.gcda
+                          */*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*.gcda
+                          */*/*/*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*/*/*.gcda
+        WORKIND_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Deleting coverage data files..."
+    )
+    add_dependencies(reset_coverage clean_coverage_html)
+  endif()
 
-    if(COVERAGE_FOUND)
-        set(PYTHON_COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/python_coverage_html)
-        configure_file(.coveragerc.in ${CMAKE_BINARY_DIR}/.coveragerc @ONLY)
+  if(COVERAGE_FOUND)
+    set(PYTHON_COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/python_coverage_html)
+    configure_file(.coveragerc.in ${CMAKE_BINARY_DIR}/.coveragerc @ONLY)
 
-        add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/unittest/python/.coverage
-            COMMAND ${COVERAGE_BINARY} combine
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
-            COMMENT "Combine Python coverage files..."
-        )
+    add_custom_command(
+        OUTPUT ${CMAKE_BINARY_DIR}/unittest/python/.coverage
+        COMMAND ${COVERAGE_BINARY} combine
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
+        COMMENT "Combine Python coverage files..."
+    )
 
-        add_custom_target(
-            gen_python_coverage_html
-            COMMAND ${COVERAGE_BINARY} html --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -d ${PYTHON_COVERAGE_HTML_DIR}
-            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
-            COMMENT "Generating HTML Python coverage report..."
-        )
+    add_custom_target(
+        gen_python_coverage_html
+        COMMAND ${COVERAGE_BINARY} html --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -d ${PYTHON_COVERAGE_HTML_DIR}
+        DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
+        COMMENT "Generating HTML Python coverage report..."
+    )
 
-        add_custom_target(
-            gen_python_coverage_xml
-            COMMAND ${COVERAGE_BINARY} xml --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -o ${CMAKE_BINARY_DIR}/python_coverage.xml
-            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
-            COMMENT "Generating XML Python coverage report..."
-        )
-    endif()
+    add_custom_target(
+        gen_python_coverage_xml
+        COMMAND ${COVERAGE_BINARY} xml --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -o ${CMAKE_BINARY_DIR}/python_coverage.xml
+        DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
+        COMMENT "Generating XML Python coverage report..."
+    )
+  endif()
 endif()

cmake/Modules/CodingStandard.cmake

@@ -1,40 +1,39 @@
-# use default (or custom) Python executable, if version is sufficient
-if(Python_VERSION VERSION_GREATER_EQUAL 3.6)
+# use default (or custom) Python executable.
+# Python version check is in main CMakeLists.txt file
+if(Python_EXECUTABLE)
   set(Python3_EXECUTABLE ${Python_EXECUTABLE})
 endif()
 find_package(Python3 COMPONENTS Interpreter)
 
 if(Python3_EXECUTABLE)
-    if(Python3_VERSION VERSION_GREATER_EQUAL 3.6)
-        add_custom_target(
-          check-whitespace
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Check for whitespace errors")
-        add_custom_target(
-          check-homepage
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Check for homepage URL errors")
-        add_custom_target(
-          check-permissions
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Check for permission errors")
-        add_custom_target(
-          fix-whitespace
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Fix whitespace errors")
-        add_custom_target(
-          fix-homepage
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py -f .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Fix homepage URL errors")
-        add_custom_target(
-          fix-permissions
-          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py -f .
-          WORKING_DIRECTORY  ${LAMMPS_DIR}
-          COMMENT "Fix permission errors")
-    endif()
+  add_custom_target(
+    check-whitespace
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Check for whitespace errors")
+  add_custom_target(
+    check-homepage
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Check for homepage URL errors")
+  add_custom_target(
+    check-permissions
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Check for permission errors")
+  add_custom_target(
+    fix-whitespace
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Fix whitespace errors")
+  add_custom_target(
+    fix-homepage
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py -f .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Fix homepage URL errors")
+  add_custom_target(
+    fix-permissions
+    ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py -f .
+    WORKING_DIRECTORY  ${LAMMPS_DIR}
+    COMMENT "Fix permission errors")
 endif()

cmake/Modules/Documentation.cmake

@@ -13,7 +13,7 @@ if(BUILD_DOC)
   endif()
   find_package(Python3 REQUIRED COMPONENTS Interpreter)
   if(Python3_VERSION VERSION_LESS 3.8)
-    message(FATAL_ERROR "Python 3.8 and up is required to build the HTML documentation")
+    message(FATAL_ERROR "Python 3.8 and up is required to build the LAMMPS HTML documentation")
   endif()
   set(VIRTUALENV ${Python3_EXECUTABLE} -m venv)
 
@@ -65,8 +65,8 @@ if(BUILD_DOC)
     find_package(Sphinx)
   endif()
 
-  set(MATHJAX_URL "https://github.com/mathjax/MathJax/archive/3.1.3.tar.gz" CACHE STRING "URL for MathJax tarball")
-  set(MATHJAX_MD5 "b81661c6e6ba06278e6ae37b30b0c492" CACHE STRING "MD5 checksum of MathJax tarball")
+  set(MATHJAX_URL "https://github.com/mathjax/MathJax/archive/3.2.2.tar.gz" CACHE STRING "URL for MathJax tarball")
+  set(MATHJAX_MD5 "08dd6ef33ca08870220d9aade2a62845" CACHE STRING "MD5 checksum of MathJax tarball")
   mark_as_advanced(MATHJAX_URL)
   GetFallbackURL(MATHJAX_URL MATHJAX_FALLBACK)
 

cmake/Modules/LAMMPSInterfacePlugin.cmake

@@ -34,8 +34,26 @@ if(MSVC)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
-# C++11 is required
-set(CMAKE_CXX_STANDARD 11)
+if(NOT CMAKE_CXX_STANDARD)
+  if(cxx_std_17 IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    set(CMAKE_CXX_STANDARD 17)
+  else()
+    set(CMAKE_CXX_STANDARD 11)
+  endif()
+endif()
+if(CMAKE_CXX_STANDARD LESS 11)
+  message(FATAL_ERROR "C++ standard must be set to at least 11")
+endif()
+if(CMAKE_CXX_STANDARD LESS 17)
+  message(WARNING "Selecting C++17 standard is preferred over C++${CMAKE_CXX_STANDARD}")
+endif()
+if(PKG_KOKKOS AND (CMAKE_CXX_STANDARD LESS 17))
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+# turn off C++17 check in lmptype.h
+if(LAMMPS_CXX11)
+  add_compile_definitions(LAMMPS_CXX11)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Need -restrict with Intel compilers
@@ -44,6 +62,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
 endif()
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
+# skip over obsolete MPI-2 C++ bindings
+set(MPI_CXX_SKIP_MPICXX TRUE)
+
 #######
 # helper functions from LAMMPSUtils.cmake
 function(validate_option name values)
@@ -110,8 +131,7 @@ endif()
 ################################################################################
 # MPI configuration
 if(NOT CMAKE_CROSSCOMPILING)
-  set(MPI_CXX_SKIP_MPICXX TRUE)
-  find_package(MPI QUIET)
+  find_package(MPI QUIET COMPONENTS CXX)
   option(BUILD_MPI "Build MPI version" ${MPI_FOUND})
 else()
   option(BUILD_MPI "Build MPI version" OFF)
@@ -123,78 +143,38 @@ if(BUILD_MPI)
   set(MPI_CXX_SKIP_MPICXX TRUE)
   # We use a non-standard procedure to cross-compile with MPI on Windows
   if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING)
-    # Download and configure MinGW compatible MPICH development files for Windows
-    option(USE_MSMPI "Use Microsoft's MS-MPI SDK instead of MPICH2-1.4.1" OFF)
-    if(USE_MSMPI)
-      message(STATUS "Downloading and configuring MS-MPI 10.1 for Windows cross-compilation")
-      set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/msmpi-win64-devel.tar.gz" CACHE STRING "URL for MS-MPI (win64) tarball")
-      set(MPICH2_WIN64_DEVEL_MD5 "86314daf1bffb809f1fcbefb8a547490" CACHE STRING "MD5 checksum of MS-MPI (win64) tarball")
-      mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
-      mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
+    message(STATUS "Downloading and configuring MS-MPI 10.1 for Windows cross-compilation")
+    set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/msmpi-win64-devel.tar.gz" CACHE STRING "URL for MS-MPI (win64) tarball")
+    set(MPICH2_WIN64_DEVEL_MD5 "86314daf1bffb809f1fcbefb8a547490" CACHE STRING "MD5 checksum of MS-MPI (win64) tarball")
+    mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
+    mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
 
-      include(ExternalProject)
-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        ExternalProject_Add(mpi4win_build
-          URL     ${MPICH2_WIN64_DEVEL_URL}
-          URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
-          CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-          BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmsmpi.a)
-      else()
-        message(FATAL_ERROR "Only x86 64-bit builds are supported with MS-MPI")
-      endif()
-
-      ExternalProject_get_property(mpi4win_build SOURCE_DIR)
-      file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
-      add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
-      set_target_properties(MPI::MPI_CXX PROPERTIES
-        IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmsmpi.a"
-        INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
-        INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-      add_dependencies(MPI::MPI_CXX mpi4win_build)
-
-      # set variables for status reporting at the end of CMake run
-      set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
-      set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-      set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmsmpi.a")
+    include(ExternalProject)
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+      ExternalProject_Add(mpi4win_build
+        URL     ${MPICH2_WIN64_DEVEL_URL}
+        URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
+        CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
+        BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmsmpi.a)
     else()
-      # Download and configure custom MPICH files for Windows
-      message(STATUS "Downloading and configuring MPICH-1.4.1 for Windows")
-      set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/mpich2-win64-devel.tar.gz" CACHE STRING "URL for MPICH2 (win64) tarball")
-      set(MPICH2_WIN64_DEVEL_MD5 "4939fdb59d13182fd5dd65211e469f14" CACHE STRING "MD5 checksum of MPICH2 (win64) tarball")
-      mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
-      mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
-
-      include(ExternalProject)
-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        ExternalProject_Add(mpi4win_build
-          URL     ${MPICH2_WIN64_DEVEL_URL}
-          URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
-          CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-          BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
-      else()
-        ExternalProject_Add(mpi4win_build
-          URL     ${MPICH2_WIN32_DEVEL_URL}
-          URL_MD5 ${MPICH2_WIN32_DEVEL_MD5}
-          CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-          BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
-      endif()
-
-      ExternalProject_get_property(mpi4win_build SOURCE_DIR)
-      file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
-      add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
-      set_target_properties(MPI::MPI_CXX PROPERTIES
-        IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmpi.a"
-        INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
-        INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-      add_dependencies(MPI::MPI_CXX mpi4win_build)
-
-      # set variables for status reporting at the end of CMake run
-      set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
-      set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-      set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmpi.a")
+      message(FATAL_ERROR "Only x86 64-bit builds are supported with MS-MPI")
     endif()
+
+    ExternalProject_get_property(mpi4win_build SOURCE_DIR)
+    file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
+    add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
+    set_target_properties(MPI::MPI_CXX PROPERTIES
+      IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmsmpi.a"
+      INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
+      INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX=1")
+    add_dependencies(MPI::MPI_CXX mpi4win_build)
+
+    # set variables for status reporting at the end of CMake run
+    set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
+    set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX=1")
+    set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmsmpi.a")
   else()
-    find_package(MPI REQUIRED)
+    find_package(MPI REQUIRED COMPONENTS CXX)
     option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
     if(LAMMPS_LONGLONG_TO_LONG)
       target_compile_definitions(lammps INTERFACE -DLAMMPS_LONGLONG_TO_LONG)
@@ -242,8 +222,8 @@ endif()
 
 ################
 # integer size selection
-set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallsmall: all 32-bit, smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)")
-set(LAMMPS_SIZES_VALUES smallbig bigbig smallsmall)
+set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)")
+set(LAMMPS_SIZES_VALUES smallbig bigbig)
 set_property(CACHE LAMMPS_SIZES PROPERTY STRINGS ${LAMMPS_SIZES_VALUES})
 validate_option(LAMMPS_SIZES LAMMPS_SIZES_VALUES)
 string(TOUPPER ${LAMMPS_SIZES} LAMMPS_SIZES)

cmake/Modules/LAMMPSUtils.cmake

@@ -30,7 +30,7 @@ function(check_omp_h_include)
   if(OpenMP_CXX_FOUND)
     set(CMAKE_REQUIRED_FLAGS ${OpenMP_CXX_FLAGS})
     set(CMAKE_REQUIRED_INCLUDES ${OpenMP_CXX_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LINK_OPTIONS ${OpenMP_CXX_FLAGS})
+    separate_arguments(CMAKE_REQUIRED_LINK_OPTIONS NATIVE_COMMAND ${OpenMP_CXX_FLAGS}) # needs to be a list
     set(CMAKE_REQUIRED_LIBRARIES ${OpenMP_CXX_LIBRARIES})
     # there are all kinds of problems with finding omp.h
     # for Clang and derived compilers so we pretend it is there.
@@ -75,13 +75,25 @@ function(get_lammps_version version_header variable)
     list(FIND MONTHS "${month}" month)
     string(LENGTH ${day} day_length)
     string(LENGTH ${month} month_length)
-    if(day_length EQUAL 1)
-        set(day "0${day}")
+    # no leading zero needed for new version string with dots
+    # if(day_length EQUAL 1)
+    #   set(day "0${day}")
+    # endif()
+    # if(month_length EQUAL 1)
+    #   set(month "0${month}")
+    #endif()
+    file(STRINGS ${version_header} line REGEX LAMMPS_UPDATE)
+    string(REGEX REPLACE "#define LAMMPS_UPDATE \"Update ([0-9]+)\"" "\\1" tweak "${line}")
+    if (line MATCHES "#define LAMMPS_UPDATE \"(Maintenance|Development)\"")
+      set(tweak "99")
     endif()
-    if(month_length EQUAL 1)
-        set(month "0${month}")
+    if(NOT tweak)
+      set(tweak "0")
     endif()
-    set(${variable} "${year}${month}${day}" PARENT_SCOPE)
+    # new version string with dots
+    set(${variable} "${year}.${month}.${day}.${tweak}" PARENT_SCOPE)
+    # old version string without dots
+    # set(${variable} "${year}${month}${day}" PARENT_SCOPE)
 endfunction()
 
 function(check_for_autogen_files source_dir)

cmake/Modules/MPI4WIN.cmake

@@ -1,74 +1,31 @@
-# Download and configure MinGW compatible MPICH development files for Windows
-option(USE_MSMPI "Use Microsoft's MS-MPI SDK instead of MPICH2-1.4.1" OFF)
+# set-up MS-MPI library for Windows with MinGW compatibility
+message(STATUS "Downloading and configuring MS-MPI 10.1 for Windows cross-compilation")
+set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/msmpi-win64-devel.tar.gz" CACHE STRING "URL for MS-MPI (win64) tarball")
+set(MPICH2_WIN64_DEVEL_MD5 "86314daf1bffb809f1fcbefb8a547490" CACHE STRING "MD5 checksum of MS-MPI (win64) tarball")
+mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
+mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
 
-if(USE_MSMPI)
-  message(STATUS "Downloading and configuring MS-MPI 10.1 for Windows cross-compilation")
-  set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/msmpi-win64-devel.tar.gz" CACHE STRING "URL for MS-MPI (win64) tarball")
-  set(MPICH2_WIN64_DEVEL_MD5 "86314daf1bffb809f1fcbefb8a547490" CACHE STRING "MD5 checksum of MS-MPI (win64) tarball")
-  mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
-  mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
-
-  include(ExternalProject)
-  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-    ExternalProject_Add(mpi4win_build
-      URL     ${MPICH2_WIN64_DEVEL_URL}
-      URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
-      CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-      BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmsmpi.a)
-  else()
-    message(FATAL_ERROR "Only x86 64-bit builds are supported with MS-MPI")
-  endif()
-
-  ExternalProject_get_property(mpi4win_build SOURCE_DIR)
-  file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
-  add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
-  set_target_properties(MPI::MPI_CXX PROPERTIES
-    IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmsmpi.a"
-    INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
-    INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-  add_dependencies(MPI::MPI_CXX mpi4win_build)
-
-  # set variables for status reporting at the end of CMake run
-  set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
-  set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-  set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmsmpi.a")
+include(ExternalProject)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  ExternalProject_Add(mpi4win_build
+    URL     ${MPICH2_WIN64_DEVEL_URL}
+    URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
+    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmsmpi.a)
 else()
-  message(STATUS "Downloading and configuring MPICH2-1.4.1 for Windows cross-compilation")
-  set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/mpich2-win64-devel.tar.gz" CACHE STRING "URL for MPICH2 (win64) tarball")
-  set(MPICH2_WIN32_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/mpich2-win32-devel.tar.gz" CACHE STRING "URL for MPICH2 (win32) tarball")
-  set(MPICH2_WIN64_DEVEL_MD5 "4939fdb59d13182fd5dd65211e469f14" CACHE STRING "MD5 checksum of MPICH2 (win64) tarball")
-  set(MPICH2_WIN32_DEVEL_MD5 "a61d153500dce44e21b755ee7257e031" CACHE STRING "MD5 checksum of MPICH2 (win32) tarball")
-  mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
-  mark_as_advanced(MPICH2_WIN32_DEVEL_URL)
-  mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
-  mark_as_advanced(MPICH2_WIN32_DEVEL_MD5)
-
-  include(ExternalProject)
-  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-    ExternalProject_Add(mpi4win_build
-      URL     ${MPICH2_WIN64_DEVEL_URL}
-      URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
-      CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-      BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
-  else()
-    ExternalProject_Add(mpi4win_build
-      URL     ${MPICH2_WIN32_DEVEL_URL}
-      URL_MD5 ${MPICH2_WIN32_DEVEL_MD5}
-      CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-      BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
-  endif()
-
-  ExternalProject_get_property(mpi4win_build SOURCE_DIR)
-  file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
-  add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
-  set_target_properties(MPI::MPI_CXX PROPERTIES
-    IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmpi.a"
-    INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
-    INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-  add_dependencies(MPI::MPI_CXX mpi4win_build)
-
-  # set variables for status reporting at the end of CMake run
-  set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
-  set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-  set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmpi.a")
+  message(FATAL_ERROR "Only x86 64-bit builds are supported with MS-MPI")
 endif()
+
+ExternalProject_get_property(mpi4win_build SOURCE_DIR)
+file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
+add_library(MPI::MPI_CXX UNKNOWN IMPORTED)
+set_target_properties(MPI::MPI_CXX PROPERTIES
+  IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmsmpi.a"
+  INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
+  INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX=1")
+add_dependencies(MPI::MPI_CXX mpi4win_build)
+
+# set variables for status reporting at the end of CMake run
+set(MPI_CXX_INCLUDE_PATH "${SOURCE_DIR}/include")
+set(MPI_CXX_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX=1")
+set(MPI_CXX_LIBRARIES "${SOURCE_DIR}/lib/libmsmpi.a")

cmake/Modules/Packages/COLVARS.cmake

@@ -14,10 +14,6 @@ endif()
 
 add_library(colvars STATIC ${COLVARS_SOURCES})
 target_compile_definitions(colvars PRIVATE -DCOLVARS_LAMMPS)
-separate_arguments(CMAKE_TUNE_FLAGS)
-foreach(_FLAG ${CMAKE_TUNE_FLAGS})
-  target_compile_options(colvars PRIVATE ${_FLAG})
-endforeach()
 set_target_properties(colvars PROPERTIES OUTPUT_NAME lammps_colvars${LAMMPS_MACHINE})
 target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars)
 # The line below is needed to locate math_eigen_impl.h
@@ -30,6 +26,10 @@ if(BUILD_OMP)
   target_link_libraries(colvars PRIVATE OpenMP::OpenMP_CXX)
 endif()
 
+if(BUILD_MPI)
+  target_link_libraries(colvars PUBLIC MPI::MPI_CXX)
+endif()
+
 if(COLVARS_DEBUG)
   # Need to export the define publicly to be valid in interface code
   target_compile_definitions(colvars PUBLIC -DCOLVARS_DEBUG)

cmake/Modules/Packages/EXTRA-COMMAND.cmake

@@ -1,10 +1,18 @@
 # the geturl command needs libcurl
 
-find_package(CURL QUIET COMPONENTS HTTP HTTPS)
+find_package(CURL QUIET)
 option(WITH_CURL "Enable libcurl support" ${CURL_FOUND})
 if(WITH_CURL)
-  find_package(CURL REQUIRED COMPONENTS HTTP HTTPS)
   target_compile_definitions(lammps PRIVATE -DLAMMPS_CURL)
-  target_link_libraries(lammps PRIVATE CURL::libcurl)
+
+  # need to use pkgconfig for fully static bins to find custom static libs
+  if (CMAKE_SYSTEM_NAME STREQUAL "LinuxMUSL")
+    include(FindPkgConfig)
+    pkg_check_modules(CURL IMPORTED_TARGET libcurl libssl libcrypto)
+    target_link_libraries(lammps PUBLIC PkgConfig::CURL)
+  else()
+    find_package(CURL REQUIRED)
+    target_link_libraries(lammps PRIVATE CURL::libcurl)
+  endif()
 endif()
 

cmake/Modules/Packages/GPU.cmake

@@ -189,7 +189,7 @@ if(GPU_API STREQUAL "CUDA")
   endif()
 
   add_executable(nvc_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
-  target_compile_definitions(nvc_get_devices PRIVATE -DUCL_CUDADR)
+  target_compile_definitions(nvc_get_devices PRIVATE -DUCL_CUDADR -DLAMMPS_${LAMMPS_SIZES})
   target_link_libraries(nvc_get_devices PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
   target_include_directories(nvc_get_devices PRIVATE ${CUDA_INCLUDE_DIRS})
 
@@ -489,7 +489,7 @@ else()
   target_link_libraries(gpu PRIVATE mpi_stubs)
 endif()
 
-target_compile_definitions(gpu PRIVATE -DLAMMPS_${LAMMPS_SIZES})
 set_target_properties(gpu PROPERTIES OUTPUT_NAME lammps_gpu${LAMMPS_MACHINE})
+target_compile_definitions(gpu PRIVATE -DLAMMPS_${LAMMPS_SIZES})
 target_sources(lammps PRIVATE ${GPU_SOURCES})
 target_include_directories(lammps PRIVATE ${GPU_SOURCES_DIR})

cmake/Modules/Packages/KOKKOS.cmake

@@ -57,8 +57,8 @@ if(DOWNLOAD_KOKKOS)
   list(APPEND KOKKOS_LIB_BUILD_ARGS "-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}")
   list(APPEND KOKKOS_LIB_BUILD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
   include(ExternalProject)
-  set(KOKKOS_URL "https://github.com/kokkos/kokkos/archive/4.5.01.tar.gz" CACHE STRING "URL for KOKKOS tarball")
-  set(KOKKOS_MD5 "4d832aa0284169d9e3fbae3165286bc6" CACHE STRING "MD5 checksum of KOKKOS tarball")
+  set(KOKKOS_URL "https://github.com/kokkos/kokkos/archive/4.6.00.tar.gz" CACHE STRING "URL for KOKKOS tarball")
+  set(KOKKOS_MD5 "61b2b69ae50d83eedcc7d47a3fa3d6cb" CACHE STRING "MD5 checksum of KOKKOS tarball")
   mark_as_advanced(KOKKOS_URL)
   mark_as_advanced(KOKKOS_MD5)
   GetFallbackURL(KOKKOS_URL KOKKOS_FALLBACK)
@@ -83,7 +83,7 @@ if(DOWNLOAD_KOKKOS)
   add_dependencies(LAMMPS::KOKKOSCORE kokkos_build)
   add_dependencies(LAMMPS::KOKKOSCONTAINERS kokkos_build)
 elseif(EXTERNAL_KOKKOS)
-  find_package(Kokkos 4.5.01 REQUIRED CONFIG)
+  find_package(Kokkos 4.6.00 REQUIRED CONFIG)
   target_link_libraries(lammps PRIVATE Kokkos::kokkos)
 else()
   set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)

cmake/Modules/Packages/MC.cmake

@@ -7,3 +7,13 @@ if(NOT PKG_MANYBODY)
   list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MC/fix_sgcmc.cpp)
   set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
 endif()
+
+# fix neighbor/swap may only be installed if also the VORONOI package is installed
+if(NOT PKG_VORONOI)
+  get_property(LAMMPS_FIX_HEADERS GLOBAL PROPERTY FIX)
+  list(REMOVE_ITEM LAMMPS_FIX_HEADERS ${LAMMPS_SOURCE_DIR}/MC/fix_neighbor_swap.h)
+  set_property(GLOBAL PROPERTY FIX "${LAMMPS_FIX_HEADERS}")
+  get_target_property(LAMMPS_SOURCES lammps SOURCES)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MC/fix_neighbor_swap.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
+endif()

cmake/Modules/Packages/ML-IAP.cmake

@@ -24,9 +24,7 @@ if(MLIAP_ENABLE_PYTHON)
   if(NOT PKG_PYTHON)
     message(FATAL_ERROR "Must enable PYTHON package for including Python support in ML-IAP")
   endif()
-  if(Python_VERSION VERSION_LESS 3.6)
-    message(FATAL_ERROR "Python support in ML-IAP requires Python 3.6 or later")
-  endif()
+  # Python version check is in main CMakeLists.txt file
 
   set(MLIAP_BINARY_DIR ${CMAKE_BINARY_DIR}/cython)
   file(GLOB MLIAP_CYTHON_SRC CONFIGURE_DEPENDS ${LAMMPS_SOURCE_DIR}/ML-IAP/*.pyx)

cmake/Modules/Packages/ML-QUIP.cmake

@@ -37,7 +37,7 @@ if(DOWNLOAD_QUIP)
   endforeach()
   # Fix cmake crashing when MATH_LINKOPTS not set, required for e.g. recent Cray Programming Environment
   set(temp "${temp} -L/_DUMMY_PATH_\n")
-  set(temp "${temp}PYTHON=python\nPIP=pip\nEXTRA_LINKOPTS=\n")
+  set(temp "${temp}PYTHON=${Python_EXECUTABLE}\nPIP=pip\nEXTRA_LINKOPTS=\n")
   set(temp "${temp}HAVE_CP2K=0\nHAVE_VASP=0\nHAVE_TB=0\nHAVE_PRECON=1\nHAVE_LOTF=0\nHAVE_ONIOM=0\n")
   set(temp "${temp}HAVE_LOCAL_E_MIX=0\nHAVE_QC=0\nHAVE_GAP=1\nHAVE_DESCRIPTORS_NONCOMMERCIAL=1\n")
   set(temp "${temp}HAVE_TURBOGAP=0\nHAVE_QR=1\nHAVE_THIRDPARTY=0\nHAVE_FX=0\nHAVE_SCME=0\nHAVE_MTP=0\n")

cmake/Modules/Packages/PLUMED.cmake

@@ -40,6 +40,13 @@ mark_as_advanced(PLUMED_URL)
 mark_as_advanced(PLUMED_MD5)
 GetFallbackURL(PLUMED_URL PLUMED_FALLBACK)
 
+# adjust C++ standard support for self-compiled Plumed2
+if(CMAKE_CXX_STANDARD GREATER 11)
+  set(PLUMED_CXX_STANDARD 14)
+else()
+  set(PLUMED_CXX_STANDARD 11)
+endif()
+
 if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND (CMAKE_CROSSCOMPILING))
   if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
     set(CROSS_CONFIGURE mingw64-configure)
@@ -55,7 +62,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND (CMAKE_CROSSCOMPILING))
     URL_MD5 ${PLUMED_MD5}
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CROSS_CONFIGURE} --disable-shared --disable-bsymbolic
-                                         --disable-python --enable-cxx=11
+                                         --disable-python --enable-cxx=${PLUMED_CXX_STANDARD}
                                          --enable-modules=-adjmat:+crystallization:-dimred:+drr:+eds:-fisst:+funnel:+logmfd:+manyrestraints:+maze:+opes:+multicolvar:-pamm:-piv:+s2cm:-sasa:-ves
                                          ${PLUMED_CONFIG_OMP}
                                          ${PLUMED_CONFIG_MPI}
@@ -142,7 +149,7 @@ else()
       CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
                                              ${CONFIGURE_REQUEST_PIC}
                                              --enable-modules=all
-                                             --enable-cxx=11
+                                             --enable-cxx=${PLUMED_CXX_STANDARD}
                                              --disable-python
                                              ${PLUMED_CONFIG_MPI}
                                              ${PLUMED_CONFIG_OMP}

cmake/Modules/Packages/PYTHON.cmake

@@ -1,6 +1,6 @@
 
 if(NOT Python_INTERPRETER)
-  # backward compatibility with CMake before 3.12 and older LAMMPS documentation
+  # backward compatibility with older LAMMPS documentation
   if(PYTHON_EXECUTABLE)
     set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
   endif()

cmake/Modules/Packages/SCAFACOS.cmake

@@ -14,27 +14,16 @@ endif()
 option(DOWNLOAD_SCAFACOS "Download ScaFaCoS library instead of using an already installed one" ${DOWNLOAD_SCAFACOS_DEFAULT})
 if(DOWNLOAD_SCAFACOS)
   message(STATUS "ScaFaCoS download requested - we will build our own")
-  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")
-  set(SCAFACOS_MD5 "bd46d74e3296bd8a444d731bb10c1738" CACHE STRING "MD5 checksum of SCAFACOS tarball")
+  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")
+  set(SCAFACOS_MD5 "23867540ec32e63ce71d6ecc105278d2" CACHE STRING "MD5 checksum of SCAFACOS tarball")
   mark_as_advanced(SCAFACOS_URL)
   mark_as_advanced(SCAFACOS_MD5)
   GetFallbackURL(SCAFACOS_URL SCAFACOS_FALLBACK)
 
-
-  # version 1.0.1 needs a patch to compile and linke cleanly with GCC 10 and later.
-  file(DOWNLOAD ${LAMMPS_THIRDPARTY_URL}/scafacos-1.0.1-fix.diff ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
-          EXPECTED_HASH MD5=4baa1333bb28fcce102d505e1992d032)
-
-  find_program(HAVE_PATCH patch)
-  if(NOT HAVE_PATCH)
-    message(FATAL_ERROR "The 'patch' program is required to build the ScaFaCoS library")
-  endif()
-
   include(ExternalProject)
   ExternalProject_Add(scafacos_build
     URL     ${SCAFACOS_URL} ${SCAFACOS_FALLBACK}
     URL_MD5 ${SCAFACOS_MD5}
-    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
     CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-doc
                                              --enable-fcs-solvers=fmm,p2nfft,direct,ewald,p3m
                                              --with-internal-fftw --with-internal-pfft

cmake/Modules/Testing.cmake

@@ -21,11 +21,11 @@ if(ENABLE_TESTING)
   # also only verified with Fedora Linux > 30 and Ubuntu 18.04 or 22.04+(Ubuntu 20.04 fails)
   if((CMAKE_SYSTEM_NAME STREQUAL "Linux")
       AND ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")))
-    if(((CMAKE_LINUX_DISTRO STREQUAL "Ubuntu") AND
-          ((CMAKE_DISTRO_VERSION VERSION_LESS_EQUAL 18.04) OR (CMAKE_DISTRO_VERSION VERSION_GREATER_EQUAL 22.04)))
+    if(((CMAKE_LINUX_DISTRO STREQUAL "Ubuntu") AND (CMAKE_DISTRO_VERSION VERSION_GREATER_EQUAL 22.04))
         OR ((CMAKE_LINUX_DISTRO STREQUAL "Fedora") AND (CMAKE_DISTRO_VERSION VERSION_GREATER 30)))
       include(CheckCXXCompilerFlag)
       set(CMAKE_CUSTOM_LINKER_DEFAULT default)
+      check_cxx_compiler_flag(--ld-path=${CMAKE_LINKER} HAVE_LD_PATH_FLAG)
       check_cxx_compiler_flag(-fuse-ld=mold HAVE_MOLD_LINKER_FLAG)
       check_cxx_compiler_flag(-fuse-ld=lld HAVE_LLD_LINKER_FLAG)
       check_cxx_compiler_flag(-fuse-ld=gold HAVE_GOLD_LINKER_FLAG)
@@ -50,6 +50,17 @@ if(ENABLE_TESTING)
       if(NOT "${CMAKE_CUSTOM_LINKER}" STREQUAL "default")
         target_link_options(lammps PUBLIC -fuse-ld=${CMAKE_CUSTOM_LINKER})
       endif()
+      if(HAVE_LD_PATH_FLAG)
+        if("${CMAKE_CUSTOM_LINKER}" STREQUAL "mold")
+          target_link_options(lammps PUBLIC --ld-path=${HAVE_MOLD_LINKER_BIN})
+        elseif("${CMAKE_CUSTOM_LINKER}" STREQUAL "lld")
+          target_link_options(lammps PUBLIC --ld-path=${HAVE_LLD_LINKER_BIN})
+        elseif("${CMAKE_CUSTOM_LINKER}" STREQUAL "gold")
+          target_link_options(lammps PUBLIC --ld-path=${HAVE_GOLD_LINKER_BIN})
+        elseif("${CMAKE_CUSTOM_LINKER}" STREQUAL "bfd")
+          target_link_options(lammps PUBLIC --ld-path=${HAVE_BFD_LINKER_BIN})
+        endif()
+      endif()
     endif()
   endif()
 

cmake/Modules/Tools.cmake

@@ -6,6 +6,10 @@ if(BUILD_TOOLS)
   add_executable(stl_bin2txt ${LAMMPS_TOOLS_DIR}/stl_bin2txt.cpp)
   install(TARGETS stl_bin2txt DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+  add_executable(reformat-json ${LAMMPS_TOOLS_DIR}/json/reformat-json.cpp)
+  target_include_directories(reformat-json PRIVATE ${LAMMPS_SOURCE_DIR})
+  install(TARGETS reformat-json DESTINATION ${CMAKE_INSTALL_BINDIR})
+
   include(CheckGeneratorSupport)
   if(CMAKE_GENERATOR_SUPPORT_FORTRAN)
     include(CheckLanguage)

cmake/presets/hip_amd.cmake

@@ -19,12 +19,19 @@ set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
 
 set(MPI_CXX "hipcc" CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+set(MPI_C "hipcc" CACHE STRING "" FORCE)
+set(MPI_C_COMPILER "mpicc" CACHE STRING "" FORCE)
+
+# change as needed. This is for Fedora Linux 41 and 42
+set(_libomp_root "/usr/lib/clang/18")
+# we need to explicitly specify the include dir, since hipcc will
+# compile each file twice and doesn't find omp.h the second time
 
 unset(HAVE_OMP_H_INCLUDE CACHE)
 set(OpenMP_C "hipcc" CACHE STRING "" FORCE)
-set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-fopenmp=libomp -I${_libomp_root}/include" CACHE STRING "" FORCE)
 set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
 set(OpenMP_CXX "hipcc" CACHE STRING "" FORCE)
-set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX_FLAGS "-fopenmp=libomp -I${_libomp_root}/include" CACHE STRING "" FORCE)
 set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
 set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)

cmake/presets/kokkos-cuda.cmake

@@ -1,10 +1,8 @@
 # preset that enables KOKKOS and selects CUDA compilation with OpenMP
-# enabled as well. This preselects CC 5.0 as default GPU arch, since
-# that is compatible with all higher CC, but not the default CC 3.5
+# enabled as well. The GPU architecture *must* match your hardware (If not manually set, Kokkos will try to autodetect it).
 set(PKG_KOKKOS ON CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_SERIAL ON CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_CUDA   ON CACHE BOOL "" FORCE)
-set(Kokkos_ARCH_PASCAL60 ON CACHE BOOL "" FORCE)
 set(BUILD_OMP ON CACHE BOOL "" FORCE)
 get_filename_component(NVCC_WRAPPER_CMD ${CMAKE_CURRENT_SOURCE_DIR}/../lib/kokkos/bin/nvcc_wrapper ABSOLUTE)
 set(CMAKE_CXX_COMPILER ${NVCC_WRAPPER_CMD} CACHE FILEPATH "" FORCE)

cmake/presets/kokkos-hip.cmake

@@ -1,22 +1,21 @@
-# preset that enables KOKKOS and selects HIP compilation with OpenMP
-# enabled as well. Also sets some performance related compiler flags.
+# preset that enables KOKKOS and selects HIP compilation withOUT OpenMP.
+# Kokkos OpenMP is not compatible with the second pass of hipcc.
 set(PKG_KOKKOS ON CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_SERIAL ON CACHE BOOL "" FORCE)
-set(Kokkos_ENABLE_OPENMP ON CACHE BOOL "" FORCE)
+set(Kokkos_ENABLE_OPENMP OFF CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_CUDA   OFF CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_HIP    ON CACHE BOOL "" FORCE)
 set(Kokkos_ARCH_VEGA90A on CACHE BOOL "" FORCE)
 set(Kokkos_ENABLE_HIP_MULTIPLE_KERNEL_INSTANTIATIONS ON CACHE BOOL "" FORCE)
 set(BUILD_OMP ON CACHE BOOL "" FORCE)
 
-set(CMAKE_CXX_COMPILER hipcc CACHE STRING "" FORCE)
-set(CMAKE_TUNE_FLAGS "-munsafe-fp-atomics" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -munsafe-fp-atomics" CACHE STRING "" FORCE)
 
-# If KSPACE is also enabled, use CUFFT for FFTs
+# If KSPACE is also enabled, use HIPFFT for FFTs
 set(FFT_KOKKOS "HIPFFT" CACHE STRING "" FORCE)
 
 # hide deprecation warnings temporarily for stable release
-set(Kokkos_ENABLE_DEPRECATION_WARNINGS OFF CACHE BOOL "" FORCE)
+#set(Kokkos_ENABLE_DEPRECATION_WARNINGS OFF CACHE BOOL "" FORCE)
 
 # these flags are needed to build with Cray MPICH on OLCF Crusher
 #-D CMAKE_CXX_FLAGS="-I/${MPICH_DIR}/include"

cmake/presets/kokkos-sycl-intel.cmake

@@ -21,9 +21,10 @@ set(CMAKE_C_COMPILER icx CACHE STRING "" FORCE)
 set(CMAKE_Fortran_COMPILER "" CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "" FORCE)
-# Silence everything
-set(CMAKE_CXX_FLAGS "-w" CACHE STRING "" FORCE)
+
+# set(_intel_sycl_flags " -w -fsycl -flink-huge-device-code -fsycl-targets=spir64_gen "
+set(_intel_sycl_flags " -w -fsycl -fsycl-device-code-split=per_kernel -fsycl-targets=spir64_gen ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_intel_sycl_flags}" CACHE STRING "" FORCE)
+
 #set(CMAKE_EXE_LINKER_FLAGS "-fsycl -flink-huge-device-code -fsycl-targets=spir64_gen " CACHE STRING "" FORCE)
-#set(CMAKE_TUNE_FLAGS "-O3 -fsycl -fsycl-device-code-split=per_kernel -fsycl-targets=spir64_gen" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS "-fsycl -flink-huge-device-code " CACHE STRING "" FORCE)
-set(CMAKE_TUNE_FLAGS "-O3 -fsycl -fsycl-device-code-split=per_kernel " CACHE STRING "" FORCE)
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsycl -flink-huge-device-code " CACHE STRING "" FORCE)

cmake/presets/kokkos-sycl-nvidia.cmake

@@ -14,5 +14,7 @@ set(Kokkos_ENABLE_DEPRECATION_WARNINGS OFF CACHE BOOL "" FORCE)
 set(CMAKE_CXX_COMPILER clang++ CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "-Xsycl-target-frontend -O3" CACHE STRING "" FORCE)
-set(CMAKE_TUNE_FLAGS "-fgpu-inline-threshold=100000 -Xsycl-target-frontend -O3  -Xsycl-target-frontend -ffp-contract=on -Wno-unknown-cuda-version" CACHE STRING "" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xsycl-target-frontend -O3 " CACHE STRING "" FORCE)
+
+set(_intel_sycl_flags "-fgpu-inline-threshold=100000 -Xsycl-target-frontend -O3  -Xsycl-target-frontend -ffp-contract=on -Wno-unknown-cuda-version")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_intel_sycl_flags}" CACHE STRING "" FORCE)

cmake/presets/mingw-cross.cmake

@@ -91,7 +91,7 @@ endif()
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
 set(LAMMPS_MEMALIGN "0" CACHE STRING "" FORCE)
-set(CMAKE_TUNE_FLAGS "-Wno-missing-include-dirs" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-include-dirs" CACHE STRING "" FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-stdcall-fixup,--as-needed,-lssp" CACHE STRING "" FORCE)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-stdcall-fixup,--as-needed,-lssp" CACHE STRING "" FORCE)
 set(BUILD_TOOLS ON CACHE BOOL "" FORCE)

cmake/presets/windows-intel-llvm.cmake

@@ -5,4 +5,4 @@ set(CMAKE_C_COMPILER "icx" CACHE STRING "" FORCE)
 set(CMAKE_Fortran_COMPILER "ifx" CACHE STRING "" FORCE)
 set(INTEL_LRT_MODE "C++11" CACHE STRING "" FORCE)
 unset(HAVE_OMP_H_INCLUDE CACHE)
-set(CMAKE_TUNE_FLAGS -Wno-unused-command-line-argument)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument" CACHE STRING "" FORCE)

doc/Makefile

@@ -17,9 +17,11 @@ MATHJAXTAG     = 3.2.2
 
 PYTHON         = $(word 3,$(shell type python3))
 DOXYGEN        = $(word 3,$(shell type doxygen))
+PANDOC         = $(word 3,$(shell type pandoc))
 HAS_PYTHON3    = NO
 HAS_DOXYGEN    = NO
 HAS_PDFLATEX   = NO
+HAS_PANDOC     = NO
 
 ifeq ($(shell type python3 >/dev/null 2>&1; echo $$?), 0)
 HAS_PYTHON3    = YES
@@ -31,10 +33,14 @@ endif
 
 ifeq ($(shell type pdflatex >/dev/null 2>&1; echo $$?), 0)
 ifeq ($(shell type latexmk >/dev/null 2>&1; echo $$?), 0)
-HAS_PDFLATEX = YES
+HAS_PDFLATEX   = YES
 endif
 endif
 
+ifeq ($(shell type pandoc >/dev/null 2>&1; echo $$?), 0)
+HAS_PANDOC     = YES
+endif
+
 # override settings for PIP commands
 # PIP_OPTIONS = --cert /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt --proxy http://proxy.mydomain.org
 
@@ -45,8 +51,9 @@ SPHINXEXTRA = -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiprocess
 # we only want to use explicitly listed files.
 DOXYFILES      = $(shell sed -n -e 's/\#.*$$//' -e '/^ *INPUT \+=/,/^[A-Z_]\+ \+=/p' doxygen/Doxyfile.in | sed -e 's/@LAMMPS_SOURCE_DIR@/..\/src/g' -e 's/\\//g' -e 's/ \+/ /' -e 's/[A-Z_]\+ \+= *\(YES\|NO\|\)//') 
 
-.PHONY: help clean-all clean clean-spelling epub mobi html pdf spelling anchor_check style_check char_check role_check xmlgen fasthtml
+.PHONY: help clean-all clean clean-spelling epub mobi html pdf spelling anchor_check style_check char_check role_check xmlgen fasthtml fasthtml-init 
 
+FASTHTMLFILES = $(patsubst $(RSTDIR)/%.rst,fasthtml/%.html,$(wildcard $(RSTDIR)/*rst))
 # ------------------------------------------
 
 help:
@@ -105,6 +112,8 @@ html: xmlgen globbed-tocs $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJ
 		env LC_ALL=C grep -n ':\(ref\|doc\):[^`]' $(RSTDIR)/*.rst ;\
 		env LC_ALL=C grep -n '\(ref\|doc\)`[^`]' $(RSTDIR)/*.rst ;\
 		$(PYTHON) $(BUILDDIR)/utils/check-styles.py -s ../src -d src ;\
+		env LC_ALL=C grep -n -E '^ *\.\. [a-z0-9]+:(\s+.*|)$$' \
+                         $(RSTDIR)/*.rst ../src/*.{cpp,h} ../src/*/*.{cpp,h} ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)
@@ -116,25 +125,23 @@ html: xmlgen globbed-tocs $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJ
 	@rm -rf html/PDF/.[sg]*
 	@echo "Build finished. The HTML pages are in doc/html."
 
-fasthtml: xmlgen globbed-tocs $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJAX)
-	@if [ "$(HAS_BASH)" == "NO" ] ; then echo "bash was not found at $(OSHELL)! Please use: $(MAKE) SHELL=/path/to/bash" 1>&2; exit 1; fi
-	@$(MAKE) $(MFLAGS) -C graphviz all
-	@mkdir -p fasthtml
-	@(\
-		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
-		sphinx-build $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/fasthtml/doctrees $(RSTDIR) fasthtml ;\
-		touch $(RSTDIR)/Fortran.rst ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
-		sphinx-build $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/fasthtml/doctrees $(RSTDIR) fasthtml ;\
-		deactivate ;\
-	)
-	@rm -rf fasthtml/_sources
-	@rm -rf fasthtml/PDF
-	@rm -rf fasthtml/USER
-	@rm -rf fasthtml/JPG
-	@cp -r src/PDF fasthtml/PDF
-	@rm -rf fasthtml/PDF/.[sg]*
+fasthtml: fasthtml-init $(FASTHTMLFILES)
 	@echo "Fast HTML build finished. The HTML pages are in doc/fasthtml."
 
+fasthtml-init:
+	@mkdir -p fasthtml/JPG
+	@cp src/JPG/*.* fasthtml/JPG
+	@cp $(RSTDIR)/accel_styles.rst $(RSTDIR)/lepton_expression.rst fasthtml/
+	@cp $(BUILDDIR)/utils/pandoc.css fasthtml/
+
+fasthtml/%.html: $(RSTDIR)/%.rst
+	@if [ "$(HAS_PANDOC)" == "NO" ] ; then echo "Make 'fasthtml' requires the 'pandoc' software" 1>&2; exit 1; fi
+	@mkdir -p fasthtml
+	@echo converting $< to $@
+	@sed -e 's/\\AA/\\mathring{\\mathrm{A}}/g' $< > fasthtml/$*.temp.rst
+	@pandoc -s --mathml --css="pandoc.css" --template=$(BUILDDIR)/utils/pandoc.html --metadata title="$@" -o $@ fasthtml/$*.temp.rst
+	@rm -f fasthtml/$*.temp.rst
+
 spelling: xmlgen globbed-tocs $(SPHINXCONFIG)/conf.py $(VENV) $(SPHINXCONFIG)/false_positives.txt
 	@if [ "$(HAS_BASH)" == "NO" ] ; then echo "bash was not found at $(OSHELL)! Please use: $(MAKE) SHELL=/path/to/bash" 1>&2; exit 1; fi
 	@(\
@@ -188,6 +195,8 @@ pdf: xmlgen globbed-tocs $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK)
 		env LC_ALL=C grep -n ':\(ref\|doc\):[^`]' $(RSTDIR)/*.rst ;\
 		env LC_ALL=C grep -n '\(ref\|doc\)`[^`]' $(RSTDIR)/*.rst ;\
 		$(PYTHON) utils/check-styles.py -s ../src -d src ;\
+		env LC_ALL=C grep -n -E '^ *\.\. [a-z0-9]+:(\s+.*|)$$' \
+                         $(RSTDIR)/*.rst ../src/*.{cpp,h} ../src/*/*.{cpp,h} ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)
@@ -237,6 +246,8 @@ role_check :
 	@( env LC_ALL=C grep -n ' `[^`]\+<[a-z][^`]\+`[^_]' $(RSTDIR)/*.rst && exit 1 || : )
 	@( env LC_ALL=C grep -n ':\(ref\|doc\):[^`]' $(RSTDIR)/*.rst && exit 1 || : )
 	@( env LC_ALL=C grep -n '\(ref\|doc\)`[^`]' $(RSTDIR)/*.rst && exit 1 || : )
+	@( env LC_ALL=C grep -n -E '^ *\.\. [a-z0-9]+:(\s+.*|)$$' \
+                        $(RSTDIR)/*.rst ../src/*.{cpp,h} ../src/*/*.{cpp,h} && exit 1 || : )
 
 link_check : $(VENV) html
 	@(\

doc/README

@@ -22,12 +22,12 @@ doxygen-warn.log  logfile with warnings from running doxygen
 and:
 
 github-development-workflow.md   notes on the LAMMPS development workflow
-include-file-conventions.md      notes on LAMMPS' include file conventions
 documentation_conventions.md     notes on writing documentation for LAMMPS
 
 If you downloaded a LAMMPS tarball from www.lammps.org, then the html
 folder and the PDF manual should be included. If you downloaded LAMMPS
-from GitHub then you either need to build them.
+using GitHub then you either need to build them yourself or read the
+online version at https://docs.lammps.org/
 
 You can build the HTML and PDF files yourself, by typing "make html"
 or by "make pdf", respectively.  This requires various tools and files.
@@ -39,10 +39,10 @@ environment and local folders.
 
 Installing prerequisites for the documentation build
 
-To run the HTML documention build toolchain, python 3.x, doxygen, git,
-and the venv python module have to be installed if not already available.
-Also internet access is initially required to download external files
-and tools.
+To run the HTML documention build toolchain, python 3.8 or later,
+doxygen 1.8.10 or later, git, and the venv python module have to be
+installed if not already available.  Also internet access is initially
+required to download external files and tools.
 
 Building the PDF format manual requires in addition a compatible LaTeX
 installation with support for PDFLaTeX and several add-on LaTeX packages
@@ -52,16 +52,24 @@ installed.  This includes:
 - babel
 - capt-of
 - cmap
+- dvipng
+- ellipse
 - fncychap
+- fontawesom
 - framed
 - geometry
+- gyre
 - hyperref
 - hypcap
 - needspace
+- pict2e
 - times
 - tabulary
+- titlesec
 - upquote
 - wrapfig
+- xindy
+
 Also the latexmk script is required to run PDFLaTeX and related tools.
 the required number of times to have self-consistent output and include
 updated bibliography and indices.

doc/graphviz/lammps-releases.dot

@@ -5,13 +5,13 @@ digraph releases {
     github -> develop [label="Merge commits"];
     {
         rank = "same";
-        work [shape="none" label="Development branches:"]
+        work [shape="none" label="Development branches:" fontname="bold"]
         develop [label="'develop' branch" height=0.75];
         maintenance [label="'maintenance' branch" height=0.75];
     };
     {
         rank = "same";
-        upload [shape="none" label="Release branches:"]
+        upload [shape="none" label="Release branches:" fontname="bold"]
         release [label="'release' branch" height=0.75];
         stable [label="'stable' branch" height=0.75];
     };
@@ -22,7 +22,7 @@ digraph releases {
     maintenance -> stable [label="Updates to stable release"];
     {
         rank = "same";
-        tag [shape="none" label="Applied tags:"];
+        tag [shape="none" label="Applied tags:" fontname="bold"];
         patchtag [shape="box" label="patch_<date>"];
         stabletag [shape="box" label="stable_<date>"];
         updatetag [shape="box" label="stable_<date>_update<num>"];

doc/lammps.1

@@ -1,7 +1,7 @@
-.TH LAMMPS "1" "4 February 2025" "2025-02-04"
+.TH LAMMPS "1" "12 June 2025" "2025-06-12"
 .SH NAME
 .B LAMMPS
-\- Molecular Dynamics Simulator.  Version 4 February 2025
+\- Molecular Dynamics Simulator.  Version 12 June 2025
 
 .SH SYNOPSIS
 .B lmp

doc/src/Build.rst

@@ -17,6 +17,7 @@ section of the manual.
 .. toctree::
    :maxdepth: 1
 
+   Build_prerequisites
    Build_cmake
    Build_make
    Build_link

doc/src/Build_basics.rst

@@ -212,11 +212,7 @@ LAMMPS.
       You can tell CMake to look for a specific compiler with setting
       CMake variables (listed below) during configuration.  For a few
       common choices, there are also presets in the ``cmake/presets``
-      folder.  For convenience, there is a ``CMAKE_TUNE_FLAGS`` variable
-      that can be set to apply global compiler options (applied to
-      compilation only), to be used for adding compiler or host specific
-      optimization flags in addition to the "flags" variables listed
-      below. You may also specify the corresponding ``CMAKE_*_FLAGS``
+      folder.  You may also specify the corresponding ``CMAKE_*_FLAGS``
       variables individually, if you want to experiment with alternate
       optimization flags.  You should specify all 3 compilers, so that
       the (few) LAMMPS source files written in C or Fortran are built
@@ -266,10 +262,6 @@ LAMMPS.
       ``-C ../cmake/presets/pgi.cmake`` will switch the compiler to the PGI compilers,
       and ``-C ../cmake/presets/nvhpc.cmake`` will switch to the NVHPC compilers.
 
-      Furthermore, you can set ``CMAKE_TUNE_FLAGS`` to specifically add
-      compiler flags to tune for optimal performance on given hosts.
-      This variable is empty by default.
-
       .. note::
 
          When the cmake command completes, it prints a summary to the

doc/src/Build_cmake.rst

@@ -52,9 +52,9 @@ software or for people that want to modify or extend LAMMPS.
   compilers can be configured and built concurrently from the same
   source tree.
 - Simplified packaging of LAMMPS for Linux distributions, environment
-  modules, or automated build tools like `Homebrew <https://brew.sh/>`_.
-- Integration of automated unit and regression testing (the LAMMPS side
-  of this is still under active development).
+  modules, or automated build tools like `Spack <https://spack.io>`_
+  or `Homebrew <https://brew.sh/>`_.
+- Integration of automated unit and regression testing.
 
 .. _cmake_build:
 
@@ -119,6 +119,13 @@ configured) and additional files like LAMMPS API headers, manpages,
 potential and force field files.  The location of the installation tree
 defaults to ``${HOME}/.local``.
 
+.. note::
+
+   If you have set `-D CMAKE_INSTALL_PREFIX` to install LAMMPS into a
+   system location on a Linux machine , you may also have to run (as
+   root) the `ldconfig` program to update the cache file for fast lookup
+   of system shared libraries.
+
 .. _cmake_options:
 
 Configuration and build options

doc/src/Build_extras.rst

@@ -255,11 +255,10 @@ Traditional make
 
 Before building LAMMPS, you must build the GPU library in ``lib/gpu``\ .
 You can do this manually if you prefer; follow the instructions in
-``lib/gpu/README``.  Note that the GPU library uses MPI calls, so you must
-use the same MPI library (or the STUBS library) settings as the main
-LAMMPS code.  This also applies to the ``-DLAMMPS_BIGBIG``\ ,
-``-DLAMMPS_SMALLBIG``\ , or ``-DLAMMPS_SMALLSMALL`` settings in whichever
-Makefile you use.
+``lib/gpu/README``.  Note that the GPU library uses MPI calls, so you
+must use the same MPI library (or the STUBS library) settings as the
+main LAMMPS code.  This also applies to the ``-DLAMMPS_BIGBIG`` or
+``-DLAMMPS_SMALLBIG`` settings in whichever Makefile you use.
 
 You can also build the library in one step from the ``lammps/src`` dir,
 using a command like these, which simply invokes the ``lib/gpu/Install.py``
@@ -612,6 +611,9 @@ They must be specified in uppercase.
    *  - ZEN3
       - HOST
       - AMD Zen3 architecture
+   *  - ZEN4
+      - HOST
+      - AMD Zen4 architecture
    *  - RISCV_SG2042
       - HOST
       - SG2042 (RISC-V) CPUs
@@ -715,7 +717,7 @@ They must be specified in uppercase.
       - GPU
       - Intel GPU Ponte Vecchio
 
-This list was last updated for version 4.5.1 of the Kokkos library.
+This list was last updated for version 4.6.0 of the Kokkos library.
 
 .. tabs::
 
@@ -1139,11 +1141,10 @@ POEMS package
 PYTHON package
 ---------------------------
 
-Building with the PYTHON package requires you have a the Python development
-headers and library available on your system, which needs to be a Python 2.7
-version or a Python 3.x version.  Since support for Python 2.x has ended,
-using Python 3.x is strongly recommended. See ``lib/python/README`` for
-additional details.
+Building with the PYTHON package requires you have a the Python
+development headers and library available on your system, which
+needs to be Python version 3.6 or later.  See ``lib/python/README``
+for additional details.
 
 .. tabs::
 
@@ -1159,7 +1160,7 @@ additional details.
       set the Python_EXECUTABLE variable to specify which Python
       interpreter should be used.  Note note that you will also need to
       have the development headers installed for this version,
-      e.g. python2-devel.
+      e.g. python3-devel.
 
    .. tab:: Traditional make
 

doc/src/Build_make.rst

@@ -30,9 +30,9 @@ additional tools to be available and functioning.
   * A Bourne shell compatible "Unix" shell program (frequently this is ``bash``)
   * A few shell utilities: ``ls``, ``mv``, ``ln``, ``rm``, ``grep``, ``sed``, ``tr``, ``cat``, ``touch``, ``diff``, ``dirname``
   * Python (optional, required for ``make lib-<pkg>`` in the ``src``
-    folder).  Python scripts are currently tested with python 2.7 and
-    3.6 to 3.11. The procedure for :doc:`building the documentation
-    <Build_manual>` *requires* Python 3.5 or later.
+    folder).  Python scripts are currently tested with 3.6 to 3.11.
+    The procedure for :doc:`building the documentation <Build_manual>`
+    *requires* Python 3.8 or later.
 
 Getting started
 ^^^^^^^^^^^^^^^

doc/src/Build_manual.rst

@@ -78,8 +78,7 @@ folder.  The following ``make`` commands are available:
    make epub          # generate LAMMPS.epub in ePUB format using Sphinx
    make mobi          # generate LAMMPS.mobi in MOBI format using ebook-convert
 
-   make fasthtml      # generate approximate HTML in fasthtml dir using Sphinx
-                      # some Sphinx extensions do not work correctly with this
+   make fasthtml      # generate approximate HTML in fasthtml dir using pandoc
 
    make clean         # remove intermediate RST files created by HTML build
    make clean-all     # remove entire build folder and any cached data
@@ -116,9 +115,9 @@ environment variable.
 Prerequisites for HTML
 ----------------------
 
-To run the HTML documentation build toolchain, python 3, git, doxygen,
-and virtualenv have to be installed locally.  Here are instructions for
-common setups:
+To run the HTML documentation build toolchain, Python 3.8 or later, git,
+doxygen, and virtualenv have to be installed locally.  Here are
+instructions for common setups:
 
 .. tabs::
 
@@ -128,13 +127,7 @@ common setups:
 
          sudo apt-get install git doxygen
 
-   .. tab:: RHEL or CentOS (Version 7.x)
-
-      .. code-block:: bash
-
-         sudo yum install git doxygen
-
-   .. tab:: Fedora or RHEL/CentOS (8.x or later)
+   .. tab:: Fedora or RHEL/AlmaLinux/RockyLinux (8.x or later)
 
       .. code-block:: bash
 
@@ -154,7 +147,36 @@ Prerequisites for PDF
 
 In addition to the tools needed for building the HTML format manual,
 a working LaTeX installation with support for PDFLaTeX and a selection
-of LaTeX styles/packages are required.  To run the PDFLaTeX translation
+of LaTeX styles/packages are required.  Apart from LaTeX packages that
+are usually installed by default, the following packages are required:
+
+.. table_from_list::
+   :columns: 11
+
+   - amsmath
+   - anysize
+   - babel
+   - capt-of
+   - cmap
+   - dvipng
+   - ellipse
+   - fncychap
+   - fontawesome
+   - framed
+   - geometry
+   - gyre
+   - hyperref
+   - hypcap
+   - needspace
+   - pict2e
+   - times
+   - tabulary
+   - titlesec
+   - upquote
+   - wrapfig
+   - xindy
+
+To run the PDFLaTeX translation
 the ``latexmk`` script needs to be installed as well.
 
 Prerequisites for ePUB and MOBI
@@ -182,12 +204,42 @@ documentation is required and either existing files in the ``src``
 folder need to be updated or new files added. These files are written in
 `reStructuredText <rst_>`_ markup for translation with the Sphinx tool.
 
+Testing your contribution
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Before contributing any documentation, please check that both the HTML
-and the PDF format documentation can translate without errors.  During
-testing the html translation, you may use the ``make fasthtml`` command
-which does an approximate translation (i.e. not all Sphinx features and
-extensions will work), but runs very fast because it will only translate
-files that have been changed since the last ``make fasthtml`` command.
+and the PDF format documentation can translate without errors and that
+there are no spelling issues.  This is done with ``make html``, ``make pdf``,
+and ``make spelling``, respectively.
+
+Fast and approximate translation to HTML
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Translating the full manual to HTML or PDF can take a long time.  Thus
+there is a fast and approximate way to translate the reStructuredText to
+HTML as a quick-n-dirty way of checking your manual page.
+
+This translation uses `Pandoc <https://pandoc.org>`_ instead of Sphinx
+and thus all special Sphinx features (cross-references, advanced tables,
+embedding of Python docstrings or doxygen documentation, and so on) will
+not render correctly.  Most embedded math should render correctly.  This
+is a **very fast** way to check the syntax and layout of a documentation
+file translated to HTML while writing or updating it.
+
+To translate **all** manual pages, you can type ``make fasthtml`` at the
+command line.  The translated HTML files are then in the ``fasthtml``
+folder. All subsequent ``make fasthtml`` commands will only translate
+``.rst`` files that have been changed.  The ``make fasthtml`` command
+can be parallelized with make using the `-j` flag.  You can also
+directly translate only individual pages: e.g. to translate only the
+``doc/src/pair_lj.rst`` page type ``make fasthtml/pair_lj.html``
+
+After writing the documentation is completed, you will still need
+to verify with ``make html`` and ``make pdf`` that it translates
+correctly in both formats.
+
+Tests for consistency, completeness, and other known issues
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Please also check the output to the console for any warnings or problems.  There will
 be multiple tests run automatically:

doc/src/Build_prerequisites.rst

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

doc/src/Build_settings.rst

@@ -8,29 +8,30 @@ Optional build settings
 LAMMPS can be built with several optional settings.  Each subsection
 explains how to do this for building both with CMake and make.
 
-* `C++11 standard compliance`_ when building all of LAMMPS
+* `C++11 and C++17 standard compliance`_ when building all of LAMMPS
 * `FFT library`_ for use with the :doc:`kspace_style pppm <kspace_style>` command
 * `Size of LAMMPS integer types and size limits`_
 * `Read or write compressed files`_
 * `Output of JPEG, PNG, and movie files`_ via the :doc:`dump image <dump_image>` or :doc:`dump movie <dump_image>` commands
-* `Support for downloading files`_
+* `Support for downloading files from the input`_
+* `Prevent download of large potential files`_
 * `Memory allocation alignment`_
 * `Workaround for long long integers`_
 * `Exception handling when using LAMMPS as a library`_ to capture errors
-* `Trigger selected floating-point exceptions`_
 
 ----------
 
 .. _cxx11:
 
-C++11 standard compliance
--------------------------
+C++11 and C++17 standard compliance
+-----------------------------------
 
-A C++11 standard compatible compiler is a requirement for compiling LAMMPS.
-LAMMPS version 3 March 2020 is the last version compatible with the previous
-C++98 standard for the core code and most packages. Most currently used
-C++ compilers are compatible with C++11, but some older ones may need extra
-flags to enable C++11 compliance.  Example for GNU c++ 4.8.x:
+A C++11 standard compatible compiler is currently the minimum
+requirement for compiling LAMMPS.  LAMMPS version 3 March 2020 is the
+last version compatible with the previous C++98 standard for the core
+code and most packages. Most currently used C++ compilers are compatible
+with C++11, but some older ones may need extra flags to enable C++11
+compliance.  Example for GNU c++ 4.8.x:
 
 .. code-block:: make
 
@@ -40,6 +41,17 @@ Individual packages may require compliance with a later C++ standard
 like C++14 or C++17.  These requirements will be documented with the
 :doc:`individual packages <Packages_details>`.
 
+.. versionchanged:: 4Feb2025
+
+Starting with LAMMPS version 4 February 2025 we are starting a
+transition to require the C++17 standard.  Most current compilers are
+compatible and if the C++17 standard is available by default, LAMMPS
+will enable C++17 and will compile normally.  If the chosen compiler is
+not compatible with C++17, but only supports C++11, then the define
+-DLAMMPS_CXX11 is required to fall back to compiling with a C++11
+compiler.  After the next stable release of LAMMPS in summer 2025, the
+LAMMPS development branch and future releases will require C++17.
+
 ----------
 
 .. _fft:
@@ -303,7 +315,7 @@ large counters can become before "rolling over".  The default setting of
 
       .. code-block:: bash
 
-         -D LAMMPS_SIZES=value   # smallbig (default) or bigbig or smallsmall
+         -D LAMMPS_SIZES=value   # smallbig (default) or bigbig
 
       If the variable is not set explicitly, "smallbig" is used.
 
@@ -314,7 +326,7 @@ large counters can become before "rolling over".  The default setting of
 
       .. code-block:: make
 
-         LMP_INC = -DLAMMPS_SMALLBIG    # or -DLAMMPS_BIGBIG or -DLAMMPS_SMALLSMALL
+         LMP_INC = -DLAMMPS_SMALLBIG    # or -DLAMMPS_BIGBIG
 
       The default setting is ``-DLAMMPS_SMALLBIG`` if nothing is specified
 
@@ -323,34 +335,27 @@ LAMMPS system size restrictions
 
 .. list-table::
    :header-rows: 1
-   :widths: 18 27 28 27
+   :widths: 27 36 37
    :align: center
 
    * -
      - smallbig
      - bigbig
-     - smallsmall
    * - Total atom count
      - :math:`2^{63}` atoms (= :math:`9.223 \cdot 10^{18}`)
      - :math:`2^{63}` atoms (= :math:`9.223 \cdot 10^{18}`)
-     - :math:`2^{31}` atoms (= :math:`2.147 \cdot 10^9`)
    * - Total timesteps
      - :math:`2^{63}` steps (= :math:`9.223 \cdot 10^{18}`)
      - :math:`2^{63}` steps (= :math:`9.223 \cdot 10^{18}`)
-     - :math:`2^{31}` steps (= :math:`2.147 \cdot 10^9`)
    * - Atom ID values
      - :math:`1 \le i \le 2^{31} (= 2.147 \cdot 10^9)`
      - :math:`1 \le i \le 2^{63} (= 9.223 \cdot 10^{18})`
-     - :math:`1 \le i \le 2^{31} (= 2.147 \cdot 10^9)`
    * - Image flag values
      - :math:`-512 \le i \le 511`
      - :math:`- 1\,048\,576 \le i \le 1\,048\,575`
-     - :math:`-512 \le i \le 511`
 
 The "bigbig" setting increases the size of image flags and atom IDs over
-"smallbig" and the "smallsmall" setting is only needed if your machine
-does not support 64-bit integers or incurs performance penalties when
-using them.
+the default "smallbig" setting.
 
 These are limits for the core of the LAMMPS code, specific features or
 some styles may impose additional limits.  The :ref:`ATC
@@ -504,8 +509,8 @@ during a run.
 
 .. _libcurl:
 
-Support for downloading files
------------------------------
+Support for downloading files from the input
+--------------------------------------------
 
 .. versionadded:: 29Aug2024
 
@@ -548,6 +553,25 @@ LAMMPS is compiled accordingly which needs the following settings:
 
 ----------
 
+.. _download_pot:
+
+Prevent download of large potential files
+-----------------------------------------
+
+.. versionadded:: 8Feb2023
+
+LAMMPS bundles a selection of potential files in the ``potentials``
+folder as examples of how those kinds of potential files look like and
+for use with the provided input examples in the ``examples`` tree.  To
+keep the size of the distributed LAMMPS source package small, very large
+potential files (> 5 MBytes) are not bundled, but only downloaded on
+demand when the :doc:`corresponding package <Packages_list>` is
+installed.  This automatic download can be prevented when :doc:`building
+LAMMPS with CMake <Build_cmake>` by adding the setting `-D
+DOWNLOAD_POTENTIALS=off` when configuring.
+
+----------
+
 .. _align:
 
 Memory allocation alignment
@@ -634,40 +658,3 @@ code has to be set up to *catch* exceptions thrown from within LAMMPS.
    throw an exception and thus other MPI ranks may get stuck waiting for
    messages from the ones with errors.
 
-----------
-
-.. _trap_fpe:
-
-Trigger selected floating-point exceptions
-------------------------------------------
-
-Many kinds of CPUs have the capability to detect when a calculation
-results in an invalid math operation, like a division by zero or calling
-the square root with a negative argument.  The default behavior on
-most operating systems is to continue and have values for ``NaN`` (= not
-a number) or ``Inf`` (= infinity).  This allows software to detect and
-recover from such conditions.  This behavior can be changed, however,
-often through use of compiler flags.  On Linux systems (or more general
-on systems using the GNU C library), these so-called floating-point traps
-can also be selectively enabled through library calls.  LAMMPS supports
-that by setting the ``-DLAMMPS_TRAP_FPE`` pre-processor define.  As it is
-done in the ``main()`` function, this applies only to the standalone
-executable, not the library.
-
-.. tabs::
-
-   .. tab:: CMake build
-
-      .. code-block:: bash
-
-         -D CMAKE_TUNE_FLAGS=-DLAMMPS_TRAP_FPE
-
-   .. tab:: Traditional make
-
-      .. code-block:: make
-
-         LMP_INC = -DLAMMPS_TRAP_FPE  <other LMP_INC settings>
-
-After compilation with this flag set, the LAMMPS executable will stop
-and produce a core dump when a division by zero, overflow, illegal math
-function argument or other invalid floating point operation is encountered.

doc/src/Commands_all.rst

@@ -140,6 +140,7 @@ additional letter in parenthesis: k = KOKKOS.
    * :doc:`plugin <plugin>`
    * :doc:`prd <prd>`
    * :doc:`python <python>`
+   * :doc:`region2vmd <region2vmd>`
    * :doc:`tad <tad>`
    * :doc:`temper <temper>`
    * :doc:`temper/grem <temper_grem>`

doc/src/Commands_bond.rst

@@ -23,6 +23,7 @@ OPT.
    *
    * :doc:`bpm/rotational <bond_bpm_rotational>`
    * :doc:`bpm/spring <bond_bpm_spring>`
+   * :doc:`bpm/spring/plastic <bond_bpm_spring_plastic>`
    * :doc:`class2 (ko) <bond_class2>`
    * :doc:`fene (iko) <bond_fene>`
    * :doc:`fene/expand (o) <bond_fene_expand>`
@@ -127,7 +128,7 @@ OPT.
    * :doc:`harmonic (iko) <dihedral_harmonic>`
    * :doc:`helix (o) <dihedral_helix>`
    * :doc:`lepton (o) <dihedral_lepton>`
-   * :doc:`multi/harmonic (o) <dihedral_multi_harmonic>`
+   * :doc:`multi/harmonic (ko) <dihedral_multi_harmonic>`
    * :doc:`nharmonic (o) <dihedral_nharmonic>`
    * :doc:`opls (iko) <dihedral_opls>`
    * :doc:`quadratic (o) <dihedral_quadratic>`

doc/src/Commands_compute.rst

@@ -178,6 +178,7 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`ti <compute_ti>`
    * :doc:`torque/chunk <compute_torque_chunk>`
    * :doc:`vacf <compute_vacf>`
+   * :doc:`vacf/chunk <compute_vacf_chunk>`
    * :doc:`vcm/chunk <compute_vcm_chunk>`
    * :doc:`viscosity/cos <compute_viscosity_cos>`
    * :doc:`voronoi/atom <compute_voronoi_atom>`

doc/src/Commands_dump.rst

@@ -19,6 +19,7 @@ An alphabetic list of all LAMMPS :doc:`dump <dump>` commands.
    * :doc:`custom/gz <dump>`
    * :doc:`custom/zstd <dump>`
    * :doc:`dcd <dump>`
+   * :doc:`extxyz <dump>`
    * :doc:`grid <dump>`
    * :doc:`grid/vtk <dump>`
    * :doc:`h5md <dump_h5md>`

doc/src/Commands_fix.rst

@@ -29,6 +29,7 @@ OPT.
    * :doc:`ave/grid <fix_ave_grid>`
    * :doc:`ave/histo <fix_ave_histo>`
    * :doc:`ave/histo/weight <fix_ave_histo>`
+   * :doc:`ave/moments <fix_ave_moments>`
    * :doc:`ave/time <fix_ave_time>`
    * :doc:`aveforce <fix_aveforce>`
    * :doc:`balance <fix_balance>`
@@ -77,6 +78,7 @@ OPT.
    * :doc:`flow/gauss <fix_flow_gauss>`
    * :doc:`freeze (k) <fix_freeze>`
    * :doc:`gcmc <fix_gcmc>`
+   * :doc:`gjf <fix_gjf>`
    * :doc:`gld <fix_gld>`
    * :doc:`gle <fix_gle>`
    * :doc:`gravity (ko) <fix_gravity>`
@@ -162,6 +164,8 @@ OPT.
    * :doc:`phonon <fix_phonon>`
    * :doc:`pimd/langevin <fix_pimd>`
    * :doc:`pimd/nvt <fix_pimd>`
+   * :doc:`pimd/langevin/bosonic <fix_pimd>`
+   * :doc:`pimd/nvt/bosonic <fix_pimd>`
    * :doc:`planeforce <fix_planeforce>`
    * :doc:`plumed <fix_plumed>`
    * :doc:`poems <fix_poems>`
@@ -184,6 +188,7 @@ OPT.
    * :doc:`qeq/fire <fix_qeq>`
    * :doc:`qeq/point <fix_qeq>`
    * :doc:`qeq/reaxff (ko) <fix_qeq_reaxff>`
+   * :doc:`qeq/rel/reaxff <fix_qeq_rel_reaxff>`
    * :doc:`qeq/shielded <fix_qeq>`
    * :doc:`qeq/slater <fix_qeq>`
    * :doc:`qmmm <fix_qmmm>`
@@ -213,6 +218,7 @@ OPT.
    * :doc:`rigid/small (o) <fix_rigid>`
    * :doc:`rx (k) <fix_rx>`
    * :doc:`saed/vtk <fix_saed_vtk>`
+   * :doc:`set <fix_set>`
    * :doc:`setforce (k) <fix_setforce>`
    * :doc:`setforce/spin <fix_setforce>`
    * :doc:`sgcmc <fix_sgcmc>`

doc/src/Commands_kspace.rst

@@ -31,3 +31,5 @@ OPT.
    * :doc:`pppm/dielectric <kspace_style>`
    * :doc:`pppm/electrode (i) <kspace_style>`
    * :doc:`scafacos <kspace_style>`
+   * :doc:`zero <kspace_style>`
+

doc/src/Commands_pair.rst

@@ -179,6 +179,7 @@ OPT.
    * :doc:`lj/long/dipole/long <pair_dipole>`
    * :doc:`lj/long/tip4p/long (o) <pair_lj_long>`
    * :doc:`lj/mdf <pair_mdf>`
+   * :doc:`lj/pirani (o) <pair_lj_pirani>`
    * :doc:`lj/relres (o) <pair_lj_relres>`
    * :doc:`lj/spica (gko) <pair_spica>`
    * :doc:`lj/spica/coul/long (gko) <pair_spica>`

doc/src/Commands_removed.rst

@@ -12,10 +12,21 @@ stop LAMMPS and print a suitable error message in most cases, when a
 style/command is used that has been removed or will replace the command
 with the direct alternative (if available) and print a warning.
 
+GJF formulation in fix langevin
+-------------------------------
+
+.. deprecated:: 12Jun2025
+
+The *gjf* keyword in fix langevin is deprecated and will be removed
+soon.  The GJF functionality has been moved to its own fix style
+:doc:`fix gjf <fix_gjf>` and it is strongly recommended to use that
+fix instead.
+
+
 LAMMPS shell
 ------------
 
-.. versionchanged:: 29Aug2024
+.. deprecated:: 29Aug2024
 
 The LAMMPS shell has been removed from the LAMMPS distribution. Users
 are encouraged to use the :ref:`LAMMPS-GUI <lammps_gui>` tool instead.
@@ -23,7 +34,7 @@ are encouraged to use the :ref:`LAMMPS-GUI <lammps_gui>` tool instead.
 i-PI tool
 ---------
 
-.. versionchanged:: 27Jun2024
+.. deprecated:: 27Jun2024
 
 The i-PI tool has been removed from the LAMMPS distribution.  Instead,
 instructions to install i-PI from PyPI via pip are provided.
@@ -170,6 +181,18 @@ performance characteristics on NVIDIA GPUs. Both, the KOKKOS
 and the :ref:`GPU package <PKG-GPU>` are maintained
 and allow running LAMMPS with GPU acceleration.
 
+Compute atom/molecule
+---------------------
+
+.. deprecated:: 11 Dec2015
+
+The atom/molecule command has been removed from LAMMPS since it was superseded
+by the more general and extensible "chunk infrastructure".  Here the system is
+partitioned in one of many possible ways - including using molecule IDs -
+through the :doc:`compute chunk/atom <compute_chunk_atom>` command and then
+summing is done using :doc:`compute reduce/chunk <compute_reduce_chunk>` Please
+refer to the :doc:`chunk HOWTO <Howto_chunk>` section for an overview.
+
 Fix ave/spatial and fix ave/spatial/sphere
 ------------------------------------------
 

doc/src/Developer.rst

@@ -24,4 +24,5 @@ of time and requests from the LAMMPS user community.
    Classes
    Developer_platform
    Developer_utils
+   Developer_internal
    Developer_grid

doc/src/Developer_internal.rst

@@ -0,0 +1,120 @@
+Internal Styles
+---------------
+
+LAMMPS has a number of styles that are not meant to be used in an input
+file and thus are not documented in the :doc:`LAMMPS command
+documentation <Commands_all>`.  The differentiation between user
+commands and internal commands is through the case of the command name:
+user commands and styles are all lower case, internal styles are all
+upper case.  Internal styles are not called from the input file, but
+their classes are instantiated by other styles.  Often they are
+created by other styles to store internal data or to perform actions
+regularly at specific steps of the simulation.
+
+The paragraphs below document some of those styles that have general
+utility and may be used to avoid redundant implementation.
+
+DEPRECATED Styles
+^^^^^^^^^^^^^^^^^
+
+The styles called DEPRECATED (e.g. pair, bond, fix, compute, region, etc.)
+have the purpose to inform users that a specific style has been removed
+or renamed.  This is achieved by creating an alias for the deprecated
+style to the corresponding class.  For example, the fix style DEPRECATED
+is aliased to fix style ave/spatial and fix style ave/spatial/sphere with
+the following code:
+
+.. code-block:: c++
+
+   FixStyle(DEPRECATED,FixDeprecated);
+   FixStyle(ave/spatial,FixDeprecated);
+   FixStyle(ave/spatial/sphere,FixDeprecated);
+
+The individual class will then determine based on the style name
+what action to perform:
+
+- inform that the style has been removed and what style replaces it, if any, and then error out
+- inform that the style has been renamed and then either execute the replacement or error out
+- inform that the style is no longer required, and it is thus ignored and continue
+
+There is also a section in the user's guide for :doc:`removed commands
+and packages <Commands_removed>` with additional explanations.
+
+Internal fix styles
+^^^^^^^^^^^^^^^^^^^
+
+These provide an implementation of features that would otherwise have
+been replicated across multiple styles.  The used fix ID is generally
+derived from the compute or fix ID creating the fix with some string
+appended.  When needed, the fix can be looked up with
+``Modify::get_fix_by_id()``, which returns a pointer to the fix
+instance.  The data managed by the fix can be accessed just as for other
+fixes that can be used in input files.
+
+fix DUMMY
+"""""""""
+
+Most fix classes cannot be instantiated before the simulation box has
+been created since they access data that is only available then.
+However, in some cases it is required that a fix must be at or close to
+the top of the list of all fixes.  In those cases an instance of the
+DUMMY fix style may be created by calling ``Modify::add_fix()`` and then
+later replaced by the intended fix through calling ``Modify::replace_fix()``.
+
+fix STORE/ATOM
+""""""""""""""
+
+Fix STORE/ATOM can be used as persistent storage of per-atom data.
+
+**Syntax**
+
+.. code-block:: LAMMPS
+
+   fix ID group-ID STORE/ATOM N1 N2 gflag rflag
+
+* ID, group-ID are documented in :doc:`fix <fix>` command
+* STORE/ATOM = style name of this fix command
+* N1 = 1, N2 = 0 : data is per-atom vector = single value per atom
+* N1 > 1, N2 = 0 : data is per-atom array = N1 values per atom
+* N1 > 0, N2 > 0 : data is per-atom tensor = N1xN2 values per atom
+* gflag = 1 communicate per-atom values with ghost atoms, 0 do not update ghost atom data
+* rflag = 1 store per-atom value in restart file, 0 do not store data in restart
+
+Similar functionality is also available through using custom per-atom
+properties with :doc:`fix property/atom <fix_property_atom>`.  The
+choice between the two fixes should be based on whether the user should
+be able to access this per-atom data: if yes, then fix property/atom is
+preferred, otherwise fix STORE/ATOM.
+
+fix STORE/GLOBAL
+""""""""""""""""
+
+Fix STORE/GLOBAL can be used as persistent storage of global data with support for restarts
+
+**Syntax**
+
+.. code-block:: LAMMPS
+
+   fix ID group-ID STORE/GLOBAL N1 N2
+
+* ID, group-ID are documented in :doc:`fix <fix>` command
+* STORE/GLOBAL = style name of this fix command
+* N1 >=1 : number of global items to store
+* N2 = 1 : data is global vector of length N1
+* N2 > 1 : data is global N1xN2 array
+
+fix STORE/LOCAL
+"""""""""""""""
+
+Fix STORE/LOCAL can be used as persistent storage for local data
+
+**Syntax**
+
+.. code-block:: LAMMPS
+
+   fix ID group-ID STORE/LOCAL Nreset Nvalues
+
+* ID, group-ID are documented in :doc:`fix <fix>` command
+* STORE/LOCAL = style name of this fix command
+* Nreset = frequency at which local data is available
+* Nvalues = number of values per local item, that is the number of columns

doc/src/Developer_notes.rst

@@ -7,7 +7,7 @@ typically document what a variable stores, what a small section of
 code does, or what a function does and its input/outputs.  The topics
 on this page are intended to document code functionality at a higher level.
 
-.. contents::
+.. contents:: Available notes
 
 ----
 

doc/src/Developer_plugins.rst

@@ -68,24 +68,25 @@ Members of ``lammpsplugin_t``
    * - author
      - String with the name and email of the author
    * - creator.v1
-     - Pointer to factory function for pair, bond, angle, dihedral, improper, kspace, or command styles
+     - Pointer to factory function for pair, bond, angle, dihedral, improper, kspace, command, or minimize styles
    * - creator.v2
-     - Pointer to factory function for compute, fix, or region styles
+     - Pointer to factory function for compute, fix, region, or run styles
    * - handle
      - Pointer to the open DSO file handle
 
 Only one of the two alternate creator entries can be used at a time and
 which of those is determined by the style of plugin. The "creator.v1"
 element is for factory functions of supported styles computing forces
-(i.e. pair, bond, angle, dihedral, or improper styles) or command styles
-and the function takes as single argument the pointer to the LAMMPS
-instance. The factory function is cast to the ``lammpsplugin_factory1``
-type before assignment.  The "creator.v2" element is for factory
-functions creating an instance of a fix, compute, or region style and
-takes three arguments: a pointer to the LAMMPS instance, an integer with
-the length of the argument list and a ``char **`` pointer to the list of
-arguments. The factory function pointer needs to be cast to the
-``lammpsplugin_factory2`` type before assignment.
+(i.e. pair, bond, angle, dihedral, or improper styles), command styles,
+or minimize styles and the function takes as single argument the pointer
+to the LAMMPS instance. The factory function is cast to the
+``lammpsplugin_factory1`` type before assignment.  The "creator.v2"
+element is for factory functions creating an instance of a fix, compute,
+region, or run style and takes three arguments: a pointer to the LAMMPS
+instance, an integer with the length of the argument list and a ``char
+**`` pointer to the list of arguments. The factory function pointer
+needs to be cast to the ``lammpsplugin_factory2`` type before
+assignment.
 
 Pair style example
 ^^^^^^^^^^^^^^^^^^
@@ -247,8 +248,8 @@ DSO handle.  The registration function is called with a pointer to the address
 of this struct and the pointer of the LAMMPS class.  The registration function
 will then add the factory function of the plugin style to the respective
 style map under the provided name.  It will also make a copy of the struct
-in a list of all loaded plugins and update the reference counter for loaded
-plugins from this specific DSO file.
+in a global list of all loaded plugins and update the reference counter for
+loaded plugins from this specific DSO file.
 
 The pair style itself (i.e. the PairMorse2 class in this example) can be
 written just like any other pair style that is included in LAMMPS.  For
@@ -263,6 +264,21 @@ the plugin will override the existing code.  This can be used to modify
 the behavior of existing styles or to debug new versions of them without
 having to re-compile or re-install all of LAMMPS.
 
+.. versionchanged:: 12Jun2025
+
+When using the :doc:`clear <clear>` command, plugins are not unloaded
+but restored to their respective style maps.  This also applies when
+multiple LAMMPS instances are created and deleted through the library
+interface.  The :doc:`plugin load <plugin>` load command may be issued
+again, but for existing plugins they will be skipped.  To replace
+plugins they must be explicitly unloaded with :doc:`plugin unload
+<plugin>`.  When multiple LAMMPS instances are created concurrently, any
+loaded plugins will be added to the global list of plugins, but are not
+immediately available to any LAMMPS instance that was created before
+loading the plugin.  To "import" such plugins, the :doc:`plugin restore
+<plugin>` may be used.  Plugins are only removed when they are explicitly
+unloaded or the LAMMPS interface is "finalized".
+
 Compiling plugins
 ^^^^^^^^^^^^^^^^^
 

doc/src/Developer_updating.rst

@@ -29,6 +29,7 @@ Available topics in mostly chronological order are:
 - `Rename of fix STORE/PERATOM to fix STORE/ATOM and change of arguments`_
 - `Use Output::get_dump_by_id() instead of Output::find_dump()`_
 - `Refactored grid communication using Grid3d/Grid2d classes instead of GridComm`_
+- `FLERR as first argument to minimum image functions in Domain class`_
 
 ----
 
@@ -610,3 +611,47 @@ KSpace solvers which use distributed FFT grids:
 - ``src/KSPACE/pppm.cpp``
 
 This change is **required** or else the code will not compile.
+
+FLERR as first argument to minimum image functions in Domain class
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionchanged:: 12Jun2025
+
+The ``Domain::minimum_image()`` and ``Domain::minimum_image_big()``
+functions were changed to take the ``FLERR`` macros as first argument.
+This way the error message indicates *where* the function was called
+instead of pointing to the implementation of the function.  Example:
+
+Old:
+
+.. code-block:: c++
+
+   double delx1 = x[i1][0] - x[i2][0];
+   double dely1 = x[i1][1] - x[i2][1];
+   double delz1 = x[i1][2] - x[i2][2];
+   domain->minimum_image(delx1, dely1, delz1);
+   double r1 = sqrt(delx1 * delx1 + dely1 * dely1 + delz1 * delz1);
+
+   double delx2 = x[i3][0] - x[i2][0];
+   double dely2 = x[i3][1] - x[i2][1];
+   double delz2 = x[i3][2] - x[i2][2];
+   domain->minimum_image_big(delx2, dely2, delz2);
+   double r2 = sqrt(delx2 * delx2 + dely2 * dely2 + delz2 * delz2);
+
+New:
+
+.. code-block:: c++
+
+   double delx1 = x[i1][0] - x[i2][0];
+   double dely1 = x[i1][1] - x[i2][1];
+   double delz1 = x[i1][2] - x[i2][2];
+   domain->minimum_image(FLERR, delx1, dely1, delz1);
+   double r1 = sqrt(delx1 * delx1 + dely1 * dely1 + delz1 * delz1);
+
+   double delx2 = x[i3][0] - x[i2][0];
+   double dely2 = x[i3][1] - x[i2][1];
+   double delz2 = x[i3][2] - x[i2][2];
+   domain->minimum_image_big(FLERR, delx2, dely2, delz2);
+   double r2 = sqrt(delx2 * delx2 + dely2 * dely2 + delz2 * delz2);
+
+This change is **required** or else the code will not compile.

doc/src/Errors_warnings.rst

@@ -1,11 +1,15 @@
 Warning messages
 ================
 
-This is an alphabetic list of the WARNING messages LAMMPS prints out
-and the reason why.  If the explanation here is not sufficient, the
-documentation for the offending command may help.  Warning messages
-also list the source file and line number where the warning was
-generated.  For example, a message like this:
+This is an alphabetic list of some of the WARNING messages LAMMPS prints
+out and the reason why.  If the explanation here is not sufficient, the
+documentation for the offending command may help.  This is a historic
+list and no longer updated.  Instead the LAMMPS developers are trying
+to provide more details right with the error message or link to a
+paragraph with :doc:`detailed explanations <Errors_details>`.
+
+Warning messages also list the source file and line number where the
+warning was generated.  For example, a message like this:
 
 .. parsed-literal::
 
@@ -14,7 +18,7 @@ generated.  For example, a message like this:
 means that line #187 in the file src/domain.cpp generated the error.
 Looking in the source code may help you figure out what went wrong.
 
-Doc page with :doc:`ERROR messages <Errors_messages>`
+Please also see the page with :doc:`Error messages <Errors_messages>`
 
 ----------
 
@@ -28,16 +32,10 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    cutoff is set too short or the angle has blown apart and an atom is
    too far away.
 
-*Angle style in data file differs from currently defined angle style*
-   Self-explanatory.
-
 *Angles are defined but no angle style is set*
    The topology contains angles, but there are no angle forces computed
    since there was no angle_style command.
 
-*Atom style in data file differs from currently defined atom style*
-   Self-explanatory.
-
 *Bond atom missing in box size check*
    The second atom needed to compute a particular bond is missing on this
    processor.  Typically this is because the pairwise cutoff is set too
@@ -53,9 +51,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    processor.  Typically this is because the pairwise cutoff is set too
    short or the bond has blown apart and an atom is too far away.
 
-*Bond style in data file differs from currently defined bond style*
-   Self-explanatory.
-
 *Bonds are defined but no bond style is set*
    The topology contains bonds, but there are no bond forces computed
    since there was no bond_style command.
@@ -68,9 +63,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    length, multiplying by the number of bonds in the interaction (e.g. 3
    for a dihedral) and adding a small amount of stretch.
 
-*Both groups in compute group/group have a net charge; the Kspace boundary correction to energy will be non-zero*
-   Self-explanatory.
-
 *Calling write_dump before a full system init.*
    The write_dump command is used before the system has been fully
    initialized as part of a 'run' or 'minimize' command. Not all dump
@@ -86,18 +78,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    This means the temperature associated with the rigid bodies may be
    incorrect on this timestep.
 
-*Cannot include log terms without 1/r terms; setting flagHI to 1*
-   Self-explanatory.
-
-*Cannot include log terms without 1/r terms; setting flagHI to 1.*
-   Self-explanatory.
-
-*Charges are set, but coulombic solver is not used*
-   Self-explanatory.
-
-*Charges did not converge at step %ld: %lg*
-   Self-explanatory.
-
 *Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost*
    The communication cutoff defaults to the maximum of what is inferred from
    pair and bond styles (will be zero, if none are defined) and what is specified
@@ -123,9 +103,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    is not changed automatically and the warning may be ignored depending
    on the specific system being simulated.
 
-*Communication cutoff is too small for SNAP micro load balancing, increased to %lf*
-   Self-explanatory.
-
 *Compute cna/atom cutoff may be too large to find ghost atom neighbors*
    The neighbor cutoff used may not encompass enough ghost atoms
    to perform this operation correctly.
@@ -158,9 +135,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    Conformation of the 4 listed dihedral atoms is extreme; you may want
    to check your simulation geometry.
 
-*Dihedral style in data file differs from currently defined dihedral style*
-   Self-explanatory.
-
 *Dihedrals are defined but no dihedral style is set*
    The topology contains dihedrals, but there are no dihedral forces computed
    since there was no dihedral_style command.
@@ -177,9 +151,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *Estimated error in splitting of dispersion coeffs is %g*
    Error is greater than 0.0001 percent.
 
-*Ewald/disp Newton solver failed, using old method to estimate g_ewald*
-   Self-explanatory. Choosing a different cutoff value may help.
-
 *FENE bond too long*
    A FENE bond has stretched dangerously far.  It's interaction strength
    will be truncated to attempt to prevent the bond from blowing up.
@@ -192,9 +163,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    A FENE bond has stretched dangerously far.  It's interaction strength
    will be truncated to attempt to prevent the bond from blowing up.
 
-*Fix halt condition for fix-id %s met on step %ld with value %g*
-   Self explanatory.
-
 *Fix SRD walls overlap but fix srd overlap not set*
    You likely want to set this in your input script.
 
@@ -238,21 +206,12 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *Fix property/atom mol or charge w/out ghost communication*
    A model typically needs these properties defined for ghost atoms.
 
-*Fix qeq CG convergence failed (%g) after %d iterations at %ld step*
-   Self-explanatory.
-
 *Fix qeq has non-zero lower Taper radius cutoff*
    Absolute value must be <= 0.01.
 
 *Fix qeq has very low Taper radius cutoff*
    Value should typically be >= 5.0.
 
-*Fix qeq/dynamic tolerance may be too small for damped dynamics*
-   Self-explanatory.
-
-*Fix qeq/fire tolerance may be too small for damped fires*
-   Self-explanatory.
-
 *Fix rattle should come after all other integration fixes*
    This fix is designed to work after all other integration fixes change
    atom positions.  Thus it should be the last integration fix specified.
@@ -285,9 +244,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    The user-specified force accuracy cannot be achieved unless the table
    feature is disabled by using 'pair_modify table 0'.
 
-*Geometric mixing assumed for 1/r\^6 coefficients*
-   Self-explanatory.
-
 *Group for fix_modify temp != fix group*
    The fix_modify command is specifying a temperature computation that
    computes a temperature on a different group of atoms than the fix
@@ -310,46 +266,14 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    Conformation of the 4 listed improper atoms is extreme; you may want
    to check your simulation geometry.
 
-*Improper style in data file differs from currently defined improper style*
-   Self-explanatory.
-
 *Impropers are defined but no improper style is set*
    The topology contains impropers, but there are no improper forces computed
    since there was no improper_style command.
 
-*Inconsistent image flags*
-   The image flags for a pair on bonded atoms appear to be inconsistent.
-   Inconsistent means that when the coordinates of the two atoms are
-   unwrapped using the image flags, the two atoms are far apart.
-   Specifically they are further apart than half a periodic box length.
-   Or they are more than a box length apart in a non-periodic dimension.
-   This is usually due to the initial data file not having correct image
-   flags for the two atoms in a bond that straddles a periodic boundary.
-   They should be different by 1 in that case.  This is a warning because
-   inconsistent image flags will not cause problems for dynamics or most
-   LAMMPS simulations.  However they can cause problems when such atoms
-   are used with the fix rigid or replicate commands.  Note that if you
-   have an infinite periodic crystal with bonds then it is impossible to
-   have fully consistent image flags, since some bonds will cross
-   periodic boundaries and connect two atoms with the same image
-   flag.
-
 *Increasing communication cutoff for GPU style*
    The pair style has increased the communication cutoff to be consistent with
    the communication cutoff requirements for this pair style when run on the GPU.
 
-*KIM Model does not provide 'energy'; Potential energy will be zero*
-   Self-explanatory.
-
-*KIM Model does not provide 'forces'; Forces will be zero*
-   Self-explanatory.
-
-*KIM Model does not provide 'particleEnergy'; energy per atom will be zero*
-   Self-explanatory.
-
-*KIM Model does not provide 'particleVirial'; virial per atom will be zero*
-   Self-explanatory.
-
 *Kspace_modify slab param < 2.0 may cause unphysical behavior*
    The kspace_modify slab parameter should be larger to ensure periodic
    grids padded with empty space do not overlap.
@@ -401,20 +325,10 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    box, or moved further than one processor's subdomain away before
    reneighboring.
 
-*MSM mesh too small, increasing to 2 points in each direction*
-   Self-explanatory.
-
 *Mismatch between velocity and compute groups*
    The temperature computation used by the velocity command will not be
    on the same group of atoms that velocities are being set for.
 
-*Mixing forced for lj coefficients*
-   Self-explanatory.
-
-*Molecule attributes do not match system attributes*
-   An attribute is specified (e.g. diameter, charge) that is
-   not defined for the specified atom style.
-
 *Molecule has bond topology but no special bond settings*
    This means the bonded atoms will not be excluded in pairwise
    interactions.
@@ -449,9 +363,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *More than one compute damage/atom*
    It is not efficient to use compute ke/atom more than once.
 
-*More than one compute dilatation/atom*
-   Self-explanatory.
-
 *More than one compute erotate/sphere/atom*
    It is not efficient to use compute erorate/sphere/atom more than once.
 
@@ -464,24 +375,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *More than one compute orientorder/atom*
    It is not efficient to use compute orientorder/atom more than once.
 
-*More than one compute plasticity/atom*
-   Self-explanatory.
-
-*More than one compute sna/atom*
-   Self-explanatory.
-
-*More than one compute sna/grid*
-   Self-explanatory.
-
-*More than one compute sna/grid/local*
-   Self-explanatory.
-
-*More than one compute snad/atom*
-   Self-explanatory.
-
-*More than one compute snav/atom*
-   Self-explanatory.
-
 *More than one fix poems*
    It is not efficient to use fix poems more than once.
 
@@ -557,21 +450,12 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *Pair COMB charge %.10f with force %.10f hit min barrier*
    Something is possibly wrong with your model.
 
-*Pair brownian needs newton pair on for momentum conservation*
-   Self-explanatory.
-
-*Pair dpd needs newton pair on for momentum conservation*
-   Self-explanatory.
-
 *Pair dsmc: num_of_collisions > number_of_A*
    Collision model in DSMC is breaking down.
 
 *Pair dsmc: num_of_collisions > number_of_B*
    Collision model in DSMC is breaking down.
 
-*Pair style in data file differs from currently defined pair style*
-   Self-explanatory.
-
 *Pair style restartinfo set but has no restart support*
    This pair style has a bug, where it does not support reading and
    writing information to a restart file, but does not set the member
@@ -681,9 +565,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    cluster specified by the fix shake command is numerically suspect.  LAMMPS
    will set it to 0.0 and continue.
 
-*Shell command '%s' failed with error '%s'*
-   Self-explanatory.
-
 *Shell command returned with non-zero status*
    This may indicate the shell command did not operate as expected.
 
@@ -694,15 +575,9 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    This will lead to invalid constraint forces in the SHAKE/RATTLE
    computation.
 
-*Simulations might be very slow because of large number of structure factors*
-   Self-explanatory.
-
 *Slab correction not needed for MSM*
    Slab correction is intended to be used with Ewald or PPPM and is not needed by MSM.
 
-*Specifying an 'subset' value of '0' is equivalent to no 'subset' keyword*
-   Self-explanatory.
-
 *System is not charge neutral, net charge = %g*
    The total charge on all atoms on the system is not 0.0.
    For some KSpace solvers this is only a warning.
@@ -734,9 +609,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    assumed to also be for all atoms.  Thus the pressure printed by thermo
    could be inaccurate.
 
-*The fix ave/spatial command has been replaced by the more flexible fix ave/chunk and compute chunk/atom commands -- fix ave/spatial will be removed in the summer of 2015*
-   Self-explanatory.
-
 *The minimizer does not re-orient dipoles when using fix efield*
    This means that only the atom coordinates will be minimized,
    not the orientation of the dipoles.
@@ -745,9 +617,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    More than the maximum # of neighbors was found multiple times.  This
    was unexpected.
 
-*Too many inner timesteps in fix ttm*
-   Self-explanatory.
-
 *Too many neighbors in CNA for %d atoms*
    More than the maximum # of neighbors was found multiple times.  This
    was unexpected.
@@ -775,24 +644,6 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    The deformation will heat the SRD particles so this can
    be dangerous.
 
-*Using kspace solver on system with no charge*
-   Self-explanatory.
-
-*Using largest cut-off for lj/long/dipole/long long long*
-   Self-explanatory.
-
-*Using largest cutoff for buck/long/coul/long*
-   Self-explanatory.
-
-*Using largest cutoff for lj/long/coul/long*
-   Self-explanatory.
-
-*Using largest cutoff for pair_style lj/long/tip4p/long*
-   Self-explanatory.
-
-*Using package gpu without any pair style defined*
-   Self-explanatory.
-
 *Using pair potential shift with pair_modify compute no*
    The shift effects will thus not be computed.
 

doc/src/Examples.rst

@@ -54,7 +54,7 @@ Lowercase directories
 +-------------+------------------------------------------------------------------+
 | body        | body particles, 2d system                                        |
 +-------------+------------------------------------------------------------------+
-| bpm         | BPM simulations of pouring elastic grains and plate impact       |
+| bpm         | simulations of solid elastic/plastic deformation and fracture    |
 +-------------+------------------------------------------------------------------+
 | cmap        | CMAP 5-body contributions to CHARMM force field                  |
 +-------------+------------------------------------------------------------------+

doc/src/Fortran.rst

@@ -69,10 +69,11 @@ statement.  Internally, it will call either
 :cpp:func:`lammps_open_fortran` or :cpp:func:`lammps_open_no_mpi` from
 the C library API to create the class instance.  All arguments are
 optional and :cpp:func:`lammps_mpi_init` will be called automatically
-if it is needed.  Similarly, a possible call to
-:cpp:func:`lammps_mpi_finalize` is integrated into the :f:func:`close`
-function and triggered with the optional logical argument set to
-``.TRUE.``. Here is a simple example:
+if it is needed.  Similarly, optional calls to
+:cpp:func:`lammps_mpi_finalize`, :cpp:func:`lammps_kokkos_finalize`,
+:cpp:func:`lammps_python_finalize`, and :cpp:func:`lammps_plugin_finalize`
+are integrated into the :f:func:`close` function and triggered with the
+optional logical argument set to ``.TRUE.``. Here is a simple example:
 
 .. code-block:: fortran
 
@@ -521,8 +522,8 @@ Procedures Bound to the :f:type:`lammps` Derived Type
    This method will close down the LAMMPS instance through calling
    :cpp:func:`lammps_close`.  If the *finalize* argument is present and
    has a value of ``.TRUE.``, then this subroutine also calls
-   :cpp:func:`lammps_kokkos_finalize` and
-   :cpp:func:`lammps_mpi_finalize`.
+   :cpp:func:`lammps_kokkos_finalize`, :cpp:func:`lammps_mpi_finalize`,
+   :cpp:func:`lammps_python_finalize`, and :cpp:func:`lammps_plugin_finalize`.
 
    :o finalize: shut down the MPI environment of the LAMMPS
     library if ``.TRUE.``.
@@ -530,6 +531,8 @@ Procedures Bound to the :f:type:`lammps` Derived Type
    :to: :cpp:func:`lammps_close`
    :to: :cpp:func:`lammps_mpi_finalize`
    :to: :cpp:func:`lammps_kokkos_finalize`
+   :to: :cpp:func:`lammps_python_finalize`
+   :to: :cpp:func:`lammps_plugin_finalize`
 
 --------
 
@@ -2773,8 +2776,7 @@ Procedures Bound to the :f:type:`lammps` Derived Type
         END SUBROUTINE external_callback
       END INTERFACE
 
-   where ``c_bigint`` is ``c_int`` if ``-DLAMMPS_SMALLSMALL`` was used and
-   ``c_int64_t`` otherwise; and ``c_tagint`` is ``c_int64_t`` if
+   where ``c_bigint`` is ``c_int64_t`` and ``c_tagint`` is ``c_int64_t`` if
    ``-DLAMMPS_BIGBIG`` was used and ``c_int`` otherwise.
 
    The argument *caller* to :f:subr:`set_fix_external_callback` is unlimited

doc/src/Howto.rst

@@ -40,6 +40,7 @@ Settings howto
    Howto_walls
    Howto_nemd
    Howto_dispersion
+   Howto_bulk2slab
 
 Analysis howto
 ==============
@@ -65,6 +66,7 @@ Force fields howto
    :name: force_howto
    :maxdepth: 1
 
+   Howto_FFgeneral
    Howto_bioFF
    Howto_amoeba
    Howto_tip3p

doc/src/Howto_FFgeneral.rst

@@ -0,0 +1,55 @@
+Some general force field considerations
+=======================================
+
+A compact summary of the concepts, definitions, and properties of force
+fields with explicit bonded interactions (like the ones discussed in
+this HowTo) is given in :ref:`(Gissinger) <Typelabel2>`.
+
+A force field has 2 parts: the formulas that define its potential
+functions and the coefficients used for a particular system.  To assign
+parameters it is first required to assign atom types.  Those are not
+only based on the elements, but also on the chemical environment due to
+the atoms bound to them.  This often follows the chemical concept of
+*functional groups*.  Example: a carbon atom bound with a single bond to
+a single OH-group (alcohol) would be a different atom type than a carbon
+atom bound to a methyl CH3 group (aliphatic carbon).  The atom types
+usually then determine the non-bonded Lennard-Jones parameters and the
+parameters for bonds, angles, dihedrals, and impropers.  On top of that,
+partial charges have to be applied.  Those are usually independent of
+the atom types and are determined either for groups of atoms called
+residues with some fitting procedure based on quantum mechanical
+calculations, or based on some increment system that add or subtract
+increments from the partial charge of an atom based on the types of
+the neighboring atoms.
+
+Force fields differ in the strategies they employ to determine the
+parameters and charge distribution in how generic or specific they are
+which in turn has an impact on the accuracy (compare for example
+CGenFF to CHARMM and GAFF to Amber).  Because of the different
+strategies, it is not a good idea to use a mix of parameters from
+different force field *families* (like CHARMM, Amber, or GROMOS)
+and that extends to the parameters for the solvent, especially
+water.  The publication describing the parameterization of a force
+field will describe which water model to use.  Changing the water
+model usually leads to overall worse results (even if it may improve
+on the water itself).
+
+In addition, one has to consider that *families* of force fields like
+CHARMM, Amber, OPLS, or GROMOS have evolved over time and thus provide
+different *revisions* of the force field parameters.  These often
+corresponds to changes in the functional form or the parameterization
+strategies.  This may also result in changes required for simulation
+settings like the preferred cutoff or how Coulomb interactions are
+computed (cutoff, smoothed/shifted cutoff, or long-range with Ewald
+summation or equivalent).  Unless explicitly stated in the publication
+describing the force field, the Coulomb interaction cannot be chosen at
+will but must match the revision of the force field.  That said,
+liberties may be taken during the initial equilibration of a system to
+speed up the process, but not for production simulations.
+
+----------
+
+.. _Typelabel2:
+
+**(Gissinger)** J. R. Gissinger, I. Nikiforov, Y. Afshar, B. Waters, M. Choi, D. S. Karls, A. Stukowski, W. Im, H. Heinz, A. Kohlmeyer, and E. B. Tadmor, J Phys Chem B, 128, 3282-3297 (2024).
+

doc/src/Howto_bioFF.rst

@@ -1,22 +1,16 @@
 CHARMM, AMBER, COMPASS, DREIDING, and OPLS force fields
 =======================================================
 
-A compact summary of the concepts, definitions, and properties of
-force fields with explicit bonded interactions (like the ones discussed
-in this HowTo) is given in :ref:`(Gissinger) <Typelabel2>`.
-
-A force field has 2 parts: the formulas that define it and the
-coefficients used for a particular system.  Here we only discuss
-formulas implemented in LAMMPS that correspond to formulas commonly used
-in the CHARMM, AMBER, COMPASS, and DREIDING force fields.  Setting
-coefficients is done either from special sections in an input data file
-via the :doc:`read_data <read_data>` command or in the input script with
-commands like :doc:`pair_coeff <pair_coeff>` or :doc:`bond_coeff
-<bond_coeff>` and so on.  See the :doc:`Tools <Tools>` doc page for
-additional tools that can use CHARMM, AMBER, or Materials Studio
-generated files to assign force field coefficients and convert their
-output into LAMMPS input. LAMMPS input scripts can also be generated by
-`charmm-gui.org <https://charmm-gui.org/>`_.
+Here we only discuss formulas implemented in LAMMPS that correspond to
+formulas commonly used in the CHARMM, AMBER, COMPASS, and DREIDING force
+fields.  Setting coefficients is done either from special sections in an
+input data file via the :doc:`read_data <read_data>` command or in the
+input script with commands like :doc:`pair_coeff <pair_coeff>` or
+:doc:`bond_coeff <bond_coeff>` and so on.  See the :doc:`Tools <Tools>`
+doc page for additional tools that can use CHARMM, AMBER, or Materials
+Studio generated files to assign force field coefficients and convert
+their output into LAMMPS input. LAMMPS input scripts can also be
+generated by `charmm-gui.org <https://charmm-gui.org/>`_.
 
 CHARMM and AMBER
 ----------------
@@ -203,9 +197,11 @@ rather than individual force constants and geometric parameters that
 depend on the particular combinations of atoms involved in the bond,
 angle, or torsion terms.  DREIDING has an :doc:`explicit hydrogen bond
 term <pair_hbond_dreiding>` to describe interactions involving a
-hydrogen atom on very electronegative atoms (N, O, F).  Unlike CHARMM
-or AMBER, the DREIDING force field has not been parameterized for
-considering solvents (like water).
+hydrogen atom on very electronegative atoms (N, O, F).  Unlike CHARMM or
+AMBER, the DREIDING force field has not been parameterized for
+considering solvents (like water) and has no rules for assigning
+(partial) charges.  That will seriously limit its accuracy when used for
+simulating systems where those matter.
 
 See :ref:`(Mayo) <howto-Mayo>` for a description of the DREIDING force field
 
@@ -272,10 +268,6 @@ compatible with a subset of OPLS interactions.
 
 ----------
 
-.. _Typelabel2:
-
-**(Gissinger)** J. R. Gissinger, I. Nikiforov, Y. Afshar, B. Waters, M. Choi, D. S. Karls, A. Stukowski, W. Im, H. Heinz, A. Kohlmeyer, and E. B. Tadmor, J Phys Chem B, 128, 3282-3297 (2024).
-
 .. _howto-MacKerell:
 
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field, Fischer, Gao, Guo, Ha, et al (1998).  J Phys Chem, 102, 3586 . https://doi.org/10.1021/jp973084f

doc/src/Howto_bpm.rst

@@ -42,12 +42,14 @@ such as those created by pouring grains using :doc:`fix pour
 
 ----------
 
-Currently, there are two types of bonds included in the BPM package. The
+Currently, there are three types of bonds included in the BPM package. The
 first bond style, :doc:`bond bpm/spring <bond_bpm_spring>`, only applies
 pairwise, central body forces. Point particles must have :doc:`bond atom
 style <atom_style>` and may be thought of as nodes in a spring
 network. An optional multibody term can be used to adjust the network's
-Poisson's ratio. Alternatively, the second bond style, :doc:`bond bpm/rotational
+Poisson's ratio. The :doc:`bpm/spring/plastic <bond_bpm_spring_plastic>`
+bond style is similar except it adds a plastic yield strain.
+Alternatively, the third bond style, :doc:`bond bpm/rotational
 <bond_bpm_rotational>`, resolves tangential forces and torques arising
 with the shearing, bending, and twisting of the bond due to rotation or
 displacement of particles.  Particles are similar to those used in the

doc/src/Howto_bulk2slab.rst

@@ -0,0 +1,160 @@
+===========================
+Convert bulk system to slab
+===========================
+
+A regularly encountered simulation problem is how to convert a bulk
+system that has been run for a while to equilibrate into a slab system
+with some vacuum space and free surfaces.  The challenge here is that
+one cannot just change the box dimensions with the :doc:`change_box
+command <change_box>` or edit the box boundaries in a data file because
+some atoms will have non-zero image flags from diffusing around.
+
+Changing the box dimensions results in an undesired displacement of
+those atoms, since the image flags indicate how many times the box
+length in x-, y-, or z-direction needs to be added or subtracted to get
+the "unwrapped" coordinates.  By changing the box dimension this
+distance is changed and thus those atoms move unphysically relative to
+their neighbors with zero image flags.  Setting image flags forcibly to
+zero creates problems because that could break apart molecules by having
+one atom of a bond on the top of the system and the other at the bottom.
+
+.. _bulk2slab:
+.. figure:: JPG/rhodo-both.jpg
+   :figwidth: 80%
+   :figclass: align-center
+
+   Snapshots of the bulk Rhodopsin in lipid layer and water system (right)
+   and the generated slab geometry (left)
+
+.. admonition:: Disclaimer
+   :class: note
+
+   The following workflow will work for many bulk systems, but not all.
+   Some systems cannot be converted (e.g. polymers with bonds to the
+   same molecule across periodic boundaries, sometimes called "infinite
+   polymers").  The amount of vacuum that needs to be added depends on
+   the length of the molecules where the system is split (the example
+   here splits where there is water with short molecules).  In some
+   cases, the system may need to be re-centered in the box first using
+   the :doc:`displace_atoms command <displace_atoms>`.  Also, the time
+   spent on strong thermalization and equilibration will depend on the
+   specific system and its thermodynamic conditions.
+
+Below is a suggested workflow using the :doc:`Rhodopsin benchmark input
+<Speed_bench>` for demonstration.  The figure shows the state *before*
+the procedure on the left (with unwrapped atoms that have diffused out
+of the box) and *after* on the right (with the vacuum added above and
+below).  The procedure is implemented by modifying a copy of the
+``in.rhodo`` input file.  The first lines up to and including the
+:doc:`read_data command <read_data>` remain unchanged.  Then we insert
+the following lines to add vacuum to the z direction above and below the
+system:
+
+.. code-block:: LAMMPS
+
+   variable       delta index 10.0
+   reset_atoms    image all
+   write_dump     all custom rhodo-unwrap.lammpstrj id xu yu zu
+   change_box     all z final $(zlo-2.0*v_delta) $(zhi+2.0*v_delta) &
+                      boundary p p f
+   read_dump      rhodo-unwrap.lammpstrj 0 x y z box no replace yes
+   kspace_modify  slab 3.0
+
+Specifically, the :doc:`variable delta <variable>` (set to 10.0)
+represents a distance that determines the amount of vacuum added: we add
+twice its value in each direction to the z-dimension; thus in total
+:math:`40 \AA` get added.  The :doc:`reset_atoms image all
+<reset_atoms>` command shall reset any image flags to become either 0 or
+:math:`\pm 1` and thus have the minimum distance from the center of the
+simulation box, but the correct relative distance for bonded atoms.
+
+The :doc:`write_dump command <write_dump>` then writes out the resulting
+*unwrapped* coordinates of the system.  After expanding the box,
+coordinates that were outside the box should now be inside and the
+unwrapped coordinates will become "wrapped", while atoms outside the
+periodic boundaries will be wrapped back into the box and their image
+flags in those directions restored.
+
+The :doc:`change_box command <change_box>` adds the desired
+distance to the low and high box boundary in z-direction and then changes
+the :doc:`boundary to "p p f" <boundary>` which will force the image
+flags in z-direction to zero and create an undesired displacement for
+the atoms with non-zero image flags.
+
+With the :doc:`read_dump command <read_dump>` we read back and replace
+partially incorrect coordinates with the previously saved, unwrapped
+coordinates.  It is important to ignore the box dimensions stored in the
+dump file.  We want to preserve the expanded box.  Finally, we turn on
+the slab correction for the PPPM long-range solver with the
+:doc:`kspace_modify command <kspace_modify>` as required when using a
+long range Coulomb solver for non-periodic z-dimension.
+
+Next we replace the :doc:`fix npt command <fix_nh>` with:
+
+.. code-block:: LAMMPS
+
+   fix            2 nvt temp 300.0 300.0 10.0
+
+We now have an open system and thus the adjustment of the cell in
+z-direction is no longer required.  Since splitting the bulk water
+region where the vacuum is inserted, creates surface atoms with high
+potential energy, we reduce the thermostat time constant from 100.0 to
+10.0 to remove excess kinetic energy resulting from that change faster.
+
+Also the high potential energy of the surface atoms can cause that some
+of them are ejected from the slab.  In order to suppress that, we add
+soft harmonic walls to push back any atoms that want to leave the slab.
+To determine the position of the wall, we first need to to determine the
+extent of the atoms in z-direction and then place the harmonic walls
+based on that information:
+
+.. code-block:: LAMMPS
+
+   compute         zmin all reduce min z
+   compute         zmax all reduce max z
+   thermo_style    custom zlo c_zmin zhi c_zmax
+   run             0 post no
+   fix             3 all wall/harmonic zhi $(c_zmax+v_delta) 10.0 0.0 ${delta} &
+                                       zlo $(c_zmin-v_delta) 10.0 0.0 ${delta}
+
+The two :doc:`compute reduce <compute_reduce>` command determine the
+minimum and maximum z-coordinate across all atoms.  In order to trigger
+the execution of the compute commands we need to "consume" them.  This
+is done with the :doc:`thermo_style custom <thermo_style>` command
+followed by the :doc:`run 0 <run>` command.  This avoids and error
+accessing the min/max values determined by the compute commands to
+compute the location of the wall in lower and upper direction.  This
+uses the previously defined *delta* variable to determine the distance
+of the wall from the extent of the system and the cutoff for the wall
+interaction.  This way only atoms that move beyond the min/max values in
+z-direction will experience a restoring force, nudging them back to the
+slab.  The force constant of :math:`10.0 \frac{\mathrm{kcal/mol}}{\AA}`
+was determined empirically.
+
+Adding these "restoring" soft walls assist in making the free surfaces
+above and below the slab flat, instead of having rugged or ondulated
+surfaces.  The impact of the walls can be changed by adjusting the force
+constant, cutoff, and position of the wall.
+
+Finally, we replace the :doc:`run 100 <run>` of the original input with:
+
+.. code-block:: LAMMPS
+
+   run             1000 post no
+
+   unfix           3
+   fix             2 all nvt temp 300.0 300.0 100.0
+   run             1000 post no
+
+   write_data      data.rhodo-slab
+
+This runs the system converted to a slab first for 1000 MD steps using
+the walls and stronger Nose-Hoover thermostat.  Then the walls are
+removed with :doc:`unfix 3 <unfix>` and the thermostat time constant
+reset to 100.0 and the system run for another 1000 steps.  Finally the
+resulting slab geometry is written to a new data file
+``data.rhodo-slab`` with a :doc:`write_data command <write_data>`.  The
+number of MD steps required to reach a proper equilibrium state is very
+likely larger.  The number of 1000 steps (corresponding to 2
+picoseconds) was chosen for demonstration purposes, so that the
+procedure can be easily and quickly tested.

doc/src/Howto_cmake.rst

@@ -285,7 +285,7 @@ when used before the CMake directory, there may be a space between the
 can have boolean values (on/off, yes/no, or 1/0 are all valid) or are
 strings representing a choice, or a path, or are free format. If the
 string would contain whitespace, it must be put in quotes, for example
-``-D CMAKE_TUNE_FLAGS="-ftree-vectorize -ffast-math"``.
+``-D CMAKE_CXX_FLAGS="-O3 -Wall -ftree-vectorize -ffast-math"``.
 
 CMake variables fall into two categories: 1) common CMake variables that
 are used by default for any CMake configuration setup and 2) project
@@ -341,8 +341,6 @@ Some common LAMMPS specific variables
      - compile some additional executables from the ``tools`` folder (default: ``off``)
    * - ``BUILD_DOC``
      - include building the HTML format documentation for packaging/installing (default: ``off``)
-   * - ``CMAKE_TUNE_FLAGS``
-     - common compiler flags, for optimization or instrumentation (default:)
    * - ``LAMMPS_MACHINE``
      - when set to ``name`` the LAMMPS executable and library will be called ``lmp_name`` and ``liblammps_name.a``
    * - ``FFT``

doc/src/Howto_github.rst

@@ -487,10 +487,10 @@ updates are back-ported from the *develop* branch to the *maintenance*
 branch and occasionally merged to *stable* as an update release.
 
 Furthermore, the naming of the release tags now follow the pattern
-"patch_<Day><Month><Year>" to simplify comparisons between releases.
-For stable releases additional "stable_<Day><Month><Year>" tags are
+"patch\_<Day><Month><Year>" to simplify comparisons between releases.
+For stable releases additional "stable\_<Day><Month><Year>" tags are
 applied and update releases are tagged with
-"stable_<Day><Month><Year>_update<Number>", Finally, all releases and
+"stable\_<Day><Month><Year>\_update<Number>", Finally, all releases and
 submissions are subject to automatic testing and code checks to make
 sure they compile with a variety of compilers and popular operating
 systems.  Some unit and regression testing is applied as well.
@@ -498,3 +498,7 @@ systems.  Some unit and regression testing is applied as well.
 A detailed discussion of the LAMMPS developer GitHub workflow can be
 found in the file `doc/github-development-workflow.md
 <https://github.com/lammps/lammps/blob/develop/doc/github-development-workflow.md>`_
+
+.. raw:: latex
+
+   \clearpage

doc/src/Howto_lammps_gui.rst

@@ -1,35 +1,25 @@
 Using LAMMPS-GUI
 ================
 
+LAMMPS-GUI is a graphical text editor programmed using the `Qt Framework
+<https://www.qt.io/>`_ and customized for editing LAMMPS input files.  It
+is linked to the :ref:`LAMMPS library <lammps_c_api>` and thus can run
+LAMMPS directly using the contents of the editor's text buffer as input.
+
+It *differs* from other known interfaces to LAMMPS in that it can
+retrieve and display information from LAMMPS *while it is running*,
+display visualizations created with the :doc:`dump image command
+<dump_image>`, can launch the online LAMMPS documentation for known
+LAMMPS commands and styles, and directly integrates with a collection
+of LAMMPS tutorials (:ref:`Gravelle1 <Gravelle1>`).
+
 This document describes **LAMMPS-GUI version 1.6**.
 
 -----
 
-LAMMPS-GUI is a graphical text editor customized for editing LAMMPS
-input files that is linked to the :ref:`LAMMPS library <lammps_c_api>`
-and thus can run LAMMPS directly using the contents of the editor's text
-buffer as input.  It can retrieve and display information from LAMMPS
-while it is running, display visualizations created with the :doc:`dump
-image command <dump_image>`, and is adapted specifically for editing
-LAMMPS input files through text completion and reformatting, and linking
-to the online LAMMPS documentation for known LAMMPS commands and styles.
+.. contents::
 
-.. note::
-
-   Pre-compiled, ready-to-use LAMMPS-GUI executables for Linux x86\_64
-   (Ubuntu 20.04LTS or later and compatible), macOS (version 11 aka Big
-   Sur or later), and Windows (version 10 or later) :ref:`are available
-   <lammps_gui_install>` for download.  Non-MPI LAMMPS executables (as
-   ``lmp``) for running LAMMPS from the command-line and :doc:`some
-   LAMMPS tools <Tools>` compiled executables are also included.
-   Also, the pre-compiled LAMMPS-GUI packages include the WHAM executables
-   from http://membrane.urmc.rochester.edu/content/wham/ for use with
-   LAMMPS tutorials.
-
-   The source code for LAMMPS-GUI is included in the LAMMPS source code
-   distribution and can be found in the ``tools/lammps-gui`` folder.  It
-   can be compiled alongside LAMMPS when :doc:`compiling with CMake
-   <Build_cmake>`.
+----
 
 LAMMPS-GUI tries to provide an experience similar to what people
 traditionally would have running LAMMPS using a command-line window and
@@ -64,8 +54,8 @@ simple LAMMPS simulations.  It is very suitable for tutorials on LAMMPS
 since you only need to learn how to use a single program for most tasks
 and thus time can be saved and people can focus on learning LAMMPS.
 The tutorials at https://lammpstutorials.github.io/ are specifically
-updated for use with LAMMPS-GUI and can their tutorial materials can
-be downloaded and loaded directly from the GUI.
+updated for use with LAMMPS-GUI and their tutorial materials can
+be downloaded and edited directly from the GUI.
 
 Another design goal is to keep the barrier low when replacing part of
 the functionality of LAMMPS-GUI with external tools.  That said, LAMMPS-GUI
@@ -78,10 +68,31 @@ has some unique functionality that is not found elsewhere:
 - monitoring of simulation progress
 - interactive visualization using the :doc:`dump image <dump_image>`
   command with the option to copy-paste the resulting settings
-- automatic slide show generation from dump image out at runtime
-- automatic plotting of thermodynamics data at runtime
+- automatic slide show generation from dump image output at runtime
+- automatic plotting of thermodynamic data at runtime
 - inspection of binary restart files
 
+.. admonition:: Download LAMMPS-GUI for your platform
+   :class: Hint
+
+   Pre-compiled, ready-to-use LAMMPS-GUI executables for Linux x86\_64
+   (Ubuntu 20.04LTS or later and compatible), macOS (version 11 aka Big
+   Sur or later), and Windows (version 10 or later) :ref:`are available
+   <lammps_gui_install>` for download.  Non-MPI LAMMPS executables (as
+   ``lmp``) for running LAMMPS from the command-line and :doc:`some
+   LAMMPS tools <Tools>` compiled executables are also included.  Also,
+   the pre-compiled LAMMPS-GUI packages include the WHAM executables
+   from http://membrane.urmc.rochester.edu/content/wham/ for use with
+   LAMMPS tutorials documented in this paper (:ref:`Gravelle1
+   <Gravelle1>`).
+
+   The source code for LAMMPS-GUI is included in the LAMMPS source code
+   distribution and can be found in the ``tools/lammps-gui`` folder.  It
+   can be compiled alongside LAMMPS when :doc:`compiling with CMake
+   <Build_cmake>`.
+
+-----
+
 The following text provides a detailed tour of the features and
 functionality of LAMMPS-GUI.  Suggestions for new features and
 reports of bugs are always welcome.  You can use the :doc:`the same
@@ -92,9 +103,12 @@ channels as for LAMMPS itself <Errors_bugs>` for that purpose.
 Installing Pre-compiled LAMMPS-GUI Packages
 -------------------------------------------
 
-LAMMPS-GUI is available as pre-compiled binary packages for Linux
-x86\_64, macOS 11 and later, and Windows 10 and later.  Alternately, it
-can be compiled from source.
+LAMMPS-GUI is available for download as pre-compiled binary packages for
+Linux x86\_64 (Ubuntu 20.04LTS or later and compatible), macOS (version
+11 aka Big Sur or later), and Windows (version 10 or later) from the
+`LAMMPS release pages on GitHub <https://github.com/lammps/lammps/releases/>`_.
+A backup download location is at https://download.lammps.org/static/
+Alternately, LAMMPS-GUI can be compiled from source when building LAMMPS.
 
 Windows 10 and later
 ^^^^^^^^^^^^^^^^^^^^
@@ -294,7 +308,10 @@ of the *Output* window showing how many warnings and errors were
 detected and how many lines the entire output has.  By clicking on the
 button on the right with the warning symbol or by using the keyboard
 shortcut `Ctrl-N` (`Command-N` on macOS), you can jump to the next
-line with a warning or error.
+line with a warning or error.  If there is a URL pointing to additional
+explanations in the online manual, that URL will be highlighted and
+double-clicking on it shall open the corresponding manual page in
+the web browser.  The option is also available from the context menu.
 
 By default, the *Output* window is replaced each time a run is started.
 The runs are counted and the run number for the current run is displayed
@@ -349,8 +366,13 @@ data or both.  The smoothing uses a `Savitzky-Golay convolution filter
 window width (left) and order (right) parameters can be set in the boxes
 next to the drop down menu.  Default settings are 10 and 4 which means
 that the smoothing window includes 10 points each to the left and the
-right of the current data point and a fourth order polynomial is fit to
-the data in the window.
+right of the current data point for a total of 21 points and a fourth
+order polynomial is fitted to the data in the window.
+
+The "Title:" and "Y:" input boxes allow to edit the text shown as the
+plot title and the y-axis label, respectively.  The text entered in the
+"Title:" box is applied to *all* charts, while the "Y:" text changes
+only the y-axis label of the currently *selected* plot.
 
 You can use the mouse to zoom into the graph (hold the left button and
 drag to mark an area) or zoom out (right click) and you can reset the
@@ -382,6 +404,11 @@ here you get the compounded data set starting with the last change of
 output fields or timestep setting, while the export from the log will
 contain *all* YAML output but *segmented* into individual runs.
 
+The *Preferences* dialog has a *Charts* tab, where you can configure
+multiple chart-related settings, like the default title, colors for the
+graphs, default choice of the raw / smooth graph selection, and the
+default chart graph size.
+
 Image Slide Show
 ----------------
 
@@ -461,11 +488,11 @@ correspond to (via their mass) and then colorize them in the image and
 set their atom diameters accordingly.  If this is not possible, for
 instance when using reduced (= 'lj') :doc:`units <units>`, then
 LAMMPS-GUI will check the current pair style and if it is a
-Lennard-Jones type potential, it will extract the *sigma* parameter
-for each atom type and assign atom diameters from those numbers.
-For cases where atom diameters are not auto-detected, the *Atom size* field
-can be edited and a suitable value set manually. The default value
-is inferred from the x-direction lattice spacing.
+Lennard-Jones type potential, it will extract the *sigma* parameter for
+each atom type and assign atom diameters from those numbers.  For cases
+where atom diameters are not auto-detected, the *Atom size* field can be
+edited and a suitable value set manually. The default value is inferred
+from the x-direction lattice spacing.
 
 If elements cannot be detected the default sequence of colors of the
 :doc:`dump image <dump_image>` command is assigned to the different atom
@@ -480,22 +507,31 @@ types.
 |gui-image1|  |gui-image2|
 
 The default image size, some default image quality settings, the view
-style and some colors can be changed in the *Preferences* dialog
-window.  From the image viewer window further adjustments can be made:
-actual image size, high-quality (SSAO) rendering, anti-aliasing, view
-style, display of box or axes, zoom factor.  The view of the system can
-be rotated horizontally and vertically.  It is also possible to only
-display the atoms within a group defined in the input script (default is
-"all").  The image can also be re-centered on the center of mass of the
-selected group.  After each change, the image is rendered again and the
-display updated.  The small palette icon on the top left is colored
-while LAMMPS is running to render the new image; it is grayed out when
-LAMMPS is finished.  When there are many atoms to render and high
-quality images with anti-aliasing are requested, re-rendering may take
-several seconds.  From the *File* menu of the image window, the
-current image can be saved to a file (keyboard shortcut `Ctrl-S`) or
-copied to the clipboard (keyboard shortcut `Ctrl-C`) for pasting the
-image into another application.
+style and some colors can be changed in the *Preferences* dialog window.
+From the image viewer window further adjustments can be made: actual
+image size, high-quality (SSAO) rendering, anti-aliasing, view style,
+display of box or axes, zoom factor.  The view of the system can be
+rotated horizontally and vertically.
+
+It is also possible to display only the atoms within a :doc:`group
+defined in the input script <group>` (default is "all").  The available
+groups can be selected from the drop down list next to the "Group:"
+label.  Similarly, if there are :doc:`molecules defined in the input
+<molecule>`, it is possible to select one of them (default is "none")
+and visualize it (it will be shown at the center of the simulation box).
+While a molecule is selected, the group selection is disabled.  It can
+be restored by selecting the molecule "none".
+
+The image can also be re-centered on the center of mass of the selected
+group.  After each change, the image is rendered again and the display
+updated.  The small palette icon on the top left is colored while LAMMPS
+is running to render the new image; it is grayed out when LAMMPS is
+finished.  When there are many atoms to render and high quality images
+with anti-aliasing are requested, re-rendering may take several seconds.
+From the *File* menu of the image window, the current image can be saved
+to a file (keyboard shortcut `Ctrl-S`) or copied to the clipboard
+(keyboard shortcut `Ctrl-C`) for pasting the image into another
+application.
 
 From the *File* menu it is also possible to copy the current
 :doc:`dump image <dump_image>` and :doc:`dump_modify <dump_image>`
@@ -720,6 +756,22 @@ output, charts, slide show, variables, or snapshot images.  The
 default settings for their visibility can be changed in the
 *Preferences* dialog.
 
+Tutorials
+^^^^^^^^^
+
+The *Tutorials* menu is to support the set of LAMMPS tutorials for
+beginners and intermediate LAMMPS users documented in (:ref:`Gravelle1
+<Gravelle1>`).  From the drop down menu you can select which of the
+eight currently available tutorial sessions you want to begin.  This
+opens a 'wizard' dialog where you can choose in which folder you want to
+work, whether you want that folder to be wiped from *any* files, whether
+you want to download the solutions files (which can be large) to a
+``solution`` sub-folder, and whether you want the corresponding
+tutorial's online version opened in your web browser.  The dialog will
+then start downloading the files requested (download progress is
+reported in the status line) and load the first input file for the
+selected session into LAMMPS-GUI.
+
 About
 ^^^^^
 
@@ -783,18 +835,21 @@ look of LAMMPS-GUI.  The settings are grouped and each group is
 displayed within a tab.
 
 .. |guiprefs1| image:: JPG/lammps-gui-prefs-general.png
-   :width: 24%
+   :width: 19%
 
 .. |guiprefs2| image:: JPG/lammps-gui-prefs-accel.png
-   :width: 24%
+   :width: 19%
 
 .. |guiprefs3| image:: JPG/lammps-gui-prefs-image.png
-   :width: 24%
+   :width: 19%
 
 .. |guiprefs4| image:: JPG/lammps-gui-prefs-editor.png
-   :width: 24%
+   :width: 19%
 
-|guiprefs1|  |guiprefs2|  |guiprefs3|  |guiprefs4|
+.. |guiprefs5| image:: JPG/lammps-gui-prefs-charts.png
+   :width: 19%
+
+|guiprefs1|  |guiprefs2|  |guiprefs3|  |guiprefs4|  |guiprefs5|
 
 General Settings:
 ^^^^^^^^^^^^^^^^^
@@ -848,6 +903,11 @@ General Settings:
   the plots in the *Charts* window in milliseconds.  The default is to
   redraw the plots every 500 milliseconds.  This is just for the drawing,
   data collection is managed with the previous setting.
+- *HTTPS proxy setting:* Allows to enter a URL for an HTTPS proxy.  This
+  may be needed when the LAMMPS input contains :doc:`geturl commands <geturl>`
+  or for downloading tutorial files from the *Tutorials* menu.  If the
+  ``https_proxy`` environment variable was set externally, its value is
+  displayed but cannot be changed.
 
 Accelerators:
 ^^^^^^^^^^^^^
@@ -884,7 +944,7 @@ lists to select the background and box colors.
 Editor Settings:
 ^^^^^^^^^^^^^^^^
 
-This tab allows tweaking settings of the editor window.  Specifically
+This tab allows tweaking settings of the editor window.  Specifically,
 the amount of padding to be added to LAMMPS commands, types or type
 ranges, IDs (e.g. for fixes), and names (e.g. for groups).  The value
 set is the minimum width for the text element and it can be chosen in
@@ -896,6 +956,16 @@ the completion pop-up window, and whether auto-save mode is enabled.
 In auto-save mode the editor buffer is saved before a run or before
 exiting LAMMPS-GUI.
 
+Charts Settings:
+----------------
+
+This tab allows tweaking settings of the *Charts* window.  Specifically,
+one can set the default chart title (if the title contains '%f' it will
+be replaced with the name of the current input file), one can select
+whether by default the raw data, the smoothed data or both will be
+plotted, one can set the colors for the two lines, the default smoothing
+parameters, and the default size of the chart graph in pixels.
+
 -----------
 
 Keyboard Shortcuts
@@ -976,10 +1046,25 @@ available (On macOS use the Command key instead of Ctrl/Control).
      - Ctrl+Shift+T
      - LAMMPS Tutorial
 
-Further editing keybindings `are documented with the Qt documentation
+Further keybindings of the editor window `are documented with the Qt
+documentation
 <https://doc.qt.io/qt-5/qplaintextedit.html#editing-key-bindings>`_.  In
 case of conflicts the list above takes precedence.
 
 All other windows only support a subset of keyboard shortcuts listed
 above.  Typically, the shortcuts `Ctrl-/` (Stop Run), `Ctrl-W` (Close
 Window), and `Ctrl-Q` (Quit Application) are supported.
+
+-------------
+
+.. _Gravelle1:
+
+**(Gravelle1)** Gravelle, Gissinger, Kohlmeyer, `arXiv:2503.14020 \[physics.comp-ph\] <https://doi.org/10.48550/arXiv.2503.14020>`_ (2025)
+
+.. _Gravelle2:
+
+**(Gravelle2)** Gravelle https://lammpstutorials.github.io/
+
+.. raw:: latex
+
+   \clearpage

doc/src/Howto_moltemplate.rst

@@ -2,14 +2,18 @@ Moltemplate Tutorial
 ====================
 
 In this tutorial, we are going to use the tool :ref:`Moltemplate
-<moltemplate>` to set up a classical molecular dynamic simulation using
-the :ref:`OPLS-AA force field <OPLSAA96>`. The first
-task is to describe an organic compound and create a complete input deck
-for LAMMPS. The second task is to map the OPLS-AA force field to a
-molecular sample created with an external tool, e.g. PACKMOL, and
-exported as a PDB file.  The files used in this tutorial can be found
-in the ``tools/moltemplate/tutorial-files`` folder of the LAMMPS
-source code distribution.
+<Moltemplate1>` from https://moltemplate.org/ to set up a classical
+molecular dynamic simulation using the :ref:`OPLS-AA force field
+<oplsaa2024>`. The first task is to describe an organic compound and
+create a complete input deck for LAMMPS.  The second task is to use
+moltemplate to build a polymer.  The third task is to map the OPLS-AA
+force field to a molecular sample created with an external tool,
+e.g. PACKMOL, and exported as a PDB file.  The files used in this
+tutorial can be found in the ``tools/moltemplate/tutorial-files`` folder
+of the LAMMPS source code distribution.
+
+Many more examples can be found here: https://moltemplate.org/examples.html
+
 
 Simulating an organic solvent
 """""""""""""""""""""""""""""
@@ -17,14 +21,13 @@ Simulating an organic solvent
 This example aims to create a cubic box of the organic solvent
 formamide.
 
-The first step is to create a molecular topology in the
-LAMMPS-template (LT) file format representing a single molecule, which
-will be stored in a Moltemplate object called ``_FAM inherits OPLSAA {}``.
+The first step is to create a molecular topology in the LAMMPS-template
+(LT) file format representing a single molecule, which will be
+stored in a Moltemplate object called ``_FAM inherits OPLSAA {}``.
 This command states that the object ``_FAM`` is based on an existing
 object called ``OPLSAA``, which contains OPLS-AA parameters, atom type
 definitions, partial charges, masses and bond-angle rules for many organic
 and biological compounds.
-
 The atomic structure is the starting point to populate the command
 ``write('Data Atoms') {}``, which will write the ``Atoms`` section in the
 LAMMPS data file. The OPLS-AA force field uses the ``atom_style full``,
@@ -36,21 +39,23 @@ to the ``molID``, except that the same variable is used for the whole
 molecule. The atom types are assigned using ``@``-type variables. The
 assignment of atom types (e.g. ``@atom:177``, ``@atom:178``) is done using
 the OPLS-AA atom types defined in the "In Charges" section of the file
-``oplsaa.lt``, looking for a reasonable match with the description of the atom.
+``oplsaa2024.lt``, looking for a reasonable match with the description of the atom.
 The resulting file (``formamide.lt``) follows:
 
 .. code-block:: bash
 
+   import /usr/local/moltemplate/moltemplate/force_fields/oplsaa2024.lt  # defines OPLSAA
+
    _FAM inherits OPLSAA {
 
      # atomID    molID  atomType  charge  coordX  coordY  coordZ
      write('Data Atoms') {
-       $atom:C00 $mol   @atom:177  0.00    0.100   0.490   0.0
-       $atom:O01 $mol   @atom:178  0.00    1.091  -0.250   0.0
-       $atom:N02 $mol   @atom:179  0.00   -1.121  -0.181   0.0
-       $atom:H03 $mol   @atom:182  0.00   -2.013   0.272   0.0
-       $atom:H04 $mol   @atom:182  0.00   -1.056  -1.190   0.0
-       $atom:H05 $mol   @atom:221  0.00    0.144   1.570   0.0
+       $atom:C00  $mol  @atom:235  0.00    0.100   0.490   0.0
+       $atom:O01  $mol  @atom:236  0.00    1.091  -0.250   0.0
+       $atom:N02  $mol  @atom:237  0.00   -1.121  -0.181   0.0
+       $atom:H03  $mol  @atom:240  0.00   -2.013   0.272   0.0
+       $atom:H04  $mol  @atom:240  0.00   -1.056  -1.190   0.0
+       $atom:H05  $mol  @atom:279  0.00    0.144   1.570   0.0
      }
 
      # A list of the bonds in the molecule:
@@ -64,16 +69,17 @@ The resulting file (``formamide.lt``) follows:
      }
    }
 
-You don't have to specify the charge in this example because they will
-be assigned according to the atom type. Analogously, only a
-"Data Bond List" section is needed as the atom type will determine the
-bond type. The other bonded interactions (e.g. angles,
-dihedrals, and impropers) will be automatically generated by
+You don't have to specify the charge in this example because the OPLSAA
+force-field assigns charge according to the atom type.  (This is not true
+when using other force fields.)  A "Data Bond List" section is needed as
+the atom type will determine the bond type. The other bonded interactions
+(e.g. angles, dihedrals, and impropers) will be automatically generated by
 Moltemplate.
 
-If the simulation is non-neutral, or Moltemplate complains that you have
-missing bond, angle, or dihedral types, this means at least one of your
-atom types is incorrect.
+If the simulation is not charge-neutral, or Moltemplate complains that
+you have missing bond, angle, or dihedral types, this probably means that
+at least one of your atom types is incorrect (or that perhaps there is no
+suitable atom type currently defined in the ``oplsaa2024.lt`` file).
 
 The second step is to create a master file with instructions to build a
 starting structure and the LAMMPS commands to run an NPT simulation. The
@@ -81,11 +87,9 @@ master file (``solv_01.lt``) follows:
 
 .. code-block:: bash
 
-   # Import the force field.
-   import /usr/local/moltemplate/moltemplate/force_fields/oplsaa.lt
-   import formamide.lt # after oplsaa.lt, as it depends on it.
+   import formamide.lt  # Defines "_FAM" and OPLSAA
 
-   # Create the input sample.
+   # Distribute the molecules on a 5x5x5 cubic grid with spacing 4.6
    solv = new _FAM [5].move( 4.6, 0, 0)
                    [5].move( 0, 4.6, 0)
                    [5].move( 0, 0, 4.6)
@@ -98,8 +102,11 @@ master file (``solv_01.lt``) follows:
     -11.5 11.5 zlo zhi
    }
 
-   # Create an input deck for LAMMPS.
-   write_once("In Init"){
+   # Note: The lines below in the "In Run" section are often omitted.
+
+   write_once("In Run"){
+    # Create an input deck for LAMMPS.
+    # Run an NPT simulation.
     # Input variables.
     variable run    string solv_01   # output name
     variable ts     equal  1         # timestep
@@ -109,12 +116,6 @@ master file (``solv_01.lt``) follows:
     variable equi   equal  5000      # Equilibration steps
     variable prod   equal  30000     # Production steps
 
-    # PBC (set them before the creation of the box).
-    boundary p p p
-   }
-
-   # Run an NPT simulation.
-   write_once("In Run"){
     # Derived variables.
     variable tcouple equal \$\{ts\}*100
     variable pcouple equal \$\{ts\}*1000
@@ -143,7 +144,7 @@ master file (``solv_01.lt``) follows:
     unfix NPT
    }
 
-The first two commands insert the content of files ``oplsaa.lt`` and
+The first two commands insert the content of files ``oplsaa2024.lt`` and
 ``formamide.lt`` into the master file. At this point, we can use the
 command ``solv = new _FAM [N]`` to create N copies of a molecule of type
 ``_FAM``. In this case, we create an array of 5*5*5 molecules on a cubic
@@ -153,21 +154,37 @@ the sample was created from scratch, we also specify the simulation box
 size in the "Data Boundary" section.
 
 The LAMMPS setting for the force field are specified in the file
-``oplsaa.lt`` and are written automatically in the input deck. We also
+``oplsaa2024.lt`` and are written automatically in the input deck. We also
 specify the boundary conditions and a set of variables in
-the "In Init" section. The remaining commands to run an NPT simulation
+the "In Init" section.
+
+The remaining commands to run an NPT simulation
 are written in the "In Run" section. Note that in this script, LAMMPS
 variables are protected with the escape character ``\`` to distinguish
 them from Moltemplate variables, e.g. ``\$\{run\}`` is a LAMMPS
 variable that is written in the input deck as ``${run}``.
 
+(Note: Moltemplate can be slow to run, so you need to change you run
+settings frequently, I recommended moving those commands (from "In Run")
+out of your .lt files and into a separate file.  Moltemplate creates a
+file named ``run.in.EXAMPLE`` for this purpose.  You can put your run
+settings and fixes that file and then invoke LAMMPS using
+``mpirun -np 4 lmp -in run.in.EXAMPLE`` instead.)
+
+
 Compile the master file with:
 
 .. code-block:: bash
 
-   moltemplate.sh -overlay-all solv_01.lt
+   moltemplate.sh solv_01.lt
+   cleanup_moltemplate.sh   # <-- optional: see below
 
-And execute the simulation with the following:
+(Note: The optional "cleanup_moltemplate.sh" command deletes
+unused atom types, which sometimes makes LAMMPS run faster.
+But it does not work with many-body pair styles or dreiding-style h-bonds.
+Fortunately most force fields, including OPLSAA, don't use those features.)
+
+Then execute the simulation with the following:
 
 .. code-block:: bash
 
@@ -180,15 +197,116 @@ And execute the simulation with the following:
    Snapshot of the sample at the beginning and end of the simulation.
    Rendered with Ovito.
 
+
+Building a simple polymer
+"""""""""""""""""""""""""
+Moltemplate is particularly useful for building polymers (and other molecules
+with sub-units).  As an simple example, consider butane:
+
+.. figure:: JPG/butane.jpg
+
+The ``butane.lt`` file below defines Butane as a polymer containing
+4 monomers (of type ``CH3``, ``CH2``, ``CH2``, ``CH3``).
+
+.. code-block:: bash
+
+   import /usr/local/moltemplate/moltemplate/force_fields/oplsaa2024.lt  # defines OPLSAA
+
+   CH3 inherits OPLSAA {
+
+     # atomID    molID   atomType  charge   coordX   coordY    coordZ
+     write("Data Atoms") {
+       $atom:c  $mol:... @atom:54   0.0   0.000000  0.4431163  0.000000
+       $atom:h1 $mol:... @atom:60   0.0   0.000000  1.0741603  0.892431
+       $atom:h2 $mol:... @atom:60   0.0   0.000000  1.0741603 -0.892431
+       $atom:h3 $mol:... @atom:60   0.0  -0.892431 -0.1879277  0.000000
+     }
+     # (Using "$mol:..." indicates this object ("CH3") is part of a larger
+     #  molecule. Moltemplate will share the molecule-ID with that molecule.)
+
+     # A list of the bonds within the "CH3" molecular sub-unit:
+     # BondID   AtomID1   AtomID2
+     write('Data Bond List') {
+       $bond:ch1 $atom:c $atom:h1
+       $bond:ch2 $atom:c $atom:h2
+       $bond:ch3 $atom:c $atom:h3
+     }
+   }
+
+   CH2 inherits OPLSAA {
+
+     # atomID    molID   atomType  charge   coordX   coordY    coordZ
+     write("Data Atoms") {
+       $atom:c  $mol:... @atom:57   0.0   0.000000  0.4431163  0.000000
+       $atom:h1 $mol:... @atom:60   0.0   0.000000  1.0741603  0.892431
+       $atom:h2 $mol:... @atom:60   0.0   0.000000  1.0741603 -0.892431
+     }
+
+     # A list of the bonds within the "CH2" molecular sub-unit:
+     # BondID   AtomID1   AtomID2
+     write('Data Bond List') {
+       $bond:ch1 $atom:c $atom:h1
+       $bond:ch2 $atom:c $atom:h2
+     }
+   }
+
+   Butane inherits OPLSAA {
+
+     create_var {$mol}  # optional:force all monomers to share the same molecule-ID
+
+     # - Create 4 monomers
+     # - Move them along the X axis using ".move()",
+     # - Rotate them 180 degrees with respect to the previous monomer
+     monomer1 = new CH3
+     monomer2 = new CH2.rot(180,1,0,0).move(1.2533223,0,0)
+     monomer3 = new CH2.move(2.5066446,0,0)
+     monomer4 = new CH3.rot(180,0,0,1).move(3.7599669,0,0)
+
+     # A list of the bonds connecting different monomers together:
+     write('Data Bond List') {
+       $bond:b1  $atom:monomer1/c $atom:monomer2/c
+       $bond:b2  $atom:monomer2/c $atom:monomer3/c
+       $bond:b3  $atom:monomer3/c $atom:monomer4/c
+     }
+   }
+
+Again, you don't have to specify the charge in this example because OPLSAA
+assigns charges according to the atom type.
+
+This ``Butane`` object is a molecule which can be used anywhere other molecules
+can be used.  (You can arrange ``Butane`` molecules on a lattice, as we did previously.
+You can also modify individual butane molecules by adding or deleting atoms or bonds.
+You can add bonds between specific butane molecules or use ``Butane`` as a
+sub-unit to define even larger molecules.  See the moltemplate manual for details.)
+
+
+
+
+
+
+How to build a complex polymer
+""""""""""""""""""""""""""""""""""""""""""
+A similar procedure can be used to create more complicated polymers,
+such as the NIPAM polymer example shown below.  For details, see:
+
+https://github.com/jewettaij/moltemplate/tree/master/examples/all_atom/force_field_OPLSAA/NIPAM_polymer+water+ions
+
+
+
+
 Mapping an existing structure
 """""""""""""""""""""""""""""
 
 Another helpful way to use Moltemplate is mapping an existing molecular
-sample to a force field. This is useful when a complex sample is
-assembled from different simulations or created with specialized
-software (e.g. PACKMOL). As in the previous example, all molecular
-species in the sample must be defined using single-molecule Moltemplate
-objects.  For this example, we use a short polymer in a box containing
+sample to a force field. This is useful when a complex sample is assembled
+from different simulations or created with specialized software (e.g. PACKMOL).
+(Note: The previous link shows how to build this entire system from scratch
+using only moltemplate.  However here we will assume instead that we obtained
+a PDB file for this system using PACKMOL.)
+
+As in the previous examples, all molecular species in the sample
+are defined using single-molecule Moltemplate objects.
+For this example, we use a short polymer in a box containing
 water molecules and ions in the PDB file ``model.pdb``.
 
 It is essential to understand that the order of atoms in the PDB file
@@ -246,25 +364,25 @@ The resulting master LT file defining short annealing at a fixed volume
 .. code-block:: bash
 
    # Use the OPLS-AA force field for all species.
-   import /usr/local/moltemplate/moltemplate/force_fields/oplsaa.lt
+   import /usr/local/moltemplate/moltemplate/force_fields/oplsaa2024.lt
    import PolyNIPAM.lt
 
    # Define the SPC water and ions as in the OPLS-AA
    Ca inherits OPLSAA {
      write("Data Atoms"){
-       $atom:a1  $mol:. @atom:354 0.0  0.00000 0.00000 0.000000
+       $atom:a1  $mol:. @atom:412 0.0  0.00000 0.00000 0.000000
      }
    }
    Cl inherits OPLSAA {
      write("Data Atoms"){
-       $atom:a1  $mol:. @atom:344 0.0  0.00000 0.00000 0.000000
+       $atom:a1  $mol:. @atom:401 0.0  0.00000 0.00000 0.000000
      }
    }
    SPC inherits OPLSAA {
      write("Data Atoms"){
-       $atom:O  $mol:. @atom:76 0.  0.0000000 0.00000 0.000000
-       $atom:H1 $mol:. @atom:77 0.  0.8164904 0.00000 0.5773590
-       $atom:H2 $mol:. @atom:77 0. -0.8164904 0.00000 0.5773590
+       $atom:O  $mol:. @atom:9991 0.  0.0000000 0.00000 0.0000000
+       $atom:H1 $mol:. @atom:9990 0.  0.8164904 0.00000 0.5773590
+       $atom:H2 $mol:. @atom:9990 0. -0.8164904 0.00000 0.5773590
      }
      write("Data Bond List") {
        $bond:OH1 $atom:O $atom:H1
@@ -285,8 +403,15 @@ The resulting master LT file defining short annealing at a fixed volume
      0 26 zlo zhi
    }
 
-   # Define the input variables.
    write_once("In Init"){
+     boundary p p p  # "p p p" is the default. This line is optional.
+     neighbor 3 bin  # (This line is also optional in this example.)
+   }
+
+   # Note: The lines below in the "In Run" section are often omitted.
+
+   # Run an NVT simulation.
+   write_once("In Run"){
      # Input variables.
      variable run    string sample01  # output name
      variable ts     equal  2         # timestep
@@ -294,13 +419,6 @@ The resulting master LT file defining short annealing at a fixed volume
      variable p      equal  1.        # equilibrium pressure
      variable equi   equal  30000     # equilibration steps
 
-     # PBC (set them before the creation of the box).
-     boundary p p p
-     neighbor        3 bin
-   }
-
-   # Run an NVT simulation.
-   write_once("In Run"){
      # Set the output.
      thermo          1000
      thermo_style    custom step etotal evdwl ecoul elong ebond eangle &
@@ -314,8 +432,8 @@ The resulting master LT file defining short annealing at a fixed volume
      write_data \$\{run\}.min
 
      # Set the constrains.
-     group watergroup type @atom:76 @atom:77
-     fix 0 watergroup shake 0.0001 10 0 b @bond:042_043 a @angle:043_042_043
+     group watergroup type @atom:9991 @atom:9990
+     fix 0 watergroup shake 0.0001 10 0 b @bond:spcO_spcH a @angle:spcH_spcO_spcH
 
      # Short annealing.
      timestep        \$\{ts\}
@@ -327,7 +445,7 @@ The resulting master LT file defining short annealing at a fixed volume
 
 
 In this example, the water model is SPC and it is defined in the
-``oplsaa.lt`` file with atom types ``@atom:76`` and ``@atom:77``.  For
+``oplsaa2024.lt`` file with atom types ``@atom:9991`` and ``@atom:9990``.  For
 water we also use the ``group`` and ``fix shake`` commands with
 Moltemplate ``@``-type variables, to ensure consistency with the
 numerical values assigned during compilation. To identify the bond and
@@ -336,19 +454,20 @@ are:
 
 .. code-block:: bash
 
-   replace{ @atom:76 @atom:76_b042_a042_d042_i042 }
-   replace{ @atom:77 @atom:77_b043_a043_d043_i043 }
+   replace{ @atom:9991 @atom:9991_bspcO_aspcO_dspcO_ispcO }
+   replace{ @atom:9990 @atom:9990_bspcH_aspcH_dspcH_ispcH }
 
 From which we can identify the following "Data Bonds By Type":
-``@bond:042_043 @atom:*_b042*_a*_d*_i* @atom:*_b043*_a*_d*_i*`` and
-"Data Angles By Type": ``@angle:043_042_043 @atom:*_b*_a043*_d*_i*
-@atom:*_b*_a042*_d*_i* @atom:*_b*_a043*_d*_i*``
+``@bond:spcO_spcH @atom:*_bspcO*_a*_d*_i* @atom:*_bspcH*_a*_d*_i*``
+and "Data Angles By Type":
+``@angle:spcH_spcO_spcH @atom:*_b*_aspcH*_d*_i* @atom:*_b*_aspcO*_d*_i* @atom:*_b*_aspcH*_d*_i*``
 
 Compile the master file with:
 
 .. code-block:: bash
 
-   moltemplate.sh -overlay-all -pdb model.pdb sample01.lt
+   moltemplate.sh -pdb model.pdb sample01.lt
+   cleanup_moltemplate.sh
 
 And execute the simulation with the following:
 
@@ -363,8 +482,13 @@ And execute the simulation with the following:
    Sample visualized with Ovito loading the trajectory into the DATA
    file written after minimization.
 
+
 ------------
 
-.. _OPLSAA96:
+.. _oplsaa2024:
 
-**(OPLS-AA)**  Jorgensen, Maxwell, Tirado-Rives, J Am Chem Soc, 118(45), 11225-11236 (1996).
+**(OPLS-AA)**  Jorgensen, W.L., Ghahremanpour, M.M., Saar, A., Tirado-Rives, J., J. Phys. Chem. B, 128(1), 250-262 (2024).
+
+.. _Moltemplate1:
+
+**(Moltemplate)**  Jewett et al., J. Mol. Biol., 433(11), 166841 (2021)

doc/src/Howto_peri.rst

@@ -197,7 +197,7 @@ The LPS model has a force scalar state
 .. math::
 
    \underline{t} = \frac{3K\theta}{m}\underline{\omega}\,\underline{x} +
-   \alpha \underline{\omega}\,\underline{e}^{\rm d}, \qquad\qquad\textrm{(3)}
+   \alpha \underline{\omega}\,\underline{e}^\mathrm{d}, \qquad\qquad\textrm{(3)}
 
 with :math:`K` the bulk modulus and :math:`\alpha` related to the shear
 modulus :math:`G` as
@@ -242,14 +242,14 @@ scalar state are defined, respectively, as
 
 .. math::
 
-   \underline{e}^{\rm i}=\frac{\theta \underline{x}}{3}, \qquad
-   \underline{e}^{\rm d} = \underline{e}- \underline{e}^{\rm i},
+   \underline{e}^\mathrm{i}=\frac{\theta \underline{x}}{3}, \qquad
+   \underline{e}^\mathrm{d} = \underline{e}- \underline{e}^\mathrm{i},
 
 
 where the arguments of the state functions and the vectors on which they
 operate are omitted for simplicity. We note that the LPS model is linear
 in the dilatation :math:`\theta`, and in the deviatoric part of the
-extension :math:`\underline{e}^{\rm d}`.
+extension :math:`\underline{e}^\mathrm{d}`.
 
 .. note::
 

doc/src/Howto_python.rst

@@ -62,17 +62,17 @@ with :ref:`PNG, JPEG and FFMPEG output support <graphics>` enabled.
 
          cd $LAMMPS_DIR/src
 
-         # add packages if necessary
+         # add LAMMPS packages if necessary
          make yes-MOLECULE
          make yes-PYTHON
 
          # compile shared library using Makefile
          make mpi mode=shlib LMP_INC="-DLAMMPS_PNG -DLAMMPS_JPEG -DLAMMPS_FFMPEG" JPG_LIB="-lpng -ljpeg"
 
-Step 2: Installing the LAMMPS Python package
-""""""""""""""""""""""""""""""""""""""""""""
+Step 2: Installing the LAMMPS Python module
+"""""""""""""""""""""""""""""""""""""""""""
 
-Next install the LAMMPS Python package into your current Python installation with:
+Next install the LAMMPS Python module into your current Python installation with:
 
 .. code-block:: bash
 
@@ -89,6 +89,29 @@ privileges) or into your personal Python module folder.
    Recompiling the shared library requires re-installing the Python
    package.
 
+.. _externally_managed:
+
+.. admonition:: Handling an "externally-managed-environment" Error
+   :class: Hint
+
+   Some Python installations made through Linux distributions
+   (e.g. Ubuntu 24.04LTS or later) will prevent installing the LAMMPS
+   Python module into a system folder or a corresponding folder of the
+   individual user as attempted by ``make install-python`` with an error
+   stating that an *externally managed* python installation must be only
+   managed by the same package package management tool.  This is an
+   optional setting, so not all Linux distributions follow it currently
+   (Spring 2025).  The reasoning and explanations for this error can be
+   found in the `Python Packaging User Guide
+   <https://packaging.python.org/en/latest/specifications/externally-managed-environments/>`_
+
+   These guidelines suggest to create a virtual environment and install
+   the LAMMPS Python module there (see below).  This is generally a good
+   idea and the LAMMPS developers recommend this, too.  If, however, you
+   want to proceed and install the LAMMPS Python module regardless, you
+   can install the "wheel" file (see above) manually with the ``pip``
+   command by adding the ``--break-system-packages`` flag.
+
 Installation inside of a virtual environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

doc/src/Howto_spc.rst

@@ -1,5 +1,5 @@
-SPC water model
-===============
+SPC and SPC/E water model
+=========================
 
 The SPC water model specifies a 3-site rigid water molecule with
 charges and Lennard-Jones parameters assigned to each of the three atoms.

doc/src/Howto_thermostat.rst

@@ -21,9 +21,14 @@ can be invoked via the *dpd/tstat* pair style:
 * :doc:`fix nvt/sllod <fix_nvt_sllod>`
 * :doc:`fix temp/berendsen <fix_temp_berendsen>`
 * :doc:`fix temp/csvr <fix_temp_csvr>`
+* :doc:`fix ffl <fix_ffl>`
+* :doc:`fix gjf <fix_gjf>`
+* :doc:`fix gld <fix_gld>`
+* :doc:`fix gle <fix_gle>`
 * :doc:`fix langevin <fix_langevin>`
 * :doc:`fix temp/rescale <fix_temp_rescale>`
 * :doc:`pair_style dpd/tstat <pair_dpd>`
+* :doc:`pair_style dpd/ext/tstat <pair_dpd_ext>`
 
 :doc:`Fix nvt <fix_nh>` only thermostats the translational velocity of
 particles.  :doc:`Fix nvt/sllod <fix_nvt_sllod>` also does this,
@@ -82,10 +87,10 @@ that:
 
 .. note::
 
-   Only the nvt fixes perform time integration, meaning they update
+   Not all thermostat fixes perform time integration, meaning they update
    the velocities and positions of particles due to forces and velocities
    respectively.  The other thermostat fixes only adjust velocities; they
-   do NOT perform time integration updates.  Thus they should be used in
+   do NOT perform time integration updates.  Thus, they should be used in
    conjunction with a constant NVE integration fix such as these:
 
 * :doc:`fix nve <fix_nve>`

doc/src/Howto_tip4p.rst

@@ -1,5 +1,5 @@
-TIP4P water model
-=================
+TIP4P and OPC water models
+==========================
 
 The four-point TIP4P rigid water model extends the traditional
 :doc:`three-point TIP3P <Howto_tip3p>` model by adding an additional
@@ -9,9 +9,11 @@ the oxygen along the bisector of the HOH bond angle.  A bond style of
 :doc:`harmonic <bond_harmonic>` and an angle style of :doc:`harmonic
 <angle_harmonic>` or :doc:`charmm <angle_charmm>` should also be used.
 In case of rigid bonds also bond style :doc:`zero <bond_zero>` and angle
-style :doc:`zero <angle_zero>` can be used.
+style :doc:`zero <angle_zero>` can be used.  Very similar to the TIP4P
+model is the OPC water model.  It can be realized the same way as TIP4P
+but has different geometry and force field parameters.
 
-There are two ways to implement TIP4P water in LAMMPS:
+There are two ways to implement TIP4P-like water in LAMMPS:
 
 #. Use a specially written pair style that uses the :ref:`TIP3P geometry
    <tip3p_molecule>` without the point M. The point M location is then
@@ -21,7 +23,10 @@ There are two ways to implement TIP4P water in LAMMPS:
    computationally very efficient, but the charge distribution in space
    is only correct within the tip4p labeled styles.  So all other
    computations using charges will "see" the negative charge incorrectly
-   on the oxygen atom.
+   located on the oxygen atom unless they are specially written for using
+   the TIP4P geometry internally as well, e.g. :doc:`compute dipole/tip4p
+   <compute_dipole>`, :doc:`fix efield/tip4p <fix_efield>`, or
+   :doc:`kspace_style pppm/tip4p <kspace_style>`.
 
    This can be done with the following pair styles for Coulomb with a cutoff:
 
@@ -68,77 +73,90 @@ TIP4P/2005 model :ref:`(Abascal2) <Abascal2>` and a version of TIP4P
 parameters adjusted for use with a long-range Coulombic solver
 (e.g. Ewald or PPPM in LAMMPS).  Note that for implicit TIP4P models the
 OM distance is specified in the :doc:`pair_style <pair_style>` command,
-not as part of the pair coefficients.
+not as part of the pair coefficients. Also parameters for the OPC
+model (:ref:`Izadi <Izadi>`) are provided.
 
 .. list-table::
       :header-rows: 1
-      :widths: 36 19 13 15 17
+      :widths: 40 12 12 14 11 11
 
       * - Parameter
         - TIP4P (original)
         - TIP4P/Ice
         - TIP4P/2005
         - TIP4P (Ewald)
+        - OPC
       * - O mass (amu)
         - 15.9994
         - 15.9994
         - 15.9994
         - 15.9994
+        - 15.9994
       * - H mass (amu)
         - 1.008
         - 1.008
         - 1.008
         - 1.008
+        - 1.008
       * - O or M charge (:math:`e`)
         - -1.040
         - -1.1794
         - -1.1128
         - -1.04844
+        - -1.3582
       * - H charge (:math:`e`)
         - 0.520
         - 0.5897
         - 0.5564
         - 0.52422
+        - 0.6791
       * - LJ :math:`\epsilon` of OO (kcal/mole)
         - 0.1550
         - 0.21084
         - 0.1852
         - 0.16275
+        - 0.21280
       * - LJ :math:`\sigma` of OO (:math:`\AA`)
         - 3.1536
         - 3.1668
         - 3.1589
         - 3.16435
+        - 3.1660
       * - LJ :math:`\epsilon` of HH, MM, OH, OM, HM (kcal/mole)
         - 0.0
         - 0.0
         - 0.0
         - 0.0
+        - 0.0
       * - LJ :math:`\sigma` of HH, MM, OH, OM, HM (:math:`\AA`)
         - 1.0
         - 1.0
         - 1.0
         - 1.0
+        - 1.0
       * - :math:`r_0` of OH bond (:math:`\AA`)
         - 0.9572
         - 0.9572
         - 0.9572
         - 0.9572
+        - 0.8724
       * - :math:`\theta_0` of HOH angle
         - 104.52\ :math:`^{\circ}`
         - 104.52\ :math:`^{\circ}`
         - 104.52\ :math:`^{\circ}`
         - 104.52\ :math:`^{\circ}`
+        - 103.60\ :math:`^{\circ}`
       * - OM distance (:math:`\AA`)
         - 0.15
         - 0.1577
         - 0.1546
         - 0.1250
+        - 0.1594
 
-Note that the when using the TIP4P pair style, the neighbor list cutoff
+Note that the when using a TIP4P pair style, the neighbor list cutoff
 for Coulomb interactions is effectively extended by a distance 2 \* (OM
 distance), to account for the offset distance of the fictitious charges
-on O atoms in water molecules.  Thus it is typically best in an
+on O atoms in water molecules.  Thus, it is typically best in an
 efficiency sense to use a LJ cutoff >= Coulomb cutoff + 2\*(OM
 distance), to shrink the size of the neighbor list.  This leads to
 slightly larger cost for the long-range calculation, so you can test the
@@ -192,6 +210,94 @@ file changed):
     run 20000
     write_data tip4p-implicit.data nocoeff
 
+When constructing an OPC model, we cannot use the ``tip3p.mol`` file due
+to the different geometry.  Below is a molecule file providing the 3
+sites of an implicit OPC geometry for use with TIP4P styles.  Note, that
+the "Shake" and "Special" sections are missing here.  Those will be
+auto-generated by LAMMPS when the molecule file is loaded *after* the
+simulation box has been created.  These sections are required only when
+the molecule file is loaded *before*.
+
+.. _opc3p_molecule:
+.. code-block::
+
+   # Water molecule. 3 point geometry for OPC model
+
+   3 atoms
+   2 bonds
+   1 angles
+
+   Coords
+
+   1    0.00000  -0.06037   0.00000
+   2    0.68558   0.50250   0.00000
+   3   -0.68558   0.50250   0.00000
+
+   Types
+
+   1        1   # O
+   2        2   # H
+   3        2   # H
+
+   Charges
+
+   1       -1.3582
+   2        0.6791
+   3        0.6791
+
+   Bonds
+
+   1   1      1      2
+   2   1      1      3
+
+   Angles
+
+   1   1      2      1      3
+
+Below is a LAMMPS input file using the implicit method to implement
+the OPC model using the molecule file from above and including the
+PPPM long-range Coulomb solver.
+
+.. code-block:: LAMMPS
+
+    units real
+    atom_style full
+    region box block -5 5 -5 5 -5 5
+    create_box 2 box bond/types 1 angle/types 1 &
+                extra/bond/per/atom 2 extra/angle/per/atom 1 extra/special/per/atom 2
+
+    mass 1 15.9994
+    mass 2 1.008
+
+    pair_style lj/cut/tip4p/long 1 2 1 1 0.1594 12.0
+    pair_coeff 1 1 0.2128 3.166
+    pair_coeff 2 2 0.0    1.0
+
+    bond_style zero
+    bond_coeff 1 0.8724
+
+    angle_style zero
+    angle_coeff 1 103.6
+
+    kspace_style pppm/tip4p 1.0e-5
+
+    molecule water opc3p.mol  # this file has the OPC geometry but is without M
+    create_atoms 0 random 33 34564 NULL mol water 25367 overlap 1.33
+
+    fix rigid all shake 0.001 10 10000 b 1 a 1
+    minimize 0.0 0.0 1000 10000
+
+    reset_timestep 0
+    timestep 1.0
+    velocity all create 300.0 5463576
+    fix integrate all nvt temp 300 300 100.0
+
+    thermo_style custom step temp press etotal pe
+
+    thermo 1000
+    run 20000
+    write_data opc-implicit.data nocoeff
+
 Below is the code for a LAMMPS input file using the explicit method and
 a TIP4P molecule file.  Because of using :doc:`fix rigid/small
 <fix_rigid>` no bonds need to be defined and thus no extra storage needs
@@ -279,3 +385,8 @@ Phys, 79, 926 (1983).
 
 **(Abascal2)** Abascal, J Chem Phys, 123, 234505 (2005)
    https://doi.org/10.1063/1.2121687
+
+.. _Izadi:
+
+**(Izadi)** Izadi, Anandakrishnan, Onufriev, J. Phys. Chem. Lett., 5, 21, 3863 (2014)
+   https://doi.org/10.1021/jz501780a

doc/src/Howto_triclinic.rst

@@ -249,23 +249,23 @@ as follows:
 
 .. math::
 
-  a   = & {\rm lx} \\
-  b^2 = &  {\rm ly}^2 +  {\rm xy}^2 \\
-  c^2 = &  {\rm lz}^2 +  {\rm xz}^2 +  {\rm yz}^2 \\
-  \cos{\alpha} = & \frac{{\rm xy}*{\rm xz} + {\rm ly}*{\rm yz}}{b*c} \\
-  \cos{\beta}  = & \frac{\rm xz}{c} \\
-  \cos{\gamma} = & \frac{\rm xy}{b} \\
+  a   = & \mathrm{lx} \\
+  b^2 = &  \mathrm{ly}^2 + \mathrm{xy}^2 \\
+  c^2 = &  \mathrm{lz}^2 + \mathrm{xz}^2 + \mathrm{yz}^2 \\
+  \cos{\alpha} = & \frac{\mathrm{xy}*\mathrm{xz} + \mathrm{ly}*\mathrm{yz}}{b*c} \\
+  \cos{\beta}  = & \frac{\mathrm{xz}}{c} \\
+  \cos{\gamma} = & \frac{\mathrm{xy}}{b} \\
 
 The inverse relationship can be written as follows:
 
 .. math::
 
-  {\rm lx}   = & a \\
-  {\rm xy}   = & b \cos{\gamma}  \\
-  {\rm xz}   = & c \cos{\beta}\\
-  {\rm ly}^2 = & b^2 - {\rm xy}^2 \\
-  {\rm yz}   = & \frac{b*c \cos{\alpha} - {\rm xy}*{\rm xz}}{\rm ly} \\
-  {\rm lz}^2 = & c^2 - {\rm xz}^2 - {\rm yz}^2 \\
+  \mathrm{lx}   = & a \\
+  \mathrm{xy}   = & b \cos{\gamma}  \\
+  \mathrm{xz}   = & c \cos{\beta}\\
+  \mathrm{ly}^2 = & b^2 - \mathrm{xy}^2 \\
+  \mathrm{yz}   = & \frac{b*c \cos{\alpha} - \mathrm{xy}*\mathrm{xz}}{\mathrm{ly}} \\
+  \mathrm{lz}^2 = & c^2 - \mathrm{xz}^2 - \mathrm{yz}^2 \\
 
 The values of *a*, *b*, *c*, :math:`\alpha` , :math:`\beta`, and
 :math:`\gamma` can be printed out or accessed by computes using the

doc/src/Install_git.rst

@@ -12,26 +12,17 @@ several advantages:
   LAMMPS.  For that, you should first create your own :doc:`fork on
   GitHub <Howto_github>`, though.
 
-You must have `git <git_>`_ installed on your system to use the
-commands explained below to communicate with the git servers on
-GitHub.  For people still using subversion (svn), GitHub also
-provides `limited support for subversion clients <svn_>`_.
-
-.. note::
-
-   As of October 2016, the official home of public LAMMPS development is
-   on GitHub.  The previously advertised LAMMPS git repositories on
-   git.lammps.org and bitbucket.org are now offline or deprecated.
+You must have `git <git_>`_ installed on your system to use the commands
+explained below to communicate with the git servers on GitHub.
 
 .. _git: https://git-scm.com
-.. _svn: https://help.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github
 
 You can follow the LAMMPS development on 4 different git branches:
 
 * **develop** : this branch follows the ongoing development and is
   updated with every merge commit of a pull request
-* **release** : this branch is updated with every "feature release";
-   updates are always "fast-forward" merges from *develop*
+* **release** : this branch is updated with every "feature release"
+  and updates are always "fast-forward" merges from *develop*
 * **maintenance** : this branch collects back-ported bug fixes from the
   *develop* branch to the *stable* branch.  It is used to update the
   *stable* branch for "stable update releases".

doc/src/Install_mac.rst

@@ -5,8 +5,7 @@ LAMMPS can be downloaded, built, and configured for macOS with `Homebrew
 <homebrew_>`_.  (Alternatively, see the installation instructions for
 :doc:`downloading an executable via Conda <Install_conda>`.)  The
 following LAMMPS packages are unavailable at this time because of
-additional requirements not yet met: GPU, KOKKOS, MSCG, POEMS,
-VORONOI.
+additional requirements not yet met: GPU, KOKKOS.
 
 After installing Homebrew, you can install LAMMPS on your system with
 the following commands:

doc/src/Intro_authors.rst

@@ -84,8 +84,9 @@ lammps.org".  General questions about LAMMPS should be posted in the
 
    \normalsize
 
-Past developers include Paul Crozier and Mark Stevens, both at SNL,
-and Ray Shan, now at Materials Design.
+Past core developers include Paul Crozier and Mark Stevens, both at SNL,
+and Ray Shan while at SNL and later at Materials Design, now at Thermo
+Fisher Scientific.
 
 ----------
 

doc/src/Intro_overview.rst

@@ -20,13 +20,21 @@ acceleration.
 .. _lws: https://www.lammps.org
 .. _omp: https://www.openmp.org
 
-LAMMPS is written in C++ and requires a compiler that is at least
-compatible with the C++-11 standard.  Earlier versions were written in
-F77, F90, and C++-98.  See the `History page
+LAMMPS is written in C++ and currently requires a compiler that is at
+least compatible with the C++-11 standard.  Earlier versions were
+written in F77, F90, and C++-98.  See the `History page
 <https://www.lammps.org/history.html>`_ of the website for details.  All
 versions can be downloaded as source code from the `LAMMPS website
 <lws_>`_.
 
+Through a :ref:`C language API <lammps_c_api>` LAMMPS functionality can
+be accessed and managed from other programming languages rather than
+running the LAMMPS executable.  Ready to use modules for :ref:`Python
+<lammps_python_api>` and :ref:`Fortran <lammps_fortran_api>` exist, and
+an example :ref:`SWIG interface file <swig>` as well as example C files
+for dynamically loading LAMMPS as a shared library into other
+executables are provided.
+
 LAMMPS is designed to be easy to modify or extend with new capabilities,
 such as new force fields, atom types, boundary conditions, or
 diagnostics.  See the :doc:`Modify` section of for more details.

doc/src/Intro_portability.rst

@@ -13,10 +13,14 @@ Programming language standards
 
 Most of the C++ code currently requires a compiler compatible with the
 C++11 standard, the KOKKOS package currently requires C++17.  Most of
-the Python code is written to be compatible with Python 3.5 or later or
-Python 2.7.  Some Python scripts *require* Python 3 and a few others
-still need to be ported from Python 2 to Python 3.
+the Python code is written to be compatible with Python 3.6 or later.
 
+.. deprecated:: 2Apr2025
+
+Python 2.x is no longer supported and trying to use it, e.g. for the
+LAMMPS Python module should result in an error.  If you come across
+some part of the LAMMPS distribution that is not (yet) compatible with
+Python 3, please notify the LAMMPS developers.
 
 Build systems
 ^^^^^^^^^^^^^
@@ -24,8 +28,9 @@ Build systems
 LAMMPS can be compiled from source code using a (traditional) build
 system based on shell scripts, a few shell utilities (grep, sed, cat,
 tr) and the GNU make program. This requires running within a Bourne
-shell (``/bin/sh``).  Alternatively, a build system with different back ends
-can be created using CMake.  CMake must be at least version 3.16.
+shell (``/bin/sh`` or ``/bin/bash``).  Alternatively, a build system
+with different back ends can be created using CMake.  CMake must be
+at least version 3.16.
 
 Operating systems
 ^^^^^^^^^^^^^^^^^
@@ -36,11 +41,18 @@ Also, compilation and correct execution on macOS and Windows (using
 Microsoft Visual C++) is checked automatically for the largest part of
 the source code.  Some (optional) features are not compatible with all
 operating systems, either through limitations of the corresponding
-LAMMPS source code or through incompatibilities of source code or
-build system of required external libraries or packages.
+LAMMPS source code or through incompatibilities or build system
+limitations of required external libraries or packages.
 
-Executables for Windows may be created natively using either Cygwin or
-Visual Studio or with a Linux to Windows MinGW cross-compiler.
+Executables for Windows may be created either natively using Cygwin,
+MinGW, Intel, Clang, or Microsoft Visual C++ compilers, or with a Linux
+to Windows MinGW cross-compiler.  Native compilation is supported using
+Microsoft Visual Studio or a terminal window (using the CMake build
+system).
+
+Executables for macOS may be created either using Xcode or GNU compilers
+installed with Homebrew.  In the latter case, building of LAMMPS through
+Homebrew instead of a manual compile is also possible.
 
 Additionally, FreeBSD and Solaris have been tested successfully to
 run LAMMPS and produce results consistent with those on Linux.
@@ -57,8 +69,9 @@ CPU architectures
 ^^^^^^^^^^^^^^^^^
 
 The primary CPU architecture for running LAMMPS is 64-bit x86, but also
-32-bit x86, and 64-bit ARM and PowerPC (64-bit, Little Endian) are
-regularly tested.
+64-bit ARM and PowerPC (64-bit, Little Endian) are currently regularly
+tested.  Further architectures are tested by Linux distributions that
+bundle LAMMPS.
 
 Portability compliance
 ^^^^^^^^^^^^^^^^^^^^^^

doc/src/Library_add.rst

@@ -19,9 +19,9 @@ there are now a few requirements for including new changes or extensions.
     be added.
   - New features should also be implemented and documented not just
     for the C interface, but also the Python and Fortran interfaces.
-  - All additions should work and be compatible with ``-DLAMMPS_BIGBIG``,
-    ``-DLAMMPS_SMALLBIG``, ``-DLAMMPS_SMALLSMALL`` as well as when
-    compiling with and without MPI support.
+  - All additions should work and be compatible with
+    ``-DLAMMPS_BIGBIG``, ``-DLAMMPS_SMALLBIG`` as well as when compiling
+    with and without MPI support.
   - The ``library.h`` file should be kept compatible to C code at
     a level similar to C89. Its interfaces may not reference any
     custom data types (e.g. ``bigint``, ``tagint``, and so on) that

doc/src/Library_create.rst

@@ -11,6 +11,7 @@ This section documents the following functions:
 - :cpp:func:`lammps_mpi_finalize`
 - :cpp:func:`lammps_kokkos_finalize`
 - :cpp:func:`lammps_python_finalize`
+- :cpp:func:`lammps_plugin_finalize`
 - :cpp:func:`lammps_error`
 
 --------------------
@@ -119,5 +120,10 @@ calling program.
 
 -----------------------
 
+.. doxygenfunction:: lammps_plugin_finalize
+   :project: progguide
+
+-----------------------
+
 .. doxygenfunction:: lammps_error
    :project: progguide

doc/src/Library_utility.rst

@@ -20,6 +20,7 @@ functions.  They do not directly call the LAMMPS library.
 - :cpp:func:`lammps_force_timeout`
 - :cpp:func:`lammps_has_error`
 - :cpp:func:`lammps_get_last_error_message`
+- :cpp:func:`lammps_set_show_error`
 - :cpp:func:`lammps_python_api_version`
 
 The :cpp:func:`lammps_free` function is a clean-up function to free
@@ -110,6 +111,11 @@ where such memory buffers were allocated that require the use of
 
 -----------------------
 
+.. doxygenfunction:: lammps_set_show_error
+   :project: progguide
+
+-----------------------
+
 .. doxygenfunction:: lammps_python_api_version
    :project: progguide
 

doc/src/Manual_version.rst

@@ -2,9 +2,15 @@ What does a LAMMPS version mean
 -------------------------------
 
 The LAMMPS "version" is the date when it was released, such as 1 May
-2014.  LAMMPS is updated continuously, and we aim to keep it working
-correctly and reliably at all times.  Also, several variants of static
-code analysis are run regularly to maintain or improve the overall code
+2014.  LAMMPS is updated continuously, and with the help of extensive
+automated testing (mostly applied *before* changes are included) we aim
+to keep it working correctly and reliably at all times, but there also
+are regular *feature releases* with new and expanded functionality, and
+there are designated *stable releases* that receive updates with bug
+fixes back-ported from the development branch.
+
+In addition to automated testing, several variants of static code
+analysis are run regularly to maintain or improve the overall code
 quality, consistency, and compliance with programming standards, best
 practices and style conventions.  You can follow its development in a
 public `git repository on GitHub <https://github.com/lammps/lammps>`_.
@@ -19,17 +25,18 @@ Identifying the Version
 
 The version date is printed to the screen and log file every time you
 run LAMMPS.  There also is an indication, if a LAMMPS binary was
-compiled from version with modifications **after** a release.
-It is also visible in the file src/version.h and in the LAMMPS directory
-name created when you unpack a downloaded tarball.  And it is on the
-first page of the :doc:`manual <Manual>`.
+compiled from version with modifications **after** a release, either
+from the development version or the maintenance version of the last
+stable release. It is also visible in the file src/version.h and in the
+LAMMPS directory name created when you unpack a downloaded tarball.  And
+it is on the first page of the :doc:`manual <Manual>`.
 
 * If you browse the HTML pages of the online version of the LAMMPS
   manual, they will by default describe the most current feature release
   version of LAMMPS.  In the navigation bar on the bottom left, there is
   the option to view instead the documentation for the most recent
   *stable* version or the documentation corresponding to the state of
-  the development branch.
+  the development branch *develop*.
 * If you browse the HTML pages included in your downloaded tarball, they
   describe the version you have, which may be older than the online
   version.
@@ -48,8 +55,9 @@ Development
 Modifications of the LAMMPS source code (like bug fixes, code
 refactoring, updates to existing features, or addition of new features)
 are organized into pull requests.  Pull requests will be merged into the
-*develop* branch of the git repository after they pass automated testing
-and code review by the LAMMPS developers.
+*develop* branch of the LAMMPS git repository on GitHub after they pass
+automated testing and code review by :doc:`core LAMMPS developers
+<Intro_authors>`.
 
 Feature Releases
 """"""""""""""""
@@ -62,8 +70,7 @@ repository is updated with every such *feature release* and a tag in the
 format ``patch_1May2014`` is added.  A summary of the most important
 changes of these releases for the current year are posted on `this
 website page <https://www.lammps.org/bug.html>`_.  More detailed release
-notes are `available on GitHub
-<https://github.com/lammps/lammps/releases/>`_.
+notes are `available on GitHub <https://github.com/lammps/lammps/releases/>`_.
 
 Stable Releases
 """""""""""""""
@@ -71,18 +78,18 @@ Stable Releases
 About once a year, we release a *stable release* version of LAMMPS.
 This is done after a "stabilization period" where we apply only bug
 fixes and small, non-intrusive changes to the *develop* branch but no
-new features.  At the same time, the code is subjected to more detailed
-and thorough manual testing than the default automated testing.
-After such a *stable release*, both the *release* and the *stable*
-branches are updated and two tags are applied, a ``patch_1May2014`` format
-and a ``stable_1May2014`` format tag.
+new features to the core code.  At the same time, the code is subjected
+to more detailed and thorough manual testing than the default automated
+testing.  After such a *stable release*, both the *release* and the
+*stable* branches are updated and two tags are applied, a
+``patch_1May2014`` format and a ``stable_1May2014`` format tag.
 
 Stable Release Updates
 """"""""""""""""""""""
 
-Between *stable releases*, we collect bug fixes and updates back-ported
-from the *develop* branch in a branch called *maintenance*.  From the
-*maintenance* branch we make occasional *stable update releases* and
-update the *stable* branch accordingly.  The first update to the
-``stable_1May2014`` release would be tagged as
+Between *stable releases*, we collect bug fixes and updates that are
+back-ported from the *develop* branch in a branch called *maintenance*.
+From the *maintenance* branch we make occasional *stable update
+releases* and update the *stable* branch accordingly.  The first update
+to the ``stable_1May2014`` release would be tagged as
 ``stable_1May2014_update1``.  These updates contain no new features.

doc/src/Modify_compute.rst

@@ -1,19 +1,21 @@
 Compute styles
 ==============
 
-Classes that compute scalar and vector quantities like temperature
-and the pressure tensor, as well as classes that compute per-atom
-quantities like kinetic energy and the centro-symmetry parameter
-are derived from the Compute class.  New styles can be created
-to add new calculations to LAMMPS.
+Classes that compute scalar and vector quantities like temperature and
+the pressure tensor, as well as classes that compute per-atom quantities
+like kinetic energy and the centro-symmetry parameter are derived from
+the Compute class.  New styles can be created to add new calculations to
+LAMMPS.
 
-Compute_temp.cpp is a simple example of computing a scalar
-temperature.  Compute_ke_atom.cpp is a simple example of computing
-per-atom kinetic energy.
+The ``src/compute_temp.cpp`` file is a simple example of computing a
+scalar temperature. The ``src/compute_ke_atom.cpp`` file is a simple
+example of computing per-atom kinetic energy.
 
 Here is a brief description of methods you define in your new derived
-class.  See compute.h for details.
+class.  See ``src/compute.h`` for additional details.
 
++-----------------------+------------------------------------------------------------------+
+| post_constructor      | perform tasks that cannot be run in the constructor (optional)   |
 +-----------------------+------------------------------------------------------------------+
 | init                  | perform one time setup (required)                                |
 +-----------------------+------------------------------------------------------------------+
@@ -50,10 +52,11 @@ class.  See compute.h for details.
 | memory_usage          | tally memory usage (optional)                                    |
 +-----------------------+------------------------------------------------------------------+
 
-Tally-style computes are a special case, as their computation is done
-in two stages: the callback function is registered with the pair style
-and then called from the Pair::ev_tally() function, which is called for
-each pair after force and energy has been computed for this pair. Then
-the tallied values are retrieved with the standard compute_scalar or
-compute_vector or compute_peratom methods. The :doc:`compute styles in the TALLY package <compute_tally>`
-provide *examples* for utilizing this mechanism.
+Tally-style computes are a special case, as their computation is done in
+two stages: the callback function is registered with the pair style and
+then called from the Pair::ev_tally() function, which is called for each
+pair after force and energy has been computed for this pair. Then the
+tallied values are retrieved with the standard compute_scalar or
+compute_vector or compute_peratom methods. The :doc:`compute styles in
+the TALLY package <compute_tally>` provide *examples* for utilizing this
+mechanism.

doc/src/Modify_fix.rst

@@ -1,23 +1,25 @@
 Fix styles
 ==========
 
-In LAMMPS, a "fix" is any operation that is computed during
-timestepping that alters some property of the system.  Essentially
-everything that happens during a simulation besides force computation,
-neighbor list construction, and output, is a "fix".  This includes
-time integration (update of coordinates and velocities), force
-constraints or boundary conditions (SHAKE or walls), and diagnostics
-(compute a diffusion coefficient).  New styles can be created to add
-new options to LAMMPS.
+In LAMMPS, a "fix" is any operation that is computed during timestepping
+that alters some property of the system.  Essentially everything that
+happens during a simulation besides force computation, neighbor list
+construction, and output, is a "fix".  This includes time integration
+(update of coordinates and velocities), force constraints or boundary
+conditions (SHAKE or walls), and diagnostics (compute a diffusion
+coefficient).  New styles can be created to add new options to LAMMPS.
 
-Fix_setforce.cpp is a simple example of setting forces on atoms to
-prescribed values.  There are dozens of fix options already in LAMMPS;
-choose one as a template that is similar to what you want to
-implement.
+The file ``src/fix_setforce.cpp`` is a simple example of setting forces
+on atoms to prescribed values.  There are dozens of fix options already
+in LAMMPS; choose one as a template that is similar to what you want to
+implement.  There also is a detailed discussion of :doc:`how to write
+new fix styles <Developer_write_fix>` in LAMMPS.
 
 Here is a brief description of methods you can define in your new
-derived class.  See fix.h for details.
+derived class.  See ``src/fix.h`` for additional details.
 
++---------------------------+--------------------------------------------------------------------------------------------+
+| post_constructor          | perform tasks that cannot be run in the constructor (optional)                             |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | setmask                   | determines when the fix is called during the timestep (required)                           |
 +---------------------------+--------------------------------------------------------------------------------------------+
@@ -130,10 +132,11 @@ derived class.  See fix.h for details.
 
 Typically, only a small fraction of these methods are defined for a
 particular fix.  Setmask is mandatory, as it determines when the fix
-will be invoked during the timestep.  Fixes that perform time
-integration (\ *nve*, *nvt*, *npt*\ ) implement initial_integrate() and
-final_integrate() to perform velocity Verlet updates.  Fixes that
-constrain forces implement post_force().
+will be invoked during :doc:`the evolution of a timestep
+<Developer_flow>`.  Fixes that perform time integration (\ *nve*, *nvt*,
+*npt*\ ) implement initial_integrate() and final_integrate() to perform
+velocity Verlet updates.  Fixes that constrain forces implement
+post_force().
 
 Fixes that perform diagnostics typically implement end_of_step().  For
 an end_of_step fix, one of your fix arguments must be the variable
@@ -143,13 +146,13 @@ is the first argument the fix defines (after the ID, group-ID, style).
 
 If the fix needs to store information for each atom that persists from
 timestep to timestep, it can manage that memory and migrate the info
-with the atoms as they move from processors to processor by
-implementing the grow_arrays, copy_arrays, pack_exchange, and
-unpack_exchange methods.  Similarly, the pack_restart and
-unpack_restart methods can be implemented to store information about
-the fix in restart files.  If you wish an integrator or force
-constraint fix to work with rRESPA (see the :doc:`run_style <run_style>`
-command), the initial_integrate, post_force_integrate, and
-final_integrate_respa methods can be implemented.  The thermo method
-enables a fix to contribute values to thermodynamic output, as printed
-quantities and/or to be summed to the potential energy of the system.
+with the atoms as they move from processors to processor by implementing
+the grow_arrays, copy_arrays, pack_exchange, and unpack_exchange
+methods.  Similarly, the pack_restart and unpack_restart methods can be
+implemented to store information about the fix in restart files.  If you
+wish an integrator or force constraint fix to work with rRESPA (see the
+:doc:`run_style <run_style>` command), the initial_integrate,
+post_force_integrate, and final_integrate_respa methods can be
+implemented.  The thermo method enables a fix to contribute values to
+thermodynamic output, as printed quantities and/or to be summed to the
+potential energy of the system.

doc/src/Modify_pair.rst

@@ -46,6 +46,8 @@ Here is a brief list of some the class methods in the Pair class that
 +---------------------------------+------------------------------------------------------------------------+
 | compute_inner/middle/outer      | versions of compute used by rRESPA                                     |
 +---------------------------------+------------------------------------------------------------------------+
+| compute_atomic_energy           | energy of one atom, equivalent to per-atom energy                      |
++---------------------------------+------------------------------------------------------------------------+
 | memory_usage                    | return estimated amount of memory used by the pair style               |
 +---------------------------------+------------------------------------------------------------------------+
 | modify_params                   | process arguments to pair_modify command                               |
@@ -122,3 +124,5 @@ setting.
 +---------------------------------+-------------------------------------------------------------+---------+
 | spinflag                        | 1 if compatible with spin kspace_style                      | 0       |
 +---------------------------------+-------------------------------------------------------------+---------+
+| atomic_energy_enable            | 1 if compute_atomic_energy() routine exists                 | 0       |
++---------------------------------+-------------------------------------------------------------+---------+

doc/src/Modify_requirements.rst

@@ -189,10 +189,8 @@ of the contribution.  As of January 2023, all previously included
 Fortran code for the LAMMPS executable has been replaced by equivalent
 C++ code.
 
-Python code must be compatible with Python 3.5 and later.  Large parts
-of LAMMPS (including the :ref:`PYTHON package <PKG-PYTHON>`) are also
-compatible with Python 2.7.  Compatibility with Python 2.7 is desirable,
-but compatibility with Python 3.5 is **required**.
+Python code currently must be compatible with Python 3.6.  If a later
+version or Python is required, it needs to be documented.
 
 Compatibility with older programming language standards is very
 important to maintain portability and availability of LAMMPS on many