recognize STL files starting with "solid binary" as binary files

used in multiple runs (for custom/adios dump style)

.github/CODEOWNERS

@@ -18,7 +18,7 @@ src/AMOEBA/*          @sjplimp
 src/BPM/*             @jtclemm
 src/BROWNIAN/*        @samueljmcameron
 src/CG-DNA/*          @ohenrich
-src/CG-SDK/*        @yskmiyazaki
+src/CG-SPICA/*        @yskmiyazaki
 src/COLVARS/*         @giacomofiorin
 src/COMPRESS/*        @rbberger
 src/DIELECTRIC/*      @ndtrung81
@@ -37,6 +37,7 @@ src/MESONT/*          @iafoss
 src/ML-HDNNP/*        @singraber
 src/ML-IAP/*          @athomps
 src/ML-PACE/*         @yury-lysogorskiy
+src/ML-POD/*          @exapde @rohskopf
 src/MOFFF/*           @hheenen
 src/MOLFILE/*         @akohlmey
 src/NETCDF/*          @pastewka
@@ -62,7 +63,11 @@ src/MANYBODY/pair_vashishta_table.* @andeplane
 src/MANYBODY/pair_atm.*             @sergeylishchuk
 src/REPLICA/*_grem.*                @dstelter92
 src/EXTRA-COMPUTE/compute_stress_mop*.* @RomainVermorel
+src/EXTRA-COMPUTE/compute_born_matrix.* @Bibobu @athomps
 src/MISC/*_tracker.*                @jtclemm
+src/MC/fix_gcmc.*                   @athomps
+src/MC/fix_sgcmc.*                  @athomps
+src/REPLICA/fix_pimd_langevin.*     @Yi-FanLi
 
 # core LAMMPS classes
 src/lammps.*              @sjplimp
@@ -146,12 +151,12 @@ tools/vim/*           @hammondkd
 unittest/*            @akohlmey
 
 # cmake
-cmake/*               @junghans @rbberger
+cmake/*               @rbberger
 cmake/Modules/LAMMPSInterfacePlugin.cmake @akohlmey
 cmake/Modules/MPI4WIN.cmake @akohlmey
 cmake/Modules/OpenCLLoader.cmake @akohlmey
-cmake/Modules/Packages/COLVARS.cmake @junghans @rbberger @giacomofiorin
-cmake/Modules/Packages/KIM.cmake @junghans @rbberger @ellio167
+cmake/Modules/Packages/COLVARS.cmake @rbberger @giacomofiorin
+cmake/Modules/Packages/KIM.cmake @rbberger @ellio167
 cmake/presets/*.cmake @akohlmey
 
 # python

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to LAMMPS via GitHub
 
-Thank your for considering to contribute to the LAMMPS software project.
+Thank you for considering to contribute to the LAMMPS software project.
 
 The following is a set of guidelines as well as explanations of policies and work flows for contributing to the LAMMPS molecular dynamics software project. These guidelines focus on submitting issues or pull requests on the LAMMPS GitHub project.
 

.github/workflows/codeql-analysis.yml

@@ -49,7 +49,9 @@ jobs:
       shell: bash
       working-directory: build
       run: |
-        cmake -C ../cmake/presets/most.cmake ../cmake
+        cmake -C ../cmake/presets/most.cmake \
+              -D DOWNLOAD_POTENTIALS=off \
+              ../cmake
         cmake --build . --parallel 2
 
     - name: Perform CodeQL Analysis

.github/workflows/compile-msvc.yml

@@ -36,6 +36,7 @@ jobs:
         nuget install MSMPIsdk
         nuget install MSMPIDIST
         cmake -C cmake/presets/windows.cmake \
+              -D DOWNLOAD_POTENTIALS=off \
               -D PKG_PYTHON=on \
               -D WITH_PNG=off \
               -D WITH_JPEG=off \
@@ -43,7 +44,7 @@ jobs:
               -D BUILD_SHARED_LIBS=on \
               -D LAMMPS_EXCEPTIONS=on \
               -D ENABLE_TESTING=on
-        cmake --build build --config Release
+        cmake --build build --config Release --parallel 2
 
     - name: Run LAMMPS executable
       shell: bash

.github/workflows/coverity.yml

@@ -0,0 +1,103 @@
+name: "Run Coverity Scan"
+
+on:
+  schedule:
+    - cron: "0 0 * * FRI"
+
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    if: ${{ github.repository == 'lammps/lammps' }}
+    runs-on: ubuntu-latest
+    container:
+      image: lammps/buildenv:ubuntu20.04
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 2
+
+    - name: Create Build and Download Folder
+      run: mkdir build download
+
+    - name: Cache Coverity
+      id: cache-coverity
+      uses: actions/cache@v3
+      with:
+        path: ./download/
+        key: ${{ runner.os }}-download-${{ hashFiles('**/coverity_tool.*') }}
+
+    - name: Download Coverity if necessary
+      if: steps.cache-coverity.outputs.cache-hit != 'true'
+      working-directory: download
+      run: |
+        wget -nv https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=LAMMPS" -O coverity_tool.tgz
+        wget -nv https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=LAMMPS&md5=1" -O coverity_tool.md5
+        echo " coverity_tool.tgz" >> coverity_tool.md5
+        md5sum -c coverity_tool.md5
+
+    - name: Setup Coverity
+      run: |
+        tar xzf download/coverity_tool.tgz
+        ln -s cov-analysis-linux64-* coverity
+
+    - name: Configure LAMMPS via CMake
+      shell: bash
+      working-directory: build
+      run: |
+        cmake \
+        -C ../cmake/presets/clang.cmake \
+        -C ../cmake/presets/most.cmake \
+        -C ../cmake/presets/kokkos-openmp.cmake \
+        -D CMAKE_BUILD_TYPE="RelWithDebug" \
+        -D CMAKE_TUNE_FLAGS="-Wall -Wextra -Wno-unused-result" \
+        -D BUILD_MPI=on \
+        -D BUILD_OMP=on \
+        -D BUILD_SHARED_LIBS=on \
+        -D LAMMPS_SIZES=SMALLBIG \
+        -D LAMMPS_EXCEPTIONS=off \
+        -D PKG_MESSAGE=on \
+        -D PKG_MPIIO=on \
+        -D PKG_ATC=on \
+        -D PKG_AWPMD=on \
+        -D PKG_BOCS=on \
+        -D PKG_EFF=on \
+        -D PKG_H5MD=on \
+        -D PKG_INTEL=on \
+        -D PKG_LATBOLTZ=on \
+        -D PKG_MANIFOLD=on \
+        -D PKG_MGPT=on \
+        -D PKG_ML-PACE=on \
+        -D PKG_ML-RANN=on \
+        -D PKG_MOLFILE=on \
+        -D PKG_NETCDF=on \
+        -D PKG_PTM=on \
+        -D PKG_QTB=on \
+        -D PKG_SMTBQ=on \
+        -D PKG_TALLY=on \
+        ../cmake
+
+    - name: Run Coverity Scan
+      shell: bash
+      working-directory: build
+      run: |
+        export PATH=$GITHUB_WORKSPACE/coverity/bin:$PATH
+        cov-build --dir cov-int cmake --build . --parallel 2
+
+    - name: Create tarball with scan results
+      shell: bash
+      working-directory: build
+      run: tar czf lammps.tgz cov-int
+
+    - name: Upload scan result to Coverity
+      shell: bash
+      run: |
+        curl --form token=${{ secrets.COVERITY_TOKEN }} \
+             --form email=${{ secrets.COVERITY_EMAIL }} \
+             --form file=@build/lammps.tgz \
+             --form version=${{ github.sha }} \
+             --form description="LAMMPS automated build" \
+             https://scan.coverity.com/builds?project=LAMMPS

.github/workflows/unittest-macos.yml

@@ -47,6 +47,7 @@ jobs:
         python3 -m pip install pyyaml
         cmake -C ../cmake/presets/clang.cmake \
               -C ../cmake/presets/most.cmake \
+              -D DOWNLOAD_POTENTIALS=off \
               -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
               -D CMAKE_C_COMPILER_LAUNCHER=ccache \
               -D ENABLE_TESTING=on \

.gitignore

@@ -55,3 +55,8 @@ out/RelWithDebInfo
 out/Release
 out/x86
 out/x64
+src/Makefile.package-e
+src/Makefile.package.settings-e
+/cmake/build/x64-Debug-Clang
+/install/x64-GUI-MSVC
+/install

SECURITY.md

@@ -32,17 +32,21 @@ for unicode characters and only all-ASCII source code is accepted.
 
 LAMMPS follows a continuous release development model.  We aim to keep
 the development version (`develop` branch) always fully functional and
-employ a variety of automatic testing procedures to detect failures
-of existing functionality from adding or modifying features.  Most of
-those tests are run on pull requests *before* merging to the `develop`
-branch.  The `develop` branch is protected, so all changes *must* be
-submitted as a pull request and thus cannot avoid the automated tests.
+employ a variety of automatic testing procedures to detect failures of
+existing functionality from adding or modifying features.  Most of those
+tests are run on pull requests and must be passed *before* merging to
+the `develop` branch.  The `develop` branch is protected, so all changes
+*must* be submitted as a pull request and thus cannot avoid the
+automated tests.
 
 Additional tests are run *after* merging.  Before releases are made
 *all* tests must have cleared.  Then a release tag is applied and the
-`release` branch is fast-forwarded to that tag.  This is often referred
-to as a patch release. Bug fixes and updates are
-applied first to the `develop` branch.  Later, they appear in the `release`
-branch when the next patch release occurs.
-For stable releases, selected bug fixes, updates, and new functionality
-are pushed to the `stable` branch and a new stable tag is applied.
+`release` branch is fast-forwarded to that tag.  This is referred to to
+as a "feature release".  Bug fixes and updates are applied first to the
+`develop` branch.  Later, they appear in the `release` branch when the
+next patch release occurs.  For stable releases, backported bug fixes
+and infrastructure updates are first applied to the `maintenance` branch
+and then merged to `stable` and published as "updates".  For a new
+stable release the `stable` branch is updated to the corresponding state
+of the `release` branch and a new stable tag is applied in addition to
+the release tag.

bench/in.chain

@@ -1,25 +1,25 @@
 # FENE beadspring benchmark
 
-units		lj
-atom_style	bond
+units           lj
+atom_style      bond
 special_bonds   fene
 
-read_data	data.chain
+read_data       data.chain
 
-neighbor	0.4 bin
-neigh_modify	every 1 delay 1
+neighbor        0.4 bin
+neigh_modify    every 1 delay 1
 
 bond_style      fene
-bond_coeff	1 30.0 1.5 1.0 1.0
+bond_coeff      1 30.0 1.5 1.0 1.0
 
-pair_style	lj/cut 1.12
-pair_modify	shift yes
-pair_coeff	1 1 1.0 1.0 1.12
+pair_style      lj/cut 1.12
+pair_modify     shift yes
+pair_coeff      1 1 1.0 1.0 1.12
 
-fix		1 all nve
-fix		2 all langevin 1.0 1.0 10.0 904297
+fix             1 all nve
+fix             2 all langevin 1.0 1.0 10.0 904297
 
 thermo          100
-timestep	0.012
+timestep        0.012
 
-run		100
+run             100

bench/in.chain.scaled

@@ -1,32 +1,32 @@
 # FENE beadspring benchmark
 
-variable	x index 1
-variable	y index 1
-variable	z index 1
+variable        x index 1
+variable        y index 1
+variable        z index 1
 
-units		lj
-atom_style	bond
-atom_modify	map hash
+units           lj
+atom_style      bond
+atom_modify     map hash
 special_bonds   fene
 
-read_data	data.chain
+read_data       data.chain
 
-replicate	$x $y $z
+replicate       $x $y $z
 
-neighbor	0.4 bin
-neigh_modify	every 1 delay 1
+neighbor        0.4 bin
+neigh_modify    every 1 delay 1
 
 bond_style      fene
-bond_coeff	1 30.0 1.5 1.0 1.0
+bond_coeff      1 30.0 1.5 1.0 1.0
 
-pair_style	lj/cut 1.12
-pair_modify	shift yes
-pair_coeff	1 1 1.0 1.0 1.12
+pair_style      lj/cut 1.12
+pair_modify     shift yes
+pair_coeff      1 1 1.0 1.0 1.12
 
-fix		1 all nve
-fix		2 all langevin 1.0 1.0 10.0 904297
+fix             1 all nve
+fix             2 all langevin 1.0 1.0 10.0 904297
 
 thermo          100
-timestep	0.012
+timestep        0.012
 
-run		100
+run             100

bench/in.chute

@@ -1,33 +1,33 @@
 # LAMMPS benchmark of granular flow
 # chute flow of 32000 atoms with frozen base at 26 degrees
 
-units		lj
-atom_style	sphere
-boundary	p p fs
-newton		off
-comm_modify	vel yes
+units           lj
+atom_style      sphere
+boundary        p p fs
+newton          off
+comm_modify     vel yes
 
-read_data	data.chute
+read_data       data.chute
 
-pair_style	gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
-pair_coeff	* *
+pair_style      gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
+pair_coeff      * *
 
-neighbor	0.1 bin
-neigh_modify	every 1 delay 0
+neighbor        0.1 bin
+neigh_modify    every 1 delay 0
 
-timestep	0.0001
+timestep        0.0001
 
-group		bottom type 2
-group		active subtract all bottom
-neigh_modify	exclude group bottom bottom
+group           bottom type 2
+group           active subtract all bottom
+neigh_modify    exclude group bottom bottom
 
-fix		1 all gravity 1.0 chute 26.0
-fix		2 bottom freeze
-fix		3 active nve/sphere
+fix             1 all gravity 1.0 chute 26.0
+fix             2 bottom freeze
+fix             3 active nve/sphere
 
-compute		1 all erotate/sphere
-thermo_style	custom step atoms ke c_1 vol
-thermo_modify	norm no
-thermo		100
+compute         1 all erotate/sphere
+thermo_style    custom step atoms ke c_1 vol
+thermo_modify   norm no
+thermo          100
 
-run		100
+run             100

bench/in.chute.scaled

@@ -1,38 +1,38 @@
 # LAMMPS benchmark of granular flow
 # chute flow of 32000 atoms with frozen base at 26 degrees
 
-variable	x index 1
-variable	y index 1
+variable        x index 1
+variable        y index 1
 
-units		lj
-atom_style	sphere
-boundary	p p fs
-newton		off
-comm_modify	vel yes
+units           lj
+atom_style      sphere
+boundary        p p fs
+newton          off
+comm_modify     vel yes
 
-read_data	data.chute
+read_data       data.chute
 
-replicate	$x $y 1
+replicate       $x $y 1
 
-pair_style	gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
-pair_coeff	* *
+pair_style      gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
+pair_coeff      * *
 
-neighbor	0.1 bin
-neigh_modify	every 1 delay 0
+neighbor        0.1 bin
+neigh_modify    every 1 delay 0
 
-timestep	0.0001
+timestep        0.0001
 
-group		bottom type 2
-group		active subtract all bottom
-neigh_modify	exclude group bottom bottom
+group           bottom type 2
+group           active subtract all bottom
+neigh_modify    exclude group bottom bottom
 
-fix		1 all gravity 1.0 chute 26.0
-fix		2 bottom freeze
-fix		3 active nve/sphere
+fix             1 all gravity 1.0 chute 26.0
+fix             2 bottom freeze
+fix             3 active nve/sphere
 
-compute		1 all erotate/sphere
-thermo_style	custom step atoms ke c_1 vol
-thermo_modify	norm no
-thermo		100
+compute         1 all erotate/sphere
+thermo_style    custom step atoms ke c_1 vol
+thermo_modify   norm no
+thermo          100
 
-run		100
+run             100

bench/in.eam

@@ -1,32 +1,32 @@
 # bulk Cu lattice
 
-variable	x index 1
-variable	y index 1
-variable	z index 1
+variable        x index 1
+variable        y index 1
+variable        z index 1
 
-variable	xx equal 20*$x
-variable	yy equal 20*$y
-variable	zz equal 20*$z
+variable        xx equal 20*$x
+variable        yy equal 20*$y
+variable        zz equal 20*$z
 
-units		metal
-atom_style	atomic
+units           metal
+atom_style      atomic
 
-lattice		fcc 3.615
-region		box block 0 ${xx} 0 ${yy} 0 ${zz}
-create_box	1 box
-create_atoms	1 box
+lattice         fcc 3.615
+region          box block 0 ${xx} 0 ${yy} 0 ${zz}
+create_box      1 box
+create_atoms    1 box
 
-pair_style	eam
-pair_coeff	1 1 Cu_u3.eam
+pair_style      eam
+pair_coeff      1 1 Cu_u3.eam
 
-velocity	all create 1600.0 376847 loop geom
+velocity        all create 1600.0 376847 loop geom
 
-neighbor	1.0 bin
+neighbor        1.0 bin
 neigh_modify    every 1 delay 5 check yes
 
-fix		1 all nve
+fix             1 all nve
 
-timestep	0.005
-thermo		50
+timestep        0.005
+thermo          50
 
-run		100
+run             100

bench/in.lj

@@ -1,30 +1,30 @@
 # 3d Lennard-Jones melt
 
-variable	x index 1
-variable	y index 1
-variable	z index 1
+variable        x index 1
+variable        y index 1
+variable        z index 1
 
-variable	xx equal 20*$x
-variable	yy equal 20*$y
-variable	zz equal 20*$z
+variable        xx equal 20*$x
+variable        yy equal 20*$y
+variable        zz equal 20*$z
 
-units		lj
-atom_style	atomic
+units           lj
+atom_style      atomic
 
-lattice		fcc 0.8442
-region		box block 0 ${xx} 0 ${yy} 0 ${zz}
-create_box	1 box
-create_atoms	1 box
-mass		1 1.0
+lattice         fcc 0.8442
+region          box block 0 ${xx} 0 ${yy} 0 ${zz}
+create_box      1 box
+create_atoms    1 box
+mass            1 1.0
 
-velocity	all create 1.44 87287 loop geom
+velocity        all create 1.44 87287 loop geom
 
-pair_style	lj/cut 2.5
-pair_coeff	1 1 1.0 1.0 2.5
+pair_style      lj/cut 2.5
+pair_coeff      1 1 1.0 1.0 2.5
 
-neighbor	0.3 bin
-neigh_modify	delay 0 every 20 check no
+neighbor        0.3 bin
+neigh_modify    delay 0 every 20 check no
 
-fix		1 all nve
+fix             1 all nve
 
-run		100
+run             100

bench/in.rhodo

@@ -1,27 +1,27 @@
 # Rhodopsin model
 
-units           real  
-neigh_modify    delay 5 every 1   
+units           real
+neigh_modify    delay 5 every 1
 
-atom_style      full  
-bond_style      harmonic 
-angle_style     charmm 
-dihedral_style  charmm 
-improper_style  harmonic 
-pair_style      lj/charmm/coul/long 8.0 10.0 
-pair_modify     mix arithmetic 
-kspace_style    pppm 1e-4 
+atom_style      full
+bond_style      harmonic
+angle_style     charmm
+dihedral_style  charmm
+improper_style  harmonic
+pair_style      lj/charmm/coul/long 8.0 10.0
+pair_modify     mix arithmetic
+kspace_style    pppm 1e-4
 
 read_data       data.rhodo
 
 fix             1 all shake 0.0001 5 0 m 1.0 a 232
 fix             2 all npt temp 300.0 300.0 100.0 &
-		z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1
+                z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1
 
 special_bonds   charmm
- 
+
 thermo          50
-thermo_style    multi 
+thermo_style    multi
 timestep        2.0
 
-run		100
+run             100

bench/in.rhodo.scaled

@@ -1,34 +1,34 @@
 # Rhodopsin model
 
-variable	x index 1
-variable	y index 1
-variable	z index 1
+variable        x index 1
+variable        y index 1
+variable        z index 1
 
-units           real  
-neigh_modify    delay 5 every 1   
+units           real
+neigh_modify    delay 5 every 1
 
-atom_style      full  
-atom_modify	map hash
-bond_style      harmonic 
-angle_style     charmm 
-dihedral_style  charmm 
-improper_style  harmonic 
-pair_style      lj/charmm/coul/long 8.0 10.0 
-pair_modify     mix arithmetic 
-kspace_style    pppm 1e-4 
+atom_style      full
+atom_modify     map hash
+bond_style      harmonic
+angle_style     charmm
+dihedral_style  charmm
+improper_style  harmonic
+pair_style      lj/charmm/coul/long 8.0 10.0
+pair_modify     mix arithmetic
+kspace_style    pppm 1e-4
 
 read_data       data.rhodo
 
-replicate	$x $y $z
+replicate       $x $y $z
 
 fix             1 all shake 0.0001 5 0 m 1.0 a 232
 fix             2 all npt temp 300.0 300.0 100.0 &
-		z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1
+                z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1
 
 special_bonds   charmm
- 
+
 thermo          50
-thermo_style    multi 
+thermo_style    multi
 timestep        2.0
 
-run		100
+run             100

cmake/CMakeLists.jpeg

@@ -1,615 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-# When using CMake 3.4 and later, don't export symbols from executables unless
-# the CMAKE_ENABLE_EXPORTS variable is set.
-if(POLICY CMP0065)
-  cmake_policy(SET CMP0065 NEW)
-endif()
-if (POLICY CMP0077)
-  cmake_policy(SET CMP0077 NEW)
-endif()
-if(CMAKE_EXECUTABLE_SUFFIX)
-  set(CMAKE_EXECUTABLE_SUFFIX_TMP ${CMAKE_EXECUTABLE_SUFFIX})
-endif()
-
-project(libjpeg-turbo C)
-set(VERSION 2.1.3)
-set(COPYRIGHT_YEAR "1991-2022")
-string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
-list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
-list(GET VERSION_TRIPLET 1 VERSION_MINOR)
-list(GET VERSION_TRIPLET 2 VERSION_REVISION)
-function(pad_number NUMBER OUTPUT_LEN)
-  string(LENGTH "${${NUMBER}}" INPUT_LEN)
-  if(INPUT_LEN LESS OUTPUT_LEN)
-    math(EXPR ZEROES "${OUTPUT_LEN} - ${INPUT_LEN} - 1")
-    set(NUM ${${NUMBER}})
-    foreach(C RANGE ${ZEROES})
-      set(NUM "0${NUM}")
-    endforeach()
-    set(${NUMBER} ${NUM} PARENT_SCOPE)
-  endif()
-endfunction()
-pad_number(VERSION_MINOR 3)
-pad_number(VERSION_REVISION 3)
-set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION})
-
-# CMake 3.14 and later sets CMAKE_MACOSX_BUNDLE to TRUE by default when
-# CMAKE_SYSTEM_NAME is iOS, tvOS, or watchOS, which breaks the libjpeg-turbo
-# build.  (Specifically, when CMAKE_MACOSX_BUNDLE is TRUE, executables for
-# Apple platforms are built as application bundles, which causes CMake to
-# complain that our install() directives for executables do not specify a
-# BUNDLE DESTINATION.  Even if CMake did not complain, building executables as
-# application bundles would break our iOS packages.)
-set(CMAKE_MACOSX_BUNDLE FALSE)
-
-string(TIMESTAMP DEFAULT_BUILD "%Y%m%d")
-set(BUILD ${DEFAULT_BUILD} CACHE STRING "Build string (default: ${DEFAULT_BUILD})")
-
-# NOTE: On Windows, this does nothing except when using MinGW or Cygwin.
-# CMAKE_BUILD_TYPE has no meaning in Visual Studio, and it always defaults to
-# Debug when using NMake.
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
-
-message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
-
-include(cmakescripts/PackageInfo.cmake)
-
-# Detect CPU type and whether we're building 64-bit or 32-bit code
-math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8")
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC)
-set(COUNT 1)
-foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
-  if(COUNT GREATER 1)
-    message(FATAL_ERROR "The libjpeg-turbo build system does not support multiple values in CMAKE_OSX_ARCHITECTURES.")
-  endif()
-  math(EXPR COUNT "${COUNT}+1")
-endforeach()
-if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "ia32")
-  if(BITS EQUAL 64 OR CMAKE_C_COMPILER_ABI MATCHES "ELF X32")
-    set(CPU_TYPE x86_64)
-  else()
-    set(CPU_TYPE i386)
-  endif()
-  if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ${CPU_TYPE})
-    set(CMAKE_SYSTEM_PROCESSOR ${CPU_TYPE})
-  endif()
-elseif(CMAKE_SYSTEM_PROCESSOR_LC STREQUAL "aarch64" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "^arm")
-  if(BITS EQUAL 64)
-    set(CPU_TYPE arm64)
-  else()
-    set(CPU_TYPE arm)
-  endif()
-elseif(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "^ppc" OR
-  CMAKE_SYSTEM_PROCESSOR_LC MATCHES "^powerpc")
-  set(CPU_TYPE powerpc)
-else()
-  set(CPU_TYPE ${CMAKE_SYSTEM_PROCESSOR_LC})
-endif()
-if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR
-  CMAKE_OSX_ARCHITECTURES MATCHES "arm64" OR
-  CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-  set(CPU_TYPE ${CMAKE_OSX_ARCHITECTURES})
-endif()
-if(CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-  set(CPU_TYPE powerpc)
-endif()
-if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64")
-  set(CPU_TYPE arm64)
-endif()
-
-message(STATUS "${BITS}-bit build (${CPU_TYPE})")
-
-macro(report_directory var)
-  if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
-    message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
-  else()
-    message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}} (${CMAKE_INSTALL_FULL_${var}})")
-  endif()
-  mark_as_advanced(CLEAR CMAKE_INSTALL_${var})
-endmacro()
-
-set(DIRLIST "BINDIR;DATAROOTDIR;DOCDIR;INCLUDEDIR;LIBDIR")
-if(UNIX)
-  list(APPEND DIRLIST "MANDIR")
-endif()
-foreach(dir ${DIRLIST})
-  report_directory(${dir})
-endforeach()
-
-
-###############################################################################
-# CONFIGURATION OPTIONS
-###############################################################################
-
-macro(boolean_number var)
-  if(${var})
-    set(${var} 1 ${ARGN})
-  else()
-    set(${var} 0 ${ARGN})
-  endif()
-endmacro()
-
-option(ENABLE_SHARED "Build shared libraries" FALSE)
-boolean_number(ENABLE_SHARED)
-option(ENABLE_STATIC "Build static libraries" TRUE)
-boolean_number(ENABLE_STATIC)
-option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
-boolean_number(REQUIRE_SIMD)
-option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
-boolean_number(WITH_12BIT)
-option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE)
-boolean_number(WITH_ARITH_DEC)
-option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE)
-boolean_number(WITH_ARITH_ENC)
-if(CMAKE_C_COMPILER_ABI MATCHES "ELF X32")
-  set(WITH_JAVA 0)
-else()
-  option(WITH_JAVA "Build Java wrapper for the TurboJPEG API library (implies ENABLE_SHARED=1)" FALSE)
-  boolean_number(WITH_JAVA)
-endif()
-option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE)
-boolean_number(WITH_JPEG7)
-option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE)
-boolean_number(WITH_JPEG8)
-option(WITH_MEM_SRCDST "Include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI" TRUE)
-boolean_number(WITH_MEM_SRCDST)
-option(WITH_SIMD "Include SIMD extensions, if available for this platform" FALSE)
-boolean_number(WITH_SIMD)
-option(WITH_TURBOJPEG "Include the TurboJPEG API library and associated test programs" FALSE)
-boolean_number(WITH_TURBOJPEG)
-option(WITH_FUZZ "Build fuzz targets" FALSE)
-
-macro(report_option var desc)
-  if(${var})
-    message(STATUS "${desc} enabled (${var} = ${${var}})")
-  else()
-    message(STATUS "${desc} disabled (${var} = ${${var}})")
-  endif()
-endmacro()
-
-if(WITH_JAVA)
-  set(ENABLE_SHARED 1)
-endif()
-
-# Explicitly setting CMAKE_POSITION_INDEPENDENT_CODE=FALSE disables PIC for all
-# targets, which will cause the shared library builds to fail.  Thus, if shared
-# libraries are enabled and CMAKE_POSITION_INDEPENDENT_CODE is explicitly set
-# to FALSE, we need to unset it, thus restoring the default behavior
-# (automatically using PIC for shared library targets.)
-if(DEFINED CMAKE_POSITION_INDEPENDENT_CODE AND
-  NOT CMAKE_POSITION_INDEPENDENT_CODE AND ENABLE_SHARED)
-  unset(CMAKE_POSITION_INDEPENDENT_CODE CACHE)
-endif()
-
-report_option(ENABLE_SHARED "Shared libraries")
-report_option(ENABLE_STATIC "Static libraries")
-
-if(ENABLE_SHARED)
-  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
-endif()
-
-if(WITH_JPEG8 OR WITH_JPEG7)
-  set(WITH_ARITH_ENC 1)
-  set(WITH_ARITH_DEC 1)
-endif()
-if(WITH_JPEG8)
-  set(WITH_MEM_SRCDST 0)
-endif()
-
-if(WITH_12BIT)
-  set(WITH_ARITH_DEC 0)
-  set(WITH_ARITH_ENC 0)
-  set(WITH_JAVA 0)
-  set(WITH_SIMD 0)
-  set(WITH_TURBOJPEG 0)
-  set(BITS_IN_JSAMPLE 12)
-else()
-  set(BITS_IN_JSAMPLE 8)
-endif()
-report_option(WITH_12BIT "12-bit JPEG support")
-
-if(WITH_ARITH_DEC)
-  set(D_ARITH_CODING_SUPPORTED 1)
-endif()
-if(NOT WITH_12BIT)
-  report_option(WITH_ARITH_DEC "Arithmetic decoding support")
-endif()
-
-if(WITH_ARITH_ENC)
-  set(C_ARITH_CODING_SUPPORTED 1)
-endif()
-if(NOT WITH_12BIT)
-  report_option(WITH_ARITH_ENC "Arithmetic encoding support")
-endif()
-
-if(NOT WITH_12BIT)
-  report_option(WITH_TURBOJPEG "TurboJPEG API library")
-  report_option(WITH_JAVA "TurboJPEG Java wrapper")
-endif()
-
-if(WITH_MEM_SRCDST)
-  set(MEM_SRCDST_SUPPORTED 1)
-  set(MEM_SRCDST_FUNCTIONS "global:  jpeg_mem_dest;  jpeg_mem_src;")
-endif()
-if(NOT WITH_JPEG8)
-  report_option(WITH_MEM_SRCDST "In-memory source/destination managers")
-endif()
-
-set(SO_AGE 2)
-if(WITH_MEM_SRCDST)
-  set(SO_AGE 3)
-endif()
-
-if(WITH_JPEG8)
-  set(JPEG_LIB_VERSION 80)
-elseif(WITH_JPEG7)
-  set(JPEG_LIB_VERSION 70)
-else()
-  set(JPEG_LIB_VERSION 62)
-endif()
-
-math(EXPR JPEG_LIB_VERSION_DIV10 "${JPEG_LIB_VERSION} / 10")
-math(EXPR JPEG_LIB_VERSION_MOD10 "${JPEG_LIB_VERSION} % 10")
-if(JPEG_LIB_VERSION STREQUAL "62")
-  set(DEFAULT_SO_MAJOR_VERSION ${JPEG_LIB_VERSION})
-else()
-  set(DEFAULT_SO_MAJOR_VERSION ${JPEG_LIB_VERSION_DIV10})
-endif()
-if(JPEG_LIB_VERSION STREQUAL "80")
-  set(DEFAULT_SO_MINOR_VERSION 2)
-else()
-  set(DEFAULT_SO_MINOR_VERSION 0)
-endif()
-
-# This causes SO_MAJOR_VERSION/SO_MINOR_VERSION to reset to defaults if
-# WITH_JPEG7 or WITH_JPEG8 has changed.
-if((DEFINED WITH_JPEG7_INT AND NOT WITH_JPEG7 EQUAL WITH_JPEG7_INT) OR
-  (DEFINED WITH_JPEG8_INT AND NOT WITH_JPEG8 EQUAL WITH_JPEG8_INT))
-  set(FORCE_SO_VERSION "FORCE")
-endif()
-set(WITH_JPEG7_INT ${WITH_JPEG7} CACHE INTERNAL "")
-set(WITH_JPEG8_INT ${WITH_JPEG8} CACHE INTERNAL "")
-
-set(SO_MAJOR_VERSION ${DEFAULT_SO_MAJOR_VERSION} CACHE STRING
-  "Major version of the libjpeg API shared library (default: ${DEFAULT_SO_MAJOR_VERSION})"
-  ${FORCE_SO_VERSION})
-set(SO_MINOR_VERSION ${DEFAULT_SO_MINOR_VERSION} CACHE STRING
-  "Minor version of the libjpeg API shared library (default: ${DEFAULT_SO_MINOR_VERSION})"
-  ${FORCE_SO_VERSION})
-
-set(JPEG_LIB_VERSION_DECIMAL "${JPEG_LIB_VERSION_DIV10}.${JPEG_LIB_VERSION_MOD10}")
-message(STATUS "Emulating libjpeg API/ABI v${JPEG_LIB_VERSION_DECIMAL} (WITH_JPEG7 = ${WITH_JPEG7}, WITH_JPEG8 = ${WITH_JPEG8})")
-message(STATUS "libjpeg API shared library version = ${SO_MAJOR_VERSION}.${SO_AGE}.${SO_MINOR_VERSION}")
-
-# Because the TurboJPEG API library uses versioned symbols and changes the
-# names of functions whenever they are modified in a backward-incompatible
-# manner, it is always backward-ABI-compatible with itself, so the major and
-# minor SO versions don't change.  However, we increase the middle number (the
-# SO "age") whenever functions are added to the API.
-set(TURBOJPEG_SO_MAJOR_VERSION 0)
-set(TURBOJPEG_SO_AGE 2)
-set(TURBOJPEG_SO_VERSION 0.${TURBOJPEG_SO_AGE}.0)
-
-
-###############################################################################
-# COMPILER SETTINGS
-###############################################################################
-
-if(MSVC)
-  option(WITH_CRT_DLL
-    "Link all ${CMAKE_PROJECT_NAME} libraries and executables with the C run-time DLL (msvcr*.dll) instead of the static C run-time library (libcmt*.lib.)  The default is to use the C run-time DLL only with the libraries and executables that need it."
-    FALSE)
-  if(NOT WITH_CRT_DLL)
-    # Use the static C library for all build types
-    foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-      CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-      if(${var} MATCHES "/MD")
-        string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}")
-      endif()
-    endforeach()
-  endif()
-  add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
-  # Use the maximum optimization level for release builds
-  foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
-    if(${var} MATCHES "-O2")
-      string(REGEX REPLACE "-O2" "-O3" ${var} "${${var}}")
-    endif()
-  endforeach()
-endif()
-
-if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  if(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-    # Use the maximum optimization level for release builds
-    foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
-      if(${var} MATCHES "-xO3")
-        string(REGEX REPLACE "-xO3" "-xO5" ${var} "${${var}}")
-      endif()
-      if(${var} MATCHES "-xO2")
-        string(REGEX REPLACE "-xO2" "-xO5" ${var} "${${var}}")
-      endif()
-    endforeach()
-  endif()
-endif()
-
-string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
-
-set(EFFECTIVE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
-message(STATUS "Compiler flags = ${EFFECTIVE_C_FLAGS}")
-
-set(EFFECTIVE_LD_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
-message(STATUS "Linker flags = ${EFFECTIVE_LD_FLAGS}")
-
-include(CheckCSourceCompiles)
-include(CheckIncludeFiles)
-include(CheckTypeSize)
-
-check_type_size("size_t" SIZE_T)
-check_type_size("unsigned long" UNSIGNED_LONG)
-
-if(SIZE_T EQUAL UNSIGNED_LONG)
-  check_c_source_compiles("int main(int argc, char **argv) { unsigned long a = argc;  return __builtin_ctzl(a); }"
-    HAVE_BUILTIN_CTZL)
-endif()
-if(MSVC)
-  check_include_files("intrin.h" HAVE_INTRIN_H)
-endif()
-
-if(UNIX)
-  if(CMAKE_CROSSCOMPILING)
-    set(RIGHT_SHIFT_IS_UNSIGNED 0)
-  else()
-    include(CheckCSourceRuns)
-    check_c_source_runs("
-      #include <stdio.h>
-      #include <stdlib.h>
-      int is_shifting_signed (long arg) {
-        long res = arg >> 4;
-        if (res == -0x7F7E80CL)
-          return 1; /* right shift is signed */
-        /* see if unsigned-shift hack will fix it. */
-        /* we can't just test exact value since it depends on width of long... */
-        res |= (~0L) << (32-4);
-        if (res == -0x7F7E80CL)
-          return 0; /* right shift is unsigned */
-        printf(\"Right shift isn't acting as I expect it to.\\\\n\");
-        printf(\"I fear the JPEG software will not work at all.\\\\n\\\\n\");
-        return 0; /* try it with unsigned anyway */
-      }
-      int main (void) {
-        exit(is_shifting_signed(-0x7F7E80B1L));
-      }" RIGHT_SHIFT_IS_UNSIGNED)
-  endif()
-endif()
-
-if(MSVC)
-  set(INLINE_OPTIONS "__inline;inline")
-else()
-  set(INLINE_OPTIONS "__inline__;inline")
-endif()
-option(FORCE_INLINE "Force function inlining" TRUE)
-boolean_number(FORCE_INLINE)
-if(FORCE_INLINE)
-  if(MSVC)
-    list(INSERT INLINE_OPTIONS 0 "__forceinline")
-  else()
-    list(INSERT INLINE_OPTIONS 0 "inline __attribute__((always_inline))")
-    list(INSERT INLINE_OPTIONS 0 "__inline__ __attribute__((always_inline))")
-  endif()
-endif()
-foreach(inline ${INLINE_OPTIONS})
-  check_c_source_compiles("${inline} static int foo(void) { return 0; } int main(void) { return foo(); }"
-    INLINE_WORKS)
-  if(INLINE_WORKS)
-    set(INLINE ${inline})
-    break()
-  endif()
-endforeach()
-if(NOT INLINE_WORKS)
-  message(FATAL_ERROR "Could not determine how to inline functions.")
-endif()
-message(STATUS "INLINE = ${INLINE} (FORCE_INLINE = ${FORCE_INLINE})")
-
-if(WITH_TURBOJPEG)
-  if(MSVC)
-    set(THREAD_LOCAL "__declspec(thread)")
-  else()
-    set(THREAD_LOCAL "__thread")
-  endif()
-  check_c_source_compiles("${THREAD_LOCAL} int i;  int main(void) { i = 0;  return i; }" HAVE_THREAD_LOCAL)
-  if(HAVE_THREAD_LOCAL)
-    message(STATUS "THREAD_LOCAL = ${THREAD_LOCAL}")
-  else()
-    message(WARNING "Thread-local storage is not available.  The TurboJPEG API library's global error handler will not be thread-safe.")
-    unset(THREAD_LOCAL)
-  endif()
-endif()
-
-if(UNIX AND NOT APPLE)
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/conftest.map "VERS_1 { global: *; };")
-  set(CMAKE_REQUIRED_FLAGS
-    "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
-  check_c_source_compiles("int main(void) { return 0; }" HAVE_VERSION_SCRIPT)
-  set(CMAKE_REQUIRED_FLAGS)
-  file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/conftest.map)
-  if(HAVE_VERSION_SCRIPT)
-    message(STATUS "Linker supports GNU-style version scripts")
-    set(MAPFLAG "-Wl,--version-script,")
-    set(TJMAPFLAG "-Wl,--version-script,")
-  else()
-    message(STATUS "Linker does not support GNU-style version scripts")
-    if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-      # The Solaris linker doesn't like our version script for the libjpeg API
-      # library, but the version script for the TurboJPEG API library should
-      # still work.
-      file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/conftest.map
-        "VERS_1 { global: foo;  local: *; }; VERS_2 { global: foo2; } VERS_1;")
-      set(CMAKE_REQUIRED_FLAGS "-Wl,-M,${CMAKE_CURRENT_BINARY_DIR}/conftest.map -shared")
-      check_c_source_compiles("int foo() { return 0; } int foo2() { return 2; }"
-        HAVE_MAPFILE)
-      set(CMAKE_REQUIRED_FLAGS)
-      file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/conftest.map)
-      if(HAVE_MAPFILE)
-        message(STATUS "Linker supports mapfiles")
-        set(TJMAPFLAG "-Wl,-M,")
-      else()
-        message(STATUS "Linker does not support mapfiles")
-      endif()
-    endif()
-  endif()
-endif()
-
-# Generate files
-if(WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/win/jconfig.h.in jconfig.h)
-else()
-  configure_file(jconfig.h.in jconfig.h)
-endif()
-configure_file(jconfigint.h.in jconfigint.h)
-configure_file(jversion.h.in jversion.h)
-if(UNIX)
-  configure_file(libjpeg.map.in libjpeg.map)
-endif()
-
-# Include directories and compiler definitions
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
-
-###############################################################################
-# TARGETS
-###############################################################################
-
-if(CMAKE_EXECUTABLE_SUFFIX_TMP)
-  set(CMAKE_EXECUTABLE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX_TMP})
-endif()
-message(STATUS "CMAKE_EXECUTABLE_SUFFIX = ${CMAKE_EXECUTABLE_SUFFIX}")
-
-set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c
-  jcicc.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c
-  jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdatadst.c
-  jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c
-  jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c
-  jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c
-  jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c)
-
-if(WITH_ARITH_ENC OR WITH_ARITH_DEC)
-  set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c)
-endif()
-
-if(WITH_ARITH_ENC)
-  set(JPEG_SOURCES ${JPEG_SOURCES} jcarith.c)
-endif()
-
-if(WITH_ARITH_DEC)
-  set(JPEG_SOURCES ${JPEG_SOURCES} jdarith.c)
-endif()
-
-if(WITH_SIMD)
-  add_subdirectory(simd)
-  if(NEON_INTRINSICS)
-    add_definitions(-DNEON_INTRINSICS)
-  endif()
-elseif(NOT WITH_12BIT)
-  message(STATUS "SIMD extensions: None (WITH_SIMD = ${WITH_SIMD})")
-endif()
-if(WITH_SIMD)
-  message(STATUS "SIMD extensions: ${CPU_TYPE} (WITH_SIMD = ${WITH_SIMD})")
-  if(MSVC_IDE OR XCODE)
-    set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)
-  endif()
-else()
-  add_library(simd OBJECT jsimd_none.c)
-  if(NOT WIN32 AND (CMAKE_POSITION_INDEPENDENT_CODE OR ENABLE_SHARED))
-    set_target_properties(simd PROPERTIES POSITION_INDEPENDENT_CODE 1)
-  endif()
-endif()
-
-if(WITH_JAVA)
-  add_subdirectory(java)
-endif()
-
-if(ENABLE_SHARED)
-  add_subdirectory(sharedlib)
-endif()
-
-if(ENABLE_STATIC)
-  add_library(jpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
-    ${SIMD_OBJS})
-  if(NOT MSVC)
-    set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg)
-  endif()
-endif()
-
-if(WITH_TURBOJPEG)
-  if(ENABLE_SHARED)
-    set(TURBOJPEG_SOURCES ${JPEG_SOURCES} $<TARGET_OBJECTS:simd> ${SIMD_OBJS}
-      turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c rdbmp.c rdppm.c
-      wrbmp.c wrppm.c)
-    set(TJMAPFILE ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-mapfile)
-    if(WITH_JAVA)
-      set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c)
-      include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-      set(TJMAPFILE ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-mapfile.jni)
-    endif()
-    if(MSVC)
-      configure_file(${CMAKE_SOURCE_DIR}/win/turbojpeg.rc.in
-        ${CMAKE_BINARY_DIR}/win/turbojpeg.rc)
-      set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES}
-        ${CMAKE_BINARY_DIR}/win/turbojpeg.rc)
-    endif()
-    add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES})
-    set_property(TARGET turbojpeg PROPERTY COMPILE_FLAGS
-      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-    if(WIN32)
-      set_target_properties(turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE)
-    endif()
-    if(MINGW)
-      set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at)
-    endif()
-    if(APPLE AND (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR
-                  CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.4))
-      if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
-        set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-      endif()
-      set_target_properties(turbojpeg PROPERTIES MACOSX_RPATH 1)
-    endif()
-    set_target_properties(turbojpeg PROPERTIES
-      SOVERSION ${TURBOJPEG_SO_MAJOR_VERSION} VERSION ${TURBOJPEG_SO_VERSION})
-    if(TJMAPFLAG)
-      set_target_properties(turbojpeg PROPERTIES
-        LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
-    endif()
-  endif()
-
-  if(ENABLE_STATIC)
-    add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
-      ${SIMD_OBJS} turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c rdbmp.c
-      rdppm.c wrbmp.c wrppm.c)
-    set_property(TARGET turbojpeg-static PROPERTY COMPILE_FLAGS
-      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-    if(NOT MSVC)
-      set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
-    endif()
-  endif()
-endif()
-
-if(WIN32)
-  set(USE_SETMODE "-DUSE_SETMODE")
-endif()
-if(WITH_12BIT)
-  set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED ${USE_SETMODE}")
-else()
-  set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED ${USE_SETMODE}")
-  set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
-  set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
-endif()

cmake/CMakeLists.png

@@ -1,741 +0,0 @@
-# CMakeLists.txt
-
-# Copyright (C) 2018 Cosmin Truta
-# Copyright (C) 2007,2009-2018 Glenn Randers-Pehrson
-# Written by Christian Ehrlicher, 2007
-# Revised by Roger Lowman, 2009-2010
-# Revised by Clifford Yapp, 2011-2012,2017
-# Revised by Roger Leigh, 2016
-# Revised by Andreas Franek, 2016
-# Revised by Sam Serrels, 2017
-# Revised by Vadim Barkov, 2017
-# Revised by Vicky Pfau, 2018
-# Revised by Cameron Cawley, 2018
-# Revised by Cosmin Truta, 2018
-# Revised by Kyle Bentley, 2018
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-cmake_minimum_required(VERSION 3.10)
-cmake_policy(VERSION 3.1)
-# When using CMake 3.4 and later, don't export symbols from executables unless
-# the CMAKE_ENABLE_EXPORTS variable is set.
-if(POLICY CMP0065)
-  cmake_policy(SET CMP0065 NEW)
-endif()
-if (POLICY CMP0077)
-  cmake_policy(SET CMP0077 NEW)
-endif()
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
-project(libpng C ASM)
-enable_testing()
-
-set(PNGLIB_MAJOR 1)
-set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 37)
-set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
-
-include(GNUInstallDirs)
-
-# needed packages
-
-# Allow users to specify location of Zlib.
-# Useful if zlib is being built alongside this as a sub-project.
-option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" ON)
-
-if(NOT PNG_BUILD_ZLIB)
-  find_package(ZLIB REQUIRED)
-  include_directories(${ZLIB_INCLUDE_DIR})
-endif()
-
-if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-  find_library(M_LIBRARY m)
-else()
-  # libm is not needed and/or not available
-  set(M_LIBRARY "")
-endif()
-
-# COMMAND LINE OPTIONS
-option(PNG_SHARED "Build shared lib" OFF)
-option(PNG_STATIC "Build static lib" ON)
-option(PNG_TESTS  "Build libpng tests" OFF)
-
-# Many more configuration options could be added here
-option(PNG_FRAMEWORK "Build OS X framework" OFF)
-option(PNG_DEBUG "Build with debug output" OFF)
-option(PNG_HARDWARE_OPTIMIZATIONS "Enable hardware optimizations" OFF)
-
-set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
-set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
-
-if(PNG_HARDWARE_OPTIMIZATIONS)
-
-# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
-  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-  set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
-  set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
-     check: (default) use internal checking code;
-     off: disable the optimizations;
-     on: turn on unconditionally.")
-  set_property(CACHE PNG_ARM_NEON PROPERTY STRINGS
-     ${PNG_ARM_NEON_POSSIBLE_VALUES})
-  list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-            "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_ARM_NEON} STREQUAL "off")
-    set(libpng_arm_sources
-      arm/arm_init.c
-      arm/filter_neon.S
-      arm/filter_neon_intrinsics.c
-      arm/palette_neon_intrinsics.c)
-
-    if(${PNG_ARM_NEON} STREQUAL "on")
-      add_definitions(-DPNG_ARM_NEON_OPT=2)
-    elseif(${PNG_ARM_NEON} STREQUAL "check")
-      add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
-    endif()
-  else()
-    add_definitions(-DPNG_ARM_NEON_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*")
-  set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
-  set(PNG_POWERPC_VSX "on" CACHE STRING "Enable POWERPC VSX optimizations:
-     off: disable the optimizations.")
-  set_property(CACHE PNG_POWERPC_VSX PROPERTY STRINGS
-     ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
-  list(FIND PNG_POWERPC_VSX_POSSIBLE_VALUES ${PNG_POWERPC_VSX} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-            "PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_POWERPC_VSX} STREQUAL "off")
-    set(libpng_powerpc_sources
-      powerpc/powerpc_init.c
-      powerpc/filter_vsx_intrinsics.c)
-    if(${PNG_POWERPC_VSX} STREQUAL "on")
-      add_definitions(-DPNG_POWERPC_VSX_OPT=2)
-    endif()
-  else()
-    add_definitions(-DPNG_POWERPC_VSX_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
-  set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
-  set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations:
-     off: disable the optimizations")
-  set_property(CACHE PNG_INTEL_SSE PROPERTY STRINGS
-     ${PNG_INTEL_SSE_POSSIBLE_VALUES})
-  list(FIND PNG_INTEL_SSE_POSSIBLE_VALUES ${PNG_INTEL_SSE} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-            "PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_INTEL_SSE} STREQUAL "off")
-    set(libpng_intel_sources
-      intel/intel_init.c
-      intel/filter_sse2_intrinsics.c)
-    if(${PNG_INTEL_SSE} STREQUAL "on")
-      add_definitions(-DPNG_INTEL_SSE_OPT=1)
-    endif()
-  else()
-    add_definitions(-DPNG_INTEL_SSE_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*")
-  set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
-  set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations:
-     off: disable the optimizations")
-  set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS
-     ${PNG_MIPS_MSA_POSSIBLE_VALUES})
-  list(FIND PNG_MIPS_MSA_POSSIBLE_VALUES ${PNG_MIPS_MSA} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-            "PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_MIPS_MSA} STREQUAL "off")
-    set(libpng_mips_sources
-      mips/mips_init.c
-      mips/filter_msa_intrinsics.c)
-    if(${PNG_MIPS_MSA} STREQUAL "on")
-      add_definitions(-DPNG_MIPS_MSA_OPT=2)
-    endif()
-  else()
-    add_definitions(-DPNG_MIPS_MSA_OPT=0)
-  endif()
-endif()
-
-else(PNG_HARDWARE_OPTIMIZATIONS)
-
-# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-  add_definitions(-DPNG_ARM_NEON_OPT=0)
-endif()
-
-# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*")
-  add_definitions(-DPNG_POWERPC_VSX_OPT=0)
-endif()
-
-# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
-  add_definitions(-DPNG_INTEL_SSE_OPT=0)
-endif()
-
-# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
-   CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*")
-  add_definitions(-DPNG_MIPS_MSA_OPT=0)
-endif()
-
-endif(PNG_HARDWARE_OPTIMIZATIONS)
-
-# SET LIBNAME
-set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-
-# to distinguish between debug and release lib
-set(CMAKE_DEBUG_POSTFIX "d")
-
-include(CheckCSourceCompiles)
-option(ld-version-script "Enable linker version script" ON)
-if(ld-version-script AND NOT APPLE)
-  # Check if LD supports linker scripts.
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "VERS_1 {
-        global: sym;
-        local: *;
-};
-
-VERS_2 {
-        global: sym2;
-                main;
-} VERS_1;
-")
-  set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/conftest.map'")
-  check_c_source_compiles("void sym(void) {}
-void sym2(void) {}
-int main(void) {return 0;}
-" HAVE_LD_VERSION_SCRIPT)
-  if(NOT HAVE_LD_VERSION_SCRIPT)
-    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE} "-Wl,-M -Wl,${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
-  check_c_source_compiles("void sym(void) {}
-void sym2(void) {}
-int main(void) {return 0;}
-" HAVE_SOLARIS_LD_VERSION_SCRIPT)
-  endif()
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
-  file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
-endif()
-
-# Find symbol prefix.  Likely obsolete and unnecessary with recent
-# toolchains (it's not done in many other projects).
-function(symbol_prefix)
-  set(SYMBOL_PREFIX)
-
-  execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E" "-"
-                  INPUT_FILE /dev/null
-                  OUTPUT_VARIABLE OUT
-                  RESULT_VARIABLE STATUS)
-
-  if(CPP_FAIL)
-    message(WARNING "Failed to run the C preprocessor")
-  endif()
-
-  string(REPLACE "\n" ";" OUT "${OUT}")
-  foreach(line ${OUT})
-    string(REGEX MATCH "^PREFIX=" found_match "${line}")
-    if(found_match)
-      string(REGEX REPLACE "^PREFIX=(.*\)" "\\1" prefix "${line}")
-      string(REGEX MATCH "__USER_LABEL_PREFIX__" found_match "${prefix}")
-      if(found_match)
-        string(REGEX REPLACE "(.*)__USER_LABEL_PREFIX__(.*)" "\\1\\2" prefix "${prefix}")
-      endif()
-      set(SYMBOL_PREFIX "${prefix}")
-    endif()
-  endforeach()
-
-  message(STATUS "Symbol prefix: ${SYMBOL_PREFIX}")
-  set(SYMBOL_PREFIX "${SYMBOL_PREFIX}" PARENT_SCOPE)
-endfunction()
-
-if(UNIX)
-  symbol_prefix()
-endif()
-
-find_program(AWK NAMES gawk awk)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-if(NOT AWK OR ANDROID)
-  # No awk available to generate sources; use pre-built pnglibconf.h
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
-                 ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
-  add_custom_target(genfiles) # Dummy
-else()
-  include(CMakeParseArguments)
-  # Generate .chk from .out with awk
-  # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_chk)
-    set(options)
-    set(oneValueArgs INPUT OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if(NOT _GC_INPUT)
-      message(FATAL_ERROR "generate_chk: Missing INPUT argument")
-    endif()
-    if(NOT _GC_OUTPUT)
-      message(FATAL_ERROR "generate_chk: Missing OUTPUT argument")
-    endif()
-
-    add_custom_command(OUTPUT "${_GC_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DINPUT=${_GC_INPUT}"
-                               "-DOUTPUT=${_GC_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake"
-                       DEPENDS "${_GC_INPUT}" ${_GC_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Generate .out from .c with awk
-  # generate_out(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_out)
-    set(options)
-    set(oneValueArgs INPUT OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if(NOT _GO_INPUT)
-      message(FATAL_ERROR "generate_out: Missing INPUT argument")
-    endif()
-    if(NOT _GO_OUTPUT)
-      message(FATAL_ERROR "generate_out: Missing OUTPUT argument")
-    endif()
-
-    add_custom_command(OUTPUT "${_GO_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DINPUT=${_GO_INPUT}"
-                               "-DOUTPUT=${_GO_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake"
-                       DEPENDS "${_GO_INPUT}" ${_GO_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Generate specific source file with awk
-  # generate_source(OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_source)
-    set(options)
-    set(oneValueArgs OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GSO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if(NOT _GSO_OUTPUT)
-      message(FATAL_ERROR "generate_source: Missing OUTPUT argument")
-    endif()
-
-    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_GSO_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DOUTPUT=${_GSO_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
-                       DEPENDS ${_GSO_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Copy file
-  function(generate_copy source destination)
-    add_custom_command(OUTPUT "${destination}"
-                       COMMAND "${CMAKE_COMMAND}" -E remove "${destination}"
-                       COMMAND "${CMAKE_COMMAND}" -E copy "${source}"
-                                                          "${destination}"
-                       DEPENDS "${source}")
-  endfunction()
-
-  # Generate scripts/pnglibconf.h
-  generate_source(OUTPUT "scripts/pnglibconf.c"
-                  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
-
-  # Generate pnglibconf.c
-  generate_source(OUTPUT "pnglibconf.c"
-                  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
-
-  if(PNG_PREFIX)
-    set(PNGLIBCONF_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/macro.lst")
-    set(PNGPREFIX_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
-  endif()
-
-  generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
-
-  # Generate pnglibconf.h
-  generate_source(OUTPUT "pnglibconf.h"
-                  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
-                          ${PNGLIBCONF_H_EXTRA_DEPENDS})
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/intprefix.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
-               DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/prefix.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
-
-  # Generate pngprefix.h
-  generate_source(OUTPUT "pngprefix.h"
-                  DEPENDS ${PNGPREFIX_H_EXTRA_DEPENDS})
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/sym.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-               DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/vers.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_chk(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.def")
-
-  add_custom_target(symbol-check DEPENDS
-                    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk")
-
-  generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-                "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
-  generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
-                "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
-
-  add_custom_target(genvers DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
-  add_custom_target(gensym DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
-
-  add_custom_target("genprebuilt"
-                    COMMAND "${CMAKE_COMMAND}"
-                            "-DOUTPUT=scripts/pnglibconf.h.prebuilt"
-                            -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
-                    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-  # A single target handles generation of all generated files.  If
-  # they are depended upon separately by multiple targets, this
-  # confuses parallel make (it would require a separate top-level
-  # target for each file to track the dependencies properly).
-  add_custom_target(genfiles DEPENDS
-    "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym"
-    "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out")
-endif(NOT AWK OR ANDROID)
-
-# OUR SOURCES
-set(libpng_public_hdrs
-  png.h
-  pngconf.h
-  "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
-)
-set(libpng_private_hdrs
-  pngpriv.h
-  pngdebug.h
-  pnginfo.h
-  pngstruct.h
-)
-if(AWK AND NOT ANDROID)
-  list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
-endif()
-set(libpng_sources
-  ${libpng_public_hdrs}
-  ${libpng_private_hdrs}
-  png.c
-  pngerror.c
-  pngget.c
-  pngmem.c
-  pngpread.c
-  pngread.c
-  pngrio.c
-  pngrtran.c
-  pngrutil.c
-  pngset.c
-  pngtrans.c
-  pngwio.c
-  pngwrite.c
-  pngwtran.c
-  pngwutil.c
-  ${libpng_arm_sources}
-  ${libpng_intel_sources}
-  ${libpng_mips_sources}
-  ${libpng_powerpc_sources}
-)
-set(pngtest_sources
-  pngtest.c
-)
-set(pngvalid_sources
-  contrib/libtests/pngvalid.c
-)
-set(pngstest_sources
-  contrib/libtests/pngstest.c
-)
-set(pngunknown_sources
-  contrib/libtests/pngunknown.c
-)
-set(pngimage_sources
-  contrib/libtests/pngimage.c
-)
-set(pngfix_sources
-  contrib/tools/pngfix.c
-)
-set(png_fix_itxt_sources
-  contrib/tools/png-fix-itxt.c
-)
-
-if(MSVC)
-  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-endif()
-
-if(PNG_DEBUG)
-  add_definitions(-DPNG_DEBUG)
-endif()
-
-# NOW BUILD OUR TARGET
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-
-unset(PNG_LIB_TARGETS)
-
-if(PNG_STATIC)
-  # does not work without changing name
-  set(PNG_LIB_NAME_STATIC png_static)
-  add_library(png_static STATIC ${libpng_sources})
-  add_dependencies(png_static genfiles)
-  # MSVC doesn't use a different file extension for shared vs. static
-  # libs.  We are able to change OUTPUT_NAME to remove the _static
-  # for all other platforms.
-  if(NOT MSVC)
-    set_target_properties(png_static PROPERTIES
-      OUTPUT_NAME "${PNG_LIB_NAME}"
-      CLEAN_DIRECT_OUTPUT 1)
-  else()
-    set_target_properties(png_static PROPERTIES
-      OUTPUT_NAME "${PNG_LIB_NAME}_static"
-      CLEAN_DIRECT_OUTPUT 1)
-  endif()
-  list(APPEND PNG_LIB_TARGETS png_static)
-  if(MSVC)
-    # msvc does not append 'lib' - do it here to have consistent name
-    set_target_properties(png_static PROPERTIES PREFIX "lib")
-  endif()
-  target_link_libraries(png_static ${M_LIBRARY})
-endif()
-
-if(NOT PNG_LIB_TARGETS)
-  message(SEND_ERROR
-    "No library variant selected to build. "
-    "Please enable at least one of the following options: "
-    "PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK")
-endif()
-
-# Set a variable with CMake code which:
-# Creates a symlink from src to dest (if possible) or alternatively
-# copies if different.
-include(CMakeParseArguments)
-
-function(create_symlink DEST_FILE)
-
-  cmake_parse_arguments(S "" "FILE;TARGET" "" ${ARGN})
-
-  if(NOT S_TARGET AND NOT S_FILE)
-    message(FATAL_ERROR "create_symlink: Missing TARGET or FILE argument")
-  endif()
-
-  if(S_TARGET AND S_FILE)
-    message(FATAL_ERROR "create_symlink: Both source file ${S_FILE} and build target ${S_TARGET} arguments are present; can only have one.")
-  endif()
-
-  if(S_FILE)
-    # If we don't need to symlink something that's coming from a build target,
-    # we can go ahead and symlink/copy at configure time.
-    if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
-      execute_process(
-        COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE}
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    else()
-      execute_process(
-        COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE}
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    endif()
-  endif()
-
-  if(S_TARGET)
-    # We need to use generator expressions, which can be a bit tricky, so for
-    # simplicity make the symlink a POST_BUILD step and use the TARGET
-    # signature of add_custom_command.
-    if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
-      add_custom_command(TARGET ${S_TARGET} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_if_different $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
-    else()
-      add_custom_command(TARGET ${S_TARGET} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E create_symlink $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
-    endif()
-  endif()
-
-endfunction()
-
-# Create source generation scripts.
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genchk.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genout.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gensrc.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake @ONLY)
-
-# libpng is a library so default to 'lib'
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(CMAKE_INSTALL_LIBDIR lib)
-endif()
-
-# CREATE PKGCONFIG FILES
-# We use the same files like ./configure, so we have to set its vars.
-# Only do this on Windows for Cygwin - the files don't make much sense outside
-# of a UNIX look-alike.
-if(NOT WIN32 OR CYGWIN OR MINGW)
-  set(prefix      ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-  set(libdir      ${CMAKE_INSTALL_FULL_LIBDIR})
-  set(includedir  ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-  set(LIBS        "-lz -lm")
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
-  create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
-
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
-  create_symlink(libpng-config FILE ${PNGLIB_NAME}-config)
-endif()
-
-# SET UP LINKS
-if(PNG_SHARED)
-  set_target_properties(png PROPERTIES
-#   VERSION 16.${PNGLIB_RELEASE}.1.6.37
-    VERSION 16.${PNGLIB_RELEASE}.0
-    SOVERSION 16
-    CLEAN_DIRECT_OUTPUT 1)
-endif()
-
-# INSTALL
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-  install(TARGETS ${PNG_LIB_TARGETS}
-          EXPORT libpng
-          RUNTIME DESTINATION bin
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-  if(PNG_SHARED)
-    # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-    if(CYGWIN OR MINGW)
-      create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
-              DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif()
-
-    if(NOT WIN32)
-      create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-              DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif()
-  endif()
-
-  if(PNG_STATIC)
-    if(NOT WIN32 OR CYGWIN OR MINGW)
-      create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-              DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif()
-  endif()
-endif()
-
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
-  install(FILES ${libpng_public_hdrs} DESTINATION include)
-  install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
-endif()
-if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL)
-  if(NOT WIN32 OR CYGWIN OR MINGW)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
-  endif()
-endif()
-
-if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL)
-  install(TARGETS ${PNG_BIN_TARGETS}
-          RUNTIME DESTINATION bin)
-endif()
-
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
-  # Install man pages
-  if(NOT PNG_MAN_DIR)
-    set(PNG_MAN_DIR "share/man")
-  endif()
-  install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3)
-  install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5)
-  # Install pkg-config files
-  if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
-            DESTINATION bin)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
-            DESTINATION bin)
-  endif()
-endif()
-
-# Create an export file that CMake users can include() to import our targets.
-if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
-  install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
-endif()
-
-# what's with libpng-manual.txt and all the extra files?
-
-# UNINSTALL
-# do we need this?
-
-# DIST
-# do we need this?
-
-# to create msvc import lib for mingw compiled shared lib
-# pexports libpng.dll > libpng.def
-# lib /def:libpng.def /machine:x86

cmake/CMakeLists.txt

@@ -1,3 +1,4 @@
+# -*- CMake -*- master configuration file for building LAMMPS
 ########################################
 # CMake build system
 # This file is part of LAMMPS
@@ -12,11 +13,6 @@ endif()
 if(POLICY CMP0075)
   cmake_policy(SET CMP0075 NEW)
 endif()
-# set policy to silence warnings about missing executable permissions in
-# pythonx.y-config when cross-compiling. review occasionally if it may be set to NEW
-if(POLICY CMP0109)
-  cmake_policy(SET CMP0109 OLD)
-endif()
 # set policy to silence warnings about timestamps of downloaded files. review occasionally if it may be set to NEW
 if(POLICY CMP0135)
   cmake_policy(SET CMP0135 OLD)
@@ -192,6 +188,7 @@ option(BUILD_SHARED_LIBS "Build shared library" OFF)
 option(CMAKE_POSITION_INDEPENDENT_CODE "Create object compatible with shared libraries" ON)
 option(BUILD_TOOLS "Build and install LAMMPS tools (msi2lmp, binary2txt, chain)" OFF)
 option(BUILD_LAMMPS_SHELL "Build and install the LAMMPS shell" OFF)
+option(BUILD_LAMMPS_GUI "Build and install the LAMMPS GUI" OFF)
 
 # Support using clang-tidy for C++ files with selected options
 set(ENABLE_CLANG_TIDY OFF CACHE BOOL "Include clang-tidy processing when compiling")
@@ -221,6 +218,7 @@ option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF)
 
 set(STANDARD_PACKAGES
   ADIOS
+  AMOEBA
   ASPHERE
   ATC
   AWPMD
@@ -229,7 +227,7 @@ set(STANDARD_PACKAGES
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -256,7 +254,7 @@ set(STANDARD_PACKAGES
   KIM
   KSPACE
   LATBOLTZ
-  LATTE
+  LEPTON
   MACHDYN
   MANIFOLD
   MANYBODY
@@ -272,6 +270,7 @@ set(STANDARD_PACKAGES
   ML-QUIP
   ML-RANN
   ML-SNAP
+  ML-POD
   MOFFF
   MOLECULE
   MOLFILE
@@ -394,12 +393,14 @@ pkg_depends(MPIIO MPI)
 pkg_depends(ATC MANYBODY)
 pkg_depends(LATBOLTZ MPI)
 pkg_depends(SCAFACOS MPI)
+pkg_depends(AMOEBA KSPACE)
 pkg_depends(DIELECTRIC KSPACE)
 pkg_depends(DIELECTRIC EXTRA-PAIR)
 pkg_depends(CG-DNA MOLECULE)
 pkg_depends(CG-DNA ASPHERE)
 pkg_depends(ELECTRODE KSPACE)
 pkg_depends(EXTRA-MOLECULE MOLECULE)
+pkg_depends(MESONT MOLECULE)
 
 # detect if we may enable OpenMP support by default
 set(BUILD_OMP_DEFAULT OFF)
@@ -437,21 +438,19 @@ if(BUILD_OMP)
   target_link_libraries(lmp PRIVATE OpenMP::OpenMP_CXX)
 endif()
 
-if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_LATTE OR PKG_ELECTRODE)
+if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_ELECTRODE OR BUILD_TOOLS)
   enable_language(C)
-  find_package(LAPACK)
-  find_package(BLAS)
-  if(NOT LAPACK_FOUND OR NOT BLAS_FOUND)
-    include(CheckGeneratorSupport)
-    if(NOT CMAKE_GENERATOR_SUPPORT_FORTRAN)
-      status(FATAL_ERROR "Cannot build internal linear algebra library as CMake build tool lacks Fortran support")
-    endif()
-    enable_language(Fortran)
-    file(GLOB LINALG_SOURCES ${CONFIGURE_DEPENDS} ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])
+  if (NOT USE_INTERNAL_LINALG)
+    find_package(LAPACK)
+    find_package(BLAS)
+  endif()
+  if(NOT LAPACK_FOUND OR NOT BLAS_FOUND OR USE_INTERNAL_LINALG)
+    file(GLOB LINALG_SOURCES ${CONFIGURE_DEPENDS} ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.cpp)
     add_library(linalg STATIC ${LINALG_SOURCES})
     set_target_properties(linalg PROPERTIES OUTPUT_NAME lammps_linalg${LAMMPS_MACHINE})
     set(BLAS_LIBRARIES "$<TARGET_FILE:linalg>")
     set(LAPACK_LIBRARIES "$<TARGET_FILE:linalg>")
+    target_link_libraries(lammps PRIVATE linalg)
   else()
     list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
   endif()
@@ -519,7 +518,7 @@ else()
 endif()
 
 foreach(PKG_WITH_INCL KSPACE PYTHON ML-IAP VORONOI COLVARS ML-HDNNP MDI MOLFILE NETCDF
-        PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM LATTE MSCG COMPRESS ML-PACE)
+        PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM MSCG COMPRESS ML-PACE LEPTON)
   if(PKG_${PKG_WITH_INCL})
     include(Packages/${PKG_WITH_INCL})
   endif()
@@ -536,7 +535,10 @@ set(CMAKE_TUNE_FLAGS "${CMAKE_TUNE_DEFAULT}" CACHE STRING "Compiler and machine
 separate_arguments(CMAKE_TUNE_FLAGS)
 foreach(_FLAG ${CMAKE_TUNE_FLAGS})
   target_compile_options(lammps PRIVATE ${_FLAG})
-  target_compile_options(lmp PRIVATE ${_FLAG})
+  # skip these flags when linking the main executable
+  if(NOT (("${_FLAG}" STREQUAL "-Xcudafe") OR (("${_FLAG}" STREQUAL "--diag_suppress=unrecognized_pragma"))))
+    target_compile_options(lmp PRIVATE ${_FLAG})
+  endif()
 endforeach()
 ########################################################################
 # Basic system tests (standard libraries, headers, functions, types)   #
@@ -564,6 +566,8 @@ RegisterStyles(${LAMMPS_SOURCE_DIR})
 ########################################################
 # Fetch missing external files and archives for packages
 ########################################################
+option(DOWNLOAD_POTENTIALS "Automatically download large potential files" ON)
+mark_as_advanced(DOWNLOAD_POTENTIALS)
 foreach(PKG ${STANDARD_PACKAGES} ${SUFFIX_PACKAGES})
   if(PKG_${PKG})
     FetchPotentials(${LAMMPS_SOURCE_DIR}/${PKG} ${LAMMPS_POTENTIALS_DIR})
@@ -616,18 +620,11 @@ endforeach()
 ##############################################
 # add lib sources of (simple) enabled packages
 ############################################
-foreach(PKG_LIB POEMS ATC AWPMD H5MD MESONT)
+foreach(PKG_LIB POEMS ATC AWPMD H5MD)
   if(PKG_${PKG_LIB})
     string(TOLOWER "${PKG_LIB}" PKG_LIB)
-    if(PKG_LIB STREQUAL "mesont")
-      enable_language(Fortran)
-      file(GLOB_RECURSE ${PKG_LIB}_SOURCES ${CONFIGURE_DEPENDS}
-        ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.f90)
-    else()
-      file(GLOB_RECURSE ${PKG_LIB}_SOURCES ${CONFIGURE_DEPENDS}
-        ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.c
-        ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.cpp)
-    endif()
+    file(GLOB_RECURSE ${PKG_LIB}_SOURCES ${CONFIGURE_DEPENDS}
+      ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.c ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.cpp)
     add_library(${PKG_LIB} STATIC ${${PKG_LIB}_SOURCES})
     set_target_properties(${PKG_LIB} PROPERTIES OUTPUT_NAME lammps_${PKG_LIB}${LAMMPS_MACHINE})
     target_link_libraries(lammps PRIVATE ${PKG_LIB})
@@ -641,7 +638,7 @@ foreach(PKG_LIB POEMS ATC AWPMD H5MD MESONT)
   endif()
 endforeach()
 
-if(PKG_ELECTRODE)
+if(PKG_ELECTRODE OR PKG_ML-POD)
   target_link_libraries(lammps PRIVATE ${LAPACK_LIBRARIES})
 endif()
 
@@ -670,7 +667,7 @@ endif()
 # packages which selectively include variants based on enabled styles
 # e.g. accelerator packages
 ######################################################################
-foreach(PKG_WITH_INCL CORESHELL DPD-SMOOTH PHONON QEQ OPENMP KOKKOS OPT INTEL GPU)
+foreach(PKG_WITH_INCL CORESHELL DPD-SMOOTH MC MISC PHONON QEQ OPENMP KOKKOS OPT INTEL GPU)
   if(PKG_${PKG_WITH_INCL})
     include(Packages/${PKG_WITH_INCL})
   endif()
@@ -796,9 +793,11 @@ include(Tools)
 include(Documentation)
 
 ###############################################################################
-# Install potential and force field files in data directory
+# Install bench, potential and force field files in data directory
 ###############################################################################
-set(LAMMPS_INSTALL_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/lammps)
+set(LAMMPS_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/lammps)
+
+install(DIRECTORY ${LAMMPS_DIR}/bench DESTINATION ${LAMMPS_INSTALL_DATADIR})
 install(DIRECTORY ${LAMMPS_POTENTIALS_DIR} DESTINATION ${LAMMPS_INSTALL_DATADIR})
 if(BUILD_TOOLS)
   install(DIRECTORY ${LAMMPS_TOOLS_DIR}/msi2lmp/frc_files DESTINATION ${LAMMPS_INSTALL_DATADIR})
@@ -841,9 +840,8 @@ if(BUILD_SHARED_LIBS)
   set(LIBLAMMPS_SHARED_BINARY ${MY_BUILD_DIR}/liblammps${LAMMPS_MACHINE}${CMAKE_SHARED_LIBRARY_SUFFIX})
   if(Python_EXECUTABLE)
     add_custom_target(
-      install-python ${CMAKE_COMMAND} -E remove_directory build
-      COMMAND ${Python_EXECUTABLE} ${LAMMPS_PYTHON_DIR}/install.py -p ${LAMMPS_PYTHON_DIR}/lammps
-              -l ${LIBLAMMPS_SHARED_BINARY} -w ${MY_BUILD_DIR}
+      install-python ${Python_EXECUTABLE} ${LAMMPS_PYTHON_DIR}/install.py -p ${LAMMPS_PYTHON_DIR}/lammps
+      -l ${LIBLAMMPS_SHARED_BINARY} -w ${MY_BUILD_DIR} -v ${LAMMPS_SOURCE_DIR}/version.h
       COMMENT "Installing LAMMPS Python module")
   else()
     add_custom_target(
@@ -856,35 +854,6 @@ else()
     ${CMAKE_COMMAND} -E echo "Must build LAMMPS as a shared library to use the Python module")
 endif()
 
-###############################################################################
-# Add LAMMPS python module to "install" target. This is taylored for building
-# LAMMPS for package managers and with different prefix settings.
-# This requires either a shared library or that the PYTHON package is included.
-###############################################################################
-if(BUILD_SHARED_LIBS OR PKG_PYTHON)
-  if(CMAKE_VERSION VERSION_LESS 3.12)
-    # adjust so we find Python 3 versions before Python 2 on old systems with old CMake
-    set(Python_ADDITIONAL_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6)
-    find_package(PythonInterp) # Deprecated since version 3.12
-    if(PYTHONINTERP_FOUND)
-      set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
-    endif()
-  else()
-    # backward compatibility
-    if(PYTHON_EXECUTABLE)
-      set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
-    endif()
-    find_package(Python COMPONENTS Interpreter)
-  endif()
-  if(Python_EXECUTABLE)
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/python/lib)
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/python/src)
-    file(COPY ${LAMMPS_SOURCE_DIR}/version.h  DESTINATION ${CMAKE_BINARY_DIR}/python/src)
-    file(COPY ${LAMMPS_PYTHON_DIR}/README ${LAMMPS_PYTHON_DIR}/pyproject.toml ${LAMMPS_PYTHON_DIR}/setup.py ${LAMMPS_PYTHON_DIR}/lammps  DESTINATION ${CMAKE_BINARY_DIR}/python/lib)
-    install(CODE "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")\n execute_process(COMMAND ${Python_EXECUTABLE} -m pip install -v ${CMAKE_BINARY_DIR}/python/lib --prefix=${CMAKE_INSTALL_PREFIX})\n else()\n execute_process(COMMAND ${Python_EXECUTABLE} -m pip install -v ${CMAKE_BINARY_DIR}/python/lib --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR})\n endif()")
-  endif()
-endif()
-
 include(Testing)
 include(CodeCoverage)
 include(CodingStandard)
@@ -921,13 +890,23 @@ else()
 endif()
 include(FeatureSummary)
 feature_summary(DESCRIPTION "The following tools and libraries have been found and configured:" WHAT PACKAGES_FOUND)
+if(GIT_FOUND AND EXISTS ${LAMMPS_DIR}/.git)
+  execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty=-modified --always
+    OUTPUT_VARIABLE GIT_DESCRIBE
+    ERROR_QUIET
+    WORKING_DIRECTORY ${LAMMPS_DIR}
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
 message(STATUS "<<< Build configuration >>>
-   LAMMPS Version:   ${PROJECT_VERSION}
+   LAMMPS Version:   ${PROJECT_VERSION} ${GIT_DESCRIBE}
    Operating System: ${CMAKE_SYSTEM_NAME} ${CMAKE_LINUX_DISTRO} ${CMAKE_DISTRO_VERSION}
    CMake Version:    ${CMAKE_VERSION}
    Build type:       ${LAMMPS_BUILD_TYPE}
    Install path:     ${CMAKE_INSTALL_PREFIX}
    Generator:        ${CMAKE_GENERATOR} using ${CMAKE_MAKE_PROGRAM}")
+if(CMAKE_CROSSCOMPILING)
+  message(STATUS "Cross compiling on ${CMAKE_HOST_SYSTEM}")
+endif()
 ###############################################################################
 # Print package summary
 ###############################################################################
@@ -1056,6 +1035,14 @@ endif()
 if(BUILD_LAMMPS_SHELL)
   message(STATUS "<<< Building LAMMPS Shell >>>")
 endif()
+if(BUILD_LAMMPS_GUI)
+  message(STATUS "<<< Building LAMMPS GUI >>>")
+  if(LAMMPS_GUI_USE_PLUGIN)
+    message(STATUS "Loading LAMMPS library as plugin at run time")
+  else()
+    message(STATUS "Linking LAMMPS library at compile time")
+  endif()
+endif()
 if(ENABLE_TESTING)
   message(STATUS "<<< Building Unit Tests >>>")
   if(ENABLE_COVERAGE)

cmake/CMakeLists.zlib

@@ -1,195 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-# When using CMake 3.4 and later, don't export symbols from executables unless
-# the CMAKE_ENABLE_EXPORTS variable is set.
-if(POLICY CMP0065)
-  cmake_policy(SET CMP0065 NEW)
-endif()
-if (POLICY CMP0077)
-  cmake_policy(SET CMP0077 NEW)
-endif()
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
-project(zlib C)
-
-set(VERSION "1.2.11")
-
-option(ASM686 "Enable building i686 assembly implementation" OFF)
-option(AMD64 "Enable building amd64 assembly implementation" OFF)
-
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-
-include(CheckTypeSize)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckCSourceCompiles)
-
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h    HAVE_STDINT_H)
-check_include_file(stddef.h    HAVE_STDDEF_H)
-
-#
-# Check to see if we have large file support
-#
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
-if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-endif()
-if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-endif()
-if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-endif()
-check_type_size(off64_t OFF64_T)
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-#
-# Check for fseeko
-#
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-endif()
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
-  endif()
-endif()
-
-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-		${ZLIB_PC} @ONLY)
-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-
-#============================================================================
-# zlib
-#============================================================================
-
-set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-    zlib.h
-)
-set(ZLIB_PRIVATE_HDRS
-    crc32.h
-    deflate.h
-    gzguts.h
-    inffast.h
-    inffixed.h
-    inflate.h
-    inftrees.h
-    trees.h
-    zutil.h
-)
-set(ZLIB_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    deflate.c
-    gzclose.c
-    gzlib.c
-    gzread.c
-    gzwrite.c
-    inflate.c
-    infback.c
-    inftrees.c
-    inffast.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-if(NOT MINGW)
-    set(ZLIB_DLL_SRCS
-        win32/zlib1.rc # If present will override custom build rule below.
-    )
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
-if(MINGW)
-    # This gets us DLL resource information when compiling on MinGW.
-    if(NOT CMAKE_RC_COMPILER)
-        set(CMAKE_RC_COMPILER windres.exe)
-    endif()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND ${CMAKE_RC_COMPILER}
-                            -D GCC_WINDRES
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-endif(MINGW)
-
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-   set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z)
-endif()

cmake/CMakeSettings.json

@@ -63,6 +63,11 @@
           "name": "ENABLE_TESTING",
           "value": "True",
           "type": "BOOL"
+        },
+        {
+          "name": "BUILD_LAMMPS_GUI",
+          "value": "False",
+          "type": "BOOL"
         }
       ]
     },
@@ -303,6 +308,54 @@
           "type": "STRING"
         }
       ]
+    },
+    {
+      "name": "x64-GUI-MSVC",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "buildRoot": "${workspaceRoot}\\build\\${name}",
+      "installRoot": "${workspaceRoot}\\install\\${name}",
+      "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -D QT_DIR=C:\\Qt\\5.15.2\\msvc2019_64\\lib\\cmake\\Qt5  -D Qt5_DIR=C:\\Qt\\5.15.2\\msvc2019_64\\lib\\cmake\\Qt5",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "-V",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": [
+        {
+          "name": "BUILD_SHARED_LIBS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TOOLS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "LAMMPS_EXCEPTIONS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "ENABLE_TESTING",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_MPI",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "WITH_PNG",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_LAMMPS_GUI",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
     }
   ]
 }

cmake/Modules/CodingStandard.cmake

@@ -5,6 +5,10 @@ if(CMAKE_VERSION VERSION_LESS 3.12)
         set(Python3_VERSION ${PYTHON_VERSION_STRING})
     endif()
 else()
+    # use default (or custom) Python executable, if version is sufficient
+    if(Python_VERSION VERSION_GREATER_EQUAL 3.5)
+      set(Python3_EXECUTABLE ${Python_EXECUTABLE})
+    endif()
     find_package(Python3 COMPONENTS Interpreter QUIET)
 endif()
 

cmake/Modules/DetectHIPInstallation.cmake

@@ -0,0 +1,16 @@
+if(NOT DEFINED HIP_PATH)
+    if(NOT DEFINED ENV{HIP_PATH})
+        message(FATAL_ERROR "HIP support requires HIP_PATH to be defined.\n"
+        "Either pass the HIP_PATH as a CMake option via -DHIP_PATH=... or set the HIP_PATH environment variable.")
+    else()
+        set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to HIP installation")
+    endif()
+endif()
+if(NOT DEFINED ROCM_PATH)
+    if(NOT DEFINED ENV{ROCM_PATH})
+        set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to ROCm installation")
+    else()
+        set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Path to ROCm installation")
+    endif()
+endif()
+list(APPEND CMAKE_PREFIX_PATH ${HIP_PATH} ${ROCM_PATH})

cmake/Modules/Documentation.cmake

@@ -4,14 +4,18 @@
 option(BUILD_DOC "Build LAMMPS HTML documentation" OFF)
 
 if(BUILD_DOC)
-  # Sphinx 3.x requires at least Python 3.5
+  # Current Sphinx versions require at least Python 3.8
   if(CMAKE_VERSION VERSION_LESS 3.12)
-    find_package(PythonInterp 3.5 REQUIRED)
+    find_package(PythonInterp 3.8 REQUIRED)
     set(VIRTUALENV ${PYTHON_EXECUTABLE} -m venv)
   else()
+    # use default (or custom) Python executable, if version is sufficient
+    if(Python_VERSION VERSION_GREATER_EQUAL 3.8)
+      set(Python3_EXECUTABLE ${Python_EXECUTABLE})
+    endif()
     find_package(Python3 REQUIRED COMPONENTS Interpreter)
-    if(Python3_VERSION VERSION_LESS 3.5)
-      message(FATAL_ERROR "Python 3.5 and up is required to build the HTML documentation")
+    if(Python3_VERSION VERSION_LESS 3.8)
+      message(FATAL_ERROR "Python 3.8 and up is required to build the HTML documentation")
     endif()
     set(VIRTUALENV ${Python3_EXECUTABLE} -m venv)
   endif()

cmake/Modules/FindClangFormat.cmake

@@ -1,5 +1,7 @@
 # Find clang-format
 find_program(ClangFormat_EXECUTABLE NAMES clang-format
+                                          clang-format-17.0
+                                          clang-format-16.0
                                           clang-format-15.0
                                           clang-format-14.0
                                           clang-format-13.0
@@ -19,7 +21,7 @@ if(ClangFormat_EXECUTABLE)
                   OUTPUT_VARIABLE clang_format_version
                   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  if(clang_format_version MATCHES "^(Ubuntu |)clang-format version .*")
+  if(clang_format_version MATCHES "^(Ubuntu |Debian |)clang-format version .*")
     # Arch Linux output:
     # clang-format version 10.0.0
     #
@@ -32,9 +34,15 @@ if(ClangFormat_EXECUTABLE)
     # Ubuntu 22.04 LTS output:
     # Ubuntu clang-format version 14.0.0-1ubuntu1
     #
+    # Debian 11 output:
+    # Debian clang-format version 11.0.1-2
+    #
+    # Debian 12 output:
+    # Debian clang-format version 14.0.6
+    #
     # Fedora 36 output:
     # clang-format version 14.0.5 (Fedora 14.0.5-1.fc36)
-    string(REGEX REPLACE "^(Ubuntu |)clang-format version ([0-9.]+).*"
+    string(REGEX REPLACE "^(Ubuntu |Debian |)clang-format version ([0-9.]+).*"
                          "\\2"
                          ClangFormat_VERSION
                          "${clang_format_version}")

cmake/Modules/LAMMPSUtils.cmake

@@ -99,8 +99,15 @@ function(check_for_autogen_files source_dir)
 endfunction()
 
 macro(pkg_depends PKG1 PKG2)
-  if(PKG_${PKG1} AND NOT (PKG_${PKG2} OR BUILD_${PKG2}))
-    message(FATAL_ERROR "The ${PKG1} package needs LAMMPS to be built with the ${PKG2} package")
+  if(DEFINED BUILD_${PKG2})
+    if(PKG_${PKG1} AND NOT BUILD_${PKG2})
+      message(FATAL_ERROR "The ${PKG1} package needs LAMMPS to be built with -D BUILD_${PKG2}=ON")
+    endif()
+  elseif(DEFINED PKG_${PKG2})
+    if(PKG_${PKG1} AND NOT PKG_${PKG2})
+      message(WARNING "The ${PKG1} package depends on the ${PKG2} package. Enabling it.")
+      set(PKG_${PKG2} ON CACHE BOOL "" FORCE)
+    endif()
   endif()
 endmacro()
 
@@ -118,32 +125,34 @@ endfunction(GenerateBinaryHeader)
 
 # fetch missing potential files
 function(FetchPotentials pkgfolder potfolder)
-  if(EXISTS "${pkgfolder}/potentials.txt")
-    file(STRINGS "${pkgfolder}/potentials.txt" linelist REGEX "^[^#].")
-    foreach(line ${linelist})
-      string(FIND ${line} " " blank)
-      math(EXPR plusone "${blank}+1")
-      string(SUBSTRING ${line} 0 ${blank} pot)
-      string(SUBSTRING ${line} ${plusone} -1 sum)
-      if(EXISTS "${LAMMPS_POTENTIALS_DIR}/${pot}")
-        file(MD5 "${LAMMPS_POTENTIALS_DIR}/${pot}" oldsum)
-      endif()
-      if(NOT sum STREQUAL oldsum)
-        message(STATUS "Downloading external potential ${pot} from ${LAMMPS_POTENTIALS_URL}")
-        string(MD5 TMP_EXT "${CMAKE_BINARY_DIR}")
-        file(DOWNLOAD "${LAMMPS_POTENTIALS_URL}/${pot}.${sum}" "${CMAKE_BINARY_DIR}/${pot}.${TMP_EXT}"
-          EXPECTED_HASH MD5=${sum} SHOW_PROGRESS)
-        file(COPY "${CMAKE_BINARY_DIR}/${pot}.${TMP_EXT}" DESTINATION "${LAMMPS_POTENTIALS_DIR}")
-        file(RENAME "${LAMMPS_POTENTIALS_DIR}/${pot}.${TMP_EXT}" "${LAMMPS_POTENTIALS_DIR}/${pot}")
-      endif()
-    endforeach()
+  if(DOWNLOAD_POTENTIALS)
+    if(EXISTS "${pkgfolder}/potentials.txt")
+      file(STRINGS "${pkgfolder}/potentials.txt" linelist REGEX "^[^#].")
+      foreach(line ${linelist})
+        string(FIND ${line} " " blank)
+        math(EXPR plusone "${blank}+1")
+        string(SUBSTRING ${line} 0 ${blank} pot)
+        string(SUBSTRING ${line} ${plusone} -1 sum)
+        if(EXISTS "${LAMMPS_POTENTIALS_DIR}/${pot}")
+          file(MD5 "${LAMMPS_POTENTIALS_DIR}/${pot}" oldsum)
+        endif()
+        if(NOT sum STREQUAL oldsum)
+          message(STATUS "Downloading external potential ${pot} from ${LAMMPS_POTENTIALS_URL}")
+          string(RANDOM LENGTH 10 TMP_EXT)
+          file(DOWNLOAD "${LAMMPS_POTENTIALS_URL}/${pot}.${sum}" "${CMAKE_BINARY_DIR}/${pot}.${TMP_EXT}"
+            EXPECTED_HASH MD5=${sum} SHOW_PROGRESS)
+          file(COPY "${CMAKE_BINARY_DIR}/${pot}.${TMP_EXT}" DESTINATION "${LAMMPS_POTENTIALS_DIR}")
+          file(RENAME "${LAMMPS_POTENTIALS_DIR}/${pot}.${TMP_EXT}" "${LAMMPS_POTENTIALS_DIR}/${pot}")
+        endif()
+      endforeach()
+    endif()
   endif()
 endfunction(FetchPotentials)
 
 # set CMAKE_LINUX_DISTRO and CMAKE_DISTRO_VERSION on Linux
 if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND (EXISTS /etc/os-release))
   file(STRINGS /etc/os-release distro REGEX "^NAME=")
-  string(REGEX REPLACE "NAME=\"?([^\"]*)\"?" "\\1" distro "${distro}")
+  string(REGEX REPLACE "NAME=\"?([^ ]+).*\"?" "\\1" distro "${distro}")
   file(STRINGS /etc/os-release disversion REGEX "^VERSION_ID=")
   string(REGEX REPLACE "VERSION_ID=\"?([^\"]*)\"?" "\\1" disversion "${disversion}")
   set(CMAKE_LINUX_DISTRO ${distro})

cmake/Modules/Packages/COLVARS.cmake

@@ -2,19 +2,14 @@ set(COLVARS_SOURCE_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars)
 
 file(GLOB COLVARS_SOURCES ${CONFIGURE_DEPENDS} ${COLVARS_SOURCE_DIR}/[^.]*.cpp)
 
-option(COLVARS_DEBUG "Debugging messages for Colvars (quite verbose)" OFF)
+option(COLVARS_DEBUG "Enable debugging messages for Colvars (quite verbose)" OFF)
 
-# Build Lepton by default
-option(COLVARS_LEPTON "Build and link the Lepton library" ON)
+option(COLVARS_LEPTON "Use the Lepton library for custom expressions" ON)
 
 if(COLVARS_LEPTON)
-  set(LEPTON_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton)
-  file(GLOB LEPTON_SOURCES ${CONFIGURE_DEPENDS} ${LEPTON_DIR}/src/[^.]*.cpp)
-  add_library(lepton STATIC ${LEPTON_SOURCES})
-  # Change the define below to LEPTON_BUILDING_SHARED_LIBRARY when linking Lepton as a DLL with MSVC
-  target_compile_definitions(lepton PRIVATE -DLEPTON_BUILDING_STATIC_LIBRARY)
-  set_target_properties(lepton PROPERTIES OUTPUT_NAME lammps_lepton${LAMMPS_MACHINE})
-  target_include_directories(lepton PRIVATE ${LEPTON_DIR}/include)
+  if(NOT LEPTON_SOURCE_DIR)
+    include(Packages/LEPTON)
+  endif()
 endif()
 
 add_library(colvars STATIC ${COLVARS_SOURCES})
@@ -30,14 +25,11 @@ target_include_directories(colvars PRIVATE ${LAMMPS_SOURCE_DIR})
 target_link_libraries(lammps PRIVATE colvars)
 
 if(COLVARS_DEBUG)
-  # Need to export the macro publicly to also affect the proxy
+  # Need to export the define publicly to be valid in interface code
   target_compile_definitions(colvars PUBLIC -DCOLVARS_DEBUG)
 endif()
 
 if(COLVARS_LEPTON)
-  target_link_libraries(lammps PRIVATE lepton)
   target_compile_definitions(colvars PRIVATE -DLEPTON)
-  # Disable the line below when linking Lepton as a DLL with MSVC
-  target_compile_definitions(colvars PRIVATE -DLEPTON_USE_STATIC_LIBRARIES)
-  target_include_directories(colvars PUBLIC ${LEPTON_DIR}/include)
+  target_link_libraries(colvars PUBLIC lepton)
 endif()

cmake/Modules/Packages/GPU.cmake

@@ -29,6 +29,16 @@ endif()
 option(GPU_DEBUG "Enable debugging code of the GPU package" OFF)
 mark_as_advanced(GPU_DEBUG)
 
+if(PKG_AMOEBA AND FFT_SINGLE)
+  message(FATAL_ERROR "GPU acceleration of AMOEBA is not (yet) compatible with single precision FFT")
+endif()
+
+if (PKG_AMOEBA)
+  list(APPEND GPU_SOURCES
+              ${GPU_SOURCES_DIR}/amoeba_convolution_gpu.h
+              ${GPU_SOURCES_DIR}/amoeba_convolution_gpu.cpp)
+endif()
+
 file(GLOB GPU_LIB_SOURCES ${CONFIGURE_DEPENDS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/[^.]*.cpp)
 file(MAKE_DIRECTORY ${LAMMPS_LIB_BINARY_DIR}/gpu)
 
@@ -50,10 +60,12 @@ if(GPU_API STREQUAL "CUDA")
   option(CUDA_MPS_SUPPORT "Enable tweaks to support CUDA Multi-process service (MPS)" OFF)
   if(CUDA_MPS_SUPPORT)
     if(CUDPP_OPT)
-      message(FATAL_ERROR "Must use -DCUDPP_OPT=OFF with -DGPU_CUDA_MPS_SUPPORT=ON")
+      message(FATAL_ERROR "Must use -DCUDPP_OPT=OFF with -DCUDA_MPS_SUPPORT=ON")
     endif()
-    set(GPU_CUDA_MPS_FLAGS "-DCUDA_PROXY")
+    set(GPU_CUDA_MPS_FLAGS "-DCUDA_MPS_SUPPORT")
   endif()
+  option(CUDA_BUILD_MULTIARCH "Enable building CUDA kernels for all supported GPU architectures" ON)
+  mark_as_advanced(GPU_BUILD_MULTIARCH)
 
   set(GPU_ARCH "sm_50" CACHE STRING "LAMMPS GPU CUDA SM primary architecture (e.g. sm_60)")
 
@@ -83,56 +95,58 @@ if(GPU_API STREQUAL "CUDA")
   # --arch translates directly instead of JIT, so this should be for the preferred or most common architecture
   set(GPU_CUDA_GENCODE "-arch=${GPU_ARCH}")
 
-  # apply the following to build "fat" CUDA binaries only for known CUDA toolkits since version 8.0
-  # only the Kepler achitecture and beyond is supported
-  # comparison chart according to: https://en.wikipedia.org/wiki/CUDA#GPUs_supported
-  if(CUDA_VERSION VERSION_LESS 8.0)
-    message(FATAL_ERROR "CUDA Toolkit version 8.0 or later is required")
-  elseif(CUDA_VERSION VERSION_GREATER_EQUAL "13.0")
-    message(WARNING "Untested CUDA Toolkit version ${CUDA_VERSION}. Use at your own risk")
-    set(GPU_CUDA_GENCODE "-arch=all")
-  elseif(CUDA_VERSION VERSION_GREATER_EQUAL "12.0")
-    set(GPU_CUDA_GENCODE "-arch=all")
-  else()
-    # Kepler (GPU Arch 3.0) is supported by CUDA 5 to CUDA 10.2
-    if((CUDA_VERSION VERSION_GREATER_EQUAL "5.0") AND (CUDA_VERSION VERSION_LESS "11.0"))
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_30,code=[sm_30,compute_30] ")
-    endif()
-    # Kepler (GPU Arch 3.5) is supported by CUDA 5 to CUDA 11
-    if((CUDA_VERSION VERSION_GREATER_EQUAL "5.0") AND (CUDA_VERSION VERSION_LESS "12.0"))
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_35,code=[sm_35,compute_35]")
-    endif()
-    # Maxwell (GPU Arch 5.x) is supported by CUDA 6 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "6.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_50,code=[sm_50,compute_50] -gencode arch=compute_52,code=[sm_52,compute_52]")
-    endif()
-    # Pascal (GPU Arch 6.x) is supported by CUDA 8 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "8.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_60,code=[sm_60,compute_60] -gencode arch=compute_61,code=[sm_61,compute_61]")
-    endif()
-    # Volta (GPU Arch 7.0) is supported by CUDA 9 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "9.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_70,code=[sm_70,compute_70]")
-    endif()
-    # Turing (GPU Arch 7.5) is supported by CUDA 10 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_75,code=[sm_75,compute_75]")
-    endif()
-    # Ampere (GPU Arch 8.0) is supported by CUDA 11 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_80,code=[sm_80,compute_80]")
-    endif()
-    # Ampere (GPU Arch 8.6) is supported by CUDA 11.1 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "11.1")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_86,code=[sm_86,compute_86]")
-    endif()
-    # Lovelace (GPU Arch 8.9) is supported by CUDA 11.8 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_90,code=[sm_90,compute_90]")
-    endif()
-    # Hopper (GPU Arch 9.0) is supported by CUDA 12.0 and later
-    if(CUDA_VERSION VERSION_GREATER_EQUAL "12.0")
-      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_90,code=[sm_90,compute_90]")
+  if(CUDA_BUILD_MULTIARCH)
+    # apply the following to build "fat" CUDA binaries only for known CUDA toolkits since version 8.0
+    # only the Kepler achitecture and beyond is supported
+    # comparison chart according to: https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+    if(CUDA_VERSION VERSION_LESS 8.0)
+      message(FATAL_ERROR "CUDA Toolkit version 8.0 or later is required")
+    elseif(CUDA_VERSION VERSION_GREATER_EQUAL "13.0")
+      message(WARNING "Untested CUDA Toolkit version ${CUDA_VERSION}. Use at your own risk")
+      set(GPU_CUDA_GENCODE "-arch=all")
+    elseif(CUDA_VERSION VERSION_GREATER_EQUAL "12.0")
+      set(GPU_CUDA_GENCODE "-arch=all")
+    else()
+      # Kepler (GPU Arch 3.0) is supported by CUDA 5 to CUDA 10.2
+      if((CUDA_VERSION VERSION_GREATER_EQUAL "5.0") AND (CUDA_VERSION VERSION_LESS "11.0"))
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_30,code=[sm_30,compute_30] ")
+      endif()
+      # Kepler (GPU Arch 3.5) is supported by CUDA 5 to CUDA 11
+      if((CUDA_VERSION VERSION_GREATER_EQUAL "5.0") AND (CUDA_VERSION VERSION_LESS "12.0"))
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_35,code=[sm_35,compute_35]")
+      endif()
+      # Maxwell (GPU Arch 5.x) is supported by CUDA 6 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "6.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_50,code=[sm_50,compute_50] -gencode arch=compute_52,code=[sm_52,compute_52]")
+      endif()
+      # Pascal (GPU Arch 6.x) is supported by CUDA 8 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "8.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_60,code=[sm_60,compute_60] -gencode arch=compute_61,code=[sm_61,compute_61]")
+      endif()
+      # Volta (GPU Arch 7.0) is supported by CUDA 9 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "9.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_70,code=[sm_70,compute_70]")
+      endif()
+      # Turing (GPU Arch 7.5) is supported by CUDA 10 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_75,code=[sm_75,compute_75]")
+      endif()
+      # Ampere (GPU Arch 8.0) is supported by CUDA 11 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_80,code=[sm_80,compute_80]")
+      endif()
+      # Ampere (GPU Arch 8.6) is supported by CUDA 11.1 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "11.1")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_86,code=[sm_86,compute_86]")
+      endif()
+      # Lovelace (GPU Arch 8.9) is supported by CUDA 11.8 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_90,code=[sm_90,compute_90]")
+      endif()
+      # Hopper (GPU Arch 9.0) is supported by CUDA 12.0 and later
+      if(CUDA_VERSION VERSION_GREATER_EQUAL "12.0")
+        string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_90,code=[sm_90,compute_90]")
+      endif()
     endif()
   endif()
 
@@ -200,6 +214,7 @@ elseif(GPU_API STREQUAL "OPENCL")
     ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff.cu
     ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_zbl.cu
     ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_mod.cu
+    ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_hippo.cu
   )
 
   foreach(GPU_KERNEL ${GPU_LIB_CU})
@@ -216,6 +231,7 @@ elseif(GPU_API STREQUAL "OPENCL")
   GenerateOpenCLHeader(tersoff ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff.cu)
   GenerateOpenCLHeader(tersoff_zbl ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_zbl_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_zbl_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_zbl.cu)
   GenerateOpenCLHeader(tersoff_mod ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_mod_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_mod_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_tersoff_mod.cu)
+  GenerateOpenCLHeader(hippo ${CMAKE_CURRENT_BINARY_DIR}/gpu/hippo_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_hippo_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_hippo.cu)
 
   list(APPEND GPU_LIB_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/gpu/gayberne_cl.h
@@ -225,6 +241,7 @@ elseif(GPU_API STREQUAL "OPENCL")
     ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_cl.h
     ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_zbl_cl.h
     ${CMAKE_CURRENT_BINARY_DIR}/gpu/tersoff_mod_cl.h
+    ${CMAKE_CURRENT_BINARY_DIR}/gpu/hippo_cl.h
   )
 
   add_library(gpu STATIC ${GPU_LIB_SOURCES})
@@ -243,22 +260,7 @@ elseif(GPU_API STREQUAL "OPENCL")
   add_dependencies(ocl_get_devices OpenCL::OpenCL)
 
 elseif(GPU_API STREQUAL "HIP")
-  if(NOT DEFINED HIP_PATH)
-      if(NOT DEFINED ENV{HIP_PATH})
-          message(FATAL_ERROR "GPU_API=HIP requires HIP_PATH to be defined.\n"
-          "Either pass the HIP_PATH as a CMake option via -DHIP_PATH=... or set the HIP_PATH environment variable.")
-      else()
-          set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to HIP installation")
-      endif()
-  endif()
-  if(NOT DEFINED ROCM_PATH)
-      if(NOT DEFINED ENV{ROCM_PATH})
-          set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to ROCm installation")
-      else()
-          set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Path to ROCm installation")
-      endif()
-  endif()
-  list(APPEND CMAKE_PREFIX_PATH ${HIP_PATH} ${ROCM_PATH})
+  include(DetectHIPInstallation)
   find_package(hip REQUIRED)
   option(HIP_USE_DEVICE_SORT "Use GPU sorting" ON)
 
@@ -272,7 +274,7 @@ elseif(GPU_API STREQUAL "HIP")
 
   set(ENV{HIP_PLATFORM} ${HIP_PLATFORM})
 
-  if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd")
+  if(HIP_PLATFORM STREQUAL "amd")
     set(HIP_ARCH "gfx906" CACHE STRING "HIP target architecture")
   elseif(HIP_PLATFORM STREQUAL "spirv")
     set(HIP_ARCH "spirv" CACHE STRING "HIP target architecture")
@@ -345,7 +347,7 @@ elseif(GPU_API STREQUAL "HIP")
     set(CUBIN_FILE   "${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}.cubin")
     set(CUBIN_H_FILE "${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}_cubin.h")
 
-    if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd")
+    if(HIP_PLATFORM STREQUAL "amd")
         configure_file(${CU_FILE} ${CU_CPP_FILE} COPYONLY)
 
         if(HIP_COMPILER STREQUAL "clang")
@@ -399,7 +401,8 @@ elseif(GPU_API STREQUAL "HIP")
       set_property(TARGET gpu PROPERTY CXX_STANDARD 14)
     endif()
     # add hipCUB
-    target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)
+    find_package(hipcub REQUIRED)
+    target_link_libraries(gpu PRIVATE hip::hipcub)
     target_compile_definitions(gpu PRIVATE -DUSE_HIP_DEVICE_SORT)
 
     if(HIP_PLATFORM STREQUAL "nvcc")
@@ -452,26 +455,12 @@ elseif(GPU_API STREQUAL "HIP")
 
   if(HIP_PLATFORM STREQUAL "nvcc")
     target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_NVCC__)
-    target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)
     target_include_directories(gpu PRIVATE ${CUDA_INCLUDE_DIRS})
     target_link_libraries(gpu PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
 
     target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_NVCC__)
-    target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/include)
     target_include_directories(hip_get_devices PRIVATE ${CUDA_INCLUDE_DIRS})
     target_link_libraries(hip_get_devices PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
-  elseif(HIP_PLATFORM STREQUAL "hcc")
-    target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_HCC__)
-    target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)
-
-    target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_HCC__)
-    target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/../include)
-  elseif(HIP_PLATFORM STREQUAL "amd")
-    target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_AMD__)
-    target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)
-
-    target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_AMD__)
-    target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/../include)
   endif()
 endif()
 

cmake/Modules/Packages/INTEL.cmake

@@ -112,9 +112,5 @@ if(PKG_KSPACE)
   RegisterIntegrateStyle(${INTEL_SOURCES_DIR}/verlet_lrt_intel.h)
 endif()
 
-if(PKG_ELECTRODE)
-  list(APPEND INTEL_SOURCES ${INTEL_SOURCES_DIR}/electrode_accel_intel.cpp)
-endif()
-
 target_sources(lammps PRIVATE ${INTEL_SOURCES})
 target_include_directories(lammps PRIVATE ${INTEL_SOURCES_DIR})

cmake/Modules/Packages/KIM.cmake

@@ -19,7 +19,7 @@ if(CURL_FOUND)
     target_compile_definitions(lammps PRIVATE -DLMP_NO_SSL_CHECK)
   endif()
 endif()
-set(KIM_EXTRA_UNITTESTS OFF CACHE STRING "Set extra unit tests verbose mode on/off. If on, extra tests are included.")
+option(KIM_EXTRA_UNITTESTS "Enable extra unit tests for the KIM package." OFF)
 mark_as_advanced(KIM_EXTRA_UNITTESTS)
 find_package(PkgConfig QUIET)
 set(DOWNLOAD_KIM_DEFAULT ON)

cmake/Modules/Packages/KOKKOS.cmake

@@ -16,8 +16,8 @@ if(Kokkos_ENABLE_OPENMP)
   if(NOT BUILD_OMP)
     message(FATAL_ERROR "Must enable BUILD_OMP with Kokkos_ENABLE_OPENMP")
   else()
-    # NVHPC does not seem to provide a detectable OpenMP version, but is far beyond version 3.1
-    if((OpenMP_CXX_VERSION VERSION_LESS 3.1) AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC"))
+    # NVHPC/(AMD)Clang does not seem to provide a detectable OpenMP version, but is far beyond version 3.1
+    if((OpenMP_CXX_VERSION VERSION_LESS 3.1) AND NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")))
       message(FATAL_ERROR "Compiler must support OpenMP 3.1 or later with Kokkos_ENABLE_OPENMP")
     endif()
   endif()
@@ -49,8 +49,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/3.6.01.tar.gz" CACHE STRING "URL for KOKKOS tarball")
-  set(KOKKOS_MD5 "0ec97fc0c356dd65bd2487defe81a7bf" CACHE STRING "MD5 checksum of KOKKOS tarball")
+  set(KOKKOS_URL "https://github.com/kokkos/kokkos/archive/3.7.02.tar.gz" CACHE STRING "URL for KOKKOS tarball")
+  set(KOKKOS_MD5 "34d7860d548c06a4040236d959c9f99a" CACHE STRING "MD5 checksum of KOKKOS tarball")
   mark_as_advanced(KOKKOS_URL)
   mark_as_advanced(KOKKOS_MD5)
   GetFallbackURL(KOKKOS_URL KOKKOS_FALLBACK)
@@ -72,13 +72,11 @@ if(DOWNLOAD_KOKKOS)
   set_target_properties(LAMMPS::KOKKOSCONTAINERS PROPERTIES
     IMPORTED_LOCATION "${INSTALL_DIR}/lib/libkokkoscontainers.a")
   target_link_libraries(lammps PRIVATE LAMMPS::KOKKOSCORE LAMMPS::KOKKOSCONTAINERS)
-  target_link_libraries(lmp PRIVATE LAMMPS::KOKKOSCORE LAMMPS::KOKKOSCONTAINERS)
   add_dependencies(LAMMPS::KOKKOSCORE kokkos_build)
   add_dependencies(LAMMPS::KOKKOSCONTAINERS kokkos_build)
 elseif(EXTERNAL_KOKKOS)
-  find_package(Kokkos 3.6.01 REQUIRED CONFIG)
+  find_package(Kokkos 3.7.02 REQUIRED CONFIG)
   target_link_libraries(lammps PRIVATE Kokkos::kokkos)
-  target_link_libraries(lmp PRIVATE Kokkos::kokkos)
 else()
   set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
   set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
@@ -90,8 +88,7 @@ else()
   if(CMAKE_REQUEST_PIC)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
   endif()
-  add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR})
-
+  add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR} EXCLUDE_FROM_ALL)
 
   set(Kokkos_INCLUDE_DIRS ${LAMMPS_LIB_KOKKOS_SRC_DIR}/core/src
                           ${LAMMPS_LIB_KOKKOS_SRC_DIR}/containers/src
@@ -99,7 +96,6 @@ else()
                           ${LAMMPS_LIB_KOKKOS_BIN_DIR})
   target_include_directories(lammps PRIVATE ${Kokkos_INCLUDE_DIRS})
   target_link_libraries(lammps PRIVATE kokkos)
-  target_link_libraries(lmp PRIVATE kokkos)
   if(BUILD_SHARED_LIBS_WAS_ON)
     set(BUILD_SHARED_LIBS ON)
   endif()
@@ -125,9 +121,14 @@ set(KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/domain_kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/modify_kokkos.cpp)
 
+# fix wall/gran has been refactored in an incompatible way. Use old version of base class for now
+if(PKG_GRANULAR)
+  list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/fix_wall_gran_old.cpp)
+endif()
+
 if(PKG_KSPACE)
   list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/fft3d_kokkos.cpp
-                                 ${KOKKOS_PKG_SOURCES_DIR}/gridcomm_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/grid3d_kokkos.cpp
                                  ${KOKKOS_PKG_SOURCES_DIR}/remap_kokkos.cpp)
   if(Kokkos_ENABLE_CUDA)
     if(NOT (FFT STREQUAL "KISS"))
@@ -136,12 +137,37 @@ if(PKG_KSPACE)
     endif()
   elseif(Kokkos_ENABLE_HIP)
     if(NOT (FFT STREQUAL "KISS"))
+      include(DetectHIPInstallation)
+      find_package(hipfft REQUIRED)
       target_compile_definitions(lammps PRIVATE -DFFT_HIPFFT)
-      target_link_libraries(lammps PRIVATE hipfft)
+      target_link_libraries(lammps PRIVATE hip::hipfft)
     endif()
   endif()
 endif()
 
+if(PKG_ML-IAP)
+  list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/mliap_data_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/mliap_descriptor_so3_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/mliap_model_linear_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/mliap_model_python_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/mliap_unified_kokkos.cpp
+                                 ${KOKKOS_PKG_SOURCES_DIR}/mliap_so3_kokkos.cpp)
+
+  # Add KOKKOS version of ML-IAP Python coupling if non-KOKKOS version is included
+  if(MLIAP_ENABLE_PYTHON AND Cythonize_EXECUTABLE)
+    file(GLOB MLIAP_KOKKOS_CYTHON_SRC ${CONFIGURE_DEPENDS} ${LAMMPS_SOURCE_DIR}/KOKKOS/*.pyx)
+    foreach(MLIAP_CYTHON_FILE ${MLIAP_KOKKOS_CYTHON_SRC})
+      get_filename_component(MLIAP_CYTHON_BASE ${MLIAP_CYTHON_FILE} NAME_WE)
+      add_custom_command(OUTPUT  ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.h
+              COMMAND            ${CMAKE_COMMAND} -E copy_if_different ${MLIAP_CYTHON_FILE} ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
+              COMMAND            ${Cythonize_EXECUTABLE} -3 ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
+              WORKING_DIRECTORY  ${MLIAP_BINARY_DIR}
+              MAIN_DEPENDENCY    ${MLIAP_CYTHON_FILE}
+              COMMENT "Generating C++ sources with cythonize...")
+      list(APPEND KOKKOS_PKG_SOURCES ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp)
+    endforeach()
+  endif()
+endif()
 
 if(PKG_PHONON)
   list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/dynamical_matrix_kokkos.cpp)

cmake/Modules/Packages/LATTE.cmake

@@ -1,54 +0,0 @@
-enable_language(Fortran)
-
-# using lammps in a super-build setting
-if(TARGET LATTE::latte)
-  target_link_libraries(lammps PRIVATE LATTE::latte)
-  return()
-endif()
-
-find_package(LATTE 1.2.2 CONFIG)
-if(LATTE_FOUND)
-  set(DOWNLOAD_LATTE_DEFAULT OFF)
-else()
-  set(DOWNLOAD_LATTE_DEFAULT ON)
-endif()
-option(DOWNLOAD_LATTE "Download the LATTE library instead of using an already installed one" ${DOWNLOAD_LATTE_DEFAULT})
-if(DOWNLOAD_LATTE)
-  message(STATUS "LATTE download requested - we will build our own")
-  set(LATTE_URL "https://github.com/lanl/LATTE/archive/v1.2.2.tar.gz" CACHE STRING "URL for LATTE tarball")
-  set(LATTE_MD5 "820e73a457ced178c08c71389a385de7" CACHE STRING "MD5 checksum of LATTE tarball")
-  mark_as_advanced(LATTE_URL)
-  mark_as_advanced(LATTE_MD5)
-  GetFallbackURL(LATTE_URL LATTE_FALLBACK)
-
-  # CMake cannot pass BLAS or LAPACK library variable to external project if they are a list
-  list(LENGTH BLAS_LIBRARIES} NUM_BLAS)
-  list(LENGTH LAPACK_LIBRARIES NUM_LAPACK)
-  if((NUM_BLAS GREATER 1) OR (NUM_LAPACK GREATER 1) AND NOT USE_INTERNAL_LINALG)
-    message(FATAL_ERROR "Cannot compile downloaded LATTE library due to a technical limitation. "
-                        "Try to configure LAMMPS with '-D USE_INTERNAL_LINALG=on' added as a workaround.")
-  endif()
-
-  include(ExternalProject)
-  ExternalProject_Add(latte_build
-    URL     ${LATTE_URL} ${LATTE_FALLBACK}
-    URL_MD5 ${LATTE_MD5}
-    SOURCE_SUBDIR cmake
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${CMAKE_REQUEST_PIC} -DCMAKE_INSTALL_LIBDIR=lib
-    -DBLAS_LIBRARIES=${BLAS_LIBRARIES} -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES}
-    -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS}
-    -DCMAKE_Fortran_FLAGS_${BTYPE}=${CMAKE_Fortran_FLAGS_${BTYPE}} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/liblatte.a
-  )
-  ExternalProject_get_property(latte_build INSTALL_DIR)
-  add_library(LAMMPS::LATTE UNKNOWN IMPORTED)
-  set_target_properties(LAMMPS::LATTE PROPERTIES
-    IMPORTED_LOCATION "${INSTALL_DIR}/lib/liblatte.a"
-    INTERFACE_LINK_LIBRARIES "${LAPACK_LIBRARIES}")
-  target_link_libraries(lammps PRIVATE LAMMPS::LATTE)
-  add_dependencies(LAMMPS::LATTE latte_build)
-else()
-  find_package(LATTE 1.2.2 REQUIRED CONFIG)
-  target_link_libraries(lammps PRIVATE LATTE::latte)
-endif()

cmake/Modules/Packages/LEPTON.cmake

@@ -0,0 +1,35 @@
+# avoid including this file twice
+if(LEPTON_SOURCE_DIR)
+   return()
+endif()
+set(LEPTON_SOURCE_DIR ${LAMMPS_LIB_SOURCE_DIR}/lepton)
+
+file(GLOB LEPTON_SOURCES ${CONFIGURE_DEPENDS} ${LEPTON_SOURCE_DIR}/src/[^.]*.cpp)
+
+if((CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") OR
+   (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") OR
+   (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"))
+   option(LEPTON_ENABLE_JIT "Enable Just-In-Time compiler for Lepton" ON)
+else()
+   option(LEPTON_ENABLE_JIT "Enable Just-In-Time compiler for Lepton" OFF)
+endif()
+
+if(LEPTON_ENABLE_JIT)
+  file(GLOB ASMJIT_SOURCES ${CONFIGURE_DEPENDS} ${LEPTON_SOURCE_DIR}/asmjit/*/[^.]*.cpp)
+endif()
+
+add_library(lepton STATIC ${LEPTON_SOURCES} ${ASMJIT_SOURCES})
+set_target_properties(lepton PROPERTIES OUTPUT_NAME lammps_lepton${LAMMPS_MACHINE})
+target_compile_definitions(lepton PUBLIC LEPTON_BUILDING_STATIC_LIBRARY=1)
+target_include_directories(lepton PUBLIC ${LEPTON_SOURCE_DIR}/include)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  find_library(LIB_RT rt QUIET)
+  target_link_libraries(lepton PUBLIC ${LIB_RT})
+endif()
+
+if(LEPTON_ENABLE_JIT)
+  target_compile_definitions(lepton PUBLIC "LEPTON_USE_JIT=1;ASMJIT_BUILD_X86=1;ASMJIT_STATIC=1;ASMJIT_BUILD_RELEASE=1")
+  target_include_directories(lepton PUBLIC ${LEPTON_SOURCE_DIR})
+endif()
+
+target_link_libraries(lammps PRIVATE lepton)

cmake/Modules/Packages/MC.cmake

@@ -0,0 +1,9 @@
+# fix sgcmc may only be installed if also the EAM pair style from MANYBODY is installed
+if(NOT PKG_MANYBODY)
+  get_property(LAMMPS_FIX_HEADERS GLOBAL PROPERTY FIX)
+  list(REMOVE_ITEM LAMMPS_FIX_HEADERS ${LAMMPS_SOURCE_DIR}/MC/fix_sgcmc.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_sgcmc.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
+endif()

cmake/Modules/Packages/MDI.cmake

@@ -8,8 +8,8 @@ option(DOWNLOAD_MDI "Download and compile the MDI library instead of using an al
 
 if(DOWNLOAD_MDI)
   message(STATUS "MDI download requested - we will build our own")
-  set(MDI_URL "https://github.com/MolSSI-MDI/MDI_Library/archive/v1.3.2.tar.gz" CACHE STRING "URL for MDI tarball")
-  set(MDI_MD5 "836f5da400d8cff0f0e4435640f9454f" CACHE STRING "MD5 checksum for MDI tarball")
+  set(MDI_URL "https://github.com/MolSSI-MDI/MDI_Library/archive/v1.4.16.tar.gz" CACHE STRING "URL for MDI tarball")
+  set(MDI_MD5 "407db44e2d79447ab5c1233af1965f65" CACHE STRING "MD5 checksum for MDI tarball")
   mark_as_advanced(MDI_URL)
   mark_as_advanced(MDI_MD5)
   GetFallbackURL(MDI_URL MDI_FALLBACK)
@@ -27,8 +27,21 @@ if(DOWNLOAD_MDI)
   # detect if we have python development support and thus can enable python plugins
   set(MDI_USE_PYTHON_PLUGINS OFF)
   if(CMAKE_VERSION VERSION_LESS 3.12)
+    if(NOT PYTHON_VERSION_STRING)
+      set(Python_ADDITIONAL_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6)
+      # search for interpreter first, so we have a consistent library
+      find_package(PythonInterp) # Deprecated since version 3.12
+      if(PYTHONINTERP_FOUND)
+        set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
+      endif()
+    endif()
+    # search for the library matching the selected interpreter
+    set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
     find_package(PythonLibs QUIET) # Deprecated since version 3.12
     if(PYTHONLIBS_FOUND)
+      if(NOT (PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING))
+        message(FATAL_ERROR "Python Library version ${PYTHONLIBS_VERSION_STRING} does not match Interpreter version ${PYTHON_VERSION_STRING}")
+      endif()
       set(MDI_USE_PYTHON_PLUGINS ON)
     endif()
   else()
@@ -37,6 +50,14 @@ if(DOWNLOAD_MDI)
       set(MDI_USE_PYTHON_PLUGINS ON)
     endif()
   endif()
+  # python plugins are not supported and thus must be always off on Windows
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    unset(Python_Development_FOUND)
+    set(MDI_USE_PYTHON_PLUGINS OFF)
+    if(CMAKE_CROSSCOMPILING)
+      set(CMAKE_INSTALL_LIBDIR lib)
+    endif()
+  endif()
 
   # download/ build MDI library
   # always build static library with -fpic
@@ -45,8 +66,9 @@ if(DOWNLOAD_MDI)
   ExternalProject_Add(mdi_build
     URL     ${MDI_URL} ${MDI_FALLBACK}
     URL_MD5 ${MDI_MD5}
-    CMAKE_ARGS ${CMAKE_REQUEST_PIC}
-    -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/mdi_build_ext
+    CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/mdi_build_ext
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
@@ -55,25 +77,26 @@ if(DOWNLOAD_MDI)
     -Dlanguage=C
     -Dlibtype=STATIC
     -Dmpi=${MDI_USE_MPI}
+    -Dplugins=ON
     -Dpython_plugins=${MDI_USE_PYTHON_PLUGINS}
     UPDATE_COMMAND ""
-    INSTALL_COMMAND ""
-    BUILD_BYPRODUCTS "<BINARY_DIR>/MDI_Library/libmdi.a"
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/mdi_build_ext/src/mdi_build-build --target install
+    BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mdi_build_ext/${CMAKE_INSTALL_LIBDIR}/mdi/${CMAKE_STATIC_LIBRARY_PREFIX}mdi${CMAKE_STATIC_LIBRARY_SUFFIX}"
     )
 
   # where is the compiled library?
-  ExternalProject_get_property(mdi_build BINARY_DIR)
-  set(MDI_BINARY_DIR "${BINARY_DIR}/MDI_Library")
+  ExternalProject_get_property(mdi_build PREFIX)
   # workaround for older CMake versions
-  file(MAKE_DIRECTORY ${MDI_BINARY_DIR})
+  file(MAKE_DIRECTORY ${PREFIX}/${CMAKE_INSTALL_LIBDIR}/mdi)
+  file(MAKE_DIRECTORY ${PREFIX}/include/mdi)
 
   # create imported target for the MDI library
   add_library(LAMMPS::MDI UNKNOWN IMPORTED)
   add_dependencies(LAMMPS::MDI mdi_build)
   set_target_properties(LAMMPS::MDI PROPERTIES
-    IMPORTED_LOCATION "${MDI_BINARY_DIR}/libmdi.a"
-    INTERFACE_INCLUDE_DIRECTORIES ${MDI_BINARY_DIR}
-    )
+    IMPORTED_LOCATION "${PREFIX}/${CMAKE_INSTALL_LIBDIR}/mdi/${CMAKE_STATIC_LIBRARY_PREFIX}mdi${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    INTERFACE_INCLUDE_DIRECTORIES ${PREFIX}/include/mdi
+  )
 
   set(MDI_DEP_LIBS "")
   # if compiling with python plugins we need

cmake/Modules/Packages/MISC.cmake

@@ -0,0 +1,13 @@
+# pair style and fix srp/react depend on the fixes bond/break and bond/create from the MC package
+if(NOT PKG_MC)
+  get_property(LAMMPS_FIX_HEADERS GLOBAL PROPERTY FIX)
+  list(REMOVE_ITEM LAMMPS_FIX_HEADERS ${LAMMPS_SOURCE_DIR}/MISC/fix_srp_react.h)
+  set_property(GLOBAL PROPERTY FIX "${LAMMPS_FIX_HEADERS}")
+  get_property(LAMMPS_PAIR_HEADERS GLOBAL PROPERTY PAIR)
+  list(REMOVE_ITEM LAMMPS_PAIR_HEADERS ${LAMMPS_SOURCE_DIR}/MISC/pair_srp_react.h)
+  set_property(GLOBAL PROPERTY PAIR "${LAMMPS_PAIR_HEADERS}")
+  get_target_property(LAMMPS_SOURCES lammps SOURCES)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MISC/fix_srp_react.cpp)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MISC/pair_srp_react.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
+endif()

cmake/Modules/Packages/ML-IAP.cmake

@@ -34,16 +34,18 @@ if(MLIAP_ENABLE_PYTHON)
   endif()
 
   set(MLIAP_BINARY_DIR ${CMAKE_BINARY_DIR}/cython)
-  set(MLIAP_CYTHON_SRC ${LAMMPS_SOURCE_DIR}/ML-IAP/mliap_model_python_couple.pyx)
-  get_filename_component(MLIAP_CYTHON_BASE ${MLIAP_CYTHON_SRC} NAME_WE)
+  file(GLOB MLIAP_CYTHON_SRC ${CONFIGURE_DEPENDS} ${LAMMPS_SOURCE_DIR}/ML-IAP/*.pyx)
   file(MAKE_DIRECTORY ${MLIAP_BINARY_DIR})
-  add_custom_command(OUTPUT  ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.h
-          COMMAND            ${CMAKE_COMMAND} -E copy_if_different ${MLIAP_CYTHON_SRC} ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
-          COMMAND            ${Cythonize_EXECUTABLE} -3 ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
-          WORKING_DIRECTORY  ${MLIAP_BINARY_DIR}
-          MAIN_DEPENDENCY    ${MLIAP_CYTHON_SRC}
-          COMMENT "Generating C++ sources with cythonize...")
+  foreach(MLIAP_CYTHON_FILE ${MLIAP_CYTHON_SRC})
+    get_filename_component(MLIAP_CYTHON_BASE ${MLIAP_CYTHON_FILE} NAME_WE)
+    add_custom_command(OUTPUT  ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.h
+            COMMAND            ${CMAKE_COMMAND} -E copy_if_different ${MLIAP_CYTHON_FILE} ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
+            COMMAND            ${Cythonize_EXECUTABLE} -3 ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.pyx
+            WORKING_DIRECTORY  ${MLIAP_BINARY_DIR}
+            MAIN_DEPENDENCY    ${MLIAP_CYTHON_FILE}
+            COMMENT "Generating C++ sources with cythonize...")
+    target_sources(lammps PRIVATE ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp)
+  endforeach()
   target_compile_definitions(lammps PRIVATE -DMLIAP_PYTHON)
-  target_sources(lammps PRIVATE ${MLIAP_BINARY_DIR}/${MLIAP_CYTHON_BASE}.cpp)
   target_include_directories(lammps PRIVATE ${MLIAP_BINARY_DIR})
 endif()

cmake/Modules/Packages/ML-PACE.cmake

@@ -1,6 +1,6 @@
-set(PACELIB_URL "https://github.com/ICAMS/lammps-user-pace/archive/refs/tags/v.2021.10.25.fix2.tar.gz" CACHE STRING "URL for PACE evaluator library sources")
+set(PACELIB_URL "https://github.com/ICAMS/lammps-user-pace/archive/refs/tags/v.2023.01.3.fix.tar.gz" CACHE STRING "URL for PACE evaluator library sources")
 
-set(PACELIB_MD5 "32394d799bc282bb57696c78c456e64f" CACHE STRING "MD5 checksum of PACE evaluator library tarball")
+set(PACELIB_MD5 "4f0b3b5b14456fe9a73b447de3765caa" CACHE STRING "MD5 checksum of PACE evaluator library tarball")
 mark_as_advanced(PACELIB_URL)
 mark_as_advanced(PACELIB_MD5)
 GetFallbackURL(PACELIB_URL PACELIB_FALLBACK)
@@ -29,23 +29,9 @@ execute_process(
 )
 get_newest_file(${CMAKE_BINARY_DIR}/lammps-user-pace-* lib-pace)
 
-# enforce building libyaml-cpp as static library and turn off optional features
-set(YAML_BUILD_SHARED_LIBS OFF)
-set(YAML_CPP_BUILD_CONTRIB OFF)
-set(YAML_CPP_BUILD_TOOLS OFF)
-add_subdirectory(${lib-pace}/yaml-cpp build-yaml-cpp)
-set(YAML_CPP_INCLUDE_DIR ${lib-pace}/yaml-cpp/include)
-
-file(GLOB PACE_EVALUATOR_INCLUDE_DIR ${CONFIGURE_DEPENDS} ${lib-pace}/ML-PACE)
-file(GLOB PACE_EVALUATOR_SOURCES ${CONFIGURE_DEPENDS} ${lib-pace}/ML-PACE/*.cpp)
-list(FILTER PACE_EVALUATOR_SOURCES EXCLUDE REGEX pair_pace.cpp)
-
-add_library(pace STATIC ${PACE_EVALUATOR_SOURCES})
+add_subdirectory(${lib-pace} build-pace)
 set_target_properties(pace PROPERTIES CXX_EXTENSIONS ON OUTPUT_NAME lammps_pace${LAMMPS_MACHINE})
-target_include_directories(pace PUBLIC ${PACE_EVALUATOR_INCLUDE_DIR} ${YAML_CPP_INCLUDE_DIR})
 
-
-target_link_libraries(pace PRIVATE yaml-cpp-pace)
 if(CMAKE_PROJECT_NAME STREQUAL "lammps")
   target_link_libraries(lammps PRIVATE pace)
 endif()

cmake/Modules/StyleHeaderUtils.cmake

@@ -95,73 +95,76 @@ function(RegisterIntegrateStyle path)
 endfunction(RegisterIntegrateStyle)
 
 function(RegisterStyles search_path)
-    FindStyleHeaders(${search_path} ANGLE_CLASS     angle_     ANGLE     ) # angle     ) # force
-    FindStyleHeaders(${search_path} ATOM_CLASS      atom_vec_  ATOM_VEC  ) # atom      ) # atom      atom_vec_hybrid
-    FindStyleHeaders(${search_path} BODY_CLASS      body_      BODY      ) # body      ) # atom_vec_body
-    FindStyleHeaders(${search_path} BOND_CLASS      bond_      BOND      ) # bond      ) # force
-    FindStyleHeaders(${search_path} COMMAND_CLASS   "[^.]"     COMMAND   ) # command   ) # input
-    FindStyleHeaders(${search_path} COMPUTE_CLASS   compute_   COMPUTE   ) # compute   ) # modify
-    FindStyleHeaders(${search_path} DIHEDRAL_CLASS  dihedral_  DIHEDRAL  ) # dihedral  ) # force
-    FindStyleHeaders(${search_path} DUMP_CLASS      dump_      DUMP      ) # dump      ) # output    write_dump
-    FindStyleHeaders(${search_path} FIX_CLASS       fix_       FIX       ) # fix       ) # modify
-    FindStyleHeaders(${search_path} IMPROPER_CLASS  improper_  IMPROPER  ) # improper  ) # force
-    FindStyleHeaders(${search_path} INTEGRATE_CLASS "[^.]"     INTEGRATE ) # integrate ) # update
-    FindStyleHeaders(${search_path} KSPACE_CLASS    "[^.]"     KSPACE    ) # kspace    ) # force
-    FindStyleHeaders(${search_path} MINIMIZE_CLASS  min_       MINIMIZE  ) # minimize  ) # update
-    FindStyleHeaders(${search_path} NBIN_CLASS      nbin_      NBIN      ) # nbin      ) # neighbor
-    FindStyleHeaders(${search_path} NPAIR_CLASS     npair_     NPAIR     ) # npair     ) # neighbor
-    FindStyleHeaders(${search_path} NSTENCIL_CLASS  nstencil_  NSTENCIL  ) # nstencil  ) # neighbor
-    FindStyleHeaders(${search_path} NTOPO_CLASS     ntopo_     NTOPO     ) # ntopo     ) # neighbor
-    FindStyleHeaders(${search_path} PAIR_CLASS      pair_      PAIR      ) # pair      ) # force
-    FindStyleHeaders(${search_path} READER_CLASS    reader_    READER    ) # reader    ) # read_dump
-    FindStyleHeaders(${search_path} REGION_CLASS    region_    REGION    ) # region    ) # domain
+    FindStyleHeaders(${search_path} ANGLE_CLASS        angle_        ANGLE        ) # angle        ) # force
+    FindStyleHeaders(${search_path} ATOM_CLASS         atom_vec_     ATOM_VEC     ) # atom         ) # atom      atom_vec_hybrid
+    FindStyleHeaders(${search_path} BODY_CLASS         body_         BODY         ) # body         ) # atom_vec_body
+    FindStyleHeaders(${search_path} BOND_CLASS         bond_         BOND         ) # bond         ) # force
+    FindStyleHeaders(${search_path} COMMAND_CLASS      "[^.]"        COMMAND      ) # command      ) # input
+    FindStyleHeaders(${search_path} COMPUTE_CLASS      compute_      COMPUTE      ) # compute      ) # modify
+    FindStyleHeaders(${search_path} DIHEDRAL_CLASS     dihedral_     DIHEDRAL     ) # dihedral     ) # force
+    FindStyleHeaders(${search_path} DUMP_CLASS         dump_         DUMP         ) # dump         ) # output    write_dump
+    FindStyleHeaders(${search_path} FIX_CLASS          fix_          FIX          ) # fix          ) # modify
+    FindStyleHeaders(${search_path} GRAN_SUB_MOD_CLASS gran_sub_mod_ GRAN_SUB_MOD ) # gran_sub_mod ) # granular_model
+    FindStyleHeaders(${search_path} IMPROPER_CLASS     improper_     IMPROPER     ) # improper     ) # force
+    FindStyleHeaders(${search_path} INTEGRATE_CLASS    "[^.]"        INTEGRATE    ) # integrate    ) # update
+    FindStyleHeaders(${search_path} KSPACE_CLASS       "[^.]"        KSPACE       ) # kspace       ) # force
+    FindStyleHeaders(${search_path} MINIMIZE_CLASS     min_          MINIMIZE     ) # minimize     ) # update
+    FindStyleHeaders(${search_path} NBIN_CLASS         nbin_         NBIN         ) # nbin         ) # neighbor
+    FindStyleHeaders(${search_path} NPAIR_CLASS        npair_        NPAIR        ) # npair        ) # neighbor
+    FindStyleHeaders(${search_path} NSTENCIL_CLASS     nstencil_     NSTENCIL     ) # nstencil     ) # neighbor
+    FindStyleHeaders(${search_path} NTOPO_CLASS        ntopo_        NTOPO        ) # ntopo        ) # neighbor
+    FindStyleHeaders(${search_path} PAIR_CLASS         pair_         PAIR         ) # pair         ) # force
+    FindStyleHeaders(${search_path} READER_CLASS       reader_       READER       ) # reader       ) # read_dump
+    FindStyleHeaders(${search_path} REGION_CLASS       region_       REGION       ) # region       ) # domain
 endfunction(RegisterStyles)
 
 function(RegisterStylesExt search_path extension sources)
-    FindStyleHeadersExt(${search_path} ANGLE_CLASS     ${extension}  ANGLE     ${sources})
-    FindStyleHeadersExt(${search_path} ATOM_CLASS      ${extension}  ATOM_VEC  ${sources})
-    FindStyleHeadersExt(${search_path} BODY_CLASS      ${extension}  BODY      ${sources})
-    FindStyleHeadersExt(${search_path} BOND_CLASS      ${extension}  BOND      ${sources})
-    FindStyleHeadersExt(${search_path} COMMAND_CLASS   ${extension}  COMMAND   ${sources})
-    FindStyleHeadersExt(${search_path} COMPUTE_CLASS   ${extension}  COMPUTE   ${sources})
-    FindStyleHeadersExt(${search_path} DIHEDRAL_CLASS  ${extension}  DIHEDRAL  ${sources})
-    FindStyleHeadersExt(${search_path} DUMP_CLASS      ${extension}  DUMP      ${sources})
-    FindStyleHeadersExt(${search_path} FIX_CLASS       ${extension}  FIX       ${sources})
-    FindStyleHeadersExt(${search_path} IMPROPER_CLASS  ${extension}  IMPROPER  ${sources})
-    FindStyleHeadersExt(${search_path} INTEGRATE_CLASS ${extension}  INTEGRATE ${sources})
-    FindStyleHeadersExt(${search_path} KSPACE_CLASS    ${extension}  KSPACE    ${sources})
-    FindStyleHeadersExt(${search_path} MINIMIZE_CLASS  ${extension}  MINIMIZE  ${sources})
-    FindStyleHeadersExt(${search_path} NBIN_CLASS      ${extension}  NBIN      ${sources})
-    FindStyleHeadersExt(${search_path} NPAIR_CLASS     ${extension}  NPAIR     ${sources})
-    FindStyleHeadersExt(${search_path} NSTENCIL_CLASS  ${extension}  NSTENCIL  ${sources})
-    FindStyleHeadersExt(${search_path} NTOPO_CLASS     ${extension}  NTOPO     ${sources})
-    FindStyleHeadersExt(${search_path} PAIR_CLASS      ${extension}  PAIR      ${sources})
-    FindStyleHeadersExt(${search_path} READER_CLASS    ${extension}  READER    ${sources})
-    FindStyleHeadersExt(${search_path} REGION_CLASS    ${extension}  REGION    ${sources})
+    FindStyleHeadersExt(${search_path} ANGLE_CLASS        ${extension}  ANGLE        ${sources})
+    FindStyleHeadersExt(${search_path} ATOM_CLASS         ${extension}  ATOM_VEC     ${sources})
+    FindStyleHeadersExt(${search_path} BODY_CLASS         ${extension}  BODY         ${sources})
+    FindStyleHeadersExt(${search_path} BOND_CLASS         ${extension}  BOND         ${sources})
+    FindStyleHeadersExt(${search_path} COMMAND_CLASS      ${extension}  COMMAND      ${sources})
+    FindStyleHeadersExt(${search_path} COMPUTE_CLASS      ${extension}  COMPUTE      ${sources})
+    FindStyleHeadersExt(${search_path} DIHEDRAL_CLASS     ${extension}  DIHEDRAL     ${sources})
+    FindStyleHeadersExt(${search_path} DUMP_CLASS         ${extension}  DUMP         ${sources})
+    FindStyleHeadersExt(${search_path} FIX_CLASS          ${extension}  FIX          ${sources})
+    FindStyleHeadersExt(${search_path} GRAN_SUB_MOD_CLASS ${extension}  GRAN_SUB_MOD ${sources})
+    FindStyleHeadersExt(${search_path} IMPROPER_CLASS     ${extension}  IMPROPER     ${sources})
+    FindStyleHeadersExt(${search_path} INTEGRATE_CLASS    ${extension}  INTEGRATE    ${sources})
+    FindStyleHeadersExt(${search_path} KSPACE_CLASS       ${extension}  KSPACE       ${sources})
+    FindStyleHeadersExt(${search_path} MINIMIZE_CLASS     ${extension}  MINIMIZE     ${sources})
+    FindStyleHeadersExt(${search_path} NBIN_CLASS         ${extension}  NBIN         ${sources})
+    FindStyleHeadersExt(${search_path} NPAIR_CLASS        ${extension}  NPAIR        ${sources})
+    FindStyleHeadersExt(${search_path} NSTENCIL_CLASS     ${extension}  NSTENCIL     ${sources})
+    FindStyleHeadersExt(${search_path} NTOPO_CLASS        ${extension}  NTOPO        ${sources})
+    FindStyleHeadersExt(${search_path} PAIR_CLASS         ${extension}  PAIR         ${sources})
+    FindStyleHeadersExt(${search_path} READER_CLASS       ${extension}  READER       ${sources})
+    FindStyleHeadersExt(${search_path} REGION_CLASS       ${extension}  REGION       ${sources})
 endfunction(RegisterStylesExt)
 
 function(GenerateStyleHeaders output_path)
     message(STATUS "Generating style headers...")
-    GenerateStyleHeader(${output_path} ANGLE      angle     ) # force
-    GenerateStyleHeader(${output_path} ATOM_VEC   atom      ) # atom      atom_vec_hybrid
-    GenerateStyleHeader(${output_path} BODY       body      ) # atom_vec_body
-    GenerateStyleHeader(${output_path} BOND       bond      ) # force
-    GenerateStyleHeader(${output_path} COMMAND    command   ) # input
-    GenerateStyleHeader(${output_path} COMPUTE    compute   ) # modify
-    GenerateStyleHeader(${output_path} DIHEDRAL   dihedral  ) # force
-    GenerateStyleHeader(${output_path} DUMP       dump      ) # output    write_dump
-    GenerateStyleHeader(${output_path} FIX        fix       ) # modify
-    GenerateStyleHeader(${output_path} IMPROPER   improper  ) # force
-    GenerateStyleHeader(${output_path} INTEGRATE  integrate ) # update
-    GenerateStyleHeader(${output_path} KSPACE     kspace    ) # force
-    GenerateStyleHeader(${output_path} MINIMIZE   minimize  ) # update
-    GenerateStyleHeader(${output_path} NBIN       nbin      ) # neighbor
-    GenerateStyleHeader(${output_path} NPAIR      npair     ) # neighbor
-    GenerateStyleHeader(${output_path} NSTENCIL   nstencil  ) # neighbor
-    GenerateStyleHeader(${output_path} NTOPO      ntopo     ) # neighbor
-    GenerateStyleHeader(${output_path} PAIR       pair      ) # force
-    GenerateStyleHeader(${output_path} READER     reader    ) # read_dump
-    GenerateStyleHeader(${output_path} REGION     region    ) # domain
+    GenerateStyleHeader(${output_path} ANGLE        angle        ) # force
+    GenerateStyleHeader(${output_path} ATOM_VEC     atom         ) # atom      atom_vec_hybrid
+    GenerateStyleHeader(${output_path} BODY         body         ) # atom_vec_body
+    GenerateStyleHeader(${output_path} BOND         bond         ) # force
+    GenerateStyleHeader(${output_path} COMMAND      command      ) # input
+    GenerateStyleHeader(${output_path} COMPUTE      compute      ) # modify
+    GenerateStyleHeader(${output_path} DIHEDRAL     dihedral     ) # force
+    GenerateStyleHeader(${output_path} DUMP         dump         ) # output    write_dump
+    GenerateStyleHeader(${output_path} FIX          fix          ) # modify
+    GenerateStyleHeader(${output_path} GRAN_SUB_MOD gran_sub_mod ) # granular_model
+    GenerateStyleHeader(${output_path} IMPROPER     improper     ) # force
+    GenerateStyleHeader(${output_path} INTEGRATE    integrate    ) # update
+    GenerateStyleHeader(${output_path} KSPACE       kspace       ) # force
+    GenerateStyleHeader(${output_path} MINIMIZE     minimize     ) # update
+    GenerateStyleHeader(${output_path} NBIN         nbin         ) # neighbor
+    GenerateStyleHeader(${output_path} NPAIR        npair        ) # neighbor
+    GenerateStyleHeader(${output_path} NSTENCIL     nstencil     ) # neighbor
+    GenerateStyleHeader(${output_path} NTOPO        ntopo        ) # neighbor
+    GenerateStyleHeader(${output_path} PAIR         pair         ) # force
+    GenerateStyleHeader(${output_path} READER       reader       ) # read_dump
+    GenerateStyleHeader(${output_path} REGION       region       ) # domain
 endfunction(GenerateStyleHeaders)
 
 function(DetectBuildSystemConflict lammps_src_dir)

cmake/Modules/Testing.cmake

@@ -18,29 +18,33 @@ if(ENABLE_TESTING)
 
   # we need to build and link a LOT of tester executables, so it is worth checking if
   # a faster linker is available. requires GNU or Clang compiler, newer CMake.
-  # also only verified with Fedora Linux > 30 and Ubuntu <= 18.04 (Ubuntu 20.04 fails)
+  # 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_VERSION VERSION_GREATER_EQUAL 3.13)
-      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))
+      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)))
         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(-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)
       check_cxx_compiler_flag(-fuse-ld=bfd HAVE_BFD_LINKER_FLAG)
+      find_program(HAVE_MOLD_LINKER_BIN ld.mold)
       find_program(HAVE_LLD_LINKER_BIN lld ld.lld)
       find_program(HAVE_GOLD_LINKER_BIN ld.gold)
       find_program(HAVE_BFD_LINKER_BIN ld.bfd)
-      if(HAVE_LLD_LINKER_FLAG AND HAVE_LLD_LINKER_BIN)
+      if(HAVE_MOLD_LINKER_FLAG AND HAVE_MOLD_LINKER_BIN)
+        set(CMAKE_CUSTOM_LINKER_DEFAULT mold)
+      elseif(HAVE_LLD_LINKER_FLAG AND HAVE_LLD_LINKER_BIN)
         set(CMAKE_CUSTOM_LINKER_DEFAULT lld)
       elseif(HAVE_GOLD_LINKER_FLAG AND HAVE_GOLD_LINKER_BIN)
         set(CMAKE_CUSTOM_LINKER_DEFAULT gold)
       elseif(HAVE_BFD_LINKER_FLAG AND HAVE_BFD_LINKER_BIN)
         set(CMAKE_CUSTOM_LINKER_DEFAULT bfd)
       endif()
-      set(CMAKE_CUSTOM_LINKER_VALUES lld gold bfd default)
-      set(CMAKE_CUSTOM_LINKER ${CMAKE_CUSTOM_LINKER_DEFAULT} CACHE STRING "Choose a custom linker for faster linking (lld, gold, bfd, default)")
+      set(CMAKE_CUSTOM_LINKER_VALUES mold lld gold bfd default)
+      set(CMAKE_CUSTOM_LINKER ${CMAKE_CUSTOM_LINKER_DEFAULT} CACHE STRING "Choose a custom linker for faster linking (mold, lld, gold, bfd, default)")
       validate_option(CMAKE_CUSTOM_LINKER CMAKE_CUSTOM_LINKER_VALUES)
       mark_as_advanced(CMAKE_CUSTOM_LINKER)
       if(NOT "${CMAKE_CUSTOM_LINKER}" STREQUAL "default")

cmake/Modules/Tools.cmake

@@ -33,9 +33,15 @@ if(BUILD_TOOLS)
   endif()
   install(TARGETS msi2lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
   install(FILES ${LAMMPS_DOC_DIR}/msi2lmp.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+
+  add_subdirectory(${LAMMPS_TOOLS_DIR}/phonon ${CMAKE_BINARY_DIR}/phana_build)
 endif()
 
+find_package(PkgConfig QUIET)
 if(BUILD_LAMMPS_SHELL)
+  if(NOT PkgConfig_FOUND)
+    message(FATAL_ERROR "Must have pkg-config installed for building LAMMPS shell")
+  endif()
   find_package(PkgConfig REQUIRED)
   pkg_check_modules(READLINE IMPORTED_TARGET REQUIRED readline)
   if(NOT LAMMPS_EXCEPTIONS)
@@ -65,4 +71,8 @@ if(BUILD_LAMMPS_SHELL)
   install(FILES ${LAMMPS_TOOLS_DIR}/lammps-shell/lammps-shell.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
 endif()
 
-
+if(BUILD_LAMMPS_GUI)
+  get_filename_component(LAMMPS_GUI_DIR ${LAMMPS_SOURCE_DIR}/../tools/lammps-gui ABSOLUTE)
+  get_filename_component(LAMMPS_GUI_BIN ${CMAKE_BINARY_DIR}/lammps-gui-build ABSOLUTE)
+  add_subdirectory(${LAMMPS_GUI_DIR} ${LAMMPS_GUI_BIN})
+endif()

cmake/packaging/MacOSXBundleInfo.plist.in

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en-US</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+        <key>CFBundleDisplayName</key>
+        <string>The LAMMPS Molecular Dynamics Software</string>
+	<key>CFBundleIconFile</key>
+	<string>lammps</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.lammps.gui</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>LAMMPS</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+</dict>
+</plist>

cmake/packaging/README.macos

@@ -0,0 +1,69 @@
+LAMMPS and LAMMPS GUI universal binaries for macOS (arm64/x86_64)
+=================================================================
+
+This package provides universal binaries of LAMMPS and LAMMPS GUI that should
+run on macOS systems running running macOS version 11 (Big Sur) or newer.  Note
+the binaries are compiled without MPI support and contain a compatible subset
+of the available packages.
+
+The following individual commands are included:
+binary2txt lammps-gui lmp msi2lmp phana stl_bin2txt
+
+After copying the lammps-gui folder into your Applications folder, please follow
+these steps:
+
+1. Open the Terminal app
+
+2. Type the following command and press ENTER:
+
+   open ~/.zprofile
+
+   This will open a text editor for modifying the .zprofile file in your home
+   directory.
+
+3. Add the following lines to the end of the file, save it, and close the editor
+
+   LAMMPS_INSTALL_DIR=/Applications/LAMMPS.app/Contents
+   LAMMPS_POTENTIALS=${LAMMPS_INSTALL_DIR}/share/lammps/potentials
+   LAMMPS_BENCH_DIR=${LAMMPS_INSTALL_DIR}/share/lammps/bench
+   MSI2LMP_LIBRARY=${LAMMPS_INSTALL_DIR}/share/lammps/frc_files
+   PATH=${LAMMPS_INSTALL_DIR}/bin:$PATH
+   export LAMMPS_POTENTIALS LAMMPS_BENCH_DIR PATH
+
+4. In your existing terminal, type the following command make the settings active
+
+   source ~/.zprofile
+
+   Note, you don't have to type this in new terminals, since they will apply
+   the changes from .zprofile automatically.
+
+   Note: the above assumes you use the default shell (zsh) that comes with
+   MacOS. If you customized MacOS to use a different shell, you'll need to modify
+   that shell's init file (.cshrc, .bashrc, etc.) instead with appropiate commands
+   to modify the same environment variables.
+
+5. Try running LAMMPS (which might fail, see step 7)
+
+   lmp -in ${LAMMPS_BENCH_DIR}/in.lj
+
+6. Try running the LAMMPS GUI
+
+   lammps-gui ${LAMMPS_BENCH_DIR}/in.rhodo
+
+   Depending on the size and resolution of your screen, the fonts may
+   be too small to read. This can be adjusted by setting the environment
+   variable QT_FONT_DPI. The default value would be 72, so to increase
+   the fonts by a third one can add to the .zprofile file the line
+
+   export QT_FONT_DPI=96
+
+   and reload as shown above.
+
+7. Give permission to execute the commands (lmp, lammps-gui, msi2lmp, binary2txt, phana, stl_bin2txt)
+
+   MacOS will likely block the initial run of the executables, since they
+   were downloaded from the internet and are missing a known signature from an
+   identified developer. Go to "Settings" and search for "Security settings". It
+   should display a message that an executable like "lmp" was blocked. Press
+   "Open anyway", which might prompt you for your admin credentials. Afterwards
+   "lmp" and the other executables should work as expected.

cmake/packaging/build_linux_tgz.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+APP_NAME=lammps-gui
+DESTDIR=${PWD}/../LAMMPS_GUI
+
+echo "Delete old files, if they exist"
+rm -rf ${DESTDIR} ../LAMMPS-Linux-amd64.tar.gz
+
+echo "Create staging area for deployment and populate"
+DESTDIR=${DESTDIR} cmake --install .  --prefix "/"
+
+echo "Remove debug info"
+for s in ${DESTDIR}/bin/* ${DESTDIR}/lib/liblammps*
+do \
+        test -f $s && strip --strip-debug $s
+done
+
+echo "Remove libc, gcc, and X11 related shared libs"
+rm -f ${DESTDIR}/lib/ld*.so ${DESTDIR}/lib/ld*.so.[0-9]
+rm -f ${DESTDIR}/lib/lib{c,dl,rt,m,pthread}.so.?
+rm -f ${DESTDIR}/lib/lib{c,dl,rt,m,pthread}-[0-9].[0-9]*.so
+rm -f ${DESTDIR}/lib/libX* ${DESTDIR}/lib/libxcb*
+rm -f ${DESTDIR}/lib/libgcc_s*
+rm -f ${DESTDIR}/lib/libstdc++*
+
+# get qt dir
+QTDIR=$(ldd ${DESTDIR}/bin/lammps-gui | grep libQt5Core | sed -e 's/^.*=> *//' -e 's/libQt5Core.so.*$/qt5/')
+cat > ${DESTDIR}/bin/qt.conf <<EOF
+[Paths]
+Plugins = ../qt5plugins
+EOF
+
+# platform plugin
+mkdir -p ${DESTDIR}/qt5plugins/platforms
+cp ${QTDIR}/plugins/platforms/libqxcb.so ${DESTDIR}/qt5plugins/platforms
+
+# get platform plugin dependencies
+QTDEPS=$(LD_LIBRARY_PATH=${DESTDIR}/lib ldd ${QTDIR}/plugins/platforms/libqxcb.so | grep -v ${DESTDIR} | grep libQt5 | sed -e 's/^.*=> *//' -e 's/\(libQt5.*.so.*\) .*$/\1/')
+for dep in ${QTDEPS}
+do \
+    cp ${dep} ${DESTDIR}/lib
+done
+
+echo "Add additional plugins for Qt"
+for dir in styles imageformats
+do \
+    cp -r  ${QTDIR}/plugins/${dir} ${DESTDIR}/qt5plugins/
+done
+
+# get imageplugin dependencies
+for s in ${DESTDIR}/qt5plugins/imageformats/*.so
+do \
+    QTDEPS=$(LD_LIBRARY_PATH=${DESTDIR}/lib ldd $s | grep -v ${DESTDIR} | grep -E '(libQt5|jpeg)' | sed -e 's/^.*=> *//' -e 's/\(lib.*.so.*\) .*$/\1/')
+    for dep in ${QTDEPS}
+    do \
+        cp ${dep} ${DESTDIR}/lib
+    done
+done
+
+echo "Set up wrapper script"
+MYDIR=$(dirname "$0")
+cp ${MYDIR}/linux_wrapper.sh ${DESTDIR}/bin
+for s in ${DESTDIR}/bin/*
+do \
+        EXE=$(basename $s)
+        test ${EXE} = linux_wrapper.sh && continue
+        test ${EXE} = qt.conf && continue
+        ln -s bin/linux_wrapper.sh ${DESTDIR}/${EXE}
+done
+
+pushd ..
+tar -czvvf LAMMPS-Linux-amd64.tar.gz LAMMPS_GUI
+popd
+
+echo "Cleanup dir"
+rm -r ${DESTDIR}
+exit 0

cmake/packaging/build_macos_dmg.sh

@@ -0,0 +1,111 @@
+#!/bin/bash
+
+APP_NAME=lammps-gui
+
+echo "Delete old files, if they exist"
+rm -f ${APP_NAME}.dmg ${APP_NAME}-rw.dmg LAMMPS-macOS-multiarch.dmg
+
+echo "Create initial dmg file with macdeployqt"
+macdeployqt  lammps-gui.app -dmg
+echo "Create writable dmg file"
+hdiutil convert ${APP_NAME}.dmg -format UDRW -o ${APP_NAME}-rw.dmg
+
+echo "Mount writeable DMG file in read-write mode. Keep track of device and volume names"
+DEVICE=$(hdiutil attach -readwrite -noverify ${APP_NAME}-rw.dmg | grep '^/dev/' | sed 1q | awk '{print $1}')
+VOLUME=$(df | grep ${DEVICE} | sed -e 's/^.*\(\/Volumes\/\)/\1/')
+sleep 2
+
+echo "Create link to Application folder and move README and background image files"
+
+pushd "${VOLUME}"
+ln -s /Applications .
+mv  ${APP_NAME}.app/Contents/Resources/README.txt .
+mkdir  .background
+mv ${APP_NAME}.app/Contents/Resources/LAMMPS_DMG_Background.png .background/background.png
+mv ${APP_NAME}.app LAMMPS.app
+cd LAMMPS.app/Contents
+
+echo "Attach icons to LAMMPS console and GUI executables"
+echo "read 'icns' (-16455) \"Resources/lammps.icns\";" > icon.rsrc
+Rez -a icon.rsrc -o bin/lmp
+SetFile -a C bin/lmp
+Rez -a icon.rsrc -o MacOS/lammps-gui
+SetFile -a C MacOS/lammps-gui
+rm icon.rsrc
+popd
+
+echo 'Tell the Finder to resize the window, set the background,'
+echo 'change the icon size, place the icons in the right position, etc.'
+echo '
+    tell application "Finder"
+    tell disk "'${APP_NAME}'"
+
+      -- wait for the image to finish mounting
+      set open_attempts to 0
+      repeat while open_attempts < 4
+        try
+          open
+            delay 1
+            set open_attempts to 5
+          close
+        on error errStr number errorNumber
+          set open_attempts to open_attempts + 1
+          delay 10
+        end try
+      end repeat
+      delay 5
+
+      -- open the image the first time and save a .DS_Store
+      -- just the background and icon setup
+      open
+        set current view of container window to icon view
+        set theViewOptions to the icon view options of container window
+        set background picture of theViewOptions to file ".background:background.png"
+        set arrangement of theViewOptions to not arranged
+        set icon size of theViewOptions to 64
+        delay 5
+      close
+
+      -- next set up the position of the app and Applications symlink
+      -- plus hide all window decorations
+      open
+        update without registering applications
+        tell container window
+          set sidebar width to 0
+          set statusbar visible to false
+          set toolbar visible to false
+          set the bounds to { 100, 40, 868, 640 }
+          set position of item "'LAMMPS'.app" to { 190, 216 }
+          set position of item "Applications" to { 576, 216 }
+          set position of item "README.txt" to { 190, 400 }
+        end tell
+        update without registering applications
+        delay 5
+      close
+
+      -- one last open and close to check the results
+      open
+        delay 5
+      close
+    end tell
+    delay 1
+  end tell
+' | osascript
+
+sync
+
+echo "Unmount modified disk image and convert to compressed read-only image"
+hdiutil detach "${DEVICE}"
+hdiutil convert "${APP_NAME}-rw.dmg" -format UDZO -o "LAMMPS-macOS-multiarch.dmg"
+
+echo "Attach icon to .dmg file"
+echo "read 'icns' (-16455) \"lammps-gui.app/Contents/Resources/lammps.icns\";" > icon.rsrc
+Rez -a icon.rsrc -o LAMMPS-macOS-multiarch.dmg
+SetFile -a C LAMMPS-macOS-multiarch.dmg
+rm icon.rsrc
+
+echo "Delete temporary disk images"
+rm -f "${APP_NAME}-rw.dmg"
+rm -f "${APP_NAME}.dmg"
+
+exit 0

cmake/packaging/build_windows_cross_zip.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+APP_NAME=lammps-gui
+DESTDIR=${PWD}/LAMMPS_GUI
+SYSROOT="$1"
+
+echo "Delete old files, if they exist"
+rm -rvf ${DESTDIR}/LAMMPS_GUI ${DESTDIR}/LAMMPS-Win10-amd64.zip
+
+echo "Create staging area for deployment and populate"
+DESTDIR=${DESTDIR} cmake --install .  --prefix "/"
+
+# no static libs needed
+rm -rvf ${DESTDIR}/lib
+# but the LAMMPS lib
+
+echo "Copying required DLL files"
+for dll in $(objdump -p *.exe *.dll | sed -n -e '/DLL Name:/s/^.*DLL Name: *//p' | sort | uniq)
+do \
+    doskip=0
+    for skip in ADVAPI32 CFGMGR32 GDI32 KERNEL32 MPR NETAPI32 PSAPI SHELL32 USER32 USERENV UxTheme VERSION WS2_32 WSOCK32 d3d11 dwmapi liblammps msvcrt_ole32
+    do \
+        test ${dll} = ${skip}.dll && doskip=1
+    done
+    test ${doskip} -eq 1 && continue
+    test -f ${DESTDIR}/bin/${dll} || cp -v ${SYSROOT}/bin/${dll} ${DESTDIR}/bin
+done
+
+echo "Copy required Qt plugins"
+mkdir -p ${DESTDIR}/qt5plugins
+for plugin in imageformats platforms styles
+do \
+    cp -r ${SYSROOT}/lib/qt5/plugins/${plugin} ${DESTDIR}/qt5plugins/
+done
+
+echo "Check dependencies of DLL files"
+for dll in $(objdump -p ${DESTDIR}/bin/*.dll ${DESTDIR}/qt5plugins/*/*.dll | sed -n -e '/DLL Name:/s/^.*DLL Name: *//p' | sort | uniq)
+do \
+    doskip=0
+    for skip in ADVAPI32 CFGMGR32 GDI32 KERNEL32 MPR NETAPI32 PSAPI SHELL32 USER32 USERENV UxTheme VERSION WS2_32 WSOCK32 d3d11 dwmapi liblammps msvcrt_ole32
+    do \
+        test ${dll} = ${skip}.dll && doskip=1
+    done
+    test ${doskip} -eq 1 && continue
+    test -f ${DESTDIR}/bin/${dll} || cp -v ${SYSROOT}/bin/${dll} ${DESTDIR}/bin
+done
+
+for dll in $(objdump -p ${DESTDIR}/bin/*.dll ${DESTDIR}/qt5plugins/*/*.dll | sed -n -e '/DLL Name:/s/^.*DLL Name: *//p' | sort | uniq)
+do \
+    doskip=0
+    for skip in ADVAPI32 CFGMGR32 GDI32 KERNEL32 MPR NETAPI32 PSAPI SHELL32 USER32 USERENV UxTheme VERSION WS2_32 WSOCK32 d3d11 dwmapi liblammps msvcrt_ole32
+    do \
+        test ${dll} = ${skip}.dll && doskip=1
+    done
+    test ${doskip} -eq 1 && continue
+    test -f ${DESTDIR}/bin/${dll} || cp -v ${SYSROOT}/bin/${dll} ${DESTDIR}/bin
+done
+
+cat > ${DESTDIR}/bin/qt.conf <<EOF
+[Paths]
+Plugins = ../qt5plugins
+EOF
+zip -9rvD LAMMPS-Win10-amd64.zip LAMMPS_GUI
+

cmake/packaging/build_windows_vs.cmake

@@ -0,0 +1,28 @@
+# CMake script to be run post installation to build zipped package
+
+# clean up old zipfile and deployment tree
+file(REMOVE LAMMPS-Win10-amd64.zip)
+file(REMOVE_RECURSE LAMMPS_GUI)
+file(RENAME ${INSTNAME} LAMMPS_GUI)
+
+# move all executables and dlls to main folder and delete bin folder
+file(GLOB BINFILES LIST_DIRECTORIES FALSE LAMMPS_GUI/bin/*.exe LAMMPS_GUI/bin/*.dll)
+foreach(bin ${BINFILES})
+  get_filename_component(exe ${bin} NAME)
+  file(RENAME ${bin} LAMMPS_GUI/${exe})
+endforeach()
+file(REMOVE_RECURSE LAMMPS_GUI/bin)
+
+# create qt.conf so Qt will find its plugins
+file(WRITE LAMMPS_GUI/qt.conf "[Paths]\r\nPlugins = qt5plugins\r\n")
+
+# initialize environment and then run windeployqt to populate folder with missing dependencies and Qt plugins
+file(WRITE qtdeploy.bat "@ECHO OFF\r\nset VSCMD_DEBUG=0\r\nCALL ${VC_INIT} x64\r\nset PATH=${QT5_BIN_DIR};%PATH%\r\nwindeployqt --plugindir LAMMPS_GUI/qt5plugins --release  LAMMPS_GUI/lammps-gui.exe --no-quick-import --no-webkit2 --no-translations --no-system-d3d-compiler --no-angle --no-opengl-sw\r\n")
+execute_process(COMMAND cmd.exe /c qtdeploy.bat COMMAND_ECHO STDERR)
+file(REMOVE qtdeploy.bat)
+
+# create zip archive
+file(WRITE makearchive.ps1 "Compress-Archive -Path LAMMPS_GUI -CompressionLevel Optimal -DestinationPath LAMMPS-Win10-amd64.zip")
+execute_process(COMMAND powershell -ExecutionPolicy Bypass -File makearchive.ps1)
+file(REMOVE makearchive.ps1)
+file(REMOVE_RECURSE LAMMPS_GUI)

cmake/packaging/linux_wrapper.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# wrapper for bundled executables
+
+# reset locale to avoid problems with decimal numbers
+export LC_ALL=C
+
+BASEDIR=$(dirname "$0")
+EXENAME=$(basename "$0")
+
+# append to LD_LIBRARY_PATH to prefer local (newer) libs
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BASEDIR}/lib
+
+# set some environment variables for LAMMPS etc.
+LAMMPS_POTENTIALS=${BASEDIR}/share/lammps/potentials
+MSI2LMP_LIBRARY=${BASEDIR}/share/lammps/frc_files
+export LD_LIBRARY_PATH LAMMPS_POTENTIALS MSI2LMP_LIBRARY
+
+exec "${BASEDIR}/bin/${EXENAME}" "$@"

cmake/packaging/png2iconset.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+if [ $# != 2 ]
+then
+   echo "usage: $0 <pngfile> <iconset name>"
+   exit 1
+fi
+
+png="$1"
+ico="$2"
+
+if [ ! -f ${png} ]
+then
+   echo "PNG Image $1 not found"
+fi
+
+rm -rf ${ico}.iconset
+mkdir ${ico}.iconset
+sips -z   16   16 ${png} --out ${ico}.iconset/icon_16x16.png
+sips -z   32   32 ${png} --out ${ico}.iconset/icon_16x16@2x.png
+sips -z   32   32 ${png} --out ${ico}.iconset/icon_32x32.png
+sips -z   64   64 ${png} --out ${ico}.iconset/icon_32x32@2x.png
+sips -z  128  128 ${png} --out ${ico}.iconset/icon_128x128.png
+sips -z  256  256 ${png} --out ${ico}.iconset/icon_128x128@2x.png
+sips -z  256  256 ${png} --out ${ico}.iconset/icon_256x256.png
+sips -z  512  512 ${png} --out ${ico}.iconset/icon_256x256@2x.png
+sips -z  512  512 ${png} --out ${ico}.iconset/icon_512x512.png
+sips -z 1024 1024 ${png} --out ${ico}.iconset/icon_512x512@2x.png
+iconutil -c icns ${ico}.iconset
+rm -rf ${ico}.iconset

cmake/presets/all_off.cmake

@@ -3,6 +3,7 @@
 
 set(ALL_PACKAGES
   ADIOS
+  AMOEBA
   ASPHERE
   ATC
   AWPMD
@@ -11,7 +12,7 @@ set(ALL_PACKAGES
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -42,7 +43,7 @@ set(ALL_PACKAGES
   KOKKOS
   KSPACE
   LATBOLTZ
-  LATTE
+  LEPTON
   MACHDYN
   MANIFOLD
   MANYBODY
@@ -55,6 +56,7 @@ set(ALL_PACKAGES
   ML-HDNNP
   ML-IAP
   ML-PACE
+  ML-POD
   ML-QUIP
   ML-RANN
   ML-SNAP

cmake/presets/all_on.cmake

@@ -5,6 +5,7 @@
 
 set(ALL_PACKAGES
   ADIOS
+  AMOEBA
   ASPHERE
   ATC
   AWPMD
@@ -13,7 +14,7 @@ set(ALL_PACKAGES
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -44,7 +45,7 @@ set(ALL_PACKAGES
   KOKKOS
   KSPACE
   LATBOLTZ
-  LATTE
+  LEPTON
   MACHDYN
   MANIFOLD
   MANYBODY
@@ -57,6 +58,7 @@ set(ALL_PACKAGES
   ML-HDNNP
   ML-IAP
   ML-PACE
+  ML-POD
   ML-QUIP
   ML-RANN
   ML-SNAP

cmake/presets/download.cmake

@@ -1,14 +1,13 @@
 # Preset that turns on packages with automatic downloads of sources or potentials.
 # Compilation of libraries like Plumed or ScaFaCoS can take a considerable amount of time.
 
-set(ALL_PACKAGES KIM LATTE MSCG VORONOI PLUMED SCAFACOS MACHDYN MESONT MDI ML-PACE)
+set(ALL_PACKAGES KIM MSCG VORONOI PLUMED SCAFACOS MACHDYN MESONT MDI ML-PACE)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
 endforeach()
 
 set(DOWNLOAD_KIM ON CACHE BOOL "" FORCE)
-set(DOWNLOAD_LATTE ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_MDI ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_MSCG ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)

cmake/presets/macos-multiarch.cmake

@@ -0,0 +1,14 @@
+# preset that will build portable multi-arch binaries on macOS without MPI
+
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "" FORCE)
+set(CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
+
+set(CMAKE_CXX_COMPILER "clang++" CACHE STRING "" FORCE)
+set(CMAKE_C_COMPILER "clang" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+
+set(BUILD_MPI FALSE CACHE BOOL "" FORCE)
+set(BUILD_SHARED_LIBS FALSE CACHE BOOL "" FORCE)
+set(LAMMPS_EXCEPTIONS TRUE CACHE BOOL "" FORCE)

cmake/presets/mingw-cross.cmake

@@ -1,4 +1,5 @@
 set(WIN_PACKAGES
+  AMOEBA
   ASPHERE
   ATC
   AWPMD
@@ -7,7 +8,7 @@ set(WIN_PACKAGES
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -34,7 +35,7 @@ set(WIN_PACKAGES
   INTEL
   INTERLAYER
   KSPACE
-  LATTE
+  LEPTON
   MACHDYN
   MANIFOLD
   MANYBODY
@@ -46,6 +47,7 @@ set(WIN_PACKAGES
   MISC
   ML-HDNNP
   ML-IAP
+  ML-POD
   ML-RANN
   ML-SNAP
   MOFFF

cmake/presets/most.cmake

@@ -3,13 +3,14 @@
 # are removed. The resulting binary should be able to run most inputs.
 
 set(ALL_PACKAGES
+  AMOEBA
   ASPHERE
   BOCS
   BODY
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -34,12 +35,15 @@ set(ALL_PACKAGES
   GRANULAR
   INTERLAYER
   KSPACE
+  LEPTON
   MACHDYN
   MANYBODY
   MC
   MEAM
+  MESONT
   MISC
   ML-IAP
+  ML-POD
   ML-SNAP
   MOFFF
   MOLECULE

cmake/presets/nolib.cmake

@@ -12,10 +12,9 @@ set(PACKAGES_WITH_LIB
   KIM
   KOKKOS
   LATBOLTZ
-  LATTE
+  LEPTON
   MACHDYN
   MDI
-  MESONT
   ML-HDNNP
   ML-PACE
   ML-QUIP

cmake/presets/windows.cmake

@@ -1,11 +1,13 @@
 set(WIN_PACKAGES
+  AMOEBA
   ASPHERE
+  AWPMD
   BOCS
   BODY
   BPM
   BROWNIAN
   CG-DNA
-  CG-SDK
+  CG-SPICA
   CLASS2
   COLLOID
   COLVARS
@@ -19,6 +21,7 @@ set(WIN_PACKAGES
   DPD-SMOOTH
   DRUDE
   EFF
+  ELECTRODE
   EXTRA-COMPUTE
   EXTRA-DUMP
   EXTRA-FIX
@@ -28,17 +31,22 @@ set(WIN_PACKAGES
   GRANULAR
   INTERLAYER
   KSPACE
+  LEPTON
+  MACHDYN
   MANIFOLD
   MANYBODY
   MC
   MEAM
+  MESONT
   MISC
   ML-IAP
+  ML-POD
   ML-SNAP
   MOFFF
   MOLECULE
   MOLFILE
   OPENMP
+  OPT
   ORIENT
   PERI
   PHONON

doc/Makefile

@@ -86,18 +86,19 @@ html: xmlgen $(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
 	@(\
-		. $(VENV)/bin/activate ; env PYTHONWARNINGS= \
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build -E $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
-		touch $(RSTDIR)/Fortran.rst ;\
+		touch $(RSTDIR)/Fortran.rst ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
 		ln -sf Manual.html html/index.html;\
 		rm -f $(BUILDDIR)/doxygen/xml/run.stamp;\
-		echo "############################################" ;\
+		echo "############################################" ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		rst_anchor_check src/*.rst ;\
-		python $(BUILDDIR)/utils/check-packages.py -s ../src -d src ;\
+		$(PYTHON) $(BUILDDIR)/utils/check-packages.py -s ../src -d src ;\
 		env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst ;\
 		env LC_ALL=C grep -n ' :[a-z]\+`' $(RSTDIR)/*.rst ;\
-		python $(BUILDDIR)/utils/check-styles.py -s ../src -d src ;\
+		env LC_ALL=C grep -n ' `[^`]\+<[a-z][^`]\+`[^_]' $(RSTDIR)/*.rst ;\
+		$(PYTHON) $(BUILDDIR)/utils/check-styles.py -s ../src -d src ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)
@@ -114,9 +115,9 @@ fasthtml: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJAX)
 	@$(MAKE) $(MFLAGS) -C graphviz all
 	@mkdir -p fasthtml
 	@(\
-		. $(VENV)/bin/activate ; env PYTHONWARNINGS= \
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/fasthtml/doctrees $(RSTDIR) fasthtml ;\
-		touch $(RSTDIR)/Fortran.rst ;\
+		touch $(RSTDIR)/Fortran.rst ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build $(SPHINXEXTRA) -b html -c $(SPHINXCONFIG) -d $(BUILDDIR)/fasthtml/doctrees $(RSTDIR) fasthtml ;\
 		deactivate ;\
 	)
@@ -131,8 +132,8 @@ fasthtml: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJAX)
 spelling: xmlgen $(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
 	@(\
-		. $(VENV)/bin/activate ; env PYTHONWARNINGS= \
-		cp $(SPHINXCONFIG)/false_positives.txt $(RSTDIR)/ ; env PYTHONWARNINGS= \
+		. $(VENV)/bin/activate ; \
+		cp $(SPHINXCONFIG)/false_positives.txt $(RSTDIR)/;  env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build -b spelling -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) spelling ;\
 		rm -f $(BUILDDIR)/doxygen/xml/run.stamp;\
 		deactivate ;\
@@ -146,9 +147,9 @@ epub: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK)
 	@rm -f LAMMPS.epub
 	@cp src/JPG/*.* epub/JPG
 	@(\
-		. $(VENV)/bin/activate ;\
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build -E $(SPHINXEXTRA) -b epub -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) epub ;\
-		touch $(RSTDIR)/Fortran.rst ;\
+		touch $(RSTDIR)/Fortran.rst ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build $(SPHINXEXTRA) -b epub -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) epub ;\
 		rm -f $(BUILDDIR)/doxygen/xml/run.stamp;\
 		deactivate ;\
@@ -167,17 +168,18 @@ pdf: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK)
 	@$(MAKE) $(MFLAGS) -C graphviz all
 	@if [ "$(HAS_PDFLATEX)" == "NO" ] ; then echo "PDFLaTeX or latexmk were not found! Please check README for further instructions" 1>&2; exit 1; fi
 	@(\
-		. $(VENV)/bin/activate ; env PYTHONWARNINGS= \
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build -E $(SPHINXEXTRA) -b latex -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) latex ;\
-		touch $(RSTDIR)/Fortran.rst ;\
+		touch $(RSTDIR)/Fortran.rst ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		sphinx-build  $(SPHINXEXTRA) -b latex -c $(SPHINXCONFIG) -d $(BUILDDIR)/doctrees $(RSTDIR) latex ;\
 		rm -f $(BUILDDIR)/doxygen/xml/run.stamp;\
-		echo "############################################" ;\
+		echo "############################################" ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		rst_anchor_check src/*.rst ;\
-		python utils/check-packages.py -s ../src -d src ;\
+		$(PYTHON) utils/check-packages.py -s ../src -d src ;\
 		env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst ;\
 		env LC_ALL=C grep -n ' :[a-z]\+`' $(RSTDIR)/*.rst ;\
-		python utils/check-styles.py -s ../src -d src ;\
+		env LC_ALL=C grep -n ' `[^`]\+<[a-z][^`]\+`[^_]' $(RSTDIR)/*.rst ;\
+		$(PYTHON) utils/check-styles.py -s ../src -d src ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)
@@ -200,22 +202,22 @@ pdf: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK)
 
 anchor_check : $(ANCHORCHECK)
 	@(\
-		. $(VENV)/bin/activate ;\
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		rst_anchor_check src/*.rst ;\
 		deactivate ;\
 	)
 
 style_check : $(VENV)
 	@(\
-		. $(VENV)/bin/activate ;\
-		python utils/check-styles.py -s ../src -d src ;\
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
+		$(PYTHON) utils/check-styles.py -s ../src -d src ;\
 		deactivate ;\
 	)
 
 package_check : $(VENV)
 	@(\
-		. $(VENV)/bin/activate ;\
-		python utils/check-packages.py -s ../src -d src ;\
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
+		$(PYTHON) utils/check-packages.py -s ../src -d src ;\
 		deactivate ;\
 	)
 
@@ -224,6 +226,14 @@ char_check :
 
 role_check :
 	@( env LC_ALL=C grep -n ' :[a-z]\+`' $(RSTDIR)/*.rst && exit 1 || : )
+	@( env LC_ALL=C grep -n ' `[^`]\+<[a-z][^`]\+`[^_]' $(RSTDIR)/*.rst && exit 1 || : )
+
+link_check : $(VENV) html
+	@(\
+		. $(VENV)/bin/activate ; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
+		linkchecker -F html --check-extern html/Manual.html ;\
+		deactivate ;\
+	)
 
 xmlgen : doxygen/xml/index.xml
 
@@ -252,7 +262,7 @@ $(MATHJAX):
 
 $(ANCHORCHECK): $(VENV)
 	@( \
-		. $(VENV)/bin/activate; \
+		. $(VENV)/bin/activate; env PYTHONWARNINGS= PYTHONDONTWRITEBYTECODE=1 \
 		pip $(PIP_OPTIONS) install -e utils/converters;\
 		deactivate;\
 	)

doc/github-development-workflow.md

@@ -1,12 +1,12 @@
 # Outline of the GitHub Development Workflow
 
-This purpose of this document is to provide a point of reference for the
+The purpose of this document is to provide a point of reference for the
 core LAMMPS developers and other LAMMPS contributors to understand the
 choices the LAMMPS developers have agreed on. Git and GitHub provide the
 tools, but do not set policies, so it is up to the developers to come to
 an agreement as to how to define and interpret policies. This document
-is likely to change as our experiences and needs change and we try to
-adapt accordingly. Last change 2021-09-02.
+is likely to change as our experiences and needs change, and we try to
+adapt it accordingly. Last change 2023-02-10.
 
 ## Table of Contents
 
@@ -22,47 +22,50 @@ adapt accordingly. Last change 2021-09-02.
 ## GitHub Merge Management
 
 In the interest of consistency, ONLY ONE of the core LAMMPS developers
-should doing the merging itself.  This is currently
+should do the merging.  This is currently
 [@akohlmey](https://github.com/akohlmey) (Axel Kohlmeyer).  If this
 assignment needs to be changed, it shall be done right after a stable
 release.  If the currently assigned developer cannot merge outstanding
 pull requests in a timely manner, or in other extenuating circumstances,
-other core LAMMPS developers with merge rights can merge pull requests,
-when necessary.
+other core LAMMPS developers with merge permission may merge pull
+requests.
 
 ## Pull Requests
 
-ALL changes to the LAMMPS code and documentation, however trivial, MUST
-be submitted as a pull request to GitHub. All changes to the "develop"
-branch must be made exclusively through merging pull requests. The
-"release" and "stable" branches, respectively are only to be updated
-upon patch or stable releases with fast-forward merges based on the
-associated tags. Pull requests may also be submitted to (long-running)
-feature branches created by LAMMPS developers inside the LAMMPS project,
-if needed. Those are not subject to the merge and review restrictions
-discussed in this document, though, but get managed as needed on a
-case-by-case basis.
+*ALL* changes to the LAMMPS code and documentation, however trivial,
+MUST be submitted as a pull request to GitHub.  All changes to the
+"develop" branch must be made exclusively through merging pull requests.
+The "release" and "stable" branches, respectively, are only to be
+updated upon feature or stable releases based on the associated
+tags.  Updates to the stable release in between stable releases
+(for example, back-ported bug fixes) are first merged into the "maintenance"
+branch and then into the "stable" branch as update releases.
+
+Pull requests may also be submitted to (long-running) feature branches
+created by LAMMPS developers inside the LAMMPS project, if needed. Those
+are not subject to the merge and review restrictions discussed in this
+document, though, but get managed as needed on a case-by-case basis.
 
 ### Pull Request Assignments
 
 Pull requests can be "chaperoned" by one of the LAMMPS core developers.
-This is indicated by who the pull request is assigned to. LAMMPS core
-developers can self-assign or they can decide to assign a pull request
+This is indicated by whom the pull request is assigned to.  LAMMPS core
+developers can self-assign, or they can decide to assign a pull request
 to a different LAMMPS developer. Being assigned to a pull request means,
 that this pull request may need some work and the assignee is tasked to
-determine whether this might be needed or not, and may either implement
-the required changes or ask the submitter of the pull request to implement
-them.  Even though, all LAMMPS developers may have write access to pull
-requests (if enabled by the submitter, which is the default), only the
-submitter or the assignee of a pull request may do so.  During this
-period the `work_in_progress` label may be applied to the pull
-request.  The assignee gets to decide what happens to the pull request
-next, e.g. whether it should be assigned to a different developer for
-additional checks and changes, or is recommended to be merged.  Removing
-the `work_in_progress` label and assigning the pull request to the
-developer tasked with merging signals that a pull request is ready to be
-merged. In addition, a `ready_for_merge` label may also be assigned
-to signal urgency to merge this pull request quickly.
+determine whether this might be needed or not. The assignee may either
+choose to implement required changes or ask the submitter of the pull
+request to implement them.  Even though, all LAMMPS developers may have
+write access to pull requests (if enabled by the submitter, which is the
+default), only the submitter or the assignee of a pull request should do
+so.  During this period, the `work_in_progress` label may be applied to
+the pull request.  The assignee gets to decide what happens to the pull
+request next, e.g. whether it should be assigned to a different
+developer for additional checks and changes, or is recommended to be
+merged.  Removing the `work_in_progress` label and assigning the pull
+request to the developer tasked with merging signals that a pull request
+is ready to be merged. In addition, a `ready_for_merge` label may also
+be assigned to signal urgency to merge this pull request quickly.
 
 ### Pull Request Reviews
 
@@ -70,32 +73,33 @@ People can be assigned to review a pull request in two ways:
 
   * They can be assigned manually to review a pull request
     by the submitter or a LAMMPS developer
-  * They can be automatically assigned, because a developers matches
-    a file pattern in the `.github/CODEOWNERS` file, which associates
-    developers with the code they contributed and maintain.
+  * They can be automatically assigned, because a developer's GitHub
+    handle matches a file pattern in the `.github/CODEOWNERS` file,
+    which associates developers with the code they contributed and
+    maintain.
 
 Reviewers are requested to state their appraisal of the proposed changes
 and either approve or request changes. People may unassign themselves
 from review, if they feel not competent about the changes proposed. At
-least two approvals from LAMMPS developers with write access are required
-before merging in addition to the automated compilation tests.
-Merging counts as implicit approval, so does submission of a pull request
-(by a LAMMPS developer). So the person doing the merge may not also submit
-an approving review. The feature, that reviews from code owners are "hard"
-reviews (i.e. they must all be approved before merging is allowed), is
-currently disabled and it is in the discretion of the merge maintainer to
-assess when a sufficient degree of approval, especially from external
-contributors, has been reached in these cases.  Reviews may be
-(automatically) dismissed, when the reviewed code has been changed,
-and then approval is required a second time.
+least two approvals from LAMMPS developers with write access are
+required before merging, in addition to passing all automated
+compilation and unit tests.  Merging counts as implicit approval, so
+does submission of a pull request (by a LAMMPS developer). So the person
+doing the merge may not also submit an approving review.  The GitHub
+feature, that reviews from code owners are "hard" reviews (i.e. they
+must all approve before merging is allowed), is currently disabled.
+It is in the discretion of the merge maintainer to assess when a
+sufficient degree of approval has been reached, especially from external
+collaborators.  Reviews may be (automatically) dismissed, when the
+reviewed code has been changed. Review may be requested a second time.
 
 ### Pull Request Discussions
 
 All discussions about a pull request should be kept as much as possible
 on the pull request discussion page on GitHub, so that other developers
 can later review the entire discussion after the fact and understand the
-rationale behind choices made.  Exceptions to this policy are technical
-discussions, that are centered on tools or policies themselves
+rationale behind choices that were made.  Exceptions to this policy are
+technical discussions, that are centered on tools or policies themselves
 (git, GitHub, c++) rather than on the content of the pull request.
 
 ## GitHub Issues
@@ -109,39 +113,47 @@ marker in the subject. This is automatically done when using the
 corresponding template for submitting an issue.  Issues may be assigned
 to one or more developers, if they are working on this feature or
 working to resolve an issue.  Issues that have nobody working
-on them at the moment or in the near future, have the label
+on them at the moment, or in the near future, have the label
 `volunteer needed` attached.
 
-When an issue, say `#125` is resolved by a specific pull request,
-the comment for the pull request shall contain the text `closes #125`
-or `fixes #125`, so that the issue is automatically deleted when
-the pull request is merged.  The template for pull requests includes
-a header where connections between pull requests and issues can be listed
-and thus were this comment should be placed.
+When an issue, say `#125` is resolved by a specific pull request, the
+comment for the pull request shall contain the text `closes #125` or
+`fixes #125`, so that the issue is automatically deleted when the pull
+request is merged.  The template for pull requests includes a header
+where connections between pull requests and issues can be listed, and
+thus where this comment should be placed.
 
-## Milestones and Release Planning
+## Release Planning
 
 LAMMPS uses a continuous release development model with incremental
-changes, i.e. significant effort is made - including automated pre-merge
-testing - that the code in the branch "develop" does not get easily
+changes, i.e. significant effort is made -- including automated pre-merge
+testing -- that the code in the branch "develop" does not get easily
 broken.  These tests are run after every update to a pull request.  More
-extensive and time consuming tests (including regression testing) are
-performed after code is merged to the "develop" branch. There are patch
-releases of LAMMPS every 3-5 weeks at a point, when the LAMMPS
-developers feel, that a sufficient amount of changes have happened, and
-the post-merge testing has been successful. These patch releases are
+extensive and time-consuming tests (including regression testing) are
+performed after code is merged to the "develop" branch.  There are feature
+releases of LAMMPS made about every 4-6 weeks at a point, when the LAMMPS
+developers feel, that a sufficient number of changes have been included
+and all post-merge testing has been successful.  These feature releases are
 marked with a `patch_<version date>` tag and the "release" branch
-follows only these versions (and thus is always supposed to be of
-production quality, unlike "develop", which may be temporary broken, in
-the case of larger change sets or unexpected incompatibilities or side
-effects.
+follows only these versions with fast-forward merges.  While "develop" may
+be temporarily broken through issues only detected by the post-merge tests,
+The "release" branch is always supposed to be of production quality.
 
-About 1-2 times each year, there are going to be "stable" releases of
-LAMMPS.  These have seen additional, manual testing and review of
-results from testing with instrumented code and static code analysis.
-Also, the last 1-3 patch releases before a stable release are "release
-candidate" versions which only contain bugfixes and documentation
-updates.  For release planning and the information of code contributors,
-issues and pull requests being actively worked on are assigned a
-"milestone", which corresponds to the next stable release or the stable
-release after that, with a tentative release date.
+About once each year, there is a "stable" release of LAMMPS.  These have
+seen additional, manual testing and review of results from testing with
+instrumented code and static code analysis.  Also, the last few feature
+releases before a stable release are "release candidate" versions which
+only contain bug fixes, feature additions to peripheral functionality,
+and documentation updates.  In between stable releases, bug fixes and
+infrastructure updates are back-ported from the "develop" branch to the
+"maintenance" branch and occasionally merged into "stable" and published
+as update releases.
+
+## Project Management
+
+For release planning and the information of code contributors, issues
+and pull requests are being managed with GitHub Project Boards.  There
+are currently three boards: LAMMPS Feature Requests, LAMMPS Bug Reports,
+and LAMMPS Pull Requests.  Each board is organized in columns where
+submissions are categorized.  Within each column the entries are
+(manually) sorted according their priority.

doc/lammps.1

@@ -1,7 +1,7 @@
-.TH LAMMPS "1" "23 June 2022 - Update 4" "2022-6-23"
+.TH LAMMPS "1" "2 August 2023" "2023-08-2"
 .SH NAME
 .B LAMMPS
-\- Molecular Dynamics Simulator.  Version 23 June 2022 - Update 4
+\- Molecular Dynamics Simulator.  Version 2 August 2023
 
 .SH SYNOPSIS
 .B lmp

doc/msi2lmp.1

@@ -1,11 +1,11 @@
-.TH MSI2LMP "1" "v3.9.9" "2018-11-05"
+.TH MSI2LMP "1" "v3.9.10" "2023-03-10"
 .SH NAME
 .B MSI2LMP
 \- Converter for Materials Studio files to LAMMPS
 
 .SH SYNOPSIS
 .B msi2lmp
-<ROOTNAME> [-class <I|1|II|2|O|0>] [-frc <path to frc file>] [-print #] [-ignore] [-nocenter] [-oldstyle] [-shift <x> <y> <z>]
+[-help] <ROOTNAME> [-class <I|1|II|2|O|0>] [-frc <path to frc file>] [-print #] [-ignore] [-nocenter] [-oldstyle] [-shift <x> <y> <z>]
 
 .SH DESCRIPTION
 .PP
@@ -22,6 +22,9 @@ needed between .frc and .car/.mdf files are the atom types.
 
 .SH OPTIONS
 .TP
+\fB\-h\fR, \fB\-help\fR,
+Print detailed help message to the screen and stop.
+.TP
 \fB\<ROOTNAME>\fR
 This has to be the first argument and is a
 .B mandatory

doc/src/2001/basics.html

@@ -63,7 +63,7 @@ In the src directory, there is one top-level Makefile and several
 low-level machine-specific files named Makefile.xxx where xxx = the
 machine name. If a low-level Makefile exists for your platform, you do
 not need to edit the top-level Makefile.  However you should check the
-system-specific section of the low-level Makefile to insure the
+system-specific section of the low-level Makefile to ensure the
 various paths are correct for your environment. If a low-level
 Makefile does not exist for your platform, you will need to add a
 suitable target to the top-level Makefile. You will also need to

doc/src/2001/input_commands.html

@@ -1206,7 +1206,7 @@ this command is not typically needed if the "nonbond style" and "
 an exception to this is if a short cutoff is used initially,
   but a longer cutoff will be used for a subsequent run (in the same
   input script), in this case the "maximum cutoff" command should be
-  used to insure enough memory is allocated for the later run
+  used to ensure enough memory is allocated for the later run
 note that a restart file contains nonbond cutoffs (so it is not necessary
   to use a "nonbond style" command before "read restart"), but LAMMPS
   still needs to know what the maximum cutoff will be before the

doc/src/Bibliography.rst

@@ -203,7 +203,7 @@ Bibliography
    A Caro, DA Crowson, M Caro; Phys Rev Lett, 95, 075702 (2005)
 
 **(CasP)**
-   CasP webpage: https://www.helmholtz-berlin.de/people/gregor-schiwietz/casp_en.html
+   CasP webpage: http://www.casp-program.org/
 
 **(Cawkwell2012)**
    A.\  M. N. Niklasson, M. J. Cawkwell, Phys. Rev. B, 86 (17), 174308 (2012).

doc/src/Build.rst

@@ -6,9 +6,9 @@ either traditional makefiles for use with GNU make (which may require
 manual editing), or using a build environment generated by CMake (Unix
 Makefiles, Ninja, Xcode, Visual Studio, KDevelop, CodeBlocks and more).
 
-As an alternative you can download a package with pre-built executables
-or automated build trees as described on the :doc:`Install <Install>`
-page.
+As an alternative, you can download a package with pre-built executables
+or automated build trees, as described in the :doc:`Install <Install>`
+section of the manual.
 
 .. toctree::
    :maxdepth: 1

doc/src/Build_basics.rst

@@ -44,7 +44,7 @@ standard. A more detailed discussion of that is below.
 
       The executable created by CMake (after running make) is named
       ``lmp`` unless the ``LAMMPS_MACHINE`` option is set.  When setting
-      ``LAMMPS_MACHINE=name`` the executable will be called
+      ``LAMMPS_MACHINE=name``, the executable will be called
       ``lmp_name``.  Using ``BUILD_MPI=no`` will enforce building a
       serial executable using the MPI STUBS library.
 
@@ -60,7 +60,7 @@ standard. A more detailed discussion of that is below.
 
       Any ``make machine`` command will look up the make settings from a
       file ``Makefile.machine`` in the folder ``src/MAKE`` or one of its
-      sub-directories ``MINE``, ``MACHINES``, or ``OPTIONS``, create a
+      subdirectories ``MINE``, ``MACHINES``, or ``OPTIONS``, create a
       folder ``Obj_machine`` with all objects and generated files and an
       executable called ``lmp_machine``\ .  The standard parallel build
       with ``make mpi`` assumes a standard MPI installation with MPI
@@ -107,9 +107,9 @@ MPI and OpenMP support in LAMMPS
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you are installing MPI yourself to build a parallel LAMMPS
-executable, we recommend either MPICH or OpenMPI which are regularly
+executable, we recommend either MPICH or OpenMPI, which are regularly
 used and tested with LAMMPS by the LAMMPS developers.  MPICH can be
-downloaded from the `MPICH home page <https://www.mpich.org>`_ and
+downloaded from the `MPICH home page <https://www.mpich.org>`_, and
 OpenMPI can be downloaded correspondingly from the `OpenMPI home page
 <https://www.open-mpi.org>`_.  Other MPI packages should also work.  No
 specific vendor provided and standard compliant MPI library is currently
@@ -128,14 +128,14 @@ and adds vectorization support when compiled with compatible compilers,
 in particular the Intel compilers on top of OpenMP. Also, the ``KOKKOS``
 package can be compiled to include OpenMP threading.
 
-In addition, there are a few commands in LAMMPS that have native OpenMP
-support included as well.  These are commands in the ``MPIIO``,
-``ML-SNAP``, ``DIFFRACTION``, and ``DPD-REACT`` packages.  In addition
-some packages support OpenMP threading indirectly through the libraries
-they interface to: e.g. ``LATTE``, ``KSPACE``, and ``COLVARS``.
-See the :doc:`Packages details <Packages_details>` page for more
-info on these packages and the pages for their respective commands
-for OpenMP threading info.
+In addition, there are a few commands in LAMMPS that have native
+OpenMP support included as well.  These are commands in the ``MPIIO``,
+``ML-SNAP``, ``DIFFRACTION``, and ``DPD-REACT`` packages.
+Furthermore, some packages support OpenMP threading indirectly through
+the libraries they interface to: e.g. ``KSPACE``, and ``COLVARS``.
+See the :doc:`Packages details <Packages_details>` page for more info
+on these packages, and the pages for their respective commands for
+OpenMP threading info.
 
 For CMake, if you use ``BUILD_OMP=yes``, you can use these packages
 and turn on their native OpenMP support and turn on their native OpenMP
@@ -144,9 +144,9 @@ variable before you launch LAMMPS.
 
 For building via conventional make, the ``CCFLAGS`` and ``LINKFLAGS``
 variables in Makefile.machine need to include the compiler flag that
-enables OpenMP. For GNU compilers it is ``-fopenmp``\ .  For (recent) Intel
-compilers it is ``-qopenmp``\ .  If you are using a different compiler,
-please refer to its documentation.
+enables OpenMP. For the GNU compilers or Clang, it is ``-fopenmp``\ .
+For (recent) Intel compilers, it is ``-qopenmp``\ .  If you are using a
+different compiler, please refer to its documentation.
 
 .. _default-none-issues:
 
@@ -174,15 +174,16 @@ Choice of compiler and compile/link options
 The choice of compiler and compiler flags can be important for maximum
 performance.  Vendor provided compilers for a specific hardware can
 produce faster code than open-source compilers like the GNU compilers.
-On the most common x86 hardware most popular C++ compilers are quite
-similar in performance of C/C++ code at high optimization levels.  When
-using the ``INTEL`` package, there is a distinct advantage in using
-the `Intel C++ compiler <intel_>`_ due to much improved vectorization
-through SSE and AVX instructions on compatible hardware as the source
-code includes changes and Intel compiler specific directives to enable
-high degrees of vectorization.  This may change over time as equivalent
-vectorization directives are included into OpenMP standard revisions and
-other compilers adopt them.
+On the most common x86 hardware, the most popular C++ compilers are
+quite similar in their ability to optimize regular C/C++ source code at
+high optimization levels.  When using the ``INTEL`` package, there is a
+distinct advantage in using the `Intel C++ compiler <intel_>`_ due to
+much improved vectorization through SSE and AVX instructions on
+compatible hardware.  The source code in that package conditionally
+includes compiler specific directives to enable these high degrees of
+vectorization.  This may change over time as equivalent vectorization
+directives are included into the OpenMP standard and other compilers
+adopt them.
 
 .. _intel: https://software.intel.com/en-us/intel-compilers
 
@@ -196,7 +197,7 @@ LAMMPS.
    .. tab:: CMake build
 
       By default CMake will use the compiler it finds according to
-      internal preferences and it will add optimization flags
+      internal preferences, and it will add optimization flags
       appropriate to that compiler and any :doc:`accelerator packages
       <Speed_packages>` you have included in the build.  CMake will
       check if the detected or selected compiler is compatible with the
@@ -250,9 +251,9 @@ LAMMPS.
       and `-C ../cmake/presets/pgi.cmake`
       will switch the compiler to the PGI compilers.
 
-      In addition you can set ``CMAKE_TUNE_FLAGS`` to specifically add
-      compiler flags to tune for optimal performance on given hosts. By
-      default this variable is empty.
+      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::
 
@@ -368,10 +369,10 @@ running LAMMPS from Python via its library interface.
                                       # no default value
 
       The compilation will always produce a LAMMPS library and an
-      executable linked to it.  By default this will be a static library
-      named ``liblammps.a`` and an executable named ``lmp`` Setting
-      ``BUILD_SHARED_LIBS=yes`` will instead produce a shared library
-      called ``liblammps.so`` (or ``liblammps.dylib`` or
+      executable linked to it.  By default, this will be a static
+      library named ``liblammps.a`` and an executable named ``lmp``
+      Setting ``BUILD_SHARED_LIBS=yes`` will instead produce a shared
+      library called ``liblammps.so`` (or ``liblammps.dylib`` or
       ``liblammps.dll`` depending on the platform) If
       ``LAMMPS_MACHINE=name`` is set in addition, the name of the
       generated libraries will be changed to either ``liblammps_name.a``
@@ -429,7 +430,7 @@ You may need to use ``sudo make install`` in place of the last line if
 you do not have write privileges for ``/usr/local/lib`` or use the
 ``--prefix`` configuration option to select an installation folder,
 where you do have write access.  The end result should be the file
-``/usr/local/lib/libmpich.so``.  On many Linux installations the folder
+``/usr/local/lib/libmpich.so``.  On many Linux installations, the folder
 ``${HOME}/.local`` is an alternative to using ``/usr/local`` and does
 not require superuser or sudo access.  In that case the configuration
 step becomes:
@@ -438,9 +439,10 @@ step becomes:
 
   ./configure --enable-shared --prefix=${HOME}/.local
 
-Avoiding to use "sudo" for custom software installation (i.e. from source
-and not through a package manager tool provided by the OS) is generally
-recommended to ensure the integrity of the system software installation.
+Avoiding the use of "sudo" for custom software installation (i.e. from
+source and not through a package manager tool provided by the OS) is
+generally recommended to ensure the integrity of the system software
+installation.
 
 ----------
 
@@ -487,8 +489,9 @@ using CMake or Make.
 
       .. code-block:: bash
 
-         -D BUILD_TOOLS=value         # yes or no (default)
-         -D BUILD_LAMMPS_SHELL=value  # yes or no (default)
+         -D BUILD_TOOLS=value         # yes or no (default). Build binary2txt, chain.x, micelle2d.x, msi2lmp, phana, stl_bin2txt
+         -D BUILD_LAMMPS_SHELL=value  # yes or no (default). Build lammps-shell
+         -D BUILD_LAMMPS_GUI=value    # yes or no (default). Build lammps-gui
 
       The generated binaries will also become part of the LAMMPS installation
       (see below).
@@ -502,7 +505,6 @@ using CMake or Make.
          make binary2txt       # build only binary2txt tool
          make chain            # build only chain tool
          make micelle2d        # build only micelle2d tool
-         make thermo_extract   # build only thermo_extract tool
 
          cd lammps/tools/lammps-shell
          make                  # build LAMMPS shell
@@ -514,11 +516,11 @@ using CMake or Make.
 Install LAMMPS after a build
 ------------------------------------------
 
-After building LAMMPS, you may wish to copy the LAMMPS executable of
-library, along with other LAMMPS files (library header, doc files) to
-a globally visible place on your system, for others to access.  Note
-that you may need super-user privileges (e.g. sudo) if the directory
-you want to copy files to is protected.
+After building LAMMPS, you may wish to copy the LAMMPS executable or
+library, along with other LAMMPS files (library header, doc files), to a
+globally visible place on your system, for others to access.  Note that
+you may need super-user privileges (e.g. sudo) if the directory you want
+to copy files to is protected.
 
 .. tabs::
 
@@ -536,7 +538,7 @@ you want to copy files to is protected.
       environment variable, if you are installing LAMMPS into a non-system
       location and/or are linking to libraries in a non-system location that
       depend on such runtime path settings.
-      As an alternative you may set the CMake variable ``LAMMPS_INSTALL_RPATH``
+      As an alternative, you may set the CMake variable ``LAMMPS_INSTALL_RPATH``
       to ``on`` and then the runtime paths for any linked shared libraries
       and the library installation folder for the LAMMPS library will be
       embedded and thus the requirement to set environment variables is avoided.

doc/src/Build_cmake.rst

@@ -9,10 +9,10 @@ page.
 
 The following text assumes some familiarity with CMake and focuses on
 using the command line tool ``cmake`` and what settings are supported
-for building LAMMPS.  A more detailed tutorial on how to use ``cmake``
-itself, the text mode or graphical user interface, change the generated
-output files for different build tools and development environments is
-on a :doc:`separate page <Howto_cmake>`.
+for building LAMMPS.  A more detailed tutorial on how to use CMake
+itself, the text mode or graphical user interface, to change the
+generated output files for different build tools and development
+environments is on a :doc:`separate page <Howto_cmake>`.
 
 .. note::
 
@@ -22,12 +22,12 @@ on a :doc:`separate page <Howto_cmake>`.
 .. warning::
 
    You must not mix the :doc:`traditional make based <Build_make>`
-   LAMMPS build procedure with using CMake.  Thus no packages may be
+   LAMMPS build procedure with using CMake.  No packages may be
    installed or a build been previously attempted in the LAMMPS source
    directory by using ``make <machine>``.  CMake will detect if this is
    the case and generate an error.  To remove conflicting files from the
    ``src`` you can use the command ``make no-all purge`` which will
-   un-install all packages and delete all auto-generated files.
+   uninstall all packages and delete all auto-generated files.
 
 
 Advantages of using CMake
@@ -44,9 +44,9 @@ software or for people that want to modify or extend LAMMPS.
   and adapt the LAMMPS default build configuration accordingly.
 - CMake can generate files for different build tools and integrated
   development environments (IDE).
-- CMake supports customization of settings with a text mode or graphical
-  user interface. No knowledge of file formats or and complex command
-  line syntax required.
+- CMake supports customization of settings with a command line, text
+  mode, or graphical user interface.  No knowledge of file formats or
+  complex command line syntax is required.
 - All enabled components are compiled in a single build operation.
 - Automated dependency tracking for all files and configuration options.
 - Support for true out-of-source compilation. Multiple configurations
@@ -55,23 +55,23 @@ software or for people that want to modify or extend LAMMPS.
   source tree.
 - Simplified packaging of LAMMPS for Linux distributions, environment
   modules, or automated build tools like `Homebrew <https://brew.sh/>`_.
-- Integration of automated regression testing (the LAMMPS side for that
-  is still under development).
+- Integration of automated unit and regression testing (the LAMMPS side
+  of this is still under active development).
 
 .. _cmake_build:
 
 Getting started
 ^^^^^^^^^^^^^^^
 
-Building LAMMPS with CMake is a two-step process.  First you use CMake
-to generate a build environment in a new directory.  For that purpose
-you can use either the command-line utility ``cmake`` (or ``cmake3``),
-the text-mode UI utility ``ccmake`` (or ``ccmake3``) or the graphical
-utility ``cmake-gui``, or use them interchangeably.  The second step is
-then the compilation and linking of all objects, libraries, and
-executables. Here is a minimal example using the command line version of
-CMake to build LAMMPS with no add-on packages enabled and no
-customization:
+Building LAMMPS with CMake is a two-step process.  In the first step,
+you use CMake to generate a build environment in a new directory.  For
+that purpose you can use either the command-line utility ``cmake`` (or
+``cmake3``), the text-mode UI utility ``ccmake`` (or ``ccmake3``) or the
+graphical utility ``cmake-gui``, or use them interchangeably.  The
+second step is then the compilation and linking of all objects,
+libraries, and executables using the selected build tool.  Here is a
+minimal example using the command line version of CMake to build LAMMPS
+with no add-on packages enabled and no customization:
 
 .. code-block:: bash
 
@@ -96,17 +96,17 @@ Compilation can take a long time, since LAMMPS is a large project with
 many features. If your machine has multiple CPU cores (most do these
 days), you can speed this up by compiling sources in parallel with
 ``make -j N`` (with N being the maximum number of concurrently executed
-tasks).  Also installation of the `ccache <https://ccache.dev/>`_ (=
-Compiler Cache) software may speed up repeated compilation even more,
-e.g. during code development.
+tasks).  Installation of the `ccache <https://ccache.dev/>`_ (= Compiler
+Cache) software may speed up repeated compilation even more, e.g. during
+code development, especially when repeatedly switching between branches.
 
 After the initial build, whenever you edit LAMMPS source files, enable
 or disable packages, change compiler flags or build options, you must
 re-compile and relink the LAMMPS executable with ``cmake --build .`` (or
 ``make``).  If the compilation fails for some reason, try running
 ``cmake .`` and then compile again. The included dependency tracking
-should make certain that only the necessary subset of files are
-re-compiled.  You can also delete compiled objects, libraries and
+should make certain that only the necessary subset of files is
+re-compiled.  You can also delete compiled objects, libraries, and
 executables with ``cmake --build . --target clean`` (or ``make clean``).
 
 After compilation, you may optionally install the LAMMPS executable into
@@ -132,12 +132,12 @@ file called ``CMakeLists.txt`` (for LAMMPS it is located in the
 ``CMakeCache.txt``, which is generated at the end of the CMake
 configuration step.  The cache file contains all current CMake settings.
 
-To modify settings, enable or disable features, you need to set *variables*
-with either the *-D* command line flag (``-D VARIABLE1_NAME=value``) or
-change them in the text mode of graphical user interface.  The *-D* flag
-can be used several times in one command.
+To modify settings, enable or disable features, you need to set
+*variables* with either the *-D* command line flag (``-D
+VARIABLE1_NAME=value``) or change them in the text mode of the graphical
+user interface.  The *-D* flag can be used several times in one command.
 
-For your convenience we provide :ref:`CMake presets <cmake_presets>`
+For your convenience, we provide :ref:`CMake presets <cmake_presets>`
 that combine multiple settings to enable optional LAMMPS packages or use
 a different compiler tool chain.  Those are loaded with the *-C* flag
 (``-C ../cmake/presets/basic.cmake``).  This step would only be needed
@@ -155,22 +155,23 @@ specific CMake version is given when running ``cmake --help``.
 Multi-configuration build systems
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Throughout this manual it is mostly assumed that LAMMPS is being built
+Throughout this manual, it is mostly assumed that LAMMPS is being built
 on a Unix-like operating system with "make" as the underlying "builder",
-since this is the most common case.  In this case the build "configuration"
-is chose using ``-D CMAKE_BUILD_TYPE=<configuration>`` with ``<configuration>``
-being one of "Release", "Debug", "RelWithDebInfo", or "MinSizeRel".
-Some build tools, however, can also use or even require to have a so-called
-multi-configuration build system setup.  For those the built type (or
-configuration) is chosen at compile time using the same build files. E.g.
-with:
+since this is the most common case.  In this case the build
+"configuration" is chose using ``-D CMAKE_BUILD_TYPE=<configuration>``
+with ``<configuration>`` being one of "Release", "Debug",
+"RelWithDebInfo", or "MinSizeRel".  Some build tools, however, can also
+use or even require having a so-called multi-configuration build system
+setup.  For a multi-configuration build, the built type (or
+configuration) is selected at compile time using the same build
+files. E.g.  with:
 
 .. code-block:: bash
 
    cmake --build build-multi --config Release
 
 In that case the resulting binaries are not in the build folder directly
-but in sub-directories corresponding to the build type (i.e. Release in
+but in subdirectories corresponding to the build type (i.e. Release in
 the example from above).  Similarly, for running unit tests the
 configuration is selected with the *-C* flag:
 
@@ -184,7 +185,7 @@ particular applicable to compiling packages that require additional libraries
 that would be downloaded and compiled by CMake.  The "windows" preset file
 tries to keep track of which packages can be compiled natively with the
 MSVC compilers out-of-the box.  Not all of those external libraries are
-portable to Windows either.
+portable to Windows, either.
 
 
 Installing CMake

doc/src/Build_development.rst

@@ -46,7 +46,7 @@ It can be enabled for all C++ code with the following CMake flag
 
 With this flag enabled all source files will be processed twice, first to
 be compiled and then to be analyzed. Please note that the analysis can be
-significantly more time consuming than the compilation itself.
+significantly more time-consuming than the compilation itself.
 
 ----------
 
@@ -523,6 +523,8 @@ The following options are available.
 These should help to make source and documentation files conforming
 to some the coding style preferences of the LAMMPS developers.
 
+.. _clang-format:
+
 Clang-format support
 --------------------
 

doc/src/Build_extras.rst

@@ -43,13 +43,13 @@ This is the list of packages that may require additional steps.
    * :ref:`INTEL <intel>`
    * :ref:`KIM <kim>`
    * :ref:`KOKKOS <kokkos>`
-   * :ref:`LATTE <latte>`
+   * :ref:`LEPTON <lepton>`
    * :ref:`MACHDYN <machdyn>`
    * :ref:`MDI <mdi>`
-   * :ref:`MESONT <mesont>`
    * :ref:`ML-HDNNP <ml-hdnnp>`
    * :ref:`ML-IAP <mliap>`
    * :ref:`ML-PACE <ml-pace>`
+   * :ref:`ML-POD <ml-pod>`
    * :ref:`ML-QUIP <ml-quip>`
    * :ref:`MOLFILE <molfile>`
    * :ref:`MSCG <mscg>`
@@ -125,10 +125,11 @@ CMake build
    -D GPU_API=value             # value = opencl (default) or cuda or hip
    -D GPU_PREC=value            # precision setting
                                 # value = double or mixed (default) or single
-   -D HIP_PATH                  # path to HIP installation. Must be set if GPU_API=HIP
    -D GPU_ARCH=value            # primary GPU hardware choice for GPU_API=cuda
-                                # value = sm_XX, see below
-                                # default is sm_50
+                                # value = sm_XX (see below, default is sm_50)
+   -D GPU_DEBUG=value           # enable debug code in the GPU package library, mostly useful for developers
+                                # value = yes or no (default)
+   -D HIP_PATH=value            # value = path to HIP installation. Must be set if GPU_API=HIP
    -D HIP_ARCH=value            # primary GPU hardware choice for GPU_API=hip
                                 # value depends on selected HIP_PLATFORM
                                 # default is 'gfx906' for HIP_PLATFORM=amd and 'sm_50' for HIP_PLATFORM=nvcc
@@ -139,6 +140,8 @@ CMake build
                                 # value = yes or no (default)
    -D CUDA_MPS_SUPPORT=value    # enables some tweaks required to run with active nvidia-cuda-mps daemon
                                 # value = yes or no (default)
+   -D CUDA_BUILD_MULTIARCH=value  # enables building CUDA kernels for all supported GPU architectures
+                                  # value = yes (default) or no
    -D USE_STATIC_OPENCL_LOADER=value  # downloads/includes OpenCL ICD loader library, no local OpenCL headers/libs needed
                                       # value = yes (default) or no
 
@@ -157,37 +160,55 @@ CMake build
 A more detailed list can be found, for example,
 at `Wikipedia's CUDA article <https://en.wikipedia.org/wiki/CUDA#GPUs_supported>`_
 
-CMake can detect which version of the CUDA toolkit is used and thus will try
-to include support for **all** major GPU architectures supported by this toolkit.
-Thus the GPU_ARCH setting is merely an optimization, to have code for
-the preferred GPU architecture directly included rather than having to wait
-for the JIT compiler of the CUDA driver to translate it.
+CMake can detect which version of the CUDA toolkit is used and thus will
+try to include support for **all** major GPU architectures supported by
+this toolkit.  Thus the GPU_ARCH setting is merely an optimization, to
+have code for the preferred GPU architecture directly included rather
+than having to wait for the JIT compiler of the CUDA driver to translate
+it.  This behavior can be turned off (e.g. to speed up compilation) by
+setting :code:`CUDA_ENABLE_MULTIARCH` to :code:`no`.
 
-When compiling for CUDA or HIP with CUDA, version 8.0 or later of the CUDA toolkit
-is required and a GPU architecture of Kepler or later, which must *also* be
-supported by the CUDA toolkit in use **and** the CUDA driver in use.
-When compiling for OpenCL, OpenCL version 1.2 or later is required and the
-GPU must be supported by the GPU driver and OpenCL runtime bundled with the driver.
+When compiling for CUDA or HIP with CUDA, version 8.0 or later of the
+CUDA toolkit is required and a GPU architecture of Kepler or later,
+which must *also* be supported by the CUDA toolkit in use **and** the
+CUDA driver in use.  When compiling for OpenCL, OpenCL version 1.2 or
+later is required and the GPU must be supported by the GPU driver and
+OpenCL runtime bundled with the driver.
 
-When building with CMake, you **must NOT** build the GPU library in ``lib/gpu``
-using the traditional build procedure. CMake will detect files generated by that
-process and will terminate with an error and a suggestion for how to remove them.
+When building with CMake, you **must NOT** build the GPU library in
+``lib/gpu`` using the traditional build procedure. CMake will detect
+files generated by that process and will terminate with an error and a
+suggestion for how to remove them.
 
-If you are compiling for OpenCL, the default setting is to download, build, and
-link with a static OpenCL ICD loader library and standard OpenCL headers.  This
-way no local OpenCL development headers or library needs to be present and only
-OpenCL compatible drivers need to be installed to use OpenCL.  If this is not
-desired, you can set :code:`USE_STATIC_OPENCL_LOADER` to :code:`no`.
+If you are compiling for OpenCL, the default setting is to download,
+build, and link with a static OpenCL ICD loader library and standard
+OpenCL headers.  This way no local OpenCL development headers or library
+needs to be present and only OpenCL compatible drivers need to be
+installed to use OpenCL.  If this is not desired, you can set
+:code:`USE_STATIC_OPENCL_LOADER` to :code:`no`.
 
-If you are compiling with HIP, note that before running CMake you will have to
-set appropriate environment variables. Some variables such as
-:code:`HCC_AMDGPU_TARGET` (for ROCm <= 4.0) or :code:`CUDA_PATH` are necessary for :code:`hipcc`
-and the linker to work correctly.
+The GPU library has some multi-thread support using OpenMP.  If LAMMPS
+is built with ``-D BUILD_OMP=on`` this will also be enabled.
+
+If you are compiling with HIP, note that before running CMake you will
+have to set appropriate environment variables. Some variables such as
+:code:`HCC_AMDGPU_TARGET` (for ROCm <= 4.0) or :code:`CUDA_PATH` are
+necessary for :code:`hipcc` and the linker to work correctly.
+
+.. versionadded:: 3Aug2022
+
+Using the CHIP-SPV implementation of HIP is supported. It allows one to
+run HIP code on Intel GPUs via the OpenCL or Level Zero backends. To use
+CHIP-SPV, you must set :code:`-DHIP_USE_DEVICE_SORT=OFF` in your CMake
+command line as CHIP-SPV does not yet support hipCUB. As of Summer 2022,
+the use of HIP for Intel GPUs is experimental. You should only use this
+option in preparations to run on Aurora system at Argonne.
 
 .. code:: bash
 
    # AMDGPU target (ROCm <= 4.0)
    export HIP_PLATFORM=hcc
+   export HIP_PATH=/path/to/HIP/install
    export HCC_AMDGPU_TARGET=gfx906
    cmake -D PKG_GPU=on -D GPU_API=HIP -D HIP_ARCH=gfx906 -D CMAKE_CXX_COMPILER=hipcc ..
    make -j 4
@@ -196,6 +217,7 @@ and the linker to work correctly.
 
    # AMDGPU target (ROCm >= 4.1)
    export HIP_PLATFORM=amd
+   export HIP_PATH=/path/to/HIP/install
    cmake -D PKG_GPU=on -D GPU_API=HIP -D HIP_ARCH=gfx906 -D CMAKE_CXX_COMPILER=hipcc ..
    make -j 4
 
@@ -204,10 +226,20 @@ and the linker to work correctly.
    # CUDA target (not recommended, use GPU_ARCH=cuda)
    # !!! DO NOT set CMAKE_CXX_COMPILER !!!
    export HIP_PLATFORM=nvcc
+   export HIP_PATH=/path/to/HIP/install
    export CUDA_PATH=/usr/local/cuda
    cmake -D PKG_GPU=on -D GPU_API=HIP -D HIP_ARCH=sm_70 ..
    make -j 4
 
+.. code:: bash
+
+   # SPIR-V target (Intel GPUs)
+   export HIP_PLATFORM=spirv
+   export HIP_PATH=/path/to/HIP/install
+   export CMAKE_CXX_COMPILER=<hipcc/clang++>
+   cmake -D PKG_GPU=on -D GPU_API=HIP ..
+   make -j 4
+
 Traditional make
 ^^^^^^^^^^^^^^^^
 
@@ -254,10 +286,13 @@ To enable GPU binning via CUDA performance primitives set the Makefile variable
 most modern GPUs.
 
 To support the CUDA multiprocessor server you can set the define
-``-DCUDA_PROXY``.  Please note that in this case you must **not** use
+``-DCUDA_MPS_SUPPORT``.  Please note that in this case you must **not** use
 the CUDA performance primitives and thus set the variable ``CUDPP_OPT``
 to empty.
 
+The GPU library has some multi-thread support using OpenMP.  You need to add
+the compiler flag that enables OpenMP to the ``CUDR_OPTS`` Makefile variable.
+
 If the library build is successful, 3 files should be created:
 ``lib/gpu/libgpu.a``\ , ``lib/gpu/nvc_get_devices``\ , and
 ``lib/gpu/Makefile.lammps``\ .  The latter has settings that enable LAMMPS
@@ -268,7 +303,7 @@ your machine are not correct, the LAMMPS build will fail, and
 .. note::
 
    If you re-build the GPU library in ``lib/gpu``, you should always
-   un-install the GPU package in ``lammps/src``, then re-install it and
+   uninstall the GPU package in ``lammps/src``, then re-install it and
    re-build LAMMPS.  This is because the compilation of files in the GPU
    package uses the library settings from the ``lib/gpu/Makefile.machine``
    used to build the GPU library.
@@ -469,6 +504,9 @@ They must be specified in uppercase.
    *  - **Arch-ID**
       - **HOST or GPU**
       - **Description**
+   *  - NATIVE
+      - HOST
+      - Local machine
    *  - AMDAVX
       - HOST
       - AMD 64-bit x86 CPU (AVX 1)
@@ -508,9 +546,21 @@ They must be specified in uppercase.
    *  - BDW
       - HOST
       - Intel Broadwell Xeon E-class CPU (AVX 2 + transactional mem)
+   *  - SKL
+      - HOST
+      - Intel Skylake Client CPU
    *  - SKX
       - HOST
-      - Intel Sky Lake Xeon E-class HPC CPU (AVX512 + transactional mem)
+      - Intel Skylake Xeon Server CPU (AVX512)
+   *  - ICL
+      - HOST
+      - Intel Ice Lake Client CPU (AVX512)
+   *  - ICX
+      - HOST
+      - Intel Ice Lake Xeon Server CPU (AVX512)
+   *  - SPR
+      - HOST
+      - Intel Sapphire Rapids Xeon Server CPU (AVX512)
    *  - KNC
       - HOST
       - Intel Knights Corner Xeon Phi
@@ -571,6 +621,12 @@ They must be specified in uppercase.
    *  - AMPERE86
       - GPU
       - NVIDIA Ampere generation CC 8.6 GPU
+   *  - ADA89
+      - GPU
+      - NVIDIA Ada Lovelace generation CC 8.9 GPU
+   *  - HOPPER90
+      - GPU
+      - NVIDIA Hopper generation CC 9.0 GPU
    *  - VEGA900
       - GPU
       - AMD GPU MI25 GFX900
@@ -582,7 +638,10 @@ They must be specified in uppercase.
       - AMD GPU MI100 GFX908
    *  - VEGA90A
       - GPU
-      - AMD GPU
+      - AMD GPU MI200 GFX90A
+   *  - INTEL_GEN
+      - GPU
+      - SPIR64-based devices, e.g. Intel GPUs, using JIT
    *  - INTEL_DG1
       - GPU
       - Intel Iris XeMAX GPU
@@ -597,9 +656,12 @@ They must be specified in uppercase.
       - Intel GPU Gen12LP
    *  - INTEL_XEHP
       - GPU
-      - Intel GPUs Xe-HP
+      - Intel GPU Xe-HP
+   *  - INTEL_PVC
+      - GPU
+      - Intel GPU Ponte Vecchio
 
-This list was last updated for version 3.5.0 of the Kokkos library.
+This list was last updated for version 3.7.1 of the Kokkos library.
 
 .. tabs::
 
@@ -631,20 +693,11 @@ This list was last updated for version 3.5.0 of the Kokkos library.
          -D Kokkos_ARCH_GPUARCH=yes    # GPUARCH = GPU from list above
          -D Kokkos_ENABLE_CUDA=yes
          -D Kokkos_ENABLE_OPENMP=yes
-         -D CMAKE_CXX_COMPILER=wrapper # wrapper = full path to Cuda nvcc wrapper
 
       This will also enable executing FFTs on the GPU, either via the
       internal KISSFFT library, or - by preference - with the cuFFT
       library bundled with the CUDA toolkit, depending on whether CMake
-      can identify its location.  The *wrapper* value for
-      ``CMAKE_CXX_COMPILER`` variable is the path to the CUDA nvcc
-      compiler wrapper provided in the Kokkos library:
-      ``lib/kokkos/bin/nvcc_wrapper``\ .  The setting should include the
-      full path name to the wrapper, e.g.
-
-      .. code-block:: bash
-
-         -D CMAKE_CXX_COMPILER=${HOME}/lammps/lib/kokkos/bin/nvcc_wrapper
+      can identify its location.
 
       For AMD or NVIDIA GPUs using HIP, set these variables:
 
@@ -779,13 +832,62 @@ will thus always enable it.
 
 ----------
 
-.. _latte:
+.. _lepton:
 
-LATTE package
--------------------------
+LEPTON package
+--------------
 
-To build with this package, you must download and build the LATTE
-library.
+To build with this package, you must build the Lepton library which is
+included in the LAMMPS source distribution in the ``lib/lepton`` folder.
+
+.. tabs::
+
+   .. tab:: CMake build
+
+      This is the recommended build procedure for using Lepton in
+      LAMMPS. No additional settings are normally needed besides
+      ``-D PKG_LEPTON=yes``.
+
+      On x86 hardware the Lepton library will also include a just-in-time
+      compiler for faster execution.  This is auto detected but can
+      be explicitly disabled by setting ``-D LEPTON_ENABLE_JIT=no``
+      (or enabled by setting it to yes).
+
+   .. tab:: Traditional make
+
+      Before building LAMMPS, one must build the Lepton library in lib/lepton.
+
+      This can be done manually in the same folder by using or adapting
+      one of the provided Makefiles: for example, ``Makefile.serial`` for
+      the GNU C++ compiler, or ``Makefile.mpi`` for the MPI compiler wrapper.
+      The Lepton library is written in C++-11 and thus the C++ compiler
+      may need to be instructed to enable support for that.
+
+      In general, it is safer to use build setting consistent with the
+      rest of LAMMPS.  This is best carried out from the LAMMPS src
+      directory using a command like these, which simply invokes the
+      ``lib/lepton/Install.py`` script with the specified args:
+
+      .. code-block:: bash
+
+         make lib-lepton                      # print help message
+         make lib-lepton args="-m serial"     # build with GNU g++ compiler (settings as with "make serial")
+         make lib-lepton args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
+
+      The "machine" argument of the "-m" flag is used to find a
+      Makefile.machine to use as build recipe.
+
+      The build should produce a ``build`` folder and the library ``lib/lepton/liblmplepton.a``
+
+----------
+
+.. _machdyn:
+
+MACHDYN package
+-------------------------------
+
+To build with this package, you must download the Eigen3 library.
+Eigen3 is a template library, so you do not need to build it.
 
 .. tabs::
 
@@ -793,37 +895,33 @@ library.
 
       .. code-block:: bash
 
-         -D DOWNLOAD_LATTE=value    # download LATTE for build, value = no (default) or yes
-         -D LATTE_LIBRARY=path      # LATTE library file (only needed if a custom location)
+         -D DOWNLOAD_EIGEN3            # download Eigen3, value = no (default) or yes
+         -D EIGEN3_INCLUDE_DIR=path    # path to Eigen library (only needed if a custom location)
 
-      If ``DOWNLOAD_LATTE`` is set, the LATTE library will be downloaded
-      and built inside the CMake build directory.  If the LATTE library
-      is already on your system (in a location CMake cannot find it),
-      ``LATTE_LIBRARY`` is the filename (plus path) of the LATTE library
-      file, not the directory the library file is in.
+      If ``DOWNLOAD_EIGEN3`` is set, the Eigen3 library will be
+      downloaded and inside the CMake build directory.  If the Eigen3
+      library is already on your system (in a location where CMake
+      cannot find it), set ``EIGEN3_INCLUDE_DIR`` to the directory the
+      ``Eigen3`` include file is in.
 
    .. tab:: Traditional make
 
-      You can download and build the LATTE library manually if you
-      prefer; follow the instructions in ``lib/latte/README``\ .  You
-      can also do it in one step from the ``lammps/src`` dir, using a
-      command like these, which simply invokes the
-      ``lib/latte/Install.py`` script with the specified args:
+      You can download the Eigen3 library manually if you prefer; follow
+      the instructions in ``lib/machdyn/README``.  You can also do it in one
+      step from the ``lammps/src`` dir, using a command like these,
+      which simply invokes the ``lib/machdyn/Install.py`` script with the
+      specified args:
 
       .. code-block:: bash
 
-         make lib-latte                        # print help message
-         make lib-latte args="-b"              # download and build in lib/latte/LATTE-master
-         make lib-latte args="-p $HOME/latte"  # use existing LATTE installation in $HOME/latte
-         make lib-latte args="-b -m gfortran"  # download and build in lib/latte and
-                                               #   copy Makefile.lammps.gfortran to Makefile.lammps
+         make lib-machdyn                         # print help message
+         make lib-machdyn args="-b"               # download to lib/machdyn/eigen3
+         make lib-machdyn args="-p /usr/include/eigen3"    # use existing Eigen installation in /usr/include/eigen3
 
-      Note that 3 symbolic (soft) links, ``includelink`` and ``liblink``
-      and ``filelink.o``, are created in ``lib/latte`` to point to
-      required folders and files in the LATTE home directory.  When
-      LAMMPS itself is built it will use these links.  You should also
-      check that the ``Makefile.lammps`` file you create is appropriate
-      for the compiler you use on your system to build LATTE.
+      Note that a symbolic (soft) link named ``includelink`` is created
+      in ``lib/machdyn`` to point to the Eigen dir.  When LAMMPS builds it
+      will use this link.  You should not need to edit the
+      ``lib/machdyn/Makefile.lammps`` file.
 
 ----------
 
@@ -1030,7 +1128,7 @@ VORONOI package
 -----------------------------
 
 To build with this package, you must download and build the
-`Voro++ library <https://math.lbl.gov/voro++>`_ or install a
+`Voro++ library <https://math.lbl.gov/voro++/>`_ or install a
 binary package provided by your operating system.
 
 .. tabs::
@@ -1239,17 +1337,13 @@ module included in the LAMMPS source distribution.
 
    .. tab:: Traditional make
 
-      Before building LAMMPS, one must build the Colvars library in lib/colvars.
+      As with other libraries distributed with LAMMPS, the Colvars library
+      needs to be built before building the LAMMPS program with the COLVARS
+      package enabled.
 
-      This can be done manually in the same folder by using or adapting
-      one of the provided Makefiles: for example, ``Makefile.g++`` for
-      the GNU C++ compiler.  C++11 compatibility may need to be enabled
-      for some older compilers (as is done in the example makefile).
-
-      In general, it is safer to use build setting consistent with the
-      rest of LAMMPS.  This is best carried out from the LAMMPS src
-      directory using a command like these, which simply invokes the
-      ``lib/colvars/Install.py`` script with the specified args:
+      From the LAMMPS ``src`` directory, this is most easily and safely done
+      via one of the following commands, which implicitly rely on the
+      ``lib/colvars/Install.py`` script with optional arguments:
 
       .. code-block:: bash
 
@@ -1259,10 +1353,17 @@ module included in the LAMMPS source distribution.
          make lib-colvars args="-m g++-debug"  # build with GNU g++ compiler and colvars debugging enabled
 
       The "machine" argument of the "-m" flag is used to find a
-      Makefile.machine to use as build recipe.  If it does not already
-      exist in ``lib/colvars``, it will be auto-generated by using
-      compiler flags consistent with those parsed from the core LAMMPS
-      makefiles.
+      ``Makefile.machine`` file to use as build recipe.  If such recipe does
+      not already exist in ``lib/colvars``, suitable settings will be
+      auto-generated consistent with those used in the core LAMMPS makefiles.
+
+
+      .. versionchanged:: 8Feb2023
+
+      Please note that Colvars uses the Lepton library, which is now
+      included with the LEPTON package; if you use anything other than
+      the ``make lib-colvars`` command, please make sure to :ref:`build
+      Lepton beforehand <lepton>`.
 
       Optional flags may be specified as environment variables:
 
@@ -1271,10 +1372,10 @@ module included in the LAMMPS source distribution.
          COLVARS_DEBUG=yes make lib-colvars args="-m machine"  # Build with debug code (much slower)
          COLVARS_LEPTON=no make lib-colvars args="-m machine"  # Build without Lepton (included otherwise)
 
-      The build should produce two files: the library ``lib/colvars/libcolvars.a``
-      (which also includes Lepton objects if enabled) and the specification file
-      ``lib/colvars/Makefile.lammps``.  The latter is auto-generated, and normally does
-      not need to be edited.
+      The build should produce two files: the library
+      ``lib/colvars/libcolvars.a`` and the specification file
+      ``lib/colvars/Makefile.lammps``.  The latter is auto-generated,
+      and normally does not need to be edited.
 
 ----------
 
@@ -1289,8 +1390,21 @@ This package depends on the KSPACE package.
 
    .. tab:: CMake build
 
-      No additional settings are needed besides ``-D PKG_KSPACE=yes`` and
-      ``-D PKG_ELECTRODE=yes``.
+      .. code-block:: bash
+
+         -D PKG_ELECTRODE=yes          # enable the package itself
+         -D PKG_KSPACE=yes             # the ELECTRODE package requires KSPACE
+         -D USE_INTERNAL_LINALG=value  #
+
+      Features in the ELECTRODE package are dependent on code in the
+      KSPACE package so the latter one *must* be enabled.
+
+      The ELECTRODE package also requires LAPACK (and BLAS) and CMake
+      can identify their locations and pass that info to the ELECTRODE
+      build script.  But on some systems this may cause problems when
+      linking or the dependency is not desired.  Try enabling
+      ``USE_INTERNAL_LINALG`` in those cases to use the bundled linear
+      algebra library and work around the limitation.
 
    .. tab:: Traditional make
 
@@ -1316,10 +1430,10 @@ This package depends on the KSPACE package.
 
       .. code-block:: bash
 
-         make lib-linalg                     # print help message
-         make lib-linalg args="-m serial"    # build with GNU Fortran compiler (settings as with "make serial")
-         make lib-linalg args="-m mpi"       # build with default MPI Fortran compiler (settings as with "make mpi")
-         make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler
+         make lib-linalg                   # print help message
+         make lib-linalg args="-m serial"  # build with GNU C++ compiler (settings as with "make serial")
+         make lib-linalg args="-m mpi"     # build with default MPI C++ compiler (settings as with "make mpi")
+         make lib-linalg args="-m g++"     # build with GNU C++ compiler
 
       The package itself is activated with ``make yes-KSPACE`` and
       ``make yes-ELECTRODE``
@@ -1366,6 +1480,98 @@ at: `https://github.com/ICAMS/lammps-user-pace/ <https://github.com/ICAMS/lammps
 
 ----------
 
+.. _ml-pod:
+
+ML-POD package
+-----------------------------
+
+.. tabs::
+
+   .. tab:: CMake build
+
+      No additional settings are needed besides ``-D PKG_ML-POD=yes``.
+
+   .. tab:: Traditional make
+
+      Before building LAMMPS, you must configure the ML-POD support
+      settings in ``lib/mlpod``.  You can do this manually, if you
+      prefer, or do it in one step from the ``lammps/src`` dir, using a
+      command like the following, which simply invoke the
+      ``lib/mlpod/Install.py`` script with the specified args:
+
+      .. code-block:: bash
+
+         make lib-mlpod                   # print help message
+         make lib-mlpod args="-m serial"  # build with GNU g++ compiler and MPI STUBS (settings as with "make serial")
+         make lib-mlpod args="-m mpi"     # build with default MPI compiler (settings as with "make mpi")
+         make lib-mlpod args="-m mpi -e linalg"   # same as above but use the bundled linalg lib
+
+      Note that the ``Makefile.lammps`` file has settings to use the BLAS
+      and LAPACK linear algebra libraries.  These can either exist on
+      your system, or you can use the files provided in ``lib/linalg``.
+      In the latter case you also need to build the library in
+      ``lib/linalg`` with a command like these:
+
+      .. code-block:: bash
+
+         make lib-linalg                   # print help message
+         make lib-linalg args="-m serial"  # build with GNU C++ compiler (settings as with "make serial")
+         make lib-linalg args="-m mpi"     # build with default MPI C++ compiler (settings as with "make mpi")
+         make lib-linalg args="-m g++"     # build with GNU C++ compiler
+
+      The package itself is activated with ``make yes-ML-POD``.
+
+----------
+
+.. _ml-quip:
+
+ML-QUIP package
+---------------------------------
+
+To build with this package, you must download and build the QUIP
+library.  It can be obtained from GitHub.  For support of GAP
+potentials, additional files with specific licensing conditions need
+to be downloaded and configured.  The automatic download will from
+within CMake will download the non-commercial use version.
+
+.. tabs::
+
+   .. tab:: CMake build
+
+      .. code-block:: bash
+
+         -D DOWNLOAD_QUIP=value       # download QUIP library for build, value = no (default) or yes
+         -D QUIP_LIBRARY=path         # path to libquip.a (only needed if a custom location)
+         -D USE_INTERNAL_LINALG=value # Use the internal linear algebra library instead of LAPACK
+                                      #   value = no (default) or yes
+
+      CMake will try to download and build the QUIP library from GitHub,
+      if it is not found on the local machine. This requires to have git
+      installed. It will use the same compilers and flags as used for
+      compiling LAMMPS.  Currently this is only supported for the GNU
+      and the Intel compilers. Set the ``QUIP_LIBRARY`` variable if you
+      want to use a previously compiled and installed QUIP library and
+      CMake cannot find it.
+
+      The QUIP library requires LAPACK (and BLAS) and CMake can identify
+      their locations and pass that info to the QUIP build script. But
+      on some systems this triggers a (current) limitation of CMake and
+      the configuration will fail. Try enabling ``USE_INTERNAL_LINALG`` in
+      those cases to use the bundled linear algebra library and work around
+      the limitation.
+
+   .. tab:: Traditional make
+
+      The download/build procedure for the QUIP library, described in
+      ``lib/quip/README`` file requires setting two environment
+      variables, ``QUIP_ROOT`` and ``QUIP_ARCH``.  These are accessed by
+      the ``lib/quip/Makefile.lammps`` file which is used when you
+      compile and link LAMMPS with this package.  You should only need
+      to edit ``Makefile.lammps`` if the LAMMPS build can not use its
+      settings to successfully build on your system.
+
+----------
+
 .. _plumed:
 
 PLUMED package
@@ -1694,48 +1900,6 @@ MDI package
 
 ----------
 
-.. _mesont:
-
-MESONT package
--------------------------
-
-This package includes a library written in Fortran 90 in the
-``lib/mesont`` folder, so a working Fortran 90 compiler is required to
-compile it.  Also, the files with the force field data for running the
-bundled examples are not included in the source distribution. Instead
-they will be downloaded the first time this package is installed.
-
-.. tabs::
-
-   .. tab:: CMake build
-
-      No additional settings are needed besides ``-D PKG_MESONT=yes``
-
-   .. tab:: Traditional make
-
-      Before building LAMMPS, you must build the *mesont* library in
-      ``lib/mesont``\ .  You can also do it in one step from the
-      ``lammps/src`` dir, using a command like these, which simply
-      invokes the ``lib/mesont/Install.py`` script with the specified
-      args:
-
-      .. code-block:: bash
-
-         make lib-mesont                    # print help message
-         make lib-mesont args="-m gfortran" # build with GNU g++ compiler (settings as with "make serial")
-         make lib-mesont args="-m ifort"    # build with Intel icc compiler
-
-      The build should produce two files: ``lib/mesont/libmesont.a`` and
-      ``lib/mesont/Makefile.lammps``\ .  The latter is copied from an
-      existing ``Makefile.lammps.\*`` and has settings needed to build
-      LAMMPS with the *mesont* library (though typically the settings
-      contain only the Fortran runtime library).  If necessary, you can
-      edit/create a new ``lib/mesont/Makefile.machine`` file for your
-      system, which should define an ``EXTRAMAKE`` variable to specify a
-      corresponding ``Makefile.lammps.machine`` file.
-
-----------
-
 .. _molfile:
 
 MOLFILE package
@@ -1842,10 +2006,10 @@ OPENMP package
    Apple offers the `Xcode package and IDE
    <https://developer.apple.com/xcode/>`_ for compiling software on
    macOS, so you have likely installed it to compile LAMMPS.  Their
-   compiler is based on `Clang <https://clang.llvm.org/>`, but while it
+   compiler is based on `Clang <https://clang.llvm.org/>`_, but while it
    is capable of processing OpenMP directives, the necessary header
    files and OpenMP runtime library are missing.  The `R developers
-   <https://www.r-project.org/>` have figured out a way to build those
+   <https://www.r-project.org/>`_ have figured out a way to build those
    in a compatible fashion. One can download them from
    `https://mac.r-project.org/openmp/
    <https://mac.r-project.org/openmp/>`_.  Simply adding those files as
@@ -1929,44 +2093,6 @@ verified to work in February 2020 with Quantum Espresso versions 6.3 to
 
 ----------
 
-.. _ml-quip:
-
-ML-QUIP package
----------------------------------
-
-To build with this package, you must download and build the QUIP
-library.  It can be obtained from GitHub.  For support of GAP
-potentials, additional files with specific licensing conditions need
-to be downloaded and configured.  The automatic download will from
-within CMake will download the non-commercial use version.
-
-.. tabs::
-
-   .. tab:: CMake build
-
-      .. code-block:: bash
-
-         -D DOWNLOAD_QUIP=value       # download QUIP library for build, value = no (default) or yes
-         -D QUIP_LIBRARY=path         # path to libquip.a (only needed if a custom location)
-
-      CMake will try to download and build the QUIP library from GitHub, if it is not
-      found on the local machine. This requires to have git installed. It will use the same compilers
-      and flags as used for compiling LAMMPS.  Currently this is only supported for the GNU and the
-      Intel compilers. Set the ``QUIP_LIBRARY`` variable if you want to use a previously compiled
-      and installed QUIP library and CMake cannot find it.
-
-   .. tab:: Traditional make
-
-      The download/build procedure for the QUIP library, described in
-      ``lib/quip/README`` file requires setting two environment
-      variables, ``QUIP_ROOT`` and ``QUIP_ARCH``.  These are accessed by
-      the ``lib/quip/Makefile.lammps`` file which is used when you
-      compile and link LAMMPS with this package.  You should only need
-      to edit ``Makefile.lammps`` if the LAMMPS build can not use its
-      settings to successfully build on your system.
-
-----------
-
 .. _scafacos:
 
 SCAFACOS package
@@ -2014,50 +2140,6 @@ To build with this package, you must download and build the
 
 ----------
 
-.. _machdyn:
-
-MACHDYN package
--------------------------------
-
-To build with this package, you must download the Eigen3 library.
-Eigen3 is a template library, so you do not need to build it.
-
-.. tabs::
-
-   .. tab:: CMake build
-
-      .. code-block:: bash
-
-         -D DOWNLOAD_EIGEN3            # download Eigen3, value = no (default) or yes
-         -D EIGEN3_INCLUDE_DIR=path    # path to Eigen library (only needed if a custom location)
-
-      If ``DOWNLOAD_EIGEN3`` is set, the Eigen3 library will be
-      downloaded and inside the CMake build directory.  If the Eigen3
-      library is already on your system (in a location where CMake
-      cannot find it), set ``EIGEN3_INCLUDE_DIR`` to the directory the
-      ``Eigen3`` include file is in.
-
-   .. tab:: Traditional make
-
-      You can download the Eigen3 library manually if you prefer; follow
-      the instructions in ``lib/smd/README``.  You can also do it in one
-      step from the ``lammps/src`` dir, using a command like these,
-      which simply invokes the ``lib/smd/Install.py`` script with the
-      specified args:
-
-      .. code-block:: bash
-
-         make lib-smd                         # print help message
-         make lib-smd args="-b"               # download to lib/smd/eigen3
-         make lib-smd args="-p /usr/include/eigen3"    # use existing Eigen installation in /usr/include/eigen3
-
-      Note that a symbolic (soft) link named ``includelink`` is created
-      in ``lib/smd`` to point to the Eigen dir.  When LAMMPS builds it
-      will use this link.  You should not need to edit the
-      ``lib/smd/Makefile.lammps`` file.
-
-----------
-
 .. _vtk:
 
 VTK package

doc/src/Build_link.rst

@@ -1,33 +1,32 @@
 Link LAMMPS as a library to another code
 ========================================
 
-LAMMPS is designed as a library of C++ objects that can be
-integrated into other applications including Python scripts.
-The files ``src/library.cpp`` and ``src/library.h`` define a
-C-style API for using LAMMPS as a library.  See the
-:doc:`Howto_library` page
-for a description of the interface and how to use it for your needs.
+LAMMPS is designed as a library of C++ objects that can be integrated
+into other applications, including Python scripts.  The files
+``src/library.cpp`` and ``src/library.h`` define a C-style API for using
+LAMMPS as a library.  See the :doc:`Howto_library` page for a
+description of the interface and how to use it for your needs.
 
-The :doc:`Build_basics` page explains how to build
-LAMMPS as either a shared or static library.  This results in a file
-in the compilation folder called ``liblammps.a`` or ``liblammps_<name>.a``
-in case of building a static library.  In case of a shared library
-the name is the same only that the suffix is going to be either ``.so``
-or ``.dylib`` or ``.dll`` instead of ``.a`` depending on the OS.
-In some cases the ``.so`` file may be a symbolic link to a file with
-the suffix ``.so.0`` (or some other number).
+The :doc:`Build_basics` page explains how to build LAMMPS as either a
+shared or static library.  This results in a file in the compilation
+folder called ``liblammps.a`` or ``liblammps_<name>.a`` in case of
+building a static library.  In case of a shared library, the name is the
+same only that the suffix is going to be either ``.so`` or ``.dylib`` or
+``.dll`` instead of ``.a`` depending on the OS.  In some cases, the
+``.so`` file may be a symbolic link to a file with the suffix ``.so.0``
+(or some other number).
 
 .. note::
 
    Care should be taken to use the same MPI library for the calling code
-   and the LAMMPS library unless LAMMPS is to be compiled without (real)
-   MPI support using the include STUBS MPI library.
+   and the LAMMPS library, unless LAMMPS is to be compiled without (real)
+   MPI support using the included STUBS MPI library.
 
 Link with LAMMPS as a static library
 ------------------------------------
 
 The calling application can link to LAMMPS as a static library with
-compilation and link commands as in the examples shown below.  These
+compilation and link commands, as in the examples shown below.  These
 are examples for a code written in C in the file ``caller.c``.
 The benefit of linking to a static library is, that the resulting
 executable is independent of that library since all required
@@ -142,10 +141,10 @@ Link with LAMMPS as a shared library
 When linking to LAMMPS built as a shared library, the situation becomes
 much simpler, as all dependent libraries and objects are either included
 in the shared library or registered as a dependent library in the shared
-library file.  Thus those libraries need not to be specified when
-linking the calling executable.  Only the *-I* flags are needed.  So the
-example case from above of the serial version static LAMMPS library with
-the POEMS package installed becomes:
+library file.  Thus, those libraries need not be specified when linking
+the calling executable.  Only the *-I* flags are needed.  So the example
+case from above of the serial version static LAMMPS library with the
+POEMS package installed becomes:
 
 .. tabs::
 

doc/src/Build_make.rst

@@ -20,21 +20,22 @@ with :doc:`CMake <Build_cmake>`.  The makefiles of the traditional
 make based build process and the scripts they are calling expect a few
 additional tools to be available and functioning.
 
-  * a working C/C++ compiler toolchain supporting the C++11 standard; on
-    Linux these are often the GNU compilers. Some older compilers
+  * A working C/C++ compiler toolchain supporting the C++11 standard; on
+    Linux, these are often the GNU compilers. Some older compiler versions
     require adding flags like ``-std=c++11`` to enable the C++11 mode.
-  * a Bourne shell compatible "Unix" shell program (often 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. The procedure
-    for :doc:`building the documentation <Build_manual>` requires python 3.5 or later.
+  * 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.
 
 Getting started
 ^^^^^^^^^^^^^^^
 
 To include LAMMPS packages (i.e. optional commands and styles) you must
 enable (or "install") them first, as discussed on the :doc:`Build
-package <Build_package>` page.  If a packages requires (provided or
+package <Build_package>` page.  If a package requires (provided or
 external) libraries, you must configure and build those libraries
 **before** building LAMMPS itself and especially **before** enabling
 such a package with ``make yes-<package>``.  :doc:`Building LAMMPS with
@@ -56,36 +57,36 @@ Compilation can take a long time, since LAMMPS is a large project with
 many features. If your machine has multiple CPU cores (most do these
 days), you can speed this up by compiling sources in parallel with
 ``make -j N`` (with N being the maximum number of concurrently executed
-tasks).  Also installation of the `ccache <https://ccache.dev/>`_ (=
-Compiler Cache) software may speed up repeated compilation even more,
-e.g. during code development.
+tasks).  Installation of the `ccache <https://ccache.dev/>`_ (= Compiler
+Cache) software may speed up repeated compilation even more, e.g. during
+code development, especially when repeatedly switching between branches.
 
 After the initial build, whenever you edit LAMMPS source files, or add
 or remove new files to the source directory (e.g. by installing or
 uninstalling packages), you must re-compile and relink the LAMMPS
 executable with the same ``make <machine>`` command.  The makefile's
-dependency tracking should insure that only the necessary subset of
-files are re-compiled.  If you change settings in the makefile, you have
-to recompile *everything*.  To delete all objects you can use ``make
+dependency tracking should ensure that only the necessary subset of
+files is re-compiled.  If you change settings in the makefile, you have
+to recompile *everything*.  To delete all objects, you can use ``make
 clean-<machine>``.
 
 .. note::
 
    Before the actual compilation starts, LAMMPS will perform several
-   steps to collect information from the configuration and setup that
-   is then embedded into the executable.  When you build LAMMPS for
-   the first time, it will also compile a tool to quickly assemble
-   a list of dependencies, that are required for the make program to
-   correctly detect which parts need to be recompiled after changes
-   were made to the sources.
+   steps to collect information from the configuration and setup that is
+   then embedded into the executable.  When you build LAMMPS for the
+   first time, it will also compile a tool to quickly determine a list
+   of dependencies.  Those are required for the make program to
+   correctly detect, which files need to be recompiled or relinked
+   after changes were made to the sources.
 
 Customized builds and alternate makefiles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``src/MAKE`` directory tree contains the ``Makefile.<machine>``
 files included in the LAMMPS distribution.  Typing ``make example`` uses
-``Makefile.example`` from one of those folders, if available.  Thus the
-``make serial`` and ``make mpi`` lines above use
+``Makefile.example`` from one of those folders, if available.  The
+``make serial`` and ``make mpi`` lines above, for example, use
 ``src/MAKE/Makefile.serial`` and ``src/MAKE/Makefile.mpi``,
 respectively.  Other makefiles are in these directories:
 
@@ -106,17 +107,18 @@ a new name, please edit the first line with the description and machine
 name, so you will not confuse yourself, when looking at the machine
 summary.
 
-Makefiles you may wish to try include these (some require a package
-first be installed).  Many of these include specific compiler flags
-for optimized performance.  Please note, however, that some of these
-customized machine Makefile are contributed by users.  Since both
-compilers, OS configurations, and LAMMPS itself keep changing, their
-settings may become outdated:
+Makefiles you may wish to try out, include those listed below (some
+require a package first be installed).  Many of these include specific
+compiler flags for optimized performance.  Please note, however, that
+some of these customized machine Makefile are contributed by users, and
+thus may have modifications specific to the systems of those users.
+Since compilers, OS configurations, and LAMMPS itself keep changing,
+their settings may become outdated, too:
 
 .. code-block:: bash
 
-   make mac             # build serial LAMMPS on a Mac
-   make mac_mpi         # build parallel LAMMPS on a Mac
+   make mac             # build serial LAMMPS on macOS
+   make mac_mpi         # build parallel LAMMPS on macOS
    make intel_cpu       # build with the INTEL package optimized for CPUs
    make knl             # build with the INTEL package optimized for KNLs
    make opt             # build with the OPT package optimized for CPUs

doc/src/Build_manual.rst

@@ -2,7 +2,7 @@ Build the LAMMPS documentation
 ==============================
 
 Depending on how you obtained LAMMPS and whether you have built the
-manual yourself, this directory has a number of sub-directories and
+manual yourself, this directory has a number of subdirectories and
 files. Here is a list with descriptions:
 
 .. code-block:: bash
@@ -33,7 +33,7 @@ various tools and files.  Some of them have to be installed (see below).  For
 the rest the build process will attempt to download and install them into
 a python virtual environment and local folders.
 
-A current version of the manual (latest patch release, that is the state
+A current version of the manual (latest feature release, that is the state
 of the *release* branch) is is available online at:
 `https://docs.lammps.org/ <https://docs.lammps.org/>`_.
 A version of the manual corresponding to the ongoing development (that is
@@ -48,15 +48,15 @@ Build using GNU make
 
 The LAMMPS manual is written in `reStructuredText <rst_>`_ format which
 can be translated to different output format using the `Sphinx
-<https://sphinx-doc.org>`_ document generator tool.  It also
+<https://www.sphinx-doc.org/>`_ document generator tool.  It also
 incorporates programmer documentation extracted from the LAMMPS C++
-sources through the `Doxygen <https://doxygen.nl>`_ program.  Currently
+sources through the `Doxygen <https://doxygen.nl/>`_ program.  Currently
 the translation to HTML, PDF (via LaTeX), ePUB (for many e-book readers)
 and MOBI (for Amazon Kindle readers) are supported.  For that to work a
-Python 3 interpreter, the ``doxygen`` tools and internet access to
-download additional files and tools are required.  This download is
-usually only required once or after the documentation folder is returned
-to a pristine state with ``make clean-all``.
+Python interpreter version 3.8 or later, the ``doxygen`` tools and
+internet access to download additional files and tools are required.
+This download is usually only required once or after the documentation
+folder is returned to a pristine state with ``make clean-all``.
 
 For the documentation build a python virtual environment is set up in
 the folder ``doc/docenv`` and various python packages are installed into
@@ -87,6 +87,7 @@ folder.  The following ``make`` commands are available:
    make anchor_check  # check for duplicate anchor labels
    make style_check   # check for complete and consistent style lists
    make package_check # check for complete and consistent package lists
+   make link_check    # check for broken or outdated URLs
    make spelling      # spell-check the manual
 
 ----------

doc/src/Build_package.rst

@@ -4,13 +4,14 @@ Include packages in build
 In LAMMPS, a package is a group of files that enable a specific set of
 features.  For example, force fields for molecular systems or
 rigid-body constraints are in packages.  In the src directory, each
-package is a sub-directory with the package name in capital letters.
+package is a subdirectory with the package name in capital letters.
 
 An overview of packages is given on the :doc:`Packages <Packages>` doc
-page.  Brief overviews of each package are on the :doc:`Packages details <Packages_details>` page.
+page.  Brief overviews of each package are on the :doc:`Packages details
+<Packages_details>` page.
 
 When building LAMMPS, you can choose to include or exclude each
-package.  In general there is no need to include a package if you
+package.  Generally, there is no need to include a package if you
 never plan to use its features.
 
 If you get a run-time error that a LAMMPS command or style is
@@ -45,13 +46,13 @@ packages:
    * :ref:`INTEL <intel>`
    * :ref:`KIM <kim>`
    * :ref:`KOKKOS <kokkos>`
-   * :ref:`LATTE <latte>`
+   * :ref:`LEPTON <lepton>`
    * :ref:`MACHDYN <machdyn>`
    * :ref:`MDI <mdi>`
-   * :ref:`MESONT <mesont>`
    * :ref:`ML-HDNNP <ml-hdnnp>`
    * :ref:`ML-IAP <mliap>`
    * :ref:`ML-PACE <ml-pace>`
+   * :ref:`ML-POD <ml-pod>`
    * :ref:`ML-QUIP <ml-quip>`
    * :ref:`MOLFILE <molfile>`
    * :ref:`MSCG <mscg>`
@@ -92,7 +93,7 @@ versus make.
          If you switch between building with CMake and make builds, no
          packages in the src directory can be installed when you invoke
          ``cmake``.  CMake will give an error if that is not the case,
-         indicating how you can un-install all packages in the src dir.
+         indicating how you can uninstall all packages in the src dir.
 
    .. tab:: Traditional make
 
@@ -101,7 +102,7 @@ versus make.
          cd lammps/src
          make ps                    # check which packages are currently installed
          make yes-name              # install a package with name
-         make no-name               # un-install a package with name
+         make no-name               # uninstall a package with name
          make mpi                   # build LAMMPS with whatever packages are now installed
 
       Examples:
@@ -117,13 +118,13 @@ versus make.
       .. note::
 
          You must always re-build LAMMPS (via make) after installing or
-         un-installing a package, for the action to take effect. The
+         uninstalling a package, for the action to take effect. The
          included dependency tracking will make certain only files that
          are required to be rebuilt are recompiled.
 
       .. note::
 
-         You cannot install or un-install packages and build LAMMPS in a
+         You cannot install or uninstall packages and build LAMMPS in a
          single make command with multiple targets, e.g. ``make
          yes-colloid mpi``.  This is because the make procedure creates
          a list of source files that will be out-of-date for the build
@@ -148,7 +149,7 @@ other files dependent on that package are also excluded.
    if you downloaded a tarball, 3 packages (KSPACE, MANYBODY, MOLECULE)
    were pre-installed via the traditional make procedure in the ``src``
    directory.  That is no longer the case, so that CMake will build
-   as-is without needing to un-install those packages.
+   as-is without needing to uninstall those packages.
 
 ----------
 
@@ -165,9 +166,9 @@ control flow constructs for more complex operations.
 
 LAMMPS includes several of these files to define configuration
 "presets", similar to the options that exist for the Make based
-system. Using these files you can enable/disable portions of the
-available packages in LAMMPS. If you need a custom preset you can take
-one of them as a starting point and customize it to your needs.
+system. Using these files, you can enable/disable portions of the
+available packages in LAMMPS. If you need a custom preset, you can
+make a copy of one of them and modify it to suit your needs.
 
 .. code-block:: bash
 
@@ -181,7 +182,7 @@ one of them as a starting point and customize it to your needs.
     cmake -C ../cmake/presets/pgi.cmake      [OPTIONS] ../cmake  # change settings to use the PGI compilers by default
     cmake -C ../cmake/presets/all_on.cmake   [OPTIONS] ../cmake  # enable all packages
     cmake -C ../cmake/presets/all_off.cmake  [OPTIONS] ../cmake  # disable all packages
-    mingw64-cmake -C ../cmake/presets/mingw-cross.cmake [OPTIONS] ../cmake  #  compile with MinGW cross compilers
+    mingw64-cmake -C ../cmake/presets/mingw-cross.cmake [OPTIONS] ../cmake  #  compile with MinGW cross-compilers
 
 Presets that have names starting with "windows" are specifically for
 compiling LAMMPS :doc:`natively on Windows <Build_windows>` and
@@ -225,7 +226,7 @@ The following commands are useful for managing package source files
 and their installation when building LAMMPS via traditional make.
 Just type ``make`` in lammps/src to see a one-line summary.
 
-These commands install/un-install sets of packages:
+These commands install/uninstall sets of packages:
 
 .. code-block:: bash
 
@@ -241,40 +242,40 @@ These commands install/un-install sets of packages:
     make yes-ext                        # install packages that require external libraries
     make no-ext                         # uninstall packages that require external libraries
 
-which install/un-install various sets of packages.  Typing ``make
+which install/uninstall various sets of packages.  Typing ``make
 package`` will list all the these commands.
 
 .. note::
 
-   Installing or un-installing a package for the make based build process
+   Installing or uninstalling a package for the make based build process
    works by simply copying files back and forth between the main source
-   directory src and the sub-directories with the package name (e.g.
+   directory src and the subdirectories with the package name (e.g.
    src/KSPACE, src/ATC), so that the files are included or excluded
    when LAMMPS is built.  Only source files in the src folder will be
    compiled.
 
 The following make commands help manage files that exist in both the
-src directory and in package sub-directories.  You do not normally
+src directory and in package subdirectories.  You do not normally
 need to use these commands unless you are editing LAMMPS files or are
 updating LAMMPS via git.
 
 Type ``make package-status`` or ``make ps`` to show which packages are
 currently installed.  For those that are installed, it will list any
 files that are different in the src directory and package
-sub-directory.
+subdirectory.
 
 Type ``make package-installed`` or ``make pi`` to show which packages are
 currently installed, without listing the status of packages that are
 not installed.
 
 Type ``make package-update`` or ``make pu`` to overwrite src files with
-files from the package sub-directories if the package is installed.  It
+files from the package subdirectories if the package is installed.  It
 should be used after the checkout has been :doc:`updated or changed
-withy git <Install_git>`, this will only update the files in the package
-sub-directories, but not the copies in the src folder.
+with git <Install_git>`, this will only update the files in the package
+subdirectories, but not the copies in the src folder.
 
 Type ``make package-overwrite`` to overwrite files in the package
-sub-directories with src files.
+subdirectories with src files.
 
 Type ``make package-diff`` to list all differences between pairs of
 files in both the source directory and the package directory.

doc/src/Build_settings.rst

@@ -1,8 +1,8 @@
 Optional build settings
 =======================
 
-LAMMPS can be built with several optional settings.  Each sub-section
-explain how to do this for building both with CMake and make.
+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
 * `FFT library`_ for use with the :doc:`kspace_style pppm <kspace_style>` command
@@ -41,7 +41,7 @@ FFT library
 When the KSPACE package is included in a LAMMPS build, the
 :doc:`kspace_style pppm <kspace_style>` command performs 3d FFTs which
 require use of an FFT library to compute 1d FFTs.  The KISS FFT
-library is included with LAMMPS but other libraries can be faster.
+library is included with LAMMPS, but other libraries can be faster.
 LAMMPS can use them if they are available on your system.
 
 .. tabs::
@@ -63,9 +63,9 @@ LAMMPS can use them if they are available on your system.
       Usually these settings are all that is needed.  If FFTW3 is
       selected, then CMake will try to detect, if threaded FFTW
       libraries are available and enable them by default.  This setting
-      is independent of whether OpenMP threads are enabled and a
-      packages like KOKKOS or OPENMP is used.  If CMake cannot detect
-      the FFT library, you can set these variables to assist:
+      is independent of whether OpenMP threads are enabled and a package
+      like KOKKOS or OPENMP is used.  If CMake cannot detect the FFT
+      library, you can set these variables to assist:
 
       .. code-block:: bash
 
@@ -141,18 +141,18 @@ The Intel MKL math library is part of the Intel compiler suite.  It
 can be used with the Intel or GNU compiler (see the ``FFT_LIB`` setting
 above).
 
-Performing 3d FFTs in parallel can be time consuming due to data
-access and required communication.  This cost can be reduced by
-performing single-precision FFTs instead of double precision.  Single
-precision means the real and imaginary parts of a complex datum are
-4-byte floats.  Double precision means they are 8-byte doubles.  Note
-that Fourier transform and related PPPM operations are somewhat less
-sensitive to floating point truncation errors and thus the resulting
-error is less than the difference in precision. Using the ``-DFFT_SINGLE``
-setting trades off a little accuracy for reduced memory use and
-parallel communication costs for transposing 3d FFT data.
+Performing 3d FFTs in parallel can be time-consuming due to data access
+and required communication.  This cost can be reduced by performing
+single-precision FFTs instead of double precision.  Single precision
+means the real and imaginary parts of a complex datum are 4-byte floats.
+Double precision means they are 8-byte doubles.  Note that Fourier
+transform and related PPPM operations are somewhat less sensitive to
+floating point truncation errors, and thus the resulting error is
+generally less than the difference in precision. Using the
+``-DFFT_SINGLE`` setting trades off a little accuracy for reduced memory
+use and parallel communication costs for transposing 3d FFT data.
 
-When using ``-DFFT_SINGLE`` with FFTW3 you may need to build the FFTW
+When using ``-DFFT_SINGLE`` with FFTW3, you may need to build the FFTW
 library a second time with support for single-precision.
 
 For FFTW3, do the following, which should produce the additional
@@ -177,11 +177,11 @@ ARRAY mode.
 Size of LAMMPS integer types and size limits
 --------------------------------------------
 
-LAMMPS has a few integer data types which can be defined as either
-4-byte (= 32-bit) or 8-byte (= 64-bit) integers at compile time.
-This has an impact on the size of a system that can be simulated
-or how large counters can become before "rolling over".
-The default setting of "smallbig" is almost always adequate.
+LAMMPS uses a few custom integer data types, which can be defined as
+either 4-byte (= 32-bit) or 8-byte (= 64-bit) integers at compile time.
+This has an impact on the size of a system that can be simulated, or how
+large counters can become before "rolling over".  The default setting of
+"smallbig" is almost always adequate.
 
 .. tabs::
 
@@ -254,7 +254,7 @@ topology information, though IDs are enabled by default.  The
 :doc:`atom_modify id no <atom_modify>` command will turn them off.  Atom
 IDs are required for molecular systems with bond topology (bonds,
 angles, dihedrals, etc).  Similarly, some force or compute or fix styles
-require atom IDs.  Thus if you model a molecular system or use one of
+require atom IDs.  Thus, if you model a molecular system or use one of
 those styles with more than 2 billion atoms, you need the "bigbig"
 setting.
 
@@ -264,7 +264,7 @@ systems and 500 million for systems with bonds (the additional
 restriction is due to using the 2 upper bits of the local atom index
 in neighbor lists for storing special bonds info).
 
-Image flags store 3 values per atom in a single integer which count the
+Image flags store 3 values per atom in a single integer, which count the
 number of times an atom has moved through the periodic box in each
 dimension.  See the :doc:`dump <dump>` manual page for a discussion.  If
 an atom moves through the periodic box more than this limit, the value
@@ -285,7 +285,7 @@ Output of JPG, PNG, and movie files
 --------------------------------------------------
 
 The :doc:`dump image <dump_image>` command has options to output JPEG or
-PNG image files.  Likewise the :doc:`dump movie <dump_image>` command
+PNG image files.  Likewise, the :doc:`dump movie <dump_image>` command
 outputs movie files in a variety of movie formats.  Using these options
 requires the following settings:
 
@@ -354,7 +354,7 @@ Read or write compressed files
 If this option is enabled, large files can be read or written with
 compression by ``gzip`` or similar tools by several LAMMPS commands,
 including :doc:`read_data <read_data>`, :doc:`rerun <rerun>`, and
-:doc:`dump <dump>`.  Currently supported compression tools are:
+:doc:`dump <dump>`.  Supported compression tools are currently
 ``gzip``, ``bzip2``, ``zstd``, and ``lzma``.
 
 .. tabs::
@@ -394,7 +394,7 @@ Memory allocation alignment
 ---------------------------------------
 
 This setting enables the use of the "posix_memalign()" call instead of
-"malloc()" when LAMMPS allocates large chunks or memory.  Vector
+"malloc()" when LAMMPS allocates large chunks of memory.  Vector
 instructions on CPUs may become more efficient, if dynamically allocated
 memory is aligned on larger-than-default byte boundaries.  On most
 current operating systems, the "malloc()" implementation returns
@@ -496,7 +496,7 @@ 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
+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

doc/src/Commands.rst

@@ -21,6 +21,7 @@ commands in it are used to define a LAMMPS simulation.
    Commands_pair
    Commands_bond
    Commands_kspace
+   Commands_dump
 
 .. toctree::
    :maxdepth: 1

doc/src/Commands_all.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 General commands
 ================
@@ -23,6 +24,7 @@ table above.
 
    * :doc:`angle_coeff <angle_coeff>`
    * :doc:`angle_style <angle_style>`
+   * :doc:`angle_write <angle_write>`
    * :doc:`atom_modify <atom_modify>`
    * :doc:`atom_style <atom_style>`
    * :doc:`balance <balance>`
@@ -30,7 +32,6 @@ table above.
    * :doc:`bond_style <bond_style>`
    * :doc:`bond_write <bond_write>`
    * :doc:`boundary <boundary>`
-   * :doc:`box <box>`
    * :doc:`change_box <change_box>`
    * :doc:`clear <clear>`
    * :doc:`comm_modify <comm_modify>`
@@ -45,6 +46,7 @@ table above.
    * :doc:`dielectric <dielectric>`
    * :doc:`dihedral_coeff <dihedral_coeff>`
    * :doc:`dihedral_style <dihedral_style>`
+   * :doc:`dihedral_write <dihedral_write>`
    * :doc:`dimension <dimension>`
    * :doc:`displace_atoms <displace_atoms>`
    * :doc:`dump <dump>`
@@ -62,6 +64,7 @@ table above.
    * :doc:`kspace_modify <kspace_modify>`
    * :doc:`kspace_style <kspace_style>`
    * :doc:`label <label>`
+   * :doc:`labelmap <labelmap>`
    * :doc:`lattice <lattice>`
    * :doc:`log <log>`
    * :doc:`mass <mass>`
@@ -88,8 +91,7 @@ table above.
    * :doc:`region <region>`
    * :doc:`replicate <replicate>`
    * :doc:`rerun <rerun>`
-   * :doc:`reset_atom_ids <reset_atom_ids>`
-   * :doc:`reset_mol_ids <reset_mol_ids>`
+   * :doc:`reset_atoms <reset_atoms>`
    * :doc:`reset_timestep <reset_timestep>`
    * :doc:`restart <restart>`
    * :doc:`run <run>`
@@ -125,6 +127,7 @@ additional letter in parenthesis: k = KOKKOS.
    * :doc:`group2ndx <group2ndx>`
    * :doc:`hyper <hyper>`
    * :doc:`kim <kim_commands>`
+   * :doc:`fitpod <fitpod_command>`
    * :doc:`mdi <mdi>`
    * :doc:`ndx2group <group2ndx>`
    * :doc:`neb <neb>`

doc/src/Commands_bond.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 .. _bond:
 
@@ -41,8 +42,11 @@ OPT.
    * :doc:`gaussian <bond_gaussian>`
    * :doc:`gromos (o) <bond_gromos>`
    * :doc:`harmonic (iko) <bond_harmonic>`
+   * :doc:`harmonic/restrain <bond_harmonic_restrain>`
    * :doc:`harmonic/shift (o) <bond_harmonic_shift>`
    * :doc:`harmonic/shift/cut (o) <bond_harmonic_shift_cut>`
+   * :doc:`lepton (o) <bond_lepton>`
+   * :doc:`mesocnt <bond_mesocnt>`
    * :doc:`mm3 <bond_mm3>`
    * :doc:`morse (o) <bond_morse>`
    * :doc:`nonlinear (o) <bond_nonlinear>`
@@ -74,6 +78,7 @@ OPT.
    *
    *
    *
+   * :doc:`amoeba <angle_amoeba>`
    * :doc:`charmm (iko) <angle_charmm>`
    * :doc:`class2 (ko) <angle_class2>`
    * :doc:`class2/p6 <angle_class2>`
@@ -90,9 +95,11 @@ OPT.
    * :doc:`fourier/simple (o) <angle_fourier_simple>`
    * :doc:`gaussian <angle_gaussian>`
    * :doc:`harmonic (iko) <angle_harmonic>`
+   * :doc:`lepton (o) <angle_lepton>`
+   * :doc:`mesocnt <angle_mesocnt>`
    * :doc:`mm3 <angle_mm3>`
    * :doc:`quartic (o) <angle_quartic>`
-   * :doc:`sdk (o) <angle_sdk>`
+   * :doc:`spica (o) <angle_spica>`
    * :doc:`table (o) <angle_table>`
 
 .. _dihedral:
@@ -123,6 +130,7 @@ OPT.
    * :doc:`fourier (io) <dihedral_fourier>`
    * :doc:`harmonic (iko) <dihedral_harmonic>`
    * :doc:`helix (o) <dihedral_helix>`
+   * :doc:`lepton (o) <dihedral_lepton>`
    * :doc:`multi/harmonic (o) <dihedral_multi_harmonic>`
    * :doc:`nharmonic (o) <dihedral_nharmonic>`
    * :doc:`opls (iko) <dihedral_opls>`
@@ -152,6 +160,7 @@ OPT.
    *
    *
    *
+   * :doc:`amoeba <improper_amoeba>`
    * :doc:`class2 (ko) <improper_class2>`
    * :doc:`cossq (o) <improper_cossq>`
    * :doc:`cvff (io) <improper_cvff>`

doc/src/Commands_category.rst

@@ -25,7 +25,6 @@ Setup simulation box:
    :columns: 4
 
    * :doc:`boundary <boundary>`
-   * :doc:`box <box>`
    * :doc:`change_box <change_box>`
    * :doc:`create_box <create_box>`
    * :doc:`dimension <dimension>`

doc/src/Commands_compute.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 Compute commands
 ================
@@ -45,21 +46,25 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`com/chunk <compute_com_chunk>`
    * :doc:`contact/atom <compute_contact_atom>`
    * :doc:`coord/atom (k) <compute_coord_atom>`
+   * :doc:`count/type <compute_count_type>`
    * :doc:`damage/atom <compute_damage_atom>`
    * :doc:`dihedral <compute_dihedral>`
    * :doc:`dihedral/local <compute_dihedral_local>`
    * :doc:`dilatation/atom <compute_dilatation_atom>`
    * :doc:`dipole <compute_dipole>`
    * :doc:`dipole/chunk <compute_dipole_chunk>`
+   * :doc:`dipole/tip4p <compute_dipole>`
+   * :doc:`dipole/tip4p/chunk <compute_dipole_chunk>`
    * :doc:`displace/atom <compute_displace_atom>`
    * :doc:`dpd <compute_dpd>`
    * :doc:`dpd/atom <compute_dpd_atom>`
    * :doc:`edpd/temp/atom <compute_edpd_temp_atom>`
    * :doc:`efield/atom <compute_efield_atom>`
+   * :doc:`efield/wolf/atom <compute_efield_wolf_atom>`
    * :doc:`entropy/atom <compute_entropy_atom>`
    * :doc:`erotate/asphere <compute_erotate_asphere>`
    * :doc:`erotate/rigid <compute_erotate_rigid>`
-   * :doc:`erotate/sphere <compute_erotate_sphere>`
+   * :doc:`erotate/sphere (k) <compute_erotate_sphere>`
    * :doc:`erotate/sphere/atom <compute_erotate_sphere_atom>`
    * :doc:`event/displace <compute_event_displace>`
    * :doc:`fabric <compute_fabric>`
@@ -86,7 +91,6 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`ke/atom/eff <compute_ke_atom_eff>`
    * :doc:`ke/eff <compute_ke_eff>`
    * :doc:`ke/rigid <compute_ke_rigid>`
-   * :doc:`mesont <compute_mesont>`
    * :doc:`mliap <compute_mliap>`
    * :doc:`momentum <compute_momentum>`
    * :doc:`msd <compute_msd>`
@@ -103,9 +107,11 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`pe/tally <compute_tally>`
    * :doc:`plasticity/atom <compute_plasticity_atom>`
    * :doc:`pressure <compute_pressure>`
+   * :doc:`pressure/alchemy <compute_pressure_alchemy>`
    * :doc:`pressure/uef <compute_pressure_uef>`
    * :doc:`property/atom <compute_property_atom>`
    * :doc:`property/chunk <compute_property_chunk>`
+   * :doc:`property/grid <compute_property_grid>`
    * :doc:`property/local <compute_property_local>`
    * :doc:`ptm/atom <compute_ptm_atom>`
    * :doc:`rdf <compute_rdf>`
@@ -138,6 +144,8 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`smd/vol <compute_smd_vol>`
    * :doc:`snap <compute_sna_atom>`
    * :doc:`sna/atom <compute_sna_atom>`
+   * :doc:`sna/grid <compute_sna_atom>`
+   * :doc:`sna/grid/local <compute_sna_atom>`
    * :doc:`snad/atom <compute_sna_atom>`
    * :doc:`snav/atom <compute_sna_atom>`
    * :doc:`sph/e/atom <compute_sph_e_atom>`
@@ -145,11 +153,11 @@ KOKKOS, o = OPENMP, t = OPT.
    * :doc:`sph/t/atom <compute_sph_t_atom>`
    * :doc:`spin <compute_spin>`
    * :doc:`stress/atom <compute_stress_atom>`
-   * :doc:`stress/cartesian <compute_stress_profile>`
-   * :doc:`stress/cylinder <compute_stress_profile>`
+   * :doc:`stress/cartesian <compute_stress_cartesian>`
+   * :doc:`stress/cylinder <compute_stress_curvilinear>`
    * :doc:`stress/mop <compute_stress_mop>`
    * :doc:`stress/mop/profile <compute_stress_mop>`
-   * :doc:`stress/spherical <compute_stress_profile>`
+   * :doc:`stress/spherical <compute_stress_curvilinear>`
    * :doc:`stress/tally <compute_tally>`
    * :doc:`tdpd/cc/atom <compute_tdpd_cc_atom>`
    * :doc:`temp (k) <compute_temp>`

doc/src/Commands_dump.rst

@@ -0,0 +1,57 @@
+.. table_from_list::
+   :columns: 3
+
+   * :doc:`General commands <Commands_all>`
+   * :doc:`Fix styles <Commands_fix>`
+   * :doc:`Compute styles <Commands_compute>`
+   * :doc:`Pair styles <Commands_pair>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
+   * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
+
+Dump commands
+=============
+
+An alphabetic list of all LAMMPS :doc:`dump <dump>` commands.
+
+.. table_from_list::
+   :columns: 5
+
+   * :doc:`atom <dump>`
+   * :doc:`atom/adios <dump_adios>`
+   * :doc:`atom/gz <dump>`
+   * :doc:`atom/mpiio <dump>`
+   * :doc:`atom/zstd <dump>`
+   * :doc:`cfg <dump>`
+   * :doc:`cfg/gz <dump>`
+   * :doc:`cfg/mpiio <dump>`
+   * :doc:`cfg/uef <dump_cfg_uef>`
+   * :doc:`cfg/zstd <dump>`
+   * :doc:`custom <dump>`
+   * :doc:`custom/adios <dump_adios>`
+   * :doc:`custom/gz <dump>`
+   * :doc:`custom/mpiio <dump>`
+   * :doc:`custom/zstd <dump>`
+   * :doc:`dcd <dump>`
+   * :doc:`grid <dump>`
+   * :doc:`grid/vtk <dump>`
+   * :doc:`h5md <dump_h5md>`
+   * :doc:`image <dump_image>`
+   * :doc:`local <dump>`
+   * :doc:`local/gz <dump>`
+   * :doc:`local/zstd <dump>`
+   * :doc:`molfile <dump_molfile>`
+   * :doc:`movie <dump_image>`
+   * :doc:`netcdf <dump_netcdf>`
+   * :doc:`netcdf/mpiio <dump>`
+   * :doc:`vtk <dump_vtk>`
+   * :doc:`xtc <dump>`
+   * :doc:`xyz <dump>`
+   * :doc:`xyz/gz <dump>`
+   * :doc:`xyz/mpiio <dump>`
+   * :doc:`xyz/zstd <dump>`
+   * :doc:`yaml <dump>`
+

doc/src/Commands_fix.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 Fix commands
 ============
@@ -28,6 +29,9 @@ OPT.
    * :doc:`adapt/fep <fix_adapt_fep>`
    * :doc:`addforce <fix_addforce>`
    * :doc:`addtorque <fix_addtorque>`
+   * :doc:`alchemy <fix_alchemy>`
+   * :doc:`amoeba/bitorsion <fix_amoeba_bitorsion>`
+   * :doc:`amoeba/pitorsion <fix_amoeba_pitorsion>`
    * :doc:`append/atoms <fix_append_atoms>`
    * :doc:`atc <fix_atc>`
    * :doc:`atom/swap <fix_atom_swap>`
@@ -35,6 +39,7 @@ OPT.
    * :doc:`ave/chunk <fix_ave_chunk>`
    * :doc:`ave/correlate <fix_ave_correlate>`
    * :doc:`ave/correlate/long <fix_ave_correlate_long>`
+   * :doc:`ave/grid <fix_ave_grid>`
    * :doc:`ave/histo <fix_ave_histo>`
    * :doc:`ave/histo/weight <fix_ave_histo>`
    * :doc:`ave/time <fix_ave_time>`
@@ -62,13 +67,14 @@ OPT.
    * :doc:`drude <fix_drude>`
    * :doc:`drude/transform/direct <fix_drude_transform>`
    * :doc:`drude/transform/inverse <fix_drude_transform>`
-   * :doc:`dt/reset <fix_dt_reset>`
+   * :doc:`dt/reset (k) <fix_dt_reset>`
    * :doc:`edpd/source <fix_dpd_source>`
    * :doc:`efield <fix_efield>`
+   * :doc:`efield/tip4p <fix_efield>`
    * :doc:`ehex <fix_ehex>`
-   * :doc:`electrode/conp (i) <fix_electrode_conp>`
-   * :doc:`electrode/conq (i) <fix_electrode_conp>`
-   * :doc:`electrode/thermo (i) <fix_electrode_conp>`
+   * :doc:`electrode/conp (i) <fix_electrode>`
+   * :doc:`electrode/conq (i) <fix_electrode>`
+   * :doc:`electrode/thermo (i) <fix_electrode>`
    * :doc:`electron/stopping <fix_electron_stopping>`
    * :doc:`electron/stopping/fit <fix_electron_stopping>`
    * :doc:`enforce2d (k) <fix_enforce2d>`
@@ -88,6 +94,7 @@ OPT.
    * :doc:`grem <fix_grem>`
    * :doc:`halt <fix_halt>`
    * :doc:`heat <fix_heat>`
+   * :doc:`heat/flow <fix_heat_flow>`
    * :doc:`hyper/global <fix_hyper_global>`
    * :doc:`hyper/local <fix_hyper_local>`
    * :doc:`imd <fix_imd>`
@@ -97,13 +104,13 @@ OPT.
    * :doc:`langevin/drude <fix_langevin_drude>`
    * :doc:`langevin/eff <fix_langevin_eff>`
    * :doc:`langevin/spin <fix_langevin_spin>`
-   * :doc:`latte <fix_latte>`
    * :doc:`lb/fluid <fix_lb_fluid>`
    * :doc:`lb/momentum <fix_lb_momentum>`
    * :doc:`lb/viscous <fix_lb_viscous>`
    * :doc:`lineforce <fix_lineforce>`
    * :doc:`manifoldforce <fix_manifoldforce>`
-   * :doc:`mdi/aimd <fix_mdi_aimd>`
+   * :doc:`mdi/qm <fix_mdi_qm>`
+   * :doc:`mdi/qmmm <fix_mdi_qmmm>`
    * :doc:`meso/move <fix_meso_move>`
    * :doc:`mol/swap <fix_mol_swap>`
    * :doc:`momentum (k) <fix_momentum>`
@@ -162,8 +169,10 @@ OPT.
    * :doc:`orient/fcc <fix_orient>`
    * :doc:`orient/eco <fix_orient_eco>`
    * :doc:`pafi <fix_pafi>`
+   * :doc:`pair <fix_pair>`
    * :doc:`phonon <fix_phonon>`
-   * :doc:`pimd <fix_pimd>`
+   * :doc:`pimd/langevin <fix_pimd>`
+   * :doc:`pimd/nvt <fix_pimd>`
    * :doc:`planeforce <fix_planeforce>`
    * :doc:`plumed <fix_plumed>`
    * :doc:`poems <fix_poems>`
@@ -209,6 +218,7 @@ OPT.
    * :doc:`saed/vtk <fix_saed_vtk>`
    * :doc:`setforce (k) <fix_setforce>`
    * :doc:`setforce/spin <fix_setforce>`
+   * :doc:`sgcmc <fix_sgcmc>`
    * :doc:`shake (k) <fix_shake>`
    * :doc:`shardlow (k) <fix_shardlow>`
    * :doc:`smd <fix_smd>`
@@ -245,18 +255,19 @@ OPT.
    * :doc:`tune/kspace <fix_tune_kspace>`
    * :doc:`vector <fix_vector>`
    * :doc:`viscosity <fix_viscosity>`
-   * :doc:`viscous <fix_viscous>`
+   * :doc:`viscous (k) <fix_viscous>`
    * :doc:`viscous/sphere <fix_viscous_sphere>`
    * :doc:`wall/body/polygon <fix_wall_body_polygon>`
    * :doc:`wall/body/polyhedron <fix_wall_body_polyhedron>`
    * :doc:`wall/colloid <fix_wall>`
    * :doc:`wall/ees <fix_wall_ees>`
-   * :doc:`wall/gran <fix_wall_gran>`
+   * :doc:`wall/gran (k) <fix_wall_gran>`
    * :doc:`wall/gran/region <fix_wall_gran_region>`
    * :doc:`wall/harmonic <fix_wall>`
    * :doc:`wall/lj1043 <fix_wall>`
    * :doc:`wall/lj126 <fix_wall>`
    * :doc:`wall/lj93 (k) <fix_wall>`
+   * :doc:`wall/lepton <fix_wall>`
    * :doc:`wall/morse <fix_wall>`
    * :doc:`wall/piston <fix_wall_piston>`
    * :doc:`wall/reflect (k) <fix_wall_reflect>`
@@ -264,4 +275,5 @@ OPT.
    * :doc:`wall/region <fix_wall_region>`
    * :doc:`wall/region/ees <fix_wall_ees>`
    * :doc:`wall/srd <fix_wall_srd>`
+   * :doc:`wall/table <fix_wall>`
    * :doc:`widom <fix_widom>`

doc/src/Commands_kspace.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 KSpace solvers
 ==============

doc/src/Commands_pair.rst

@@ -10,6 +10,7 @@
    * :ref:`Dihedral styles <dihedral>`
    * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
+   * :doc:`Dump styles <Commands_dump>`
 
 Pair_style potentials
 ======================
@@ -36,8 +37,10 @@ OPT.
    *
    * :doc:`adp (ko) <pair_adp>`
    * :doc:`agni (o) <pair_agni>`
+   * :doc:`aip/water/2dm (t) <pair_aip_water_2dm>`
    * :doc:`airebo (io) <pair_airebo>`
    * :doc:`airebo/morse (io) <pair_airebo>`
+   * :doc:`amoeba (g) <pair_amoeba>`
    * :doc:`atm <pair_atm>`
    * :doc:`awpmd/cut <pair_awpmd>`
    * :doc:`beck (go) <pair_beck>`
@@ -53,6 +56,7 @@ OPT.
    * :doc:`born/coul/msm (o) <pair_born>`
    * :doc:`born/coul/wolf (go) <pair_born>`
    * :doc:`born/coul/wolf/cs (g) <pair_cs>`
+   * :doc:`born/gauss <pair_born_gauss>`
    * :doc:`bpm/spring <pair_bpm_spring>`
    * :doc:`brownian (o) <pair_brownian>`
    * :doc:`brownian/poly (o) <pair_brownian>`
@@ -124,6 +128,7 @@ OPT.
    * :doc:`hbond/dreiding/lj (o) <pair_hbond_dreiding>`
    * :doc:`hbond/dreiding/morse (o) <pair_hbond_dreiding>`
    * :doc:`hdnnp <pair_hdnnp>`
+   * :doc:`hippo (g) <pair_amoeba>`
    * :doc:`ilp/graphene/hbn (t) <pair_ilp_graphene_hbn>`
    * :doc:`ilp/tmd (t) <pair_ilp_tmd>`
    * :doc:`kolmogorov/crespi/full <pair_kolmogorov_crespi_full>`
@@ -131,6 +136,9 @@ OPT.
    * :doc:`lcbop <pair_lcbop>`
    * :doc:`lebedeva/z <pair_lebedeva_z>`
    * :doc:`lennard/mdf <pair_mdf>`
+   * :doc:`lepton (o) <pair_lepton>`
+   * :doc:`lepton/coul (o) <pair_lepton>`
+   * :doc:`lepton/sphere (o) <pair_lepton>`
    * :doc:`line/lj <pair_line_lj>`
    * :doc:`lj/charmm/coul/charmm (giko) <pair_charmm>`
    * :doc:`lj/charmm/coul/charmm/implicit (ko) <pair_charmm>`
@@ -161,16 +169,18 @@ OPT.
    * :doc:`lj/cut/coul/msm (go) <pair_lj_cut_coul>`
    * :doc:`lj/cut/coul/msm/dielectric <pair_dielectric>`
    * :doc:`lj/cut/coul/wolf (o) <pair_lj_cut_coul>`
-   * :doc:`lj/cut/dipole/cut (go) <pair_dipole>`
+   * :doc:`lj/cut/dipole/cut (gko) <pair_dipole>`
    * :doc:`lj/cut/dipole/long (g) <pair_dipole>`
    * :doc:`lj/cut/dipole/sf (go) <pair_dipole>`
    * :doc:`lj/cut/soft (o) <pair_fep_soft>`
+   * :doc:`lj/cut/sphere (o) <pair_lj_cut_sphere>`
    * :doc:`lj/cut/thole/long (o) <pair_thole>`
    * :doc:`lj/cut/tip4p/cut (o) <pair_lj_cut_tip4p>`
    * :doc:`lj/cut/tip4p/long (got) <pair_lj_cut_tip4p>`
    * :doc:`lj/cut/tip4p/long/soft (o) <pair_fep_soft>`
    * :doc:`lj/expand (gko) <pair_lj_expand>`
-   * :doc:`lj/expand/coul/long (g) <pair_lj_expand>`
+   * :doc:`lj/expand/coul/long (gk) <pair_lj_expand>`
+   * :doc:`lj/expand/sphere (o) <pair_lj_expand_sphere>`
    * :doc:`lj/gromacs (gko) <pair_gromacs>`
    * :doc:`lj/gromacs/coul/gromacs (ko) <pair_gromacs>`
    * :doc:`lj/long/coul/long (iot) <pair_lj_long>`
@@ -179,9 +189,9 @@ OPT.
    * :doc:`lj/long/tip4p/long (o) <pair_lj_long>`
    * :doc:`lj/mdf <pair_mdf>`
    * :doc:`lj/relres (o) <pair_lj_relres>`
-   * :doc:`lj/sdk (gko) <pair_sdk>`
-   * :doc:`lj/sdk/coul/long (go) <pair_sdk>`
-   * :doc:`lj/sdk/coul/msm (o) <pair_sdk>`
+   * :doc:`lj/spica (gko) <pair_spica>`
+   * :doc:`lj/spica/coul/long (go) <pair_spica>`
+   * :doc:`lj/spica/coul/msm (o) <pair_spica>`
    * :doc:`lj/sf/dipole/sf (go) <pair_dipole>`
    * :doc:`lj/smooth (go) <pair_lj_smooth>`
    * :doc:`lj/smooth/linear (o) <pair_lj_smooth_linear>`
@@ -194,14 +204,15 @@ OPT.
    * :doc:`lubricateU/poly <pair_lubricateU>`
    * :doc:`mdpd <pair_mesodpd>`
    * :doc:`mdpd/rhosum <pair_mesodpd>`
-   * :doc:`meam <pair_meam>`
+   * :doc:`meam (k) <pair_meam>`
+   * :doc:`meam/ms (k) <pair_meam>`
    * :doc:`meam/spline (o) <pair_meam_spline>`
    * :doc:`meam/sw/spline <pair_meam_sw_spline>`
    * :doc:`mesocnt <pair_mesocnt>`
-   * :doc:`mesont/tpm <pair_mesont_tpm>`
+   * :doc:`mesocnt/viscous <pair_mesocnt>`
    * :doc:`mgpt <pair_mgpt>`
    * :doc:`mie/cut (g) <pair_mie>`
-   * :doc:`mliap <pair_mliap>`
+   * :doc:`mliap (k) <pair_mliap>`
    * :doc:`mm3/switch3/coulgauss/long <pair_lj_switch3_coulgauss_long>`
    * :doc:`momb <pair_momb>`
    * :doc:`morse (gkot) <pair_morse>`
@@ -232,6 +243,8 @@ OPT.
    * :doc:`oxrna2/xstk <pair_oxrna2>`
    * :doc:`oxrna2/coaxstk <pair_oxrna2>`
    * :doc:`pace (k) <pair_pace>`
+   * :doc:`pace/extrapolation (k) <pair_pace>`
+   * :doc:`pod <pair_pod>`
    * :doc:`peri/eps <pair_peri>`
    * :doc:`peri/lps (o) <pair_peri>`
    * :doc:`peri/pmb (o) <pair_peri>`
@@ -268,6 +281,7 @@ OPT.
    * :doc:`spin/magelec <pair_spin_magelec>`
    * :doc:`spin/neel <pair_spin_neel>`
    * :doc:`srp <pair_srp>`
+   * :doc:`srp/react <pair_srp>`
    * :doc:`sw (giko) <pair_sw>`
    * :doc:`sw/angle/table <pair_sw_angle_table>`
    * :doc:`sw/mod (o) <pair_sw>`
@@ -289,6 +303,7 @@ OPT.
    * :doc:`vashishta (gko) <pair_vashishta>`
    * :doc:`vashishta/table (o) <pair_vashishta>`
    * :doc:`wf/cut <pair_wf_cut>`
+   * :doc:`ylz <pair_ylz>`
    * :doc:`yukawa (gko) <pair_yukawa>`
    * :doc:`yukawa/colloid (go) <pair_yukawa_colloid>`
    * :doc:`zbl (gko) <pair_zbl>`

doc/src/Commands_removed.rst

@@ -20,10 +20,37 @@ ways through the :doc:`compute chunk/atom <compute_chunk_atom>` command
 and then averaging is done using :doc:`fix ave/chunk <fix_ave_chunk>`.
 Please refer to the :doc:`chunk HOWTO <Howto_chunk>` section for an overview.
 
-Reset_ids command
------------------
+Box command
+-----------
 
-The reset_ids command has been renamed to :doc:`reset_atom_ids <reset_atom_ids>`.
+.. deprecated:: 22Dec2022
+
+The *box* command has been removed and the LAMMPS code changed so it won't
+be needed.  If present, LAMMPS will ignore the command and print a warning.
+
+Reset_ids, reset_atom_ids, reset_mol_ids commands
+-------------------------------------------------
+
+.. deprecated:: 22Dec2022
+
+The *reset_ids*, *reset_atom_ids*, and *reset_mol_ids* commands have
+been folded into the :doc:`reset_atoms <reset_atoms>` command.  If
+present, LAMMPS will replace the commands accordingly and print a
+warning.
+
+LATTE package
+-------------
+
+.. deprecated:: 15Jun2023
+
+The LATTE package with the fix latte command was removed from LAMMPS.
+This functionality has been superseded by :doc:`fix mdi/qm <fix_mdi_qm>`
+and :doc:`fix mdi/qmmm <fix_mdi_qmmm>` from the :ref:`MDI package
+<PKG-MDI>`.  These fixes are compatible with several quantum software
+packages, including LATTE.  See the ``examples/QUANTUM`` dir and the
+:doc:`MDI coupling HOWTO <Howto_mdi>` page.  MDI supports running LAMMPS
+with LATTE as a plugin library (similar to the way fix latte worked), as
+well as on a different set of MPI processors.
 
 MEAM package
 ------------
@@ -37,6 +64,27 @@ for some optimizations leading to better performance.  The pair style
 period the C++ version of MEAM was called USER-MEAMC so it could
 coexist with the Fortran version.
 
+Minimize style fire/old
+-----------------------
+
+.. deprecated:: 8Feb2023
+
+Minimize style *fire/old* has been removed. Its functionality can be
+reproduced with *fire* with specific options. Please see the
+:doc:`min_modify command <min_modify>` documentation for details.
+
+Pair style mesont/tpm, compute style mesont, atom style mesont
+--------------------------------------------------------------
+
+.. deprecated:: 8Feb2023
+
+Pair style *mesont/tpm*, compute style *mesont*, and atom style
+*mesont* have been removed from the :ref:`MESONT package <PKG-MESONT>`.
+The same functionality is available through
+:doc:`pair style mesocnt <pair_mesocnt>`,
+:doc:`bond style mesocnt <bond_mesocnt>` and
+:doc:`angle style mesocnt <angle_mesocnt>`.
+
 REAX package
 ------------
 

doc/src/Developer.rst

@@ -13,6 +13,7 @@ of time and requests from the LAMMPS user community.
    Developer_org
    Developer_code_design
    Developer_parallel
+   Developer_atom
    Developer_comm_ops
    Developer_flow
    Developer_write
@@ -23,3 +24,4 @@ of time and requests from the LAMMPS user community.
    Classes
    Developer_platform
    Developer_utils
+   Developer_grid

doc/src/Developer_atom.rst

@@ -0,0 +1,88 @@
+Accessing per-atom data
+-----------------------
+
+This page discusses how per-atom data is managed in LAMMPS, how it can
+be accessed, what communication patters apply, and some of the utility
+functions that exist for a variety of purposes.
+
+
+Owned and ghost atoms
+^^^^^^^^^^^^^^^^^^^^^
+
+As described on the :doc:`parallel partitioning algorithms
+<Developer_par_part>` page, LAMMPS uses a domain decomposition of the
+simulation domain, either in a *brick* or *tiled* manner.  Each MPI
+process *owns* exactly one subdomain and the atoms within it. To compute
+forces for tuples of atoms that are spread across sub-domain boundaries,
+also a "halo" of *ghost* atoms are maintained within a the communication
+cutoff distance of its subdomain.
+
+The total number of atoms is stored in `Atom::natoms` (within any
+typical class this can be referred to at `atom->natoms`. The number of
+*owned* (or "local" atoms) are stored in `Atom::nlocal`; the number of
+*ghost* atoms is stored in `Atom::nghost`.  The sum of `Atom::nlocal`
+over all MPI processes should be `Atom::natoms`. This is by default
+regularly checked by the Thermo class, and if the sum does not match,
+LAMMPS stops with a "lost atoms" error.  For convenience also the
+property `Atom::nmax` is available, this is the maximum of
+`Atom::nlocal + Atom::nghost` across all MPI processes.
+
+Per-atom properties are either managed by the atom style, or individual
+classes.  or as custom arrays by the individual classes. If only access
+to *owned* atoms is needed, they are usually allocated to be of size
+`Atom::nlocal`, otherwise of size `Atom::nmax`. Please note that not all
+per-atom properties are available or updated on *ghost* atoms. For
+example, per-atom velocities are only updated with :doc:`comm_modify vel
+yes <comm_modify>`.
+
+
+Atom indexing
+^^^^^^^^^^^^^
+
+When referring to individual atoms, they may be indexed by their local
+*index*, their index in their `Atom::x` array. This is densely populated
+containing first all *owned* atoms (index < `Atom::nlocal`) and then all
+*ghost* atoms.  The order of atoms in these arrays can change due to
+atoms migrating between between subdomains, atoms being added or
+deleted, or atoms being sorted for better cache efficiency.  Atoms are
+globally uniquely identified by their *atom ID*. There may be multiple
+atoms with the same atom ID present, but only one of them may be an
+*owned* atom.
+
+To find the local *index* of an atom, when the *atom ID* is known, the
+`Atom::map()` function may be used. It will return the local atom index
+or -1. If the returned value is between 0 (inclusive) and `Atom::nlocal`
+(exclusive) it is an *owned* or "local" atom; for larger values the atom
+is present as a ghost atom; for a value of -1, the atom is not present
+on the current subdomain at all.
+
+If multiple atoms with the same tag exist in the same subdomain, they
+can be found via the `Atom::sametag` array. It points to the next atom
+index with the same tag or -1 if there are no more atoms with the same
+tag.  The list will be exhaustive when starting with an index of an
+*owned* atom, since the atom IDs are unique, so there can only be one
+such atom.  Example code to count atoms with same atom ID in subdomain:
+
+.. code-block:: c++
+
+   for (int i = 0; i < atom->nlocal; ++i) {
+     int count = 0;
+     while (sametag[i] >= 0) {
+       i = sametag[i];
+       ++count;
+     }
+     printf("Atom ID: %ld is present %d times\n", atom->tag[i], count);
+   }
+
+Atom class versus AtomVec classes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The `Atom` class contains all kinds of flags and counters about atoms in
+the system and that includes pointers to **all** per-atom properties
+available for atoms.  However, only a subset of these pointers are
+non-NULL and which those are depends on the atom style.  For each atom
+style there is a corresponding `AtomVecXXX` class derived from the
+`AtomVec` base class, where the XXX indicates the atom style.  This
+`AtomVecXXX` class will update the counters and per-atom pointers if
+atoms are added or removed to the system or migrate between subdomains.
+

doc/src/Developer_code_design.rst

@@ -1,52 +1,53 @@
 Code design
 -----------
 
-This section explains some of the code design choices in LAMMPS with
-the goal of helping developers write new code similar to the existing
-code.  Please see the section on :doc:`Requirements for contributed
-code <Modify_style>` for more specific recommendations and guidelines.
-While that section is organized more in the form of a checklist for
-code contributors, the focus here is on overall code design strategy,
-choices made between possible alternatives, and discussing some
-relevant C++ programming language constructs.
+This section explains some code design choices in LAMMPS with the goal
+of helping developers write new code similar to the existing code.
+Please see the section on :doc:`Requirements for contributed code
+<Modify_style>` for more specific recommendations and guidelines.  While
+that section is organized more in the form of a checklist for code
+contributors, the focus here is on overall code design strategy, choices
+made between possible alternatives, and discussing some relevant C++
+programming language constructs.
 
 Historically, the basic design philosophy of the LAMMPS C++ code was a
 "C with classes" style.  The motivation was to make it easy to modify
-LAMMPS for people without significant training in C++ programming.
-Data structures and code constructs were used that resemble the
-previous implementation(s) in Fortran.  A contributing factor to this
-choice also was that at the time, C++ compilers were often not mature
-and some of the advanced features contained bugs or did not function
-as the standard required.  There were also disagreements between
-compiler vendors as to how to interpret the C++ standard documents.
+LAMMPS for people without significant training in C++ programming.  Data
+structures and code constructs were used that resemble the previous
+implementation(s) in Fortran.  A contributing factor to this choice was
+that at the time, C++ compilers were often not mature and some advanced
+features contained bugs or did not function as the standard required.
+There were also disagreements between compiler vendors as to how to
+interpret the C++ standard documents.
 
-However, C++ compilers have now advanced significantly.  In 2020 we
-decided to to require the C++11 standard as the minimum C++ language
-standard for LAMMPS.  Since then we have begun to also replace some of
-the C-style constructs with equivalent C++ functionality, either from
-the C++ standard library or as custom classes or functions, in order
-to improve readability of the code and to increase code reuse through
-abstraction of commonly used functionality.
+However, C++ compilers and the C++ programming language have advanced
+significantly.  In 2020, the LAMMPS developers decided to require the
+C++11 standard as the minimum C++ language standard for LAMMPS.  Since
+then, we have begun to replace C-style constructs with equivalent C++
+functionality.  This was taken either from the C++ standard library or
+implemented as custom classes or functions.  The goal is to improve
+readability of the code and to increase code reuse through abstraction
+of commonly used functionality.
 
 .. note::
 
-   Please note that as of spring 2022 there is still a sizable chunk
-   of legacy code in LAMMPS that has not yet been refactored to
-   reflect these style conventions in full.  LAMMPS has a large code
-   base and many different contributors and there also is a hierarchy
-   of precedence in which the code is adapted.  Highest priority has
-   been the code in the ``src`` folder, followed by code in packages
-   in order of their popularity and complexity (simpler code is
-   adapted sooner), followed by code in the ``lib`` folder.  Source
-   code that is downloaded from external packages or libraries during
-   compilation is not subject to the conventions discussed here.
+   Please note that as of spring 2023 there is still a sizable chunk of
+   legacy code in LAMMPS that has not yet been refactored to reflect
+   these style conventions in full.  LAMMPS has a large code base and
+   many contributors.  There is also a hierarchy of precedence in which
+   the code is adapted.  Highest priority has been the code in the
+   ``src`` folder, followed by code in packages in order of their
+   popularity and complexity (simpler code gets adapted sooner), followed
+   by code in the ``lib`` folder.  Source code that is downloaded from
+   external packages or libraries during compilation is not subject to
+   the conventions discussed here.
 
-Object oriented code
+Object-oriented code
 ^^^^^^^^^^^^^^^^^^^^
 
-LAMMPS is designed to be an object oriented code.  Each simulation is
+LAMMPS is designed to be an object-oriented code.  Each simulation is
 represented by an instance of the LAMMPS class.  When running in
-parallel each MPI process creates such an instance.  This can be seen
+parallel, each MPI process creates such an instance.  This can be seen
 in the ``main.cpp`` file where the core steps of running a LAMMPS
 simulation are the following 3 lines of code:
 
@@ -67,14 +68,14 @@ other special features.
 The basic LAMMPS class hierarchy which is created by the LAMMPS class
 constructor is shown in :ref:`class-topology`.  When input commands
 are processed, additional class instances are created, or deleted, or
-replaced.  Likewise specific member functions of specific classes are
+replaced.  Likewise, specific member functions of specific classes are
 called to trigger actions such creating atoms, computing forces,
 computing properties, time-propagating the system, or writing output.
 
 Compositing and Inheritance
 ===========================
 
-LAMMPS makes extensive use of the object oriented programming (OOP)
+LAMMPS makes extensive use of the object-oriented programming (OOP)
 principles of *compositing* and *inheritance*. Classes like the
 ``LAMMPS`` class are a **composite** containing pointers to instances
 of other classes like ``Atom``, ``Comm``, ``Force``, ``Neighbor``,
@@ -83,7 +84,7 @@ functionality by storing and manipulating data related to the
 simulation and providing member functions that trigger certain
 actions.  Some of those classes like ``Force`` are themselves
 composites, containing instances of classes describing different force
-interactions.  Similarly the ``Modify`` class contains a list of
+interactions.  Similarly, the ``Modify`` class contains a list of
 ``Fix`` and ``Compute`` classes.  If the input commands that
 correspond to these classes include the word *style*, then LAMMPS
 stores only a single instance of that class.  E.g. *atom_style*,
@@ -100,19 +101,18 @@ derived class variant was instantiated.  In LAMMPS these derived
 classes are often referred to as "styles", e.g.  pair styles, fix
 styles, atom styles and so on.
 
-This is the origin of the flexibility of LAMMPS.  For example pair
+This is the origin of the flexibility of LAMMPS.  For example, pair
 styles implement a variety of different non-bonded interatomic
 potentials functions.  All details for the implementation of a
 potential are stored and executed in a single class.
 
 As mentioned above, there can be multiple instances of classes derived
 from the ``Fix`` or ``Compute`` base classes.  They represent a
-different facet of LAMMPS flexibility as they provide methods which
-can be called at different points in time within a timestep, as
-explained in `Developer_flow`.  This allows the input script to tailor
-how a specific simulation is run, what diagnostic computations are
-performed, and how the output of those computations is further
-processed or output.
+different facet of LAMMPS' flexibility, as they provide methods which
+can be called at different points within a timestep, as explained in
+`Developer_flow`.  This allows the input script to tailor how a specific
+simulation is run, what diagnostic computations are performed, and how
+the output of those computations is further processed or output.
 
 Additional code sharing is possible by creating derived classes from the
 derived classes (e.g., to implement an accelerated version of a pair
@@ -164,15 +164,15 @@ The difference in behavior of the ``normal()`` and the ``poly()`` member
 functions is which of the two member functions is called when executing
 `base1->call()` versus `base2->call()`.  Without polymorphism, a
 function within the base class can only call member functions within the
-same scope, that is ``Base::call()`` will always call
-``Base::normal()``.  But for the `base2->call()` case the call of the
+same scope: that is, ``Base::call()`` will always call
+``Base::normal()``.  But for the `base2->call()` case, the call of the
 virtual member function will be dispatched to ``Derived::poly()``
-instead.  This mechanism means that functions are called within the
-scope of the class type that was used to *create* the class instance are
-invoked; even if they are assigned to a pointer using the type of a base
-class.  This is the desired behavior and this way LAMMPS can even use
-styles that are loaded at runtime from a shared object file with the
-:doc:`plugin command <plugin>`.
+instead.  This mechanism results in calling functions that are within
+the scope of the class that was used to *create* the instance, even if
+they are assigned to a pointer for their base class.  This is the
+desired behavior, and this way LAMMPS can even use styles that are loaded
+at runtime from a shared object file with the :doc:`plugin command
+<plugin>`.
 
 A special case of virtual functions are so-called pure functions.  These
 are virtual functions that are initialized to 0 in the class declaration
@@ -189,12 +189,12 @@ This has the effect that an instance of the base class cannot be
 created and that derived classes **must** implement these functions.
 Many of the functions listed with the various class styles in the
 section :doc:`Modify` are pure functions.  The motivation for this is
-to define the interface or API of the functions but defer their
+to define the interface or API of the functions, but defer their
 implementation to the derived classes.
 
 However, there are downsides to this. For example, calls to virtual
-functions from within a constructor, will not be in the scope of the
-derived class and thus it is good practice to either avoid calling them
+functions from within a constructor, will *not* be in the scope of the
+derived class, and thus it is good practice to either avoid calling them
 or to provide an explicit scope such as ``Base::poly()`` or
 ``Derived::poly()``.  Furthermore, any destructors in classes containing
 virtual functions should be declared virtual too, so they will be
@@ -208,8 +208,8 @@ dispatch.
    that are intended to replace a virtual or pure function use the
    ``override`` property keyword.  For the same reason, the use of
    overloads or default arguments for virtual functions should be
-   avoided as they lead to confusion over which function is supposed to
-   override which and which arguments need to be declared.
+   avoided, as they lead to confusion over which function is supposed to
+   override which, and which arguments need to be declared.
 
 Style Factories
 ===============
@@ -219,10 +219,10 @@ uses a programming pattern called `Factory`.  Those are functions that
 create an instance of a specific derived class, say ``PairLJCut`` and
 return a pointer to the type of the common base class of that style,
 ``Pair`` in this case.  To associate the factory function with the
-style keyword, an ``std::map`` class is used with function pointers
+style keyword, a ``std::map`` class is used with function pointers
 indexed by their keyword (for example "lj/cut" for ``PairLJCut`` and
 "morse" for ``PairMorse``).  A couple of typedefs help keep the code
-readable and a template function is used to implement the actual
+readable, and a template function is used to implement the actual
 factory functions for the individual classes.  Below is an example
 of such a factory function from the ``Force`` class as declared in
 ``force.h`` and implemented in ``force.cpp``.  The file ``style_pair.h``
@@ -279,26 +279,26 @@ from and writing to files and console instead of C++ "iostreams".
 This is mainly motivated by better performance, better control over
 formatting, and less effort to achieve specific formatting.
 
-Since mixing "stdio" and "iostreams" can lead to unexpected
-behavior. use of the latter is strongly discouraged.  Also output to
-the screen should not use the predefined ``stdout`` FILE pointer, but
-rather the ``screen`` and ``logfile`` FILE pointers managed by the
-LAMMPS class.  Furthermore, output should generally only be done by
-MPI rank 0 (``comm->me == 0``).  Output that is sent to both
-``screen`` and ``logfile`` should use the :cpp:func:`utils::logmesg()
-convenience function <LAMMPS_NS::utils::logmesg>`.
+Since mixing "stdio" and "iostreams" can lead to unexpected behavior,
+use of the latter is strongly discouraged.  Output to the screen should
+*not* use the predefined ``stdout`` FILE pointer, but rather the
+``screen`` and ``logfile`` FILE pointers managed by the LAMMPS class.
+Furthermore, output should generally only be done by MPI rank 0
+(``comm->me == 0``).  Output that is sent to both ``screen`` and
+``logfile`` should use the :cpp:func:`utils::logmesg() convenience
+function <LAMMPS_NS::utils::logmesg>`.
 
-We also discourage the use of stringstreams because the bundled {fmt}
-library and the customized tokenizer classes can provide the same
-functionality in a cleaner way with better performance.  This also
-helps maintain a consistent programming syntax with code from many
-different contributors.
+We discourage the use of stringstreams because the bundled {fmt} library
+and the customized tokenizer classes provide the same functionality in a
+cleaner way with better performance.  This also helps maintain a
+consistent programming syntax with code from many different
+contributors.
 
 Formatting with the {fmt} library
 ===================================
 
 The LAMMPS source code includes a copy of the `{fmt} library
-<https://fmt.dev>`_ which is preferred over formatting with the
+<https://fmt.dev>`_, which is preferred over formatting with the
 "printf()" family of functions.  The primary reason is that it allows
 a typesafe default format for any type of supported data.  This is
 particularly useful for formatting integers of a given size (32-bit or
@@ -313,17 +313,16 @@ been included into the C++20 language standard, so changes to adopt it
 are future-proof.
 
 Formatted strings are frequently created by calling the
-``fmt::format()`` function which will return a string as a
-``std::string`` class instance.  In contrast to the ``%`` placeholder
-in ``printf()``, the {fmt} library uses ``{}`` to embed format
-descriptors.  In the simplest case, no additional characters are
-needed as {fmt} will choose the default format based on the data type
-of the argument.  Otherwise the ``fmt::print()`` function may be
-used instead of ``printf()`` or ``fprintf()``.  In addition, several
-LAMMPS output functions, that originally accepted a single string as
-argument have been overloaded to accept a format string with optional
-arguments as well (e.g., ``Error::all()``, ``Error::one()``,
-``utils::logmesg()``).
+``fmt::format()`` function, which will return a string as a
+``std::string`` class instance.  In contrast to the ``%`` placeholder in
+``printf()``, the {fmt} library uses ``{}`` to embed format descriptors.
+In the simplest case, no additional characters are needed, as {fmt} will
+choose the default format based on the data type of the argument.
+Otherwise, the ``fmt::print()`` function may be used instead of
+``printf()`` or ``fprintf()``.  In addition, several LAMMPS output
+functions, that originally accepted a single string as argument have
+been overloaded to accept a format string with optional arguments as
+well (e.g., ``Error::all()``, ``Error::one()``, ``utils::logmesg()``).
 
 Summary of the {fmt} format syntax
 ==================================
@@ -332,10 +331,11 @@ The syntax of the format string is "{[<argument id>][:<format spec>]}",
 where either the argument id or the format spec (separated by a colon
 ':') is optional.  The argument id is usually a number starting from 0
 that is the index to the arguments following the format string.  By
-default these are assigned in order (i.e. 0, 1, 2, 3, 4 etc.).  The most
-common case for using argument id would be to use the same argument in
-multiple places in the format string without having to provide it as an
-argument multiple times. In LAMMPS the argument id is rarely used.
+default, these are assigned in order (i.e. 0, 1, 2, 3, 4 etc.).  The
+most common case for using argument id would be to use the same argument
+in multiple places in the format string without having to provide it as
+an argument multiple times. The argument id is rarely used in the LAMMPS
+source code.
 
 More common is the use of a format specifier, which starts with a colon.
 This may optionally be followed by a fill character (default is ' '). If
@@ -347,18 +347,19 @@ width, which may be followed by a dot '.' and a precision for floating
 point numbers.  The final character in the format string would be an
 indicator for the "presentation", i.e. 'd' for decimal presentation of
 integers, 'x' for hexadecimal, 'o' for octal, 'c' for character etc.
-This mostly follows the "printf()" scheme but without requiring an
+This mostly follows the "printf()" scheme, but without requiring an
 additional length parameter to distinguish between different integer
 widths.  The {fmt} library will detect those and adapt the formatting
 accordingly.  For floating point numbers there are correspondingly, 'g'
 for generic presentation, 'e' for exponential presentation, and 'f' for
 fixed point presentation.
 
-Thus "{:8}" would represent *any* type argument using at least 8
-characters; "{:<8}" would do this as left aligned, "{:^8}" as centered,
-"{:>8}" as right aligned.  If a specific presentation is selected, the
-argument type must be compatible or else the {fmt} formatting code will
-throw an exception. Some format string examples are given below:
+The format string "{:8}" would thus represent *any* type argument and be
+replaced by at least 8 characters; "{:<8}" would do this as left
+aligned, "{:^8}" as centered, "{:>8}" as right aligned.  If a specific
+presentation is selected, the argument type must be compatible or else
+the {fmt} formatting code will throw an exception.  Some format string
+examples are given below:
 
 .. code-block:: c++
 
@@ -392,12 +393,12 @@ documentation <https://fmt.dev/latest/syntax.html>`_ website.
 Memory management
 ^^^^^^^^^^^^^^^^^
 
-Dynamical allocation of small data and objects can be done with the
-the C++ commands "new" and "delete/delete[].  Large data should use
-the member functions of the ``Memory`` class, most commonly,
-``Memory::create()``, ``Memory::grow()``, and ``Memory::destroy()``,
-which provide variants for vectors, 2d arrays, 3d arrays, etc.
-These can also be used for small data.
+Dynamical allocation of small data and objects can be done with the C++
+commands "new" and "delete/delete[]".  Large data should use the member
+functions of the ``Memory`` class, most commonly, ``Memory::create()``,
+``Memory::grow()``, and ``Memory::destroy()``, which provide variants
+for vectors, 2d arrays, 3d arrays, etc.  These can also be used for
+small data.
 
 The use of ``malloc()``, ``calloc()``, ``realloc()`` and ``free()``
 directly is strongly discouraged.  To simplify adapting legacy code
@@ -408,26 +409,24 @@ perform additional error checks for safety.
 Use of these custom memory allocation functions is motivated by the
 following considerations:
 
-- memory allocation failures on *any* MPI rank during a parallel run
-  will trigger an immediate abort of the entire parallel calculation
-  instead of stalling it
-- a failing "new" will trigger an exception which is also captured by
-  LAMMPS and triggers a global abort
-- allocation of multi-dimensional arrays will be done in a C compatible
-  fashion but so that the storage of the actual data is stored in one
-  large contiguous block.  Thus when MPI communication is needed,
+- Memory allocation failures on *any* MPI rank during a parallel run
+  will trigger an immediate abort of the entire parallel calculation.
+- A failing "new" will trigger an exception, which is also captured by
+  LAMMPS and triggers a global abort.
+- Allocation of multidimensional arrays will be done in a C compatible
+  fashion, but such that the storage of the actual data is stored in one
+  large contiguous block.  Thus, when MPI communication is needed,
   the data can be communicated directly (similar to Fortran arrays).
-- the "destroy()" and "sfree()" functions may safely be called on NULL
-  pointers
-- the "destroy()" functions will nullify the pointer variables making
-  "use after free" errors easy to detect
-- it is possible to use a larger than default memory alignment (not on
+- The "destroy()" and "sfree()" functions may safely be called on NULL
+  pointers.
+- The "destroy()" functions will nullify the pointer variables, thus
+  making "use after free" errors easy to detect.
+- It is possible to use a larger than default memory alignment (not on
   all operating systems, since the allocated storage pointers must be
-  compatible with ``free()`` for technical reasons)
+  compatible with ``free()`` for technical reasons).
 
-In the practical implementation of code this means that any pointer
-variables that are class members should be initialized to a
-``nullptr`` value in their respective constructors.  That way it is
-safe to call ``Memory::destroy()`` or ``delete[]`` on them before
-*any* allocation outside the constructor.  This helps prevent memory
-leaks.
+In the practical implementation of code this means, that any pointer
+variables, that are class members should be initialized to a ``nullptr``
+value in their respective constructors.  That way, it is safe to call
+``Memory::destroy()`` or ``delete[]`` on them before *any* allocation
+outside the constructor.  This helps prevent memory leaks.

doc/src/Developer_comm_ops.rst

@@ -14,8 +14,8 @@ Owned and ghost atoms
 As described on the :doc:`parallel partitioning algorithms
 <Developer_par_part>` page, LAMMPS spatially decomposes the simulation
 domain, either in a *brick* or *tiled* manner.  Each processor (MPI
-task) owns atoms within its sub-domain and additionally stores ghost
-atoms within a cutoff distance of its sub-domain.
+task) owns atoms within its subdomain and additionally stores ghost
+atoms within a cutoff distance of its subdomain.
 
 Forward and reverse communication
 =================================
@@ -28,7 +28,7 @@ The need to do this communication arises when data from the owned atoms
 is updated (e.g. their positions) and this updated information needs to
 be **copied** to the corresponding ghost atoms.
 
-And second, *reverse communication* which sends ghost atom information
+And second, *reverse communication*, which sends ghost atom information
 from each processor to the owning processor to **accumulate** (sum)
 the values with the corresponding owned atoms.  The need for this
 arises when data is computed and also stored with ghost atoms
@@ -58,7 +58,7 @@ embedded-atom method (EAM) which compute intermediate values in the
 first part of the compute() function that need to be stored by both
 owned and ghost atoms for the second part of the force computation.
 The *Comm* class methods perform the MPI communication for buffers of
-per-atom data.  They "call back" to the *Pair* class so it can *pack*
+per-atom data.  They "call back" to the *Pair* class, so it can *pack*
 or *unpack* the buffer with data the *Pair* class owns.  There are 4
 such methods that the *Pair* class must define, assuming it uses both
 forward and reverse communication:
@@ -70,22 +70,22 @@ forward and reverse communication:
 
 The arguments to these methods include the buffer and a list of atoms
 to pack or unpack.  The *Pair* class also must set the *comm_forward*
-and *comm_reverse* variables which store the number of values stored
+and *comm_reverse* variables, which store the number of values stored
 in the communication buffers for each operation.  This means, if
 desired, it can choose to store multiple per-atom values in the
 buffer, and they will be communicated together to minimize
 communication overhead.  The communication buffers are defined vectors
 containing ``double`` values.  To correctly store integers that may be
 64-bit (bigint, tagint, imageint) in the buffer, you need to use the
-`ubuf union <Communication buffer coding with ubuf>`_ construct.
+:ref:`ubuf union <communication_buffer_coding_with_ubuf>` construct.
 
 The *Fix*, *Compute*, and *Dump* classes can also invoke the same kind
 of forward and reverse communication operations using the same *Comm*
-class methods.  Likewise the same pack/unpack methods and
+class methods.  Likewise, the same pack/unpack methods and
 comm_forward/comm_reverse variables must be defined by the calling
 *Fix*, *Compute*, or *Dump* class.
 
-For *Fix* classes there is an optional second argument to the
+For *Fix* classes, there is an optional second argument to the
 *forward_comm()* and *reverse_comm()* call which can be used when the
 fix performs multiple modes of communication, with different numbers
 of values per atom.  The fix should set the *comm_forward* and
@@ -150,7 +150,7 @@ latter case, when the *ring* operation is complete, each processor can
 examine its original buffer to extract modified values.
 
 Note that the *ring* operation is similar to an MPI_Alltoall()
-operation where every processor effectively sends and receives data to
+operation, where every processor effectively sends and receives data to
 every other processor.  The difference is that the *ring* operation
 does it one step at a time, so the total volume of data does not need
 to be stored by every processor.  However, the *ring* operation is
@@ -184,8 +184,8 @@ The *exchange_data()* method triggers the communication to be
 performed.  Each processor provides the vector of *N* datums to send,
 and the size of each datum.  All datums must be the same size.
 
-The *create_atom()* and *exchange_atom()* methods are similar except
-that the size of each datum can be different.  Typically this is used
+The *create_atom()* and *exchange_atom()* methods are similar, except
+that the size of each datum can be different.  Typically, this is used
 to communicate atoms, each with a variable amount of per-atom data, to
 other processors.
 

doc/src/Developer_flow.rst

@@ -45,9 +45,9 @@ other methods in the class.
   zero before each timestep, so that forces (torques, etc) can be
   accumulated.
 
-Now for the ``Verlet::run()`` method.  Its basic structure in hi-level pseudo
-code is shown below.  In the actual code in ``src/verlet.cpp`` some of
-these operations are conditionally invoked.
+Now for the ``Verlet::run()`` method.  Its basic structure in hi-level
+pseudocode is shown below.  In the actual code in ``src/verlet.cpp``
+some of these operations are conditionally invoked.
 
 .. code-block:: python
 
@@ -105,17 +105,17 @@ need it.  These flags are passed to the various methods that compute
 particle interactions, so that they either compute and tally the
 corresponding data or can skip the extra calculations if the energy and
 virial are not needed.  See the comments for the ``Integrate::ev_set()``
-method which document the flag values.
+method, which document the flag values.
 
 At various points of the timestep, fixes are invoked,
 e.g. ``fix->initial_integrate()``.  In the code, this is actually done
-via the Modify class which stores all the Fix objects and lists of which
+via the Modify class, which stores all the Fix objects and lists of which
 should be invoked at what point in the timestep.  Fixes are the LAMMPS
 mechanism for tailoring the operations of a timestep for a particular
 simulation.  As described elsewhere, each fix has one or more methods,
 each of which is invoked at a specific stage of the timestep, as show in
-the timestep pseudo-code.  All the active fixes defined in an input
-script, that are flagged to have an ``initial_integrate()`` method are
+the timestep pseudocode.  All the active fixes defined in an input
+script, that are flagged to have an ``initial_integrate()`` method, are
 invoked at the beginning of each timestep.  Examples are :doc:`fix nve
 <fix_nve>` or :doc:`fix nvt or fix npt <fix_nh>` which perform the
 start-of-timestep velocity-Verlet integration operations to update
@@ -131,15 +131,15 @@ can be changed using the :doc:`neigh_modify every/delay/check
 <neigh_modify>` command.  If not, coordinates of ghost atoms are
 acquired by each processor via the ``forward_comm()`` method of the Comm
 class.  If neighbor lists need to be built, several operations within
-the inner if clause of the pseudo-code are first invoked.  The
+the inner if clause of the pseudocode are first invoked.  The
 ``pre_exchange()`` method of any defined fixes is invoked first.
-Typically this inserts or deletes particles from the system.
+Typically, this inserts or deletes particles from the system.
 
 Periodic boundary conditions are then applied by the Domain class via
 its ``pbc()`` method to remap particles that have moved outside the
 simulation box back into the box.  Note that this is not done every
 timestep, but only when neighbor lists are rebuilt.  This is so that
-each processor's sub-domain will have consistent (nearby) atom
+each processor's subdomain will have consistent (nearby) atom
 coordinates for its owned and ghost atoms.  It is also why dumped atom
 coordinates may be slightly outside the simulation box if not dumped
 on a step where the neighbor lists are rebuilt.
@@ -148,15 +148,15 @@ The box boundaries are then reset (if needed) via the ``reset_box()``
 method of the Domain class, e.g. if box boundaries are shrink-wrapped to
 current particle coordinates.  A change in the box size or shape
 requires internal information for communicating ghost atoms (Comm class)
-and neighbor list bins (Neighbor class) be updated.  The ``setup()``
+and neighbor list bins (Neighbor class) to be updated.  The ``setup()``
 method of the Comm class and ``setup_bins()`` method of the Neighbor
 class perform the update.
 
 The code is now ready to migrate atoms that have left a processor's
-geometric sub-domain to new processors.  The ``exchange()`` method of
+geometric subdomain to new processors.  The ``exchange()`` method of
 the Comm class performs this operation.  The ``borders()`` method of the
 Comm class then identifies ghost atoms surrounding each processor's
-sub-domain and communicates ghost atom information to neighboring
+subdomain and communicates ghost atom information to neighboring
 processors.  It does this by looping over all the atoms owned by a
 processor to make lists of those to send to each neighbor processor.  On
 subsequent timesteps, the lists are used by the ``Comm::forward_comm()``
@@ -217,20 +217,21 @@ file, and restart files.  See the :doc:`thermo_style <thermo_style>`,
 :doc:`dump <dump>`, and :doc:`restart <restart>` commands for more
 details.
 
-The the flow of control during energy minimization iterations is
-similar to that of a molecular dynamics timestep.  Forces are computed,
-neighbor lists are built as needed, atoms migrate to new processors, and
-atom coordinates and forces are communicated to neighboring processors.
-The only difference is what Fix class operations are invoked when.  Only
-a subset of LAMMPS fixes are useful during energy minimization, as
+The flow of control during energy minimization iterations is similar to
+that of a molecular dynamics timestep.  Forces are computed, neighbor
+lists are built as needed, atoms migrate to new processors, and atom
+coordinates and forces are communicated to neighboring processors.  The
+only difference is what Fix class operations are invoked when.  Only a
+subset of LAMMPS fixes are useful during energy minimization, as
 explained in their individual doc pages.  The relevant Fix class methods
-are ``min_pre_exchange()``, ``min_pre_force()``, and ``min_post_force()``.
-Each fix is invoked at the appropriate place within the minimization
-iteration.  For example, the ``min_post_force()`` method is analogous to
-the ``post_force()`` method for dynamics; it is used to alter or constrain
-forces on each atom, which affects the minimization procedure.
+are ``min_pre_exchange()``, ``min_pre_force()``, and
+``min_post_force()``.  Each fix is invoked at the appropriate place
+within the minimization iteration.  For example, the
+``min_post_force()`` method is analogous to the ``post_force()`` method
+for dynamics; it is used to alter or constrain forces on each atom,
+which affects the minimization procedure.
 
-After all iterations are completed there is a ``cleanup`` step which
+After all iterations are completed, there is a ``cleanup`` step which
 calls the ``post_run()`` method of fixes to perform operations only required
-at the end of a calculations (like freeing temporary storage or creating
+at the end of a calculation (like freeing temporary storage or creating
 final outputs).

doc/src/Developer_grid.rst

@@ -0,0 +1,845 @@
+Use of distributed grids within style classes
+---------------------------------------------
+
+.. versionadded:: 22Dec2022
+
+The LAMMPS source code includes two classes which facilitate the
+creation and use of distributed grids.  These are the Grid2d and
+Grid3d classes in the src/grid2d.cpp.h and src/grid3d.cpp.h files
+respectively.  As the names imply, they are used for 2d or 3d
+simulations, as defined by the :doc:`dimension <dimension>` command.
+
+The :doc:`Howto_grid <Howto_grid>` page gives an overview of how
+distributed grids are defined from a user perspective, lists LAMMPS
+commands which use them, and explains how grid cell data is referenced
+from an input script.  Please read that page first as it motivates the
+coding details discussed here.
+
+This doc page is for users who wish to write new styles (input script
+commands) which use distributed grids.  There are a variety of
+material models and analysis methods which use atoms (or
+coarse-grained particles) and grids in tandem.
+
+A *distributed* grid means each processor owns a subset of the grid
+cells.  In LAMMPS, the subset for each processor will be a sub-block
+of grid cells with low and high index bounds in each dimension of the
+grid.  The union of the sub-blocks across all processors is the global
+grid.
+
+More specifically, a grid point is defined for each cell (by default
+the center point), and a processor owns a grid cell if its point is
+within the processor's spatial subdomain.  The union of processor
+subdomains is the global simulation box.  If a grid point is on the
+boundary of two subdomains, the lower processor owns the grid cell.  A
+processor may also store copies of ghost cells which surround its
+owned cells.
+
+----------
+
+Style commands
+^^^^^^^^^^^^^^
+
+Style commands which can define and use distributed grids include the
+:doc:`compute <compute>`, :doc:`fix <fix>`, :doc:`pair <pair_style>`,
+and :doc:`kspace <kspace_style>` styles.  If you wish grid cell data
+to persist across timesteps, then use a fix.  If you wish grid cell
+data to be accessible by other commands, then use a fix or compute.
+Currently in LAMMPS, the :doc:`pair_style amoeba <pair_amoeba>`,
+:doc:`kspace_style pppm <kspace_style>`, and :doc:`kspace_style msm
+<kspace_style>` commands use distributed grids but do not require
+either of these capabilities; they thus create and use distributed
+grids internally.  Note that a pair style which needs grid cell data
+to persist could be coded to work in tandem with a fix style which
+provides that capability.
+
+The *size* of a grid is specified by the number of grid cells in each
+dimension of the simulation domain.  In any dimension the size can be
+any value >= 1.  Thus a 10x10x1 grid for a 3d simulation is
+effectively a 2d grid, where each grid cell spans the entire
+z-dimension.  A 1x100x1 grid for a 3d simulation is effectively a 1d
+grid, where grid cells are a series of thin xz slabs in the
+y-dimension.  It is even possible to define a 1x1x1 3d grid, though it
+may be inefficient to use it in a computational sense.
+
+Note that the choice of grid size is independent of the number of
+processors or their layout in a grid of processor subdomains which
+overlays the simulations domain.  Depending on the distributed grid
+size, a single processor may own many 1000s or no grid cells.
+
+A command can define multiple grids, each of a different size.  Each
+grid is an instantiation of the Grid2d or Grid3d class.
+
+The command also defines what data it will store for each grid it
+creates and it allocates the multidimensional array(s) needed to
+store the data.  No grid cell data is stored within the Grid2d or
+Grid3d classes.
+
+If a single value per grid cell is needed, the data array will have
+the same dimension as the grid, i.e. a 2d array for a 2d grid,
+likewise for 3d.  If multiple values per grid cell are needed, the
+data array will have one more dimension than the grid, i.e. a 3d array
+for a 2d grid, or 4d array for a 3d grid.  A command can choose to
+define multiple data arrays for each grid it defines.
+
+----------
+
+Grid data allocation and access
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The simplest way for a command to allocate and access grid cell data
+is to use the *create_offset()* methods provided by the Memory class.
+Arguments for these methods can be values returned by the
+*setup_grid()* method (described below), which define the extent of
+the grid cells (owned+ghost) the processor owns.  These 4 methods
+allocate memory for 2d (first two) and 3d (second two) grid data.  The
+two methods that end in "_offset" allocate an array which stores a single
+value per grid cell.  The two that end in "_last" allocate an array
+which stores *Nvalues* per grid cell.
+
+.. code-block:: c++
+
+   // single value per cell for a 2d grid = 2d array
+   memory->create2d_offset(data2d_one, nylo_out, nyhi_out,
+                           nxlo_out, nxhi_out, "data2d_one");
+
+   // nvalues per cell for a 2d grid = 3d array
+   memory->create3d_offset_last(data2d_multi, nylo_out, nyhi_out,
+                                nxlo_out, nxhi_out, nvalues, "data2d_multi");
+
+   // single value per cell for a 3d grid = 3d array
+   memory->create3d_offset(data3d_one, nzlo_out, nzhi_out, nylo_out,
+                           nyhi_out, nxlo_out, nxhi_out, "data3d_one");
+
+   // nvalues per cell for a 3d grid = 4d array
+   memory->create4d_offset_last(data3d_multi, nzlo_out, nzhi_out, nylo_out,
+                                nyhi_out, nxlo_out, nxhi_out, nvalues,
+                                "data3d_multi");
+
+Note that these multidimensional arrays are allocated as contiguous
+chunks of memory where the x-index of the grid varies fastest, then y,
+and the z-index slowest.  For multiple values per grid cell, the
+Nvalues are contiguous, so their index varies even faster than the
+x-index.
+
+The key point is that the "offset" methods create arrays which are
+indexed by the range of indices which are the bounds of the sub-block
+of the global grid owned by this processor.  This means loops like
+these can be written in the caller code to loop over owned grid cells,
+where the "i" loop bounds are the range of owned grid cells for the
+processor.  These are the bounds returned by the *setup_grid()*
+method:
+
+.. code-block:: c++
+
+    for (int iy = iylo; iy <= iyhi; iy++)
+      for (int ix = ixlo; ix <= ixhi; ix++)
+        data2d_one[iy][ix] = 0.0;
+
+    for (int iy = iylo; iy <= iyhi; iy++)
+      for (int ix = ixlo; ix <= ixhi; ix++)
+        for (int m = 0; m < nvalues; m++)
+          data2d_multi[iy][ix][m] = 0.0;
+
+    for (int iz = izlo; iz <= izhi; iz++)
+      for (int iy = iylo; iy <= iyhi; iy++)
+        for (int ix = ixlo; ix <= ixhi; ix++)
+          data3d_one[iz][iy][ix] = 0.0;
+
+    for (int iz = izlo; iz <= izhi; iz++)
+      for (int iy = iylo; iy <= iyhi; iy++)
+        for (int ix = ixlo; ix <= ixhi; ix++)
+           for (int m = 0; m < nvalues; m++)
+              data3d_multi[iz][iy][ix][m] = 0.0;
+
+Simply replacing the "i" bounds with "o" bounds, also returned by the
+*setup_grid()* method, would alter this code to loop over owned+ghost
+cells (the entire allocated grid).
+
+----------
+
+Grid class constructors
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The following subsections describe the public methods of the Grid3d
+class which a style command can invoke.  The Grid2d methods are
+similar; simply remove arguments which refer to the z-dimension.
+
+There are 2 constructors which can be used.  They differ in the extra
+i/o xyz lo/hi arguments:
+
+.. code-block:: c++
+
+   Grid3d(class LAMMPS *lmp, MPI_Comm gcomm, int gnx, int gny, int gnz)
+   Grid3d(class LAMMPS *lmp, MPI_Comm gcomm, int gnx, int gny, int gnz,
+          int ixlo, int ixhi, int iylo, int iyhi, int izlo, int izhi,
+          int oxlo, int oxhi, int oylo, int oyhi, int ozlo, int ozhi)
+
+Both constructors take the LAMMPS instance pointer and a communicator
+over which the grid will be distributed.  Typically this is the
+*world* communicator the LAMMPS instance is using.  The
+:doc:`kspace_style msm <kspace_style>` command creates a series of
+grids, each of different size, which are partitioned across different
+sub-communicators of processors.  Both constructors are also passed
+the global grid size: *gnx* by *gny* by *gnz*.
+
+The first constructor is used when the caller wants the Grid class to
+partition the global grid across processors; the Grid class defines
+which grid cells each processor owns and also which it stores as ghost
+cells.  A subsequent call to *setup_grid()*, discussed below, returns
+this info to the caller.
+
+The second constructor allows the caller to define the extent of owned
+and ghost cells, and pass them to the Grid class.  The 6 arguments
+which start with "i" are the inclusive lower and upper index bounds of
+the owned (inner) grid cells this processor owns in each of the 3
+dimensions within the global grid.  Owned grid cells are indexed from
+0 to N-1 in each dimension.
+
+The 6 arguments which start with "o" are the inclusive bounds of the
+owned+ghost (outer) grid cells it stores.  If the ghost cells are on
+the other side of a periodic boundary, then these indices may be < 0
+or >= N in any dimension, so that oxlo <= ixlo and ixhi >= ixhi is
+always the case.
+
+For example, if Nx = 100, then a processor might pass ixlo=50,
+ixhi=60, oxlo=48, oxhi=62 to the Grid class.  Or ixlo=0, ixhi=10,
+oxlo=-2, oxhi=13.  If a processor owns no grid cells in a dimension,
+then the ihi value should be specified as one less than the ilo value.
+
+Note that the only reason to use the second constructor is if the
+logic for assigning ghost cells is too complex for the Grid class to
+compute, using the various set() methods described next.  Currently
+only the kspace_style pppm/electrode and kspace_style msm commands use
+the second constructor.
+
+----------
+
+Grid class set methods
+^^^^^^^^^^^^^^^^^^^^^^
+
+The following methods affect how the Grid class computes which owned
+and ghost cells are assigned to each processor.  *Set_shift_grid()* is
+the only method which influences owned cell assignment; all the rest
+influence ghost cell assignment.  These methods are only used with the
+first constructor; they are ignored if the second constructor is used.
+These methods must be called before the *setup_grid()* method is
+invoked, because they influence its operation.
+
+.. code-block:: c++
+
+   void set_shift_grid(double shift);
+   void set_distance(double distance);
+   void set_stencil_atom(int lo, int hi);
+   void set_shift_atom(double shift_lo, double shift_hi);
+   void set_stencil_grid(int lo, int hi);
+   void set_zfactor(double factor);
+
+Processors own a grid cell if a point within the grid cell is inside
+the processor's subdomain.  By default this is the center point of the
+grid cell.  The *set_shift_grid()* method can change this.  The *shift*
+argument is a value from 0.0 to 1.0 (inclusive) which is the offset of
+the point within the grid cell in each dimension.  The default is 0.5
+for the center of the cell.  A value of 0.0 is the lower left corner
+point; a value of 1.0 is the upper right corner point.  There is
+typically no need to change the default as it is optimal for
+minimizing the number of ghost cells needed.
+
+If a processor maps its particles to grid cells, it needs to allow for
+its particles being outside its subdomain between reneighboring.  The
+*distance* argument of the *set_distance()* method sets the furthest
+distance outside a processor's subdomain which a particle can move.
+Typically this is half the neighbor skin distance, assuming
+reneighboring is done appropriately.  This distance is used in
+determining how many ghost cells a processor needs to store to enable
+its particles to be mapped to grid cells.  The default value is 0.0.
+
+Some commands, like the :doc:`kspace_style pppm <kspace_style>`
+command, map values (charge in the case of PPPM) to a stencil of grid
+cells beyond the grid cell the particle is in.  The stencil extent may
+be different in the low and high directions.  The *set_stencil_atom()*
+method defines the maximum values of those 2 extents, assumed to be
+the same in each of the 3 dimensions.  Both the lo and hi values are
+specified as positive integers.  The default values are both 0.
+
+Some commands, like the :doc:`kspace_style pppm <kspace_style>`
+command, shift the position of an atom when mapping it to a grid cell,
+based on the size of the stencil used to map values to the grid
+(charge in the case of PPPM).  The lo and hi arguments of the
+*set_shift_atom()* method are the minimum shift in the low direction
+and the maximum shift in the high direction, assumed to be the same in
+each of the 3 dimensions.  The shifts should be fractions of a grid
+cell size with values between 0.0 and 1.0 inclusive.  The default
+values are both 0.0.  See the src/pppm.cpp file for examples of these
+lo/hi values for regular and staggered grids.
+
+Some methods like the :doc:`fix ttm/grid <fix_ttm>` command, perform
+finite difference kinds of operations on the grid, to diffuse electron
+heat in the case of the two-temperature model (TTM).  This operation
+uses ghost grid values beyond the owned grid values the processor
+updates.  The *set_stencil_grid()* method defines the extent of this
+stencil in both directions, assumed to be the same in each of the 3
+dimensions.  Both the lo and hi values are specified as positive
+integers.  The default values are both 0.
+
+The kspace_style pppm commands allow a grid to be defined which
+overlays a volume which extends beyond the simulation box in the z
+dimension.  This is for the purpose of modeling a 2d-periodic slab
+(non-periodic in z) as if it were a larger 3d periodic system,
+extended (with empty space) in the z dimension.  The
+:doc:`kspace_modify slab <kspace_modify>` command is used to specify
+the ratio of the larger volume to the simulation volume; a volume
+ratio of ~3 is typical.  For this kind of model, the PPPM caller sets
+the global grid size *gnz* ~3x larger than it would be otherwise.
+This same ratio is passed by the PPPM caller as the *factor* argument
+to the Grid class via the *set_zfactor()* method (*set_yfactor()* for
+2d grids).  The Grid class will then assign ownership of the 1/3 of
+grid cells that overlay the simulation box to the processors which
+also overlay the simulation box.  The remaining 2/3 of the grid cells
+are assigned to processors whose subdomains are adjacent to the upper
+z boundary of the simulation box.
+
+----------
+
+Grid class setup_grid method
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The *setup_grid()* method is called after the first constructor
+(above) to partition the grid across processors, which determines
+which grid cells each processor owns.  It also calculates how many
+ghost grid cells in each dimension and each direction each processor
+needs to store.
+
+Note that this method is NOT called if the second constructor above is
+used.  In that case, the caller assigns owned and ghost cells to each
+processor.
+
+Also note that this method must be invoked after any *set_*()* methods have
+been used, since they can influence the assignment of owned and ghost
+cells.
+
+.. code-block:: c++
+
+   void setup_grid(int &ixlo, int &ixhi, int &iylo, int &iyhi, int &izlo, int &izhi,
+                   int &oxlo, int &oxhi, int &oylo, int &oyhi, int &ozlo, int &ozhi)
+
+The 6 return arguments which start with "i" are the inclusive lower
+and upper index bounds of the owned (inner) grid cells this processor
+owns in each of the 3 dimensions within the global grid.  Owned grid
+cells are indexed from 0 to N-1 in each dimension.
+
+The 6 return arguments which start with "o" are the inclusive bounds of
+the owned+ghost cells it owns.  If the ghost cells are on the other
+side of a periodic boundary, then these indices may be < 0 or >= N in
+any dimension, so that oxlo <= ixlo and ixhi >= ixhi is always the
+case.
+
+----------
+
+More grid class set methods
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following 2 methods can be used to override settings made by the
+constructors above.  If used, they must be called called before the
+*setup_comm()* method is invoked, since it uses the settings that
+these methods override.  In LAMMPS these methods are called by by the
+:doc:`kspace_style msm <kspace_style>` command for the grids it
+instantiates using the 2nd constructor above.
+
+.. code-block:: c++
+
+   void set_proc_neighs(int pxlo, int pxhi, int pylo, int pyhi, int pzlo, int pzhi)
+   void set_caller_grid(int fxlo, int fxhi, int fylo, int fyhi, int fzlo, int fzhi)
+
+The *set_proc_neighs()* method sets the processor IDs of the 6
+neighboring processors for each processor.  Normally these would match
+the processor grid neighbors which LAMMPS creates to overlay the
+simulation box (the default).  However, MSM excludes non-participating
+processors from coarse grid communication when less processors are
+used.  This method allows MSM to override the default values.
+
+The *set_caller_grid()* method species the size of the data arrays the
+caller allocates.  Normally these would match the extent of the ghost
+grid cells (the default).  However the MSM caller allocates a larger
+data array (more ghost cells) for its finest-level grid, for use in
+other operations besides owned/ghost cell communication.  This method
+allows MSM to override the default values.
+
+
+----------
+
+Grid class get methods
+^^^^^^^^^^^^^^^^^^^^^^
+
+The following methods allow the caller to query the settings for a
+specific grid, whether it created the grid or another command created
+it.
+
+.. code-block:: c++
+
+   void get_size(int &nxgrid, int &nygrid, int &nzgrid);
+   void get_bounds_owned(int &xlo, int &xhi, int &ylo, int &yhi, int &zlo, int &zhi)
+   void get_bounds_ghost(int &xlo, int &xhi, int &ylo, int &yhi, int &zlo, int &zhi)
+
+The *get_size()* method returns the size of the global grid in each dimension.
+
+The *get_bounds_owned()* method return the inclusive index bounds of
+the grid cells this processor owns.  The values range from 0 to N-1 in
+each dimension.  These values are the same as the "i" values returned
+by *setup_grid()*.
+
+The *get_bounds_ghost()* method return the inclusive index bounds of
+the owned+ghost grid cells this processor stores.  The owned cell
+indices range from 0 to N-1, so these indices may be less than 0 or
+greater than or equal to N in each dimension.  These values are the
+same as the "o" values returned by *setup_grid()*.
+
+----------
+
+Grid class owned/ghost communication
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If needed by the command, the following methods setup and perform
+communication of grid data to/from neighboring processors.  The
+*forward_comm()* method sends owned grid cell data to the
+corresponding ghost grid cells on other processors.  The
+*reverse_comm()* method sends ghost grid cell data to the
+corresponding owned grid cells on another processor.  The caller can
+choose to sum ghost grid cell data to the owned grid cell or simply
+copy it.
+
+.. code-block:: c++
+
+   void setup_comm(int &nbuf1, int &nbuf2)
+   void forward_comm(int caller, void *ptr, int which, int nper, int nbyte,
+                     void *buf1, void *buf2, MPI_Datatype datatype);
+   void reverse_comm(int caller, void *ptr, int which, int nper, int nbyte,
+                     void *buf1, void *buf2, MPI_Datatype datatype)
+   int ghost_adjacent();
+
+The *setup_comm()* method must be called one time before performing
+*forward* or *reverse* communication (multiple times if needed).  It
+returns two integers, which should be used to allocate two buffers.
+The *nbuf1* and *nbuf2* values are the number of grid cells whose data
+will be stored in two buffers by the Grid class when *forward* or
+*reverse* communication is performed.  The caller should thus allocate
+them to a size large enough to hold all the data used in any single
+forward or reverse communication operation it performs.  Note that the
+caller may allocate and communicate multiple data arrays for a grid it
+instantiates.  This size includes the bytes needed for the data type
+of the grid data it stores, e.g. double precision values.
+
+The *forward_comm()* and *reverse_comm()* methods send grid cell data
+from owned to ghost cells, or ghost to owned cells, respectively, as
+described above.  The *caller* argument should be one of these values
+-- Grid3d::COMPUTE, Grid3d::FIX, Grid3d::KSPACE, Grid3d::PAIR --
+depending on the style of the caller class.  The *ptr* argument is the
+"this" pointer to the caller class.  These 2 arguments are used to
+call back to pack()/unpack() functions in the caller class, as
+explained below.
+
+The *which* argument is a flag the caller can set which is passed to
+the caller's pack()/unpack() methods.  This allows a single callback
+method to pack/unpack data for several different flavors of
+forward/reverse communication, e.g. operating on different grids or
+grid data.
+
+The *nper* argument is the number of values per grid cell to be
+communicated.  The *nbyte* argument is the number of bytes per value,
+e.g. 8 for double-precision values.  The *buf1* and *buf2* arguments
+are the two allocated buffers described above.  So long as they are
+allocated for the maximum size communication, they can be re-used for
+any *forward_comm()/reverse_comm()* call.  The *datatype* argument is
+the MPI_Datatype setting, which should match the buffer allocation and
+the *nbyte* argument.  E.g. MPI_DOUBLE for buffers storing double
+precision values.
+
+To use the *forward_grid()* method, the caller must provide two
+callback functions; likewise for use of the *reverse_grid()* methods.
+These are the 4 functions, their arguments are all the same.
+
+.. code-block:: c++
+
+   void pack_forward_grid(int which, void *vbuf, int nlist, int *list);
+   void unpack_forward_grid(int which, void *vbuf, int nlist, int *list);
+   void pack_reverse_grid(int which, void *vbuf, int nlist, int *list);
+   void unpack_reverse_grid(int which, void *vbuf, int nlist, int *list);
+
+The *which* argument is set to the *which* value of the
+*forward_comm()* or *reverse_comm()* calls.  It allows the pack/unpack
+function to select what data values to pack/unpack.  *Vbuf* is the
+buffer to pack/unpack the data to/from.  It is a void pointer so that
+the caller can cast it to whatever data type it chooses, e.g. double
+precision values.  *Nlist* is the number of grid cells to pack/unpack
+and *list* is a vector (nlist in length) of offsets to where the data
+for each grid cell resides in the caller's data arrays, which is best
+illustrated with an example from the src/EXTRA-FIX/fix_ttm_grid.cpp
+class which stores the scalar electron temperature for 3d system in a
+3d grid (one value per grid cell):
+
+.. code-block:: c++
+
+   void FixTTMGrid::pack_forward_grid(int /*which*/, void *vbuf, int nlist, int *list)
+   {
+     auto buf = (double *) vbuf;
+     double *src = &T_electron[nzlo_out][nylo_out][nxlo_out];
+     for (int i = 0; i < nlist; i++) buf[i] = src[list[i]];
+   }
+
+In this case, the *which* argument is not used, *vbuf* points to a
+buffer of doubles, and the electron temperature is stored by the
+FixTTMGrid class in a 3d array of owned+ghost cells called T_electron.
+That array is allocated by the *memory->create_3d_offset()* method
+described above so that the first grid cell it stores is indexed as
+T_electron[nzlo_out][nylo_out][nxlo_out].  The *nlist* values in
+*list* are integer offsets from that first grid cell.  Setting *src*
+to the address of the first cell allows those offsets to be used to
+access the temperatures to pack into the buffer.
+
+Here is a similar portion of code from the src/fix_ave_grid.cpp class
+which can store two kinds of data, a scalar count of atoms in a grid
+cell, and one or more grid-cell-averaged atom properties.  The code
+from its *unpack_reverse_grid()* function for 2d grids and multiple
+per-atom properties per grid cell (*nvalues*) is shown here:
+
+.. code-block:: c++
+
+   void FixAveGrid::unpack_reverse_grid(int /*which*/, void *vbuf, int nlist, int *list)
+   {
+     auto buf = (double *) vbuf;
+     double *count,*data,*values;
+     count = &count2d[nylo_out][nxlo_out];
+     data = &array2d[nylo_out][nxlo_out][0];
+     m = 0;
+     for (i = 0; i < nlist; i++) {
+       count[list[i]] += buf[m++];
+       values = &data[nvalues*list[i]];
+       for (j = 0; j < nvalues; j++)
+        values[j] += buf[m++];
+     }
+   }
+
+Both the count and the multiple values per grid cell are communicated
+in *vbuf*.  Note that *data* is now a pointer to the first value in
+the first grid cell.  And *values* points to where the first value in
+*data* is for an offset of grid cells, calculated by multiplying
+*nvalues* by *list[i]*.  Finally, because this is reverse
+communication, the communicated buffer values are summed to the caller
+values.
+
+The *ghost_adjacent()* method returns a 1 if every processor can
+perform the necessary owned/ghost communication with only its nearest
+neighbor processors (4 in 2d, 6 in 3d).  It returns a 0 if any
+processor's ghost cells extend further than nearest neighbor
+processors.
+
+This can be checked by callers who have the option to change the
+global grid size to ensure more efficient nearest-neighbor-only
+communication if they wish.  In this case, they instantiate a grid of
+a given size (resolution), then invoke *setup_comm()* followed by
+*ghost_adjacent()*.  If the ghost cells are not adjacent, they destroy
+the grid instance and start over with a higher-resolution grid.
+Several of the :doc:`kspace_style pppm <kspace_style>` command
+variants have this option.
+
+----------
+
+Grid class remap methods for load balancing
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following methods are used when a load-balancing operation,
+triggered by the :doc:`balance <balance>` or :doc:`fix balance
+<fix_balance>` commands, changes the partitioning of the simulation
+domain into processor subdomains.
+
+In order to work with load-balancing, any style command (compute, fix,
+pair, or kspace style) which allocates a grid and stores per-grid data
+should define a *reset_grid()* method; it takes no arguments.  It will
+be called by the two balance commands after they have reset processor
+subdomains and migrated atoms (particles) to new owning processors.
+The *reset_grid()* method will typically perform some or all of the
+following operations.  See the src/fix_ave_grid.cpp and
+src/EXTRA_FIX/fix_ttm_grid.cpp files for examples of *reset_grid()*
+methods, as well as the *pack_remap_grid()* and *unpack_remap_grid()*
+functions.
+
+First, the *reset_grid()* method can instantiate new grid(s) of the
+same global size, then call *setup_grid()* to partition them via the
+new processor subdomains.  At this point, it can invoke the
+*identical()* method which compares the owned and ghost grid cell
+index bounds between two grids, the old grid passed as a pointer
+argument, and the new grid whose *identical()* method is being called.
+It returns 1 if the indices match on all processors, otherwise 0.  If
+they all match, then the new grids can be deleted; the command can
+continue to use the old grids.
+
+If not, then the command should allocate new grid data array(s) which
+depend on the new partitioning.  If the command does not need to
+persist its grid data from the old partitioning to the new one, then
+the command can simply delete the old data array(s) and grid
+instance(s).  It can then return.
+
+If the grid data does need to persist, then the data for each grid
+needs to be "remapped" from the old grid partitioning to the new grid
+partitioning.  The *setup_remap()* and *remap()* methods are used for
+that purpose.
+
+.. code-block:: c++
+
+   int identical(Grid3d *old);
+   void setup_remap(Grid3d *old, int &nremap_buf1, int &nremap_buf2)
+   void remap(int caller, void *ptr, int which, int nper, int nbyte,
+              void *buf1, void *buf2, MPI_Datatype datatype)
+
+The arguments to these methods are identical to those for
+the *setup_comm()* and *forward_comm()* or *reverse_comm()* methods.
+However the returned *nremap_buf1* and *nremap2_buf* values will be
+different than the *nbuf1* and *nbuf2* values.  They should be used to
+allocate two different remap buffers, separate from the owned/ghost
+communication buffers.
+
+To use the *remap()* method, the caller must provide two
+callback functions:
+
+.. code-block:: c++
+
+   void pack_remap_grid(int which, void *vbuf, int nlist, int *list);
+   void unpack_remap_grid(int which, void *vbuf, int list, int *list);
+
+Their arguments are identical to those for the *pack_forward_grid()*
+and *unpack_forward_grid()* callback functions (or the reverse
+variants) discussed above.  Normally, both these methods pack/unpack
+all the data arrays for a given grid.  The *which* argument of the
+*remap()* method sets the *which* value for the pack/unpack functions.
+If the command instantiates multiple grids (of different sizes), it
+can be used within the pack/unpack methods to select which grid's data
+is being remapped.
+
+Note that the *pack_remap_grid()* function must copy values from the
+OLD grid data arrays into the *vbuf* buffer. The *unpack_remap_grid()*
+function must copy values from the *vbuf* buffer into the NEW grid
+data arrays.
+
+After the remap operation for grid cell data has been performed, the
+*reset_grid()* method can deallocate the two remap buffers it created,
+and can then exit.
+
+----------
+
+Grid class I/O methods
+^^^^^^^^^^^^^^^^^^^^^^
+
+There are two I/O methods in the Grid classes which can be used to
+read and write grid cell data to files.  The caller can decide on the
+precise format of each file, e.g. whether header lines are prepended
+or comment lines are allowed.  Fundamentally, the file should contain
+one line per grid cell for the entire global grid.  Each line should
+contain identifying info as to which grid cell it is, e.g. a unique
+grid cell ID or the ix,iy,iz indices of the cell within a 3d grid.
+The line should also contain one or more data values which are stored
+within the grid data arrays created by the command
+
+For grid cell IDs, the LAMMPS convention is that the IDs run from 1 to
+N, where N = Nx * Ny for 2d grids and N = Nx * Ny * Nz for 3d grids.
+The x-index of the grid cell varies fastest, then y, and the z-index
+varies slowest.  So for a 10x10x10 grid the cell IDs from 901-1000
+would be in the top xy layer of the z dimension.
+
+The *read_file()* method does something simple.  It reads a chunk of
+consecutive lines from the file and passes them back to the caller to
+process.  The caller provides a *unpack_read_grid()* function for this
+purpose.  The function checks the grid cell ID or indices and only
+stores grid cell data for the grid cells it owns.
+
+The *write_file()* method does something slightly more complex.  Each
+processor packs the data for its owned grid cells into a buffer.  The
+caller provides a *pack_write_grid()* function for this purpose.  The
+*write_file()* method then loops over all processors and each sends
+its buffer one at a time to processor 0, along with the 3d (or 2d)
+index bounds of its grid cell data within the global grid.  Processor
+0 calls back to the *unpack_write_grid()* function provided by the
+caller with the buffer.  The function writes one line per grid cell to
+the file.
+
+See the src/EXTRA_FIX/fix_ttm_grid.cpp file for examples of now both
+these methods are used to read/write electron temperature values
+from/to a file, as well as for implementations of the the pack/unpack
+functions described below.
+
+Here are the details of the two I/O methods and the 3 callback
+functions.  See the src/fix_ave_grid.cpp file for examples of all of
+them.
+
+.. code-block:: c++
+
+   void read_file(int caller, void *ptr, FILE *fp, int nchunk, int maxline)
+   void write_file(int caller, void *ptr, int which,
+                   int nper, int nbyte, MPI_Datatype datatype
+
+The *caller* argument in both methods should be one of these values --
+Grid3d::COMPUTE, Grid3d::FIX, Grid3d::KSPACE, Grid3d::PAIR --
+depending on the style of the caller class.  The *ptr* argument in
+both methods is the "this" pointer to the caller class.  These 2
+arguments are used to call back to pack()/unpack() functions in the
+caller class, as explained below.
+
+For the *read_file()* method, the *fp* argument is a file pointer to
+the file to be read from, opened on processor 0 by the caller.
+*Nchunk* is the number of lines to read per chunk, and *maxline* is
+the maximum number of characters per line.  The Grid class will
+allocate a buffer for storing chunks of lines based on these values.
+
+For the *write_file()* method, the *which* argument is a flag the
+caller can set which is passed back to the caller's pack()/unpack()
+methods.  If the command instantiates multiple grids (of different
+sizes), this flag can be used within the pack/unpack methods to select
+which grid's data is being written out (presumably to different
+files).  the *nper* argument is the number of values per grid cell to
+be written out.  The *nbyte* argument is the number of bytes per
+value, e.g. 8 for double-precision values.  The *datatype* argument is
+the MPI_Datatype setting, which should match the *nbyte* argument.
+E.g. MPI_DOUBLE for double precision values.
+
+To use the *read_grid()* method, the caller must provide one callback
+function.  To use the *write_grid()* method, it provides two callback
+functions:
+
+.. code-block:: c++
+
+   int unpack_read_grid(int nlines, char *buffer)
+   void pack_write_grid(int which, void *vbuf)
+   void unpack_write_grid(int which, void *vbuf, int *bounds)
+
+For *unpack_read_grid()* the *nlines* argument is the number of lines
+of character data read from the file and contained in *buffer*.  The
+lines each include a newline character at the end.  When the function
+processes the lines, it may choose to skip some of them (header or
+comment lines).  It returns an integer count of the number of grid
+cell lines it processed.  This enables the Grid class *read_file()*
+method to know when it has read the correct number of lines.
+
+For *pack_write_grid()* and *unpack_write_grid()*, the *vbuf* argument
+is the buffer to pack/unpack data to/from.  It is a void pointer so
+that the caller can cast it to whatever data type it chooses,
+e.g. double precision values.  the *which* argument is set to the
+*which* value of the *write_file()* method.  It allows the caller to
+choose which grid data to operate on.
+
+For *unpack_write_grid()*, the *bounds* argument is a vector of 4 or 6
+integer grid indices (4 for 2d, 6 for 3d).  They are the
+xlo,xhi,ylo,yhi,zlo,zhi index bounds of the portion of the global grid
+which the *vbuf* holds owned grid cell data values for.  The caller
+should loop over the values in *vbuf* with a double loop (2d) or
+triple loop (3d), similar to the code snippets listed above.  The
+x-index varies fastest, then y, and the z-index slowest.  If there are
+multiple values per grid cell, the index for those values varies
+fastest of all.  The caller can add the x,y,z indices of the grid cell
+(or the corresponding grid cell ID) to the data value(s) written as
+one line to the output file.
+
+----------
+
+Style class grid access methods
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A style command can enable its grid cell data to be accessible from
+other commands.  For example :doc:`fix ave/grid <fix_ave_grid>` or
+:doc:`dump grid <dump>` or :doc:`dump grid/vtk <dump>`.  Those
+commands access the grid cell data by using a *grid reference* in
+their input script syntax, as described on the :doc:`Howto_grid
+<Howto_grid>` doc page.  They look like this:
+
+* c_ID:gname:dname
+* c_ID:gname:dname[I]
+* f_ID:gname:dname
+* f_ID:gname:dname[I]
+
+Each grid command instantiates has a unique *gname*, defined by the
+command.  Likewise each grid cell data structure (scalar or vector)
+associated with a grid has a unique *dname*, also defined by the
+command.
+
+To provide access to its grid cell data, a style command needs to
+implement the following 4 methods:
+
+.. code-block:: c++
+
+   int get_grid_by_name(const std::string &name, int &dim);
+   void *get_grid_by_index(int index);
+   int get_griddata_by_name(int igrid, const std::string &name, int &ncol);
+   void *get_griddata_by_index(int index);
+
+Currently only computes and fixes can implement these methods.  If it
+does so, the compute of fix should also set the variable
+*pergrid_flag* to 1.  See any of the compute or fix commands which set
+"pergrid_flag = 1" for examples of how these 4 functions can be
+implemented.
+
+The *get_grid_by_name()* method takes a grid name as input and returns
+two values.  The *dim* argument is returned as 2 or 3 for the
+dimensionality of the grid.  The function return is a grid index from
+0 to G-1 where *G* is the number of grids the command instantiates.  A
+value of -1 is returned if the grid name is not recognized.
+
+The *get_grid_by_index()* method is called after the
+*get_grid_by_name()* method, using the grid index it returned as its
+argument.  This method will return a pointer to the Grid2d or Grid3d
+class.  The caller can use this to query grid attributes, such as the
+global size of the grid, to ensure it is of the expected size.
+
+The *get_griddata_by_name()* method takes a grid index *igrid* and a
+data name as input.  It returns two values.  The *ncol* argument is
+returned as a 0 if the grid data is a single value (scalar) per grid
+cell, or an integer M > 0 if there are M values (vector) per grid
+cell.  Note that even if M = 1, it is still a 1-length vector, not a
+scalar.  The function return is a data index from 0 to D-1 where *D*
+is the number of data sets associated with that grid by the command.
+A value of -1 is returned if the data name is not recognized.
+
+The *get_griddata_by_index()* method is called after the
+*get_griddata_by_name()* method, using the data index it returned as
+its argument.  This method will return a pointer to the
+multidimensional array which stores the requested data.
+
+As in the discussion above of the Memory class *create_offset()*
+methods, the dimensionality of the array associated with the returned
+pointer depends on whether it is a 2d or 3d grid and whether there is
+a single or multiple values stored for each grid cell:
+
+* single value per cell for a 2d grid = 2d array pointer
+* multiple values per cell for a 2d grid = 3d array pointer
+* single value per cell for a 3d grid = 3d array pointer
+* multiple values per cell for a 3d grid = 4d array pointer
+
+The caller will typically access the data by casting the void pointer
+to the corresponding array pointer and using nested loops in x,y,z
+between owned or ghost index bounds returned by the
+*get_bounds_owned()* or *get_bounds_ghost()* methods to index into the
+array.  Example code snippets with this logic were listed above,
+
+----------
+
+Final notes
+^^^^^^^^^^^
+
+Finally, here are some additional issues to pay attention to for
+writing any style command which uses distributed grids via the Grid2d
+or Grid3d class.
+
+The command destructor should delete all instances of the Grid class,
+any buffers it allocated for forward/reverse or remap communication,
+and any data arrays it allocated to store grid cell data.
+
+If a command is intended to work for either 2d or 3d simulations, then
+it should have logic to instantiate either 2d or 3d grids and their
+associated data arrays, depending on the dimension of the simulation
+box.  The :doc:`fix ave/grid <fix_ave_grid>` command is an example of
+such a command.
+
+When a command maps its particles to the grid and updates grid cell
+values, it should check that it is not updating or accessing a grid
+cell value outside the range of its owned+ghost cells, and generate an
+error message if that is the case.  This could happen, for example, if
+a particle has moved further than half the neighbor skin distance,
+because the neighbor list update criterion are not adequate to prevent
+it from happening.  See the src/KSPACE/pppm.cpp file and its
+*particle_map()* method for an example of this kind of error check.

doc/src/Developer_notes.rst

@@ -11,6 +11,7 @@ Available topics are:
 
 - `Reading and parsing of text and text files`_
 - `Requesting and accessing neighbor lists`_
+- `Choosing between a custom atom style, fix property/atom, and fix STORE/ATOM`_
 - `Fix contributions to instantaneous energy, virial, and cumulative energy`_
 - `KSpace PPPM FFT grids`_
 
@@ -73,6 +74,8 @@ when converting "12.5", while the ValueTokenizer class will throw an
 :cpp:func:`ValueTokenizer::next_int()
 <LAMMPS_NS::ValueTokenizer::next_int>` is called on the same string.
 
+.. _request-neighbor-list:
+
 Requesting and accessing neighbor lists
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -102,7 +105,7 @@ build is then :doc:`processed in parallel <Developer_par_neigh>`.
 The most commonly required neighbor list is a so-called "half" neighbor
 list, where each pair of atoms is listed only once (except when the
 :doc:`newton command setting <newton>` for pair is off; in that case
-pairs straddling sub-domains or periodic boundaries will be listed twice).
+pairs straddling subdomains or periodic boundaries will be listed twice).
 Thus these are the default settings when a neighbor list request is created in:
 
 .. code-block:: c++
@@ -216,6 +219,30 @@ command:
 
    neighbor->add_request(this, "delete_atoms", NeighConst::REQ_FULL);
 
+Choosing between a custom atom style, fix property/atom, and fix STORE/ATOM
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There are multiple ways to manage per-atom data within LAMMPS.  Often
+the per-atom storage is only used locally and managed by the class that
+uses it.  If the data has to persist between multiple time steps and
+migrate with atoms when they move from sub-domain to sub-domain or
+across periodic boundaries, then using a custom atom style, or :doc:`fix
+property/atom <fix_property_atom>`, or the internal fix STORE/ATOM are
+possible options.
+
+- Using the atom style is usually the most programming effort and mostly
+  needed when the per-atom data is an integral part of the model like a
+  per-atom charge or diameter and thus should be part of the Atoms
+  section of a :doc:`data file <read_data>`.
+
+- Fix property/atom is useful if the data is optional or should be
+  entered by the user, or accessed as a (named) custom property. In this
+  case the fix should be entered as part of the input (and not
+  internally) which allows to enter and store its content with data files.
+
+- Fix STORE/ATOM should be used when the data should be accessed internally
+  only and thus the fix can be created internally.
+
 Fix contributions to instantaneous energy, virial, and cumulative energy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -361,7 +388,7 @@ allocated as a 1d vector or 3d array.  Either way, the ordering of
 values within contiguous memory x fastest, then y, z slowest.
 
 For the ``3d decomposition`` of the grid, the global grid is
-partitioned into bricks that correspond to the sub-domains of the
+partitioned into bricks that correspond to the subdomains of the
 simulation box that each processor owns.  Often, this is a regular 3d
 array (Px by Py by Pz) of bricks, where P = number of processors =
 Px * Py * Pz.  More generally it can be a tiled decomposition, where

doc/src/Developer_org.rst

@@ -7,7 +7,7 @@ but there are small a number of files in several other languages like C,
 Fortran, Shell script, or Python.
 
 The core of the code is located in the ``src`` folder and its
-sub-directories.  A sizable number of these files are in the ``src``
+subdirectories.  A sizable number of these files are in the ``src``
 directory itself, but there are plenty of :doc:`packages <Packages>`,
 which can be included or excluded when LAMMPS is built.  See the
 :doc:`Include packages in build <Build_package>` section of the manual
@@ -15,42 +15,42 @@ for more information about that part of the build process.  LAMMPS
 currently supports building with :doc:`conventional makefiles
 <Build_make>` and through :doc:`CMake <Build_cmake>`.  Those procedures
 differ in how packages are enabled or disabled for inclusion into a
-LAMMPS binary so they cannot be mixed.  The source files for each
-package are in all-uppercase sub-directories of the ``src`` folder, for
+LAMMPS binary, so they cannot be mixed.  The source files for each
+package are in all-uppercase subdirectories of the ``src`` folder, for
 example ``src/MOLECULE`` or ``src/EXTRA-MOLECULE``.  The ``src/STUBS``
-sub-directory is not a package but contains a dummy MPI library, that is
+subdirectory is not a package but contains a dummy MPI library, that is
 used when building a serial version of the code. The ``src/MAKE``
-directory and its sub-directories contain makefiles with settings and
+directory and its subdirectories contain makefiles with settings and
 flags for a variety of configuration and machines for the build process
 with traditional makefiles.
 
 The ``lib`` directory contains the source code for several supporting
 libraries or files with configuration settings to use globally installed
-libraries, that are required by some of the optional packages.  They may
+libraries, that are required by some optional packages.  They may
 include python scripts that can transparently download additional source
-code on request.  Each sub-directory, like ``lib/poems`` or ``lib/gpu``,
+code on request.  Each subdirectory, like ``lib/poems`` or ``lib/gpu``,
 contains the source files, some of which are in different languages such
-as Fortran or CUDA. These libraries included in the LAMMPS build,
-if the corresponding package is installed.
+as Fortran or CUDA. These libraries included in the LAMMPS build, if the
+corresponding package is installed.
 
 LAMMPS C++ source files almost always come in pairs, such as
 ``src/run.cpp`` (implementation file) and ``src/run.h`` (header file).
 Each pair of files defines a C++ class, for example the
-:cpp:class:`LAMMPS_NS::Run` class which contains the code invoked by the
-:doc:`run <run>` command in a LAMMPS input script.  As this example
+:cpp:class:`LAMMPS_NS::Run` class, which contains the code invoked by
+the :doc:`run <run>` command in a LAMMPS input script.  As this example
 illustrates, source file and class names often have a one-to-one
 correspondence with a command used in a LAMMPS input script.  Some
 source files and classes do not have a corresponding input script
-command, e.g. ``src/force.cpp`` and the :cpp:class:`LAMMPS_NS::Force`
+command, for example ``src/force.cpp`` and the :cpp:class:`LAMMPS_NS::Force`
 class.  They are discussed in the next section.
 
 The names of all source files are in lower case and may use the
-underscore character '_' to separate words. Outside of bundled libraries
-which may have different conventions, all C and C++ header files have a
-``.h`` extension, all C++ files have a ``.cpp`` extension, and C files a
-``.c`` extension. A small number of C++ classes and utility functions
-are implemented with only a ``.h`` file. Examples are the Pointers and
-Commands classes or the MathVec functions.
+underscore character '_' to separate words. Apart from bundled,
+externally maintained libraries, which may have different conventions,
+all C and C++ header files have a ``.h`` extension, all C++ files have a
+``.cpp`` extension, and C files a ``.c`` extension.  A few C++ classes
+and utility functions are implemented with only a ``.h`` file. Examples
+are the Pointers and Commands classes or the MathVec functions.
 
 Class topology
 --------------
@@ -62,35 +62,36 @@ associated source files in the ``src`` folder, for example the class
 :cpp:class:`LAMMPS_NS::Memory` corresponds to the files ``memory.cpp``
 and ``memory.h``, or the class :cpp:class:`LAMMPS_NS::AtomVec`
 corresponds to the files ``atom_vec.cpp`` and ``atom_vec.h``.  Full
-lines in the figure represent compositing: that is the class at the base
-of the arrow holds a pointer to an instance of the class at the tip.
-Dashed lines instead represent inheritance: the class to the tip of the
-arrow is derived from the class at the base.  Classes with a red boundary
-are not instantiated directly, but they represent the base classes for
-"styles".  Those "styles" make up the bulk of the LAMMPS code and only
-a few representative examples are included in the figure so it remains
-readable.
+lines in the figure represent compositing: that is, the class at the
+base of the arrow holds a pointer to an instance of the class at the
+tip.  Dashed lines instead represent inheritance: the class at the tip
+of the arrow is derived from the class at the base.  Classes with a red
+boundary are not instantiated directly, but they represent the base
+classes for "styles".  Those "styles" make up the bulk of the LAMMPS
+code and only a few representative examples are included in the figure,
+so it remains readable.
 
 .. _class-topology:
 .. figure:: JPG/lammps-classes.png
 
    LAMMPS class topology
 
-   This figure shows some of the relations of the base classes of the
-   LAMMPS simulation package.  Full lines indicate that a class holds an
-   instance of the class it is pointing to; dashed lines point to
-   derived classes that are given as examples of what classes may be
-   instantiated during a LAMMPS run based on the input commands and
-   accessed through the API define by their respective base classes.  At
-   the core is the :cpp:class:`LAMMPS <LAMMPS_NS::LAMMPS>` class, which
-   holds pointers to class instances with specific purposes.  Those may
-   hold instances of other classes, sometimes directly, or only
-   temporarily, sometimes as derived classes or derived classes of
-   derived classes, which may also hold instances of other classes.
+      This figure shows relations of base classes of the LAMMPS
+      simulation package.  Full lines indicate that a class holds an
+      instance of the class it is pointing to; dashed lines point to
+      derived classes that are given as examples of what classes may be
+      instantiated during a LAMMPS run based on the input commands and
+      accessed through the API define by their respective base classes.
+      At the core is the :cpp:class:`LAMMPS <LAMMPS_NS::LAMMPS>` class,
+      which holds pointers to class instances with specific purposes.
+      Those may hold instances of other classes, sometimes directly, or
+      only temporarily, sometimes as derived classes or derived classes
+      of derived classes, which may also hold instances of other
+      classes.
 
 The :cpp:class:`LAMMPS_NS::LAMMPS` class is the topmost class and
-represents what is generally referred to an "instance" of LAMMPS.  It is
-a composite holding pointers to instances of other core classes
+represents what is generally referred to as an "instance of LAMMPS".  It
+is a composite holding pointers to instances of other core classes
 providing the core functionality of the MD engine in LAMMPS and through
 them abstractions of the required operations.  The constructor of the
 LAMMPS class will instantiate those instances, process the command line
@@ -102,42 +103,44 @@ LAMMPS while passing it the command line flags and input script. It
 deletes the LAMMPS instance after the method reading the input returns
 and shuts down the MPI environment before it exits the executable.
 
-The :cpp:class:`LAMMPS_NS::Pointers` is not shown in the
+The :cpp:class:`LAMMPS_NS::Pointers` class is not shown in the
 :ref:`class-topology` figure for clarity.  It holds references to many
 of the members of the `LAMMPS_NS::LAMMPS`, so that all classes derived
 from :cpp:class:`LAMMPS_NS::Pointers` have direct access to those
-reference.  From the class topology all classes with blue boundary are
+references.  From the class topology all classes with blue boundary are
 referenced in the Pointers class and all classes in the second and third
-columns, that are not listed as derived classes are instead derived from
-:cpp:class:`LAMMPS_NS::Pointers`.  To initialize the pointer references
-in Pointers, a pointer to the LAMMPS class instance needs to be passed
-to the constructor and thus all constructors for classes derived from it
-must do so and pass this pointer to the constructor for Pointers.
+columns, that are not listed as derived classes, are instead derived
+from :cpp:class:`LAMMPS_NS::Pointers`.  To initialize the pointer
+references in Pointers, a pointer to the LAMMPS class instance needs to
+be passed to the constructor. All constructors for classes derived from
+it, must do so and thus pass that pointer to the constructor for
+:cpp:class:`LAMMPS_NS::Pointers`.  The default constructor for
+:cpp:class:`LAMMPS_NS::Pointers` is disabled to enforce this.
 
 Since all storage is supposed to be encapsulated (there are a few
 exceptions), the LAMMPS class can also be instantiated multiple times by
-a calling code.  Outside of the aforementioned exceptions, those LAMMPS
+a calling code.  Outside the aforementioned exceptions, those LAMMPS
 instances can be used alternately.  As of the time of this writing
-(early 2021) LAMMPS is not yet sufficiently thread-safe for concurrent
+(early 2023) LAMMPS is not yet sufficiently thread-safe for concurrent
 execution.  When running in parallel with MPI, care has to be taken,
 that suitable copies of communicators are used to not create conflicts
 between different instances.
 
-The LAMMPS class currently (early 2021) holds instances of 19 classes
-representing the core functionality.  There are a handful of virtual
-parent classes in LAMMPS that define what LAMMPS calls ``styles``.  They
-are shaded red in the :ref:`class-topology` figure.  Each of these are
-parents of a number of child classes that implement the interface
-defined by the parent class.  There are two main categories of these
-``styles``: some may only have one instance active at a time (e.g. atom,
-pair, bond, angle, dihedral, improper, kspace, comm) and there is a
-dedicated pointer variable for each of them in the composite class.
+The LAMMPS class currently holds instances of 19 classes representing
+the core functionality.  There are a handful of virtual parent classes
+in LAMMPS that define what LAMMPS calls ``styles``.  These are shaded
+red in the :ref:`class-topology` figure.  Each of these are parents of a
+number of child classes that implement the interface defined by the
+parent class.  There are two main categories of these ``styles``: some
+may only have one instance active at a time (e.g. atom, pair, bond,
+angle, dihedral, improper, kspace, comm) and there is a dedicated
+pointer variable for each of them in the corresponding composite class.
 Setups that require a mix of different such styles have to use a
-*hybrid* class that takes the place of the one allowed instance and then
-manages and forwards calls to the corresponding sub-styles for the
-designated subset of atoms or data.  The composite class may also have
-lists of class instances, e.g. Modify handles lists of compute and fix
-styles, while Output handles a list of dump class instances.
+*hybrid* class instance that acts as a proxy, and manages and forwards
+calls to the corresponding sub-style class instances for the designated
+subset of atoms or data.  The composite class may also have lists of
+class instances, e.g. ``Modify`` handles lists of compute and fix
+styles, while ``Output`` handles a list of dump class instances.
 
 The exception to this scheme are the ``command`` style classes.  These
 implement specific commands that can be invoked before, after, or in
@@ -146,19 +149,19 @@ command() method called and then, after completion, the class instance
 deleted.  Examples for this are the create_box, create_atoms, minimize,
 run, set, or velocity command styles.
 
-For all those ``styles`` certain naming conventions are employed: for
+For all those ``styles``, certain naming conventions are employed: for
 the fix nve command the class is called FixNVE and the source files are
-``fix_nve.h`` and ``fix_nve.cpp``. Similarly for fix ave/time we have
+``fix_nve.h`` and ``fix_nve.cpp``. Similarly, for fix ave/time we have
 FixAveTime and ``fix_ave_time.h`` and ``fix_ave_time.cpp``.  Style names
 are lower case and without spaces or special characters. A suffix or
 words are appended with a forward slash '/' which denotes a variant of
 the corresponding class without the suffix.  To connect the style name
 and the class name, LAMMPS uses macros like: ``AtomStyle()``,
 ``PairStyle()``, ``BondStyle()``, ``RegionStyle()``, and so on in the
-corresponding header file.  During configuration or compilation files
+corresponding header file.  During configuration or compilation, files
 with the pattern ``style_<name>.h`` are created that consist of a list
 of include statements including all headers of all styles of a given
-type that are currently active (or "installed).
+type that are currently enabled (or "installed").
 
 
 More details on individual classes in the :ref:`class-topology` are as
@@ -172,8 +175,8 @@ follows:
   that one or multiple simulations can be run, on the processors
   allocated for a run, e.g. by the mpirun command.
 
-- The Input class reads and processes input input strings and files,
-  stores variables, and invokes :doc:`commands <Commands_all>`.
+- The Input class reads and processes input (strings and files), stores
+  variables, and invokes :doc:`commands <Commands_all>`.
 
 - Command style classes are derived from the Command class. They provide
   input script commands that perform one-time operations
@@ -192,7 +195,7 @@ follows:
 - The Atom class stores per-atom properties associated with atom styles.
   More precisely, they are allocated and managed by a class derived from
   the AtomVec class, and the Atom class simply stores pointers to them.
-  The classes derived from AtomVec represent the different atom styles
+  The classes derived from AtomVec represent the different atom styles,
   and they are instantiated through the :doc:`atom_style <atom_style>`
   command.
 
@@ -206,18 +209,22 @@ follows:
   class stores a single list (for all atoms).  A NeighRequest class
   instance is created by pair, fix, or compute styles when they need a
   particular kind of neighbor list and use the NeighRequest properties
-  to select the neighbor list settings for the given request. There can
-  be multiple instances of the NeighRequest class and the Neighbor class
-  will try to optimize how they are computed by creating copies or
-  sub-lists where possible.
+  to select the neighbor list settings for the given request.  There can
+  be multiple instances of the NeighRequest class. The Neighbor class
+  will try to optimize how the requests are processed.  Depending on the
+  NeighRequest properties, neighbor lists are constructed from scratch,
+  aliased, or constructed by post-processing an existing list into
+  sub-lists.
 
 - The Comm class performs inter-processor communication, typically of
   ghost atom information.  This usually involves MPI message exchanges
   with 6 neighboring processors in the 3d logical grid of processors
   mapped to the simulation box. There are two :doc:`communication styles
-  <comm_style>` enabling different ways to do the domain decomposition.
-  Sometimes the Irregular class is used, when atoms may migrate to
-  arbitrary processors.
+  <comm_style>`, enabling different ways to perform the domain
+  decomposition.
+
+- The Irregular class is used, when atoms may migrate to arbitrary
+  processors.
 
 - The Domain class stores the simulation box geometry, as well as
   geometric Regions and any user definition of a Lattice.  The latter
@@ -246,7 +253,7 @@ follows:
   file, dump file snapshots, and restart files.  These correspond to the
   :doc:`Thermo <thermo_style>`, :doc:`Dump <dump>`, and
   :doc:`WriteRestart <write_restart>` classes respectively.  The Dump
-  class is a base class with several derived classes implementing
+  class is a base class, with several derived classes implementing
   various dump style variants.
 
 - The Timer class logs timing information, output at the end

doc/src/Developer_par_comm.rst

@@ -1,22 +1,22 @@
 Communication
 ^^^^^^^^^^^^^
 
-Following the partitioning scheme in use all per-atom data is
+Following the selected partitioning scheme, all per-atom data is
 distributed across the MPI processes, which allows LAMMPS to handle very
 large systems provided it uses a correspondingly large number of MPI
 processes.  Since The per-atom data (atom IDs, positions, velocities,
-types, etc.)  To be able to compute the short-range interactions MPI
-processes need not only access to data of atoms they "own" but also
-information about atoms from neighboring sub-domains, in LAMMPS referred
+types, etc.)  To be able to compute the short-range interactions, MPI
+processes need not only access to the data of atoms they "own" but also
+information about atoms from neighboring subdomains, in LAMMPS referred
 to as "ghost" atoms.  These are copies of atoms storing required
 per-atom data for up to the communication cutoff distance. The green
 dashed-line boxes in the :ref:`domain-decomposition` figure illustrate
-the extended ghost-atom sub-domain for one processor.
+the extended ghost-atom subdomain for one processor.
 
 This approach is also used to implement periodic boundary
 conditions: atoms that lie within the cutoff distance across a periodic
 boundary are also stored as ghost atoms and taken from the periodic
-replication of the sub-domain, which may be the same sub-domain, e.g. if
+replication of the subdomain, which may be the same subdomain, e.g. if
 running in serial.  As a consequence of this, force computation in
 LAMMPS is not subject to minimum image conventions and thus cutoffs may
 be larger than half the simulation domain.
@@ -28,10 +28,10 @@ be larger than half the simulation domain.
    ghost atom communication
 
    This figure shows the ghost atom communication patterns between
-   sub-domains for "brick" (left) and "tiled" communication styles for
+   subdomains for "brick" (left) and "tiled" communication styles for
    2d simulations.  The numbers indicate MPI process ranks.  Here the
-   sub-domains are drawn spatially separated for clarity.  The
-   dashed-line box is the extended sub-domain of processor 0 which
+   subdomains are drawn spatially separated for clarity.  The
+   dashed-line box is the extended subdomain of processor 0 which
    includes its ghost atoms.  The red- and blue-shaded boxes are the
    regions of communicated ghost atoms.
 
@@ -42,7 +42,7 @@ atom communication is performed in two stages for a 2d simulation (three
 in 3d) for both a regular and irregular partitioning of the simulation
 box.  For the regular case (left) atoms are exchanged first in the
 *x*-direction, then in *y*, with four neighbors in the grid of processor
-sub-domains.
+subdomains.
 
 In the *x* stage, processor ranks 1 and 2 send owned atoms in their
 red-shaded regions to rank 0 (and vice versa).  Then in the *y* stage,
@@ -55,11 +55,11 @@ For the irregular case (right) the two stages are similar, but a
 processor can have more than one neighbor in each direction.  In the
 *x* stage, MPI ranks 1,2,3 send owned atoms in their red-shaded regions to
 rank 0 (and vice versa).  These include only atoms between the lower
-and upper *y*-boundary of rank 0's sub-domain.  In the *y* stage, ranks
+and upper *y*-boundary of rank 0's subdomain.  In the *y* stage, ranks
 4,5,6 send atoms in their blue-shaded regions to rank 0.  This may
 include ghost atoms they received in the *x* stage, but only if they
 are needed by rank 0 to fill its extended ghost atom regions in the
-+/-*y* directions (blue rectangles).  Thus in this case, ranks 5 and
++/-*y* directions (blue rectangles).  Thus, in this case, ranks 5 and
 6 do not include ghost atoms they received from each other (in the *x*
 stage) in the atoms they send to rank 0.  The key point is that while
 the pattern of communication is more complex in the irregular
@@ -78,14 +78,14 @@ A "reverse" communication is when computed ghost atom attributes are
 sent back to the processor who owns the atom.  This is used (for
 example) to sum partial forces on ghost atoms to the complete force on
 owned atoms.  The order of the two stages described in the
-:ref:`ghost-atom-comm` figure is inverted and the same lists of atoms
+:ref:`ghost-atom-comm` figure is inverted, and the same lists of atoms
 are used to pack and unpack message buffers with per-atom forces.  When
 a received buffer is unpacked, the ghost forces are summed to owned atom
 forces.  As in forward communication, forces on atoms in the four blue
 corners of the diagrams are sent, received, and summed twice (once at
 each stage) before owning processors have the full force.
 
-These two operations are used many places within LAMMPS aside from
+These two operations are used in many places within LAMMPS aside from
 exchange of coordinates and forces, for example by manybody potentials
 to share intermediate per-atom values, or by rigid-body integrators to
 enable each atom in a body to access body properties.  Here are
@@ -105,16 +105,16 @@ performed in LAMMPS:
   atom pairs when building neighbor lists or computing forces.
 
 - The cutoff distance for exchanging ghost atoms is typically equal to
-  the neighbor cutoff.  But it can also chosen to be longer if needed,
+  the neighbor cutoff.  But it can also set to a larger value if needed,
   e.g. half the diameter of a rigid body composed of multiple atoms or
   over 3x the length of a stretched bond for dihedral interactions.  It
   can also exceed the periodic box size.  For the regular communication
   pattern (left), if the cutoff distance extends beyond a neighbor
-  processor's sub-domain, then multiple exchanges are performed in the
+  processor's subdomain, then multiple exchanges are performed in the
   same direction.  Each exchange is with the same neighbor processor,
   but buffers are packed/unpacked using a different list of atoms. For
-  forward communication, in the first exchange a processor sends only
+  forward communication, in the first exchange, a processor sends only
   owned atoms.  In subsequent exchanges, it sends ghost atoms received
   in previous exchanges.  For the irregular pattern (right) overlaps of
-  a processor's extended ghost-atom sub-domain with all other processors
+  a processor's extended ghost-atom subdomain with all other processors
   in each dimension are detected.

doc/src/Developer_par_long.rst

@@ -20,7 +20,7 @@ e) electric field values from grid points near each atom are interpolated to com
 
 For any of the spatial-decomposition partitioning schemes each processor
 owns the brick-shaped portion of FFT grid points contained within its
-sub-domain.  The two interpolation operations use a stencil of grid
+subdomain.  The two interpolation operations use a stencil of grid
 points surrounding each atom.  To accommodate the stencil size, each
 processor also stores a few layers of ghost grid points surrounding its
 brick.  Forward and reverse communication of grid point values is
@@ -40,31 +40,31 @@ orthogonal boxes.
 
 .. _fft-parallel:
 .. figure:: img/fft-decomp-parallel.png
-   :align: center
 
-   parallel FFT in PPPM
+   Parallel FFT in PPPM
 
-   Stages of a parallel FFT for a simulation domain overlaid
-   with an 8x8x8 3d FFT grid, partitioned across 64 processors.
-   Within each of the 4 diagrams, grid cells of the same color are
-   owned by a single processor; for simplicity only cells owned by 4
-   or 8 of the 64 processors are colored.  The two images on the left
-   illustrate brick-to-pencil communication.  The two images on the
-   right illustrate pencil-to-pencil communication, which in this
-   case transposes the *y* and *z* dimensions of the grid.
+      Stages of a parallel FFT for a simulation domain overlaid with an
+      8x8x8 3d FFT grid, partitioned across 64 processors.  Within each
+      of the 4 diagrams, grid cells of the same color are owned by a
+      single processor; for simplicity, only cells owned by 4 or 8 of
+      the 64 processors are colored.  The two images on the left
+      illustrate brick-to-pencil communication.  The two images on the
+      right illustrate pencil-to-pencil communication, which in this
+      case transposes the *y* and *z* dimensions of the grid.
 
 Parallel 3d FFTs require substantial communication relative to their
 computational cost.  A 3d FFT is implemented by a series of 1d FFTs
-along the *x-*, *y-*, and *z-*\ direction of the FFT grid.  Thus the FFT
-grid cannot be decomposed like atoms into 3 dimensions for parallel
+along the *x-*, *y-*, and *z-*\ direction of the FFT grid.  Thus, the
+FFT grid cannot be decomposed like atoms into 3 dimensions for parallel
 processing of the FFTs but only in 1 (as planes) or 2 (as pencils)
 dimensions and in between the steps the grid needs to be transposed to
 have the FFT grid portion "owned" by each MPI process complete in the
 direction of the 1d FFTs it has to perform. LAMMPS uses the
-pencil-decomposition algorithm as shown in the :ref:`fft-parallel` figure.
+pencil-decomposition algorithm as shown in the :ref:`fft-parallel`
+figure.
 
 Initially (far left), each processor owns a brick of same-color grid
-cells (actually grid points) contained within in its sub-domain.  A
+cells (actually grid points) contained within in its subdomain.  A
 brick-to-pencil communication operation converts this layout to 1d
 pencils in the *x*-dimension (center left).  Again, cells of the same
 color are owned by the same processor.  Each processor can then compute
@@ -97,7 +97,7 @@ across all $P$ processors with a single call to ``MPI_Alltoall()``, but
 this is typically much slower.  However, for the specialized brick and
 pencil tiling illustrated in :ref:`fft-parallel` figure, collective
 communication across the entire MPI communicator is not required.  In
-the example an :math:`8^3` grid with 512 grid cells is partitioned
+the example, an :math:`8^3` grid with 512 grid cells is partitioned
 across 64 processors; each processor owns a 2x2x2 3d brick of grid
 cells.  The initial brick-to-pencil communication (upper left to upper
 right) only requires collective communication within subgroups of 4
@@ -132,7 +132,7 @@ grid/particle operations that LAMMPS supports:
 - The fftMPI library allows each grid dimension to be a multiple of
   small prime factors (2,3,5), and allows any number of processors to
   perform the FFT.  The resulting brick and pencil decompositions are
-  thus not always as well-aligned but the size of subgroups of
+  thus not always as well-aligned, but the size of subgroups of
   processors for the two modes of communication (brick/pencil and
   pencil/pencil) still scale as :math:`O(P^{\frac{1}{3}})` and
   :math:`O(P^{\frac{1}{2}})`.
@@ -143,26 +143,28 @@ grid/particle operations that LAMMPS supports:
   in memory.  This reordering can be done during the packing or
   unpacking of buffers for MPI communication.
 
-- For large systems and particularly a large number of MPI processes,
-  the dominant cost for parallel FFTs is often the communication, not
-  the computation of 1d FFTs, even though the latter scales as :math:`N
-  \log(N)` in the number of grid points *N* per grid direction.  This is
-  due to the fact that only a 2d decomposition into pencils is possible
-  while atom data (and their corresponding short-range force and energy
-  computations) can be decomposed efficiently in 3d.
+- For large systems and particularly many MPI processes, the dominant
+  cost for parallel FFTs is often the communication, not the computation
+  of 1d FFTs, even though the latter scales as :math:`N \log(N)` in the
+  number of grid points *N* per grid direction.  This is due to the fact
+  that only a 2d decomposition into pencils is possible while atom data
+  (and their corresponding short-range force and energy computations)
+  can be decomposed efficiently in 3d.
 
-  This can be addressed by reducing the number of MPI processes involved
-  in the MPI communication by using :doc:`hybrid MPI + OpenMP
-  parallelization <Speed_omp>`.  This will use OpenMP parallelization
-  inside the MPI domains and while that may have a lower parallel
-  efficiency, it reduces the communication overhead.
+  Reducing the number of MPI processes involved in the MPI communication
+  will reduce this kind of overhead.  By using a :doc:`hybrid MPI +
+  OpenMP parallelization <Speed_omp>` it is still possible to use all
+  processes for parallel computation.  It will use OpenMP
+  parallelization inside the MPI domains. While that may have a lower
+  parallel efficiency for some part of the computation, that can be less
+  than the communication overhead in the 3d FFTs.
 
-  As an alternative it is also possible to start a :ref:`multi-partition
+  As an alternative, it is also possible to start a :ref:`multi-partition
   <partition>` calculation and then use the :doc:`verlet/split
   integrator <run_style>` to perform the PPPM computation on a
   dedicated, separate partition of MPI processes.  This uses an integer
-  "1:*p*" mapping of *p* sub-domains of the atom decomposition to one
-  sub-domain of the FFT grid decomposition and where pairwise non-bonded
+  "1:*p*" mapping of *p* subdomains of the atom decomposition to one
+  subdomain of the FFT grid decomposition and where pairwise non-bonded
   and bonded forces and energies are computed on the larger partition
   and the PPPM kspace computation concurrently on the smaller partition.
 
@@ -172,10 +174,10 @@ grid/particle operations that LAMMPS supports:
 
 - LAMMPS implements a ``GridComm`` class which overlays the simulation
   domain with a regular grid, partitions it across processors in a
-  manner consistent with processor sub-domains, and provides methods for
+  manner consistent with processor subdomains, and provides methods for
   forward and reverse communication of owned and ghost grid point
   values.  It is used for PPPM as an FFT grid (as outlined above) and
-  also for the MSM algorithm which uses a cascade of grid sizes from
+  also for the MSM algorithm, which uses a cascade of grid sizes from
   fine to coarse to compute long-range Coulombic forces.  The GridComm
   class is also useful for models where continuum fields interact with
   particles.  For example, the two-temperature model (TTM) defines heat

doc/src/Developer_par_neigh.rst

@@ -3,12 +3,12 @@ Neighbor lists
 
 To compute forces efficiently, each processor creates a Verlet-style
 neighbor list which enumerates all pairs of atoms *i,j* (*i* = owned,
-*j* = owned or ghost) with separation less than the applicable
-neighbor list cutoff distance.  In LAMMPS the neighbor lists are stored
-in a multiple-page data structure; each page is a contiguous chunk of
-memory which stores vectors of neighbor atoms *j* for many *i* atoms.
-This allows pages to be incrementally allocated or deallocated in blocks
-as needed.  Neighbor lists typically consume the most memory of any data
+*j* = owned or ghost) with separation less than the applicable neighbor
+list cutoff distance.  In LAMMPS, the neighbor lists are stored in a
+multiple-page data structure; each page is a contiguous chunk of memory
+which stores vectors of neighbor atoms *j* for many *i* atoms.  This
+allows pages to be incrementally allocated or deallocated in blocks as
+needed.  Neighbor lists typically consume the most memory of any data
 structure in LAMMPS.  The neighbor list is rebuilt (from scratch) once
 every few timesteps, then used repeatedly each step for force or other
 computations.  The neighbor cutoff distance is :math:`R_n = R_f +
@@ -16,20 +16,20 @@ computations.  The neighbor cutoff distance is :math:`R_n = R_f +
 the interatomic potential for computing short-range pairwise or manybody
 forces and :math:`\Delta_s` is a "skin" distance that allows the list to
 be used for multiple steps assuming that atoms do not move very far
-between consecutive time steps.  Typically the code triggers
+between consecutive time steps.  Typically, the code triggers
 reneighboring when any atom has moved half the skin distance since the
 last reneighboring; this and other options of the neighbor list rebuild
 can be adjusted with the :doc:`neigh_modify <neigh_modify>` command.
 
 On steps when reneighboring is performed, atoms which have moved outside
-their owning processor's sub-domain are first migrated to new processors
+their owning processor's subdomain are first migrated to new processors
 via communication.  Periodic boundary conditions are also (only)
 enforced on these steps to ensure each atom is re-assigned to the
 correct processor.  After migration, the atoms owned by each processor
-are stored in a contiguous vector.  Periodically each processor
+are stored in a contiguous vector.  Periodically, each processor
 spatially sorts owned atoms within its vector to reorder it for improved
 cache efficiency in force computations and neighbor list building.  For
-that atoms are spatially binned and then reordered so that atoms in the
+that, atoms are spatially binned and then reordered so that atoms in the
 same bin are adjacent in the vector.  Atom sorting can be disabled or
 its settings modified with the :doc:`atom_modify <atom_modify>` command.
 
@@ -39,12 +39,12 @@ its settings modified with the :doc:`atom_modify <atom_modify>` command.
 
    neighbor list stencils
 
-   A 2d simulation sub-domain (thick black line) and the corresponding
+   A 2d simulation subdomain (thick black line) and the corresponding
    ghost atom cutoff region (dashed blue line) for both orthogonal
    (left) and triclinic (right) domains.  A regular grid of neighbor
    bins (thin lines) overlays the entire simulation domain and need not
-   align with sub-domain boundaries; only the portion overlapping the
-   augmented sub-domain is shown.  In the triclinic case it overlaps the
+   align with subdomain boundaries; only the portion overlapping the
+   augmented subdomain is shown.  In the triclinic case, it overlaps the
    bounding box of the tilted rectangle.  The blue- and red-shaded bins
    represent a stencil of bins searched to find neighbors of a particular
    atom (black dot).
@@ -52,13 +52,13 @@ its settings modified with the :doc:`atom_modify <atom_modify>` command.
 To build a local neighbor list in linear time, the simulation domain is
 overlaid (conceptually) with a regular 3d (or 2d) grid of neighbor bins,
 as shown in the :ref:`neighbor-stencil` figure for 2d models and a
-single MPI processor's sub-domain.  Each processor stores a set of
-neighbor bins which overlap its sub-domain extended by the neighbor
+single MPI processor's subdomain.  Each processor stores a set of
+neighbor bins which overlap its subdomain, extended by the neighbor
 cutoff distance :math:`R_n`.  As illustrated, the bins need not align
 with processor boundaries; an integer number in each dimension is fit to
 the size of the entire simulation box.
 
-Most often LAMMPS builds what it calls a "half" neighbor list where
+Most often, LAMMPS builds what is called a "half" neighbor list where
 each *i,j* neighbor pair is stored only once, with either atom *i* or
 *j* as the central atom.  The build can be done efficiently by using a
 pre-computed "stencil" of bins around a central origin bin which
@@ -67,18 +67,18 @@ is simply a list of integer offsets in *x,y,z* of nearby bins
 surrounding the origin bin which are close enough to contain any
 neighbor atom *j* within a distance :math:`R_n` from any atom *i* in the
 origin bin.  Note that for a half neighbor list, the stencil can be
-asymmetric since each atom only need store half its nearby neighbors.
+asymmetric, since each atom only need store half its nearby neighbors.
 
 These stencils are illustrated in the figure for a half list and a bin
 size of :math:`\frac{1}{2} R_n`.  There are 13 red+blue stencil bins in
 2d (for the orthogonal case, 15 for triclinic).  In 3d there would be
 63, 13 in the plane of bins that contain the origin bin and 25 in each
 of the two planes above it in the *z* direction (75 for triclinic).  The
-reason the triclinic stencil has extra bins is because the bins tile the
-bounding box of the entire triclinic domain and thus are not periodic
-with respect to the simulation box itself.  The stencil and logic for
-determining which *i,j* pairs to include in the neighbor list are
-altered slightly to account for this.
+triclinic stencil has extra bins because the bins tile the bounding box
+of the entire triclinic domain, and thus are not periodic with respect
+to the simulation box itself.  The stencil and logic for determining
+which *i,j* pairs to include in the neighbor list are altered slightly
+to account for this.
 
 To build a neighbor list, a processor first loops over its "owned" plus
 "ghost" atoms and assigns each to a neighbor bin.  This uses an integer
@@ -95,7 +95,7 @@ supports:
   been found to be optimal for many typical cases.  Smaller bins incur
   additional overhead to loop over; larger bins require more distance
   calculations.  Note that for smaller bin sizes, the 2d stencil in the
-  figure would be more semi-circular in shape (hemispherical in 3d),
+  figure would be of a more semicircular shape (hemispherical in 3d),
   with bins near the corners of the square eliminated due to their
   distance from the origin bin.
 
@@ -111,8 +111,8 @@ supports:
   symmetric stencil.  It also includes lists with partial enumeration of
   ghost atom neighbors.  The full and ghost-atom lists are used by
   various manybody interatomic potentials.  Lists may also use different
-  criteria for inclusion of a pair interaction.  Typically this simply
-  depends only on the distance between two atoms and the cutoff
+  criteria for inclusion of a pairwise interaction.  Typically, this
+  simply depends only on the distance between two atoms and the cutoff
   distance.  But for finite-size coarse-grained particles with
   individual diameters (e.g. polydisperse granular particles), it can
   also depend on the diameters of the two particles.
@@ -121,11 +121,11 @@ supports:
   of the master neighbor list for the full system need to be generated,
   one for each sub-style, which contains only the *i,j* pairs needed to
   compute interactions between subsets of atoms for the corresponding
-  potential.  This means not all *i* or *j* atoms owned by a processor
+  potential.  This means, not all *i* or *j* atoms owned by a processor
   are included in a particular sub-list.
 
 - Some models use different cutoff lengths for pairwise interactions
-  between different kinds of particles which are stored in a single
+  between different kinds of particles, which are stored in a single
   neighbor list.  One example is a solvated colloidal system with large
   colloidal particles where colloid/colloid, colloid/solvent, and
   solvent/solvent interaction cutoffs can be dramatically different.
@@ -144,7 +144,7 @@ supports:
 
 - For small and sparse systems and as a fallback method, LAMMPS also
   supports neighbor list construction without binning by using a full
-  :math:`O(N^2)` loop over all *i,j* atom pairs in a sub-domain when
+  :math:`O(N^2)` loop over all *i,j* atom pairs in a subdomain when
   using the :doc:`neighbor nsq <neighbor>` command.
 
 - Dependent on the "pair" setting of the :doc:`newton <newton>` command,
@@ -153,7 +153,7 @@ supports:
   For the newton pair *on* setting the atom *j* is only added to the
   list if its *z* coordinate is larger, or if equal the *y* coordinate
   is larger, and that is equal, too, the *x* coordinate is larger.  For
-  homogeneously dense systems that will result in picking neighbors from
+  homogeneously dense systems, that will result in picking neighbors from
   a same size sector in always the same direction relative to the
-  "owned" atom and thus it should lead to similar length neighbor lists
-  and thus reduce the chance of a load imbalance.
+  "owned" atom, and thus it should lead to similar length neighbor lists
+  and reduce the chance of a load imbalance.

doc/src/Developer_par_openmp.rst

@@ -6,7 +6,7 @@ thread parallelism to predominantly distribute loops over local data
 and thus follow an orthogonal parallelization strategy to the
 decomposition into spatial domains used by the :doc:`MPI partitioning
 <Developer_par_part>`.  For clarity, this section discusses only the
-implementation in the OPENMP package as it is the simplest. The INTEL
+implementation in the OPENMP package, as it is the simplest. The INTEL
 and KOKKOS package offer additional options and are more complex since
 they support more features and different hardware like co-processors
 or GPUs.
@@ -14,7 +14,7 @@ or GPUs.
 One of the key decisions when implementing the OPENMP package was to
 keep the changes to the source code small, so that it would be easier to
 maintain the code and keep it in sync with the non-threaded standard
-implementation.  this is achieved by a) making the OPENMP version a
+implementation.  This is achieved by a) making the OPENMP version a
 derived class from the regular version (e.g. ``PairLJCutOMP`` from
 ``PairLJCut``) and overriding only methods that are multi-threaded or
 need to be modified to support multi-threading (similar to what was done
@@ -26,13 +26,13 @@ into three separate classes ``ThrOMP``, ``ThrData``, and ``FixOMP``.
 available in the corresponding base class (e.g. ``Pair`` for
 ``PairLJCutOMP``) like multi-thread aware variants of the "tally"
 functions. Those functions are made available through multiple
-inheritance so those new functions have to have unique names to avoid
+inheritance, so those new functions have to have unique names to avoid
 ambiguities; typically ``_thr`` is appended to the name of the function.
-``ThrData`` is a classes that manages per-thread data structures.
-It is used instead of extending the corresponding storage to per-thread
-arrays to avoid slowdowns due to "false sharing" when multiple threads
-update adjacent elements in an array and thus force the CPU cache lines
-to be reset and re-fetched.  ``FixOMP`` finally manages the "multi-thread
+``ThrData`` is a class that manages per-thread data structures.  It is
+used instead of extending the corresponding storage to per-thread arrays
+to avoid slowdowns due to "false sharing" when multiple threads update
+adjacent elements in an array and thus force the CPU cache lines to be
+reset and re-fetched.  ``FixOMP`` finally manages the "multi-thread
 state" like settings and access to per-thread storage, it is activated
 by the :doc:`package omp <package>` command.
 
@@ -46,24 +46,24 @@ involve multiple atoms and thus there are race conditions when multiple
 threads want to update per-atom data of the same atoms.  Five possible
 strategies have been considered to avoid this:
 
-1) restructure the code so that there is no overlapping access possible
+1. Restructure the code so that there is no overlapping access possible
    when computing in parallel, e.g. by breaking lists into multiple
    parts and synchronizing threads in between.
-2) have each thread be "responsible" for a specific group of atoms and
+2. Have each thread be "responsible" for a specific group of atoms and
    compute these interactions multiple times, once on each thread that
-   is responsible for a given atom and then have each thread only update
+   is responsible for a given atom, and then have each thread only update
    the properties of this atom.
-3) use mutexes around functions and regions of code where the data race
-   could happen
-4) use atomic operations when updating per-atom properties
-5) use replicated per-thread data structures to accumulate data without
+3. Use mutexes around functions and regions of code where the data race
+   could happen.
+4. Use atomic operations when updating per-atom properties.
+5. Use replicated per-thread data structures to accumulate data without
    conflicts and then use a reduction to combine those results into the
    data structures used by the regular style.
 
 Option 5 was chosen for the OPENMP package because it would retain the
-performance for the case of 1 thread and the code would be more
+performance for the case of a single thread and the code would be more
 maintainable.  Option 1 would require extensive code changes,
-particularly to the neighbor list code; options 2 would have incurred a
+particularly to the neighbor list code; option 2 would have incurred a
 2x or more performance penalty for the serial case; option 3 causes
 significant overhead and would enforce serialization of operations in
 inner loops and thus defeat the purpose of multi-threading; option 4
@@ -80,7 +80,7 @@ equivalent to the number of CPU cores per CPU socket on high-end
 supercomputers.
 
 Thus arrays like the force array are dimensioned to the number of atoms
-times the number of threads when enabling OpenMP support and inside the
+times the number of threads when enabling OpenMP support, and inside the
 compute functions a pointer to a different chunk is obtained by each thread.
 Similarly, accumulators like potential energy or virial are kept in
 per-thread instances of the ``ThrData`` class and then only reduced and
@@ -91,7 +91,7 @@ Loop scheduling
 """""""""""""""
 
 Multi-thread parallelization is applied by distributing (outer) loops
-statically across threads.  Typically this would be the loop over local
+statically across threads.  Typically, this would be the loop over local
 atoms *i* when processing *i,j* pairs of atoms from a neighbor list.
 The design of the neighbor list code results in atoms having a similar
 number of neighbors for homogeneous systems and thus load imbalances

doc/src/Developer_par_part.rst

@@ -7,39 +7,39 @@ distributed-memory parallelism is set with the :doc:`comm_style command
 
 .. _domain-decomposition:
 .. figure:: img/domain-decomp.png
-   :align: center
 
-   domain decomposition
+   Domain decomposition schemes
 
-   This figure shows the different kinds of domain decomposition used
-   for MPI parallelization: "brick" on the left with an orthogonal
-   (left) and a triclinic (middle) simulation domain, and a "tiled"
-   decomposition (right).  The black lines show the division into
-   sub-domains and the contained atoms are "owned" by the corresponding
-   MPI process. The green dashed lines indicate how sub-domains are
-   extended with "ghost" atoms up to the communication cutoff distance.
+      This figure shows the different kinds of domain decomposition used
+      for MPI parallelization: "brick" on the left with an orthogonal
+      (left) and a triclinic (middle) simulation domain, and a "tiled"
+      decomposition (right).  The black lines show the division into
+      subdomains, and the contained atoms are "owned" by the
+      corresponding MPI process. The green dashed lines indicate how
+      subdomains are extended with "ghost" atoms up to the communication
+      cutoff distance.
 
-The LAMMPS simulation box is a 3d or 2d volume, which can be orthogonal
-or triclinic in shape, as illustrated in the :ref:`domain-decomposition`
-figure for the 2d case.  Orthogonal means the box edges are aligned with
-the *x*, *y*, *z* Cartesian axes, and the box faces are thus all
-rectangular.  Triclinic allows for a more general parallelepiped shape
-in which edges are aligned with three arbitrary vectors and the box
-faces are parallelograms.  In each dimension box faces can be periodic,
-or non-periodic with fixed or shrink-wrapped boundaries.  In the fixed
-case, atoms which move outside the face are deleted; shrink-wrapped
-means the position of the box face adjusts continuously to enclose all
-the atoms.
+The LAMMPS simulation box is a 3d or 2d volume, which can be of
+orthogonal or triclinic shape, as illustrated in the
+:ref:`domain-decomposition` figure for the 2d case.  Orthogonal means
+the box edges are aligned with the *x*, *y*, *z* Cartesian axes, and the
+box faces are thus all rectangular.  Triclinic allows for a more general
+parallelepiped shape in which edges are aligned with three arbitrary
+vectors and the box faces are parallelograms.  In each dimension, box
+faces can be periodic, or non-periodic with fixed or shrink-wrapped
+boundaries.  In the fixed case, atoms which move outside the face are
+deleted; shrink-wrapped means the position of the box face adjusts
+continuously to enclose all the atoms.
 
 For distributed-memory MPI parallelism, the simulation box is spatially
-decomposed (partitioned) into non-overlapping sub-domains which fill the
+decomposed (partitioned) into non-overlapping subdomains which fill the
 box. The default partitioning, "brick", is most suitable when atom
 density is roughly uniform, as shown in the left-side images of the
-:ref:`domain-decomposition` figure.  The sub-domains comprise a regular
-grid and all sub-domains are identical in size and shape.  Both the
+:ref:`domain-decomposition` figure.  The subdomains comprise a regular
+grid, and all subdomains are identical in size and shape.  Both the
 orthogonal and triclinic boxes can deform continuously during a
 simulation, e.g. to compress a solid or shear a liquid, in which case
-the processor sub-domains likewise deform.
+the processor subdomains likewise deform.
 
 
 For models with non-uniform density, the number of particles per
@@ -50,14 +50,14 @@ load.  For such models, LAMMPS supports multiple strategies to reduce
 the load imbalance:
 
 - The processor grid decomposition is by default based on the simulation
-  cell volume and tries to optimize the volume to surface ratio for the sub-domains.
+  cell volume and tries to optimize the volume to surface ratio for the subdomains.
   This can be changed with the :doc:`processors command <processors>`.
-- The parallel planes defining the size of the sub-domains can be shifted
+- The parallel planes defining the size of the subdomains can be shifted
   with the :doc:`balance command <balance>`. Which can be done in addition
   to choosing a more optimal processor grid.
 - The recursive bisectioning algorithm in combination with the "tiled"
   communication style can produce a partitioning with equal numbers of
-  particles in each sub-domain.
+  particles in each subdomain.
 
 
 .. |decomp1| image:: img/decomp-regular.png
@@ -76,14 +76,14 @@ the load imbalance:
 
 The pictures above demonstrate different decompositions for a 2d system
 with 12 MPI ranks.  The atom colors indicate the load imbalance of each
-sub-domain with green being optimal and red the least optimal.
+subdomain, with green being optimal and red the least optimal.
 
-Due to the vacuum in the system, the default decomposition is unbalanced
-with several MPI ranks without atoms (left). By forcing a 1x12x1
-processor grid, every MPI rank does computations now, but number of
-atoms per sub-domain is still uneven and the thin slice shape increases
-the amount of communication between sub-domains (center left). With a
-2x6x1 processor grid and shifting the sub-domain divisions, the load
-imbalance is further reduced and the amount of communication required
-between sub-domains is less (center right).  And using the recursive
-bisectioning leads to further improved decomposition (right).
+Due to the vacuum in the system, the default decomposition is
+unbalanced, with several MPI ranks without atoms (left). By forcing a
+1x12x1 processor grid, every MPI rank does computations now, but the
+number of atoms per subdomain is still uneven, and the thin slice shape
+increases the amount of communication between subdomains (center
+left). With a 2x6x1 processor grid and shifting the subdomain divisions,
+the load imbalance is further reduced and the amount of communication
+required between subdomains is less (center right).  And using the
+recursive bisectioning leads to further improved decomposition (right).