Merge pull request #2957 from akohlmey/next_release_version

Step version strings for stable release

.gitattributes

@@ -1,3 +1,5 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .github export-ignore
+.lgtm.yml export-ignore
+SECURITY.md export-ignore

.github/CODEOWNERS

@@ -13,43 +13,51 @@ lib/kim/*             @ellio167
 lib/mesont/*          @iafoss
 
 # whole packages
-src/COMPRESS/*        @akohlmey
+src/COMPRESS/*        @rbberger
 src/GPU/*             @ndtrung81
 src/KOKKOS/*          @stanmoore1
 src/KIM/*             @ellio167
 src/LATTE/*           @cnegre
 src/MESSAGE/*         @sjplimp
+src/MLIAP/*           @athomps
+src/SNAP/*            @athomps
 src/SPIN/*            @julient31
-src/USER-CGDNA/*      @ohenrich
-src/USER-CGSDK/*      @akohlmey
-src/USER-COLVARS/*    @giacomofiorin
-src/USER-INTEL/*      @wmbrownintel
-src/USER-MANIFOLD/*   @Pakketeretet2
-src/USER-MEAMC/*      @martok
-src/USER-MESONT/*     @iafoss
-src/USER-MOFFF/*      @hheenen
-src/USER-MOLFILE/*    @akohlmey
-src/USER-NETCDF/*     @pastewka
-src/USER-PLUMED/*     @gtribello
-src/USER-PHONON/*     @lingtikong
-src/USER-PTM/*        @pmla
-src/USER-OMP/*        @akohlmey
-src/USER-QMMM/*       @akohlmey
-src/USER-REAXC/*      @hasanmetin
-src/USER-SCAFACOS/*   @rhalver
-src/USER-TALLY/*      @akohlmey
-src/USER-UEF/*        @danicholson
-src/USER-VTK/*        @rbberger
-
+src/BROWNIAN/*        @samueljmcameron
+src/CG-DNA/*          @ohenrich
+src/CG-SDK/*          @akohlmey
+src/COLVARS/*         @giacomofiorin
+src/DIELECTRIC/*      @ndtrung81
+src/FEP/*             @agiliopadua
+src/ML-HDNNP/*        @singraber
+src/INTEL/*           @wmbrownintel
+src/MANIFOLD/*        @Pakketeretet2
+src/MDI/*             @taylor-a-barnes
+src/MEAM/*            @martok
+src/MESONT/*          @iafoss
+src/MOFFF/*           @hheenen
+src/MOLFILE/*         @akohlmey
+src/NETCDF/*          @pastewka
+src/ML-PACE/*         @yury-lysogorskiy
+src/PLUMED/*          @gtribello
+src/PHONON/*          @lingtikong
+src/PTM/*             @pmla
+src/OPENMP/*          @akohlmey
+src/QMMM/*            @akohlmey
+src/REAXFF/*          @hasanmetin @stanmoore1
+src/REACTION/*        @jrgissing
+src/SCAFACOS/*        @rhalver
+src/TALLY/*           @akohlmey
+src/UEF/*             @danicholson
+src/VTK/*             @rbberger
 
 # individual files in packages
 src/GPU/pair_vashishta_gpu.*        @andeplane
 src/KOKKOS/pair_vashishta_kokkos.*  @andeplane
 src/MANYBODY/pair_vashishta_table.* @andeplane
 src/MANYBODY/pair_atm.*             @sergeylishchuk
-src/USER-REACTION/fix_bond_react.*  @jrgissing
-src/USER-MISC/*_grem.*              @dstelter92
-src/USER-MISC/compute_stress_mop*.* @RomainVermorel
+src/REPLICA/*_grem.*                @dstelter92
+src/EXTRA-COMPUTE/compute_stress_mop*.* @RomainVermorel
+src/MISC/*_tracker.*                @jtclemm
 
 # core LAMMPS classes
 src/lammps.*              @sjplimp
@@ -73,6 +81,7 @@ src/kspace.*              @sjplimp
 src/lmptyp.h              @sjplimp
 src/library.*             @sjplimp
 src/main.cpp              @sjplimp
+src/min_*.*               @sjplimp
 src/memory.*              @sjplimp
 src/modify.*              @sjplimp
 src/molecule.*            @sjplimp
@@ -101,7 +110,6 @@ src/thermo.*              @sjplimp
 src/universe.*            @sjplimp
 src/update.*              @sjplimp
 src/variable.*            @sjplimp
-src/verlet.*              @sjplimp
 src/velocity.*            @sjplimp
 src/write_data.*          @sjplimp
 src/write_restart.*       @sjplimp
@@ -114,23 +122,26 @@ src/info.*                @akohlmey @rbberger
 src/timer.*               @akohlmey
 src/min*                  @sjplimp @stanmoore1
 src/utils.*               @akohlmey @rbberger
+src/verlet.*              @sjplimp @stanmoore1
 src/math_eigen_impl.h     @jewettaij
 
 # tools
 tools/msi2lmp/*       @akohlmey
 tools/emacs/*         @HaoZeke
 tools/singularity/*   @akohlmey @rbberger
-tools/code_standard/* @rbberger
+tools/coding_standard/* @rbberger
 tools/valgrind/*      @akohlmey
+tools/swig/*          @akohlmey
+tools/offline/*       @rbberger
 
 # tests
 unittest/*            @akohlmey @rbberger
 
 # cmake
 cmake/*               @junghans @rbberger
-cmake/Modules/Packages/USER-COLVARS.cmake @junghans @rbberger @giacomofiorin
+cmake/Modules/Packages/COLVARS.cmake @junghans @rbberger @giacomofiorin
 cmake/Modules/Packages/KIM.cmake @junghans @rbberger @ellio167
-cmake/presets/*.cmake @junghans @rbberger @akohlmey
+cmake/presets/*.cmake @akohlmey
 
 # python
 python/*              @rbberger
@@ -142,6 +153,7 @@ fortran/*             @akohlmey
 doc/utils/*/*         @rbberger
 doc/Makefile          @rbberger
 doc/README            @rbberger
+examples/plugin/*     @akohlmey
 
 # for releases
 src/version.h         @sjplimp

.github/CONTRIBUTING.md

@@ -5,8 +5,9 @@ Thank your 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.
 
 Thus please also have a look at:
-* [The Section on submitting new features for inclusion in LAMMPS of the Manual](https://lammps.sandia.gov/doc/Modify_contribute.html)
-* [The LAMMPS GitHub Tutorial in the Manual](http://lammps.sandia.gov/doc/Howto_github.html)
+* [The guide for submitting new features in the LAMMPS manual](https://lammps.sandia.gov/doc/Modify_contribute.html)
+* [The guide on programming style and requirement in the LAMMPS manual](https://lammps.sandia.gov/doc/Modify_contribute.html)
+* [The GitHub tutorial in the LAMMPS manual](http://lammps.sandia.gov/doc/Howto_github.html)
 
 ## Table of Contents
 
@@ -26,11 +27,11 @@ __
 
 ## I don't want to read this whole thing I just have a question!
 
-> **Note:** Please do not file an issue to ask a general question about LAMMPS, its features, how to use specific commands, or how perform simulations or analysis in LAMMPS. Instead post your question to the ['lammps-users' mailing list](https://lammps.sandia.gov/mail.html). You do not need to be subscribed to post to the list (but a mailing list subscription avoids having your post delayed until it is approved by a mailing list moderator). Most posts to the mailing list receive a response within less than 24 hours. Before posting to the mailing list, please read the [mailing list guidelines](https://lammps.sandia.gov/guidelines.html). Following those guidelines will help greatly to get a helpful response. Always mention which LAMMPS version you are using.
+> **Note:** Please do not file an issue to ask a general question about LAMMPS, its features, how to use specific commands, or how perform simulations or analysis in LAMMPS. Instead post your question to either the ['lammps-users' mailing list](https://lammps.sandia.gov/mail.html) or the [LAMMPS Material Science Discourse forum](https://matsci.org/lammps). You do not need to be subscribed to post to the list (but a mailing list subscription avoids having your post delayed until it is approved by a mailing list moderator). Most posts to the mailing list receive a response within less than 24 hours. Before posting to the mailing list, please read the [mailing list guidelines](https://lammps.sandia.gov/guidelines.html). Following those guidelines will help greatly to get a helpful response. Always mention which LAMMPS version you are using. The LAMMPS forum was recently created as part of a larger effort to build a materials science community and have discussions not just about using LAMMPS. Thus the forum may be also used for discussions that would be off-topic for the mailing list. Those will just have to be posted to a more general category.
 
 ## How Can I Contribute?
 
-There are several ways how you can actively contribute to the LAMMPS project: you can discuss compiling and using LAMMPS, and solving LAMMPS related problems with other LAMMPS users on the lammps-users mailing list, you can report bugs or suggest enhancements by creating issues on GitHub (or posting them to the lammps-users mailing list), and you can contribute by submitting pull requests on GitHub or e-mail your code
+There are several ways how you can actively contribute to the LAMMPS project: you can discuss compiling and using LAMMPS, and solving LAMMPS related problems with other LAMMPS users on the lammps-users mailing list or the forum, you can report bugs or suggest enhancements by creating issues on GitHub (or posting them to the lammps-users mailing list or posting in the LAMMPS Materials Science Discourse forum), and you can contribute by submitting pull requests on GitHub or e-mail your code
 to one of the [LAMMPS core developers](https://lammps.sandia.gov/authors.html). As you may see from the aforementioned developer page, the LAMMPS software package includes the efforts of a very large number of contributors beyond the principal authors and maintainers.
 
 ### Discussing How To Use LAMMPS
@@ -42,6 +43,8 @@ Anyone can browse/search previous questions/answers in the archives. You do not
 
 If you post a message and you are a subscriber, your message will appear immediately. If you are not a subscriber, your message will be moderated, which typically takes one business day. Either way, when someone replies the reply will usually be sent to both, your personal email address and the mailing list. When replying to people, that responded to your post to the list, please always included the mailing list in your replies (i.e. use "Reply All" and **not** "Reply"). Responses will appear on the list in a few minutes, but it can take a few hours for postings and replies to show up in the SourceForge archive. Sending replies also to the mailing list is important, so that responses are archived and people with a similar issue can search for possible solutions in the mailing list archive.
 
+The LAMMPS Materials Science Discourse forum was created recently to facilitate discussion not just about LAMMPS and as part of a larger effort  towards building a materials science community. The forum contains a read-only sub-category with the continually updated mailing list archive, so you won't miss anything by joining only the forum and not the mailing list.
+
 ### Reporting Bugs
 
 While developers writing code for LAMMPS are careful to test their code, LAMMPS is such a large and complex software, that it is impossible to test for all combinations of features under all normal and not so normal circumstances. Thus bugs do happen, and if you suspect, that you have encountered one, please try to document it and report it as an [Issue](https://github.com/lammps/lammps/issues) on the LAMMPS GitHub project web page. However, before reporting a bug, you need to check whether this is something that may have already been corrected. The [Latest Features and Bug Fixes in LAMMPS](https://lammps.sandia.gov/bug.html) web page lists all significant changes to LAMMPS over the years. It also tells you what the current latest development version of LAMMPS is, and you should test whether your issue still applies to that version.
@@ -60,37 +63,12 @@ To be able to submit an issue on GitHub, you have to register for an account (fo
 
 ### Contributing Code
 
-We encourage users to submit new features or modifications for LAMMPS to the core developers so they can be added to the LAMMPS distribution. The preferred way to manage and coordinate this is by submitting a pull request at the LAMMPS project on GitHub. For any larger modifications or programming project, you are encouraged to contact the LAMMPS developers ahead of time, in order to discuss implementation strategies and coding guidelines, that will make it easier to integrate your contribution and result in less work for everybody involved. You are also encouraged to search through the list of open issues on GitHub and submit a new issue for a planned feature, so you would not duplicate the work of others (and possibly get scooped by them) or have your work duplicated by others.
+We encourage users to submit new features or modifications for LAMMPS. Instructions, guidelines, requirements,
+and recommendations are in the following sections of the LAMMPS manual:
+* [The guide for submitting new features in the LAMMPS manual](https://lammps.sandia.gov/doc/Modify_contribute.html)
+* [The guide on programming style and requirement in the LAMMPS manual](https://lammps.sandia.gov/doc/Modify_contribute.html)
+* [The GitHub tutorial in the LAMMPS manual](http://lammps.sandia.gov/doc/Howto_github.html)
 
-How quickly your contribution will be integrated depends largely on how much effort it will cause to integrate and test it, how much it requires changes to the core code base, and of how much interest it is to the larger LAMMPS community. Please see below for a checklist of typical requirements. Once you have prepared everything, see [this tutorial](https://lammps.sandia.gov/doc/Howto_github.html)
- for instructions on how to submit your changes or new files through a GitHub pull request
-
-Here is a checklist of steps you need to follow to submit a single file or user package for our consideration. Following these steps will save both you and us time. See existing files in packages in the source directory for examples. If you are uncertain, please ask on the lammps-users mailing list.
-
-* C++ source code must be compatible with the C++-11 standard. Packages may require a later standard, if justified.
-* All source files you provide must compile with the most current version of LAMMPS with multiple configurations. In particular you need to test compiling LAMMPS from scratch with `-DLAMMPS_BIGBIG` set in addition to the default `-DLAMMPS_SMALLBIG` setting. Your code will need to work correctly in serial and in parallel using MPI.
-* For consistency with the rest of LAMMPS and especially, if you want your contribution(s) to be added to main LAMMPS code or one of its standard packages, it needs to be written in a style compatible with other LAMMPS source files. This means: 2-character indentation per level, no tabs, no trailing whitespace, no lines over 80 characters. I/O is done via the C-style stdio library, style class header files should not import any system headers, STL containers should be avoided in headers, and forward declarations used where possible or needed. All added code should be placed into the LAMMPS_NS namespace or a sub-namespace; global or static variables should be avoided, as they conflict with the modular nature of LAMMPS and the C++ class structure. There MUST NOT be any "using namespace XXX;" statements in headers. In the implementation file (<name>.cpp) system includes should be placed in angular brackets (<>) and for c-library functions the C++ style header files should be included (<cstdio> instead of <stdio.h>, or <cstring> instead of <string.h>). This all is so the developers can more easily understand, integrate, and maintain your contribution and reduce conflicts with other parts of LAMMPS. This basically means that the code accesses data structures, performs its operations, and is formatted similar to other LAMMPS source files, including the use of the error class for error and warning messages.
-* Source, style name, and documentation file should follow the following naming convention: style names should be lowercase and words separated by a forward slash; for a new fix style 'foo/bar', the class should be named FixFooBar, the name of the source files should be 'fix_foo_bar.h' and 'fix_foo_bar.cpp' and the corresponding documentation should be in a file 'fix_foo_bar.rst'.
-* If you want your contribution to be added as a user-contributed feature, and it is a single file (actually a `<name>.cpp` and `<name>.h` file) it can be rapidly added to the USER-MISC directory. Include the one-line entry to add to the USER-MISC/README file in that directory, along with the 2 source files. You can do this multiple times if you wish to contribute several individual features.
-* If you want your contribution to be added as a user-contribution and it is several related features, it is probably best to make it a user package directory with a name like USER-FOO. In addition to your new files, the directory should contain a README text file. The README should contain your name and contact information and a brief description of what your new package does. If your files depend on other LAMMPS style files also being installed (e.g. because your file is a derived class from the other LAMMPS class), then an Install.sh file is also needed to check for those dependencies. See other README and Install.sh files in other USER directories as examples. Send us a tarball of this USER-FOO directory.
-* Your new source files need to have the LAMMPS copyright, GPL notice, and your name and email address at the top, like other user-contributed LAMMPS source files. They need to create a class that is inside the LAMMPS namespace. If the file is for one of the USER packages, including USER-MISC, then we are not as picky about the coding style (see above). I.e. the files do not need to be in the same stylistic format and syntax as other LAMMPS files, though that would be nice for developers as well as users who try to read your code.
-* You **must** also create or extend a documentation file for each new command or style you are adding to LAMMPS. For simplicity and convenience, the documentation of groups of closely related commands or styles may be combined into a single file. This will be one file for a single-file feature. For a package, it might be several files. These are files in the [reStructuredText](https://docutils.sourceforge.io/rst.html) markup language, that are then converted to HTML and PDF. The tools for this conversion are included in the source distribution, and the translation can be as simple as doing "make html pdf" in the doc folder. Thus the documentation source files must be in the same format and style as other `<name>.rst` files in the lammps/doc/src directory for similar commands and styles; use one or more of them as a starting point. An introduction to reStructuredText can be found at [https://docutils.sourceforge.io/docs/user/rst/quickstart.html](https://docutils.sourceforge.io/docs/user/rst/quickstart.html). The text files can include mathematical expressions and symbol in ".. math::" sections or ":math:" expressions or figures (see doc/JPG for examples), or even additional PDF files with further details (see doc/PDF for examples). The doc page should also include literature citations as appropriate; see the bottom of doc/fix_nh.rst for examples and the earlier part of the same file for how to format the cite itself. The "Restrictions" section of the doc page should indicate that your command is only available if LAMMPS is built with the appropriate USER-MISC or USER-FOO package. See other user package doc files for examples of how to do this. The prerequisite for building the HTML format files are Python 3.x and virtualenv. Please run at least `make html`, `make pdf` and `make spelling` and carefully inspect and proofread the resulting HTML format doc page as well as the output produced to the screen. Make sure that all spelling errors are fixed or the necessary false positives are added to the `doc/utils/sphinx-config/false_positives.txt` file.  For new styles, those usually also need to be added to lists on the respective overview pages. This can be checked for also with `make style_check`.
-* For a new package (or even a single command) you should include one or more example scripts demonstrating its use. These should run in no more than a couple minutes, even on a single processor, and not require large data files as input. See directories under examples/USER for examples of input scripts other users provided for their packages. These example inputs are also required for validating memory accesses and testing for memory leaks with valgrind
-* For new utility functions or class (i.e. anything that does not depend on a LAMMPS object), new unit tests should be added to the unittest tree.
-* When adding a new LAMMPS style, a .yaml file with a test configuration and reference data should be added for the styles where a suitable tester program already exists (e.g. pair styles, bond styles, etc.).
-* If there is a paper of yours describing your feature (either the algorithm/science behind the feature itself, or its initial usage, or its implementation in LAMMPS), you can add the citation to the <name>.cpp source file. See src/USER-EFF/atom_vec_electron.cpp for an example. A LaTeX citation is stored in a variable at the top of the file and a single line of code that references the variable is added to the constructor of the class. Whenever a user invokes your feature from their input script, this will cause LAMMPS to output the citation to a log.cite file and prompt the user to examine the file. Note that you should only use this for a paper you or your group authored. E.g. adding a cite in the code for a paper by Nose and Hoover if you write a fix that implements their integrator is not the intended usage. That kind of citation should just be in the doc page you provide.
-
-Finally, as a general rule-of-thumb, the more clear and self-explanatory you make your documentation and README files, and the easier you make it for people to get started, e.g. by providing example scripts, the more likely it is that users will try out your new feature.
-
-If the new features/files are broadly useful we may add them as core files to LAMMPS or as part of a standard package. Else we will add them as a user-contributed file or package. Examples of user packages are in src sub-directories that start with USER. The USER-MISC package is simply a collection of (mostly) unrelated single files, which is the simplest way to have your contribution quickly added to the LAMMPS distribution. You can see a list of the both standard and user packages by typing "make package" in the LAMMPS src directory.
-
-Note that by providing us files to release, you are agreeing to make them open-source, i.e. we can release them under the terms of the GPL, used as a license for the rest of LAMMPS. See Section 1.4 for details.
-
-With user packages and files, all we are really providing (aside from the fame and fortune that accompanies having your name in the source code and on the Authors page of the LAMMPS WWW site), is a means for you to distribute your work to the LAMMPS user community, and a mechanism for others to easily try out your new feature. This may help you find bugs or make contact with new collaborators. Note that you are also implicitly agreeing to support your code which means answer questions, fix bugs, and maintain it if LAMMPS changes in some way that breaks it (an unusual event).
-
-To be able to submit an issue on GitHub, you have to register for an account (for GitHub in general). If you do not want to do that, or have other reservations or difficulties to submit a pull request, you can - as an alternative - contact one or more of the core LAMMPS developers and ask if one of them would be interested in manually merging your code into LAMMPS and send them your source code. Since the effort to merge a pull request is a small fraction of the effort of integrating source code manually (which would usually be done by converting the contribution into a pull request), your chances to have your new code included quickly are the best with a pull request.
-
-If you prefer to submit patches or full files, you should first make certain, that your code works correctly with the latest patch-level version of LAMMPS and contains all bug fixes from it. Then create a gzipped tar file of all changed or added files or a corresponding patch file using 'diff -u' or 'diff -c' and compress it with gzip. Please only use gzip compression, as this works well on all platforms.
 
 ## GitHub Workflows
 
@@ -100,17 +78,17 @@ This section briefly summarizes the steps that will happen **after** you have su
 
 After submitting an issue, one or more of the LAMMPS developers will review it and categorize it by assigning labels. Confirmed bug reports will be labeled `bug`; if the bug report also contains a suggestion for how to fix it, it will be labeled `bugfix`; if the issue is a feature request, it will be labeled `enhancement`. Other labels may be attached as well, depending on which parts of the LAMMPS code are affected. If the assessment is, that the issue does not warrant any changes, the `wontfix` label will be applied and if the submission is incorrect or something that should not be submitted as an issue, the `invalid` label will be applied. In both of the last two cases, the issue will then be closed without further action.
 
-For feature requests, what happens next is that developers may comment on the viability or relevance of the request, discuss and make suggestions for how to implement it. If a LAMMPS developer or user is planning to implement the feature, the issue will be assigned to that developer. For developers, that are not yet listed as LAMMPS project collaborators, they will receive an invitation to be added to the LAMMPS project as a collaborator so they can get assigned. If the requested feature or enhancement is implemented, it will usually be submitted as a pull request, which will contain a reference to the issue number. And once the pull request is reviewed and accepted for inclusion into LAMMPS, the issue will be closed. For details on how pull requests are processed, please see below.
+For feature requests, what happens next is that developers may comment on the viability or relevance of the request, discuss and make suggestions for how to implement it. If a LAMMPS developer or user is planning to implement the feature, the issue will be assigned to that developer. For developers, that are not yet listed as LAMMPS project collaborators, they will receive an invitation to be added to the LAMMPS project as a collaborator so they can get assigned. If the requested feature or enhancement is implemented, it will be submitted as a pull request, which will contain a reference to the issue number. And once the pull request is reviewed and accepted for inclusion into LAMMPS, the issue will be closed. For details on how pull requests are processed, please see below. Feature requests may be labeled with `volunteer_needed` if none of the LAMMPS developers has the time and the required knowledge implement the feature.
 
-For bug reports, the next step is that one of the core LAMMPS developers will self-assign to the issue and try to confirm the bug. If confirmed, the `bug` label and potentially other labels are added to classify the issue and its impact to LAMMPS. Before confirming, further questions may be asked or requests for providing additional input files or details about the steps required to reproduce the issue. Any bugfix is likely to be submitted as a pull request (more about that below) and since most bugs require only local changes, the bugfix may be included in a pull request specifically set up to collect such local bugfixes or small enhancements. Once the bugfix is included in the master branch, the issue will be closed.
+For bug reports, the next step is that one of the core LAMMPS developers will self-assign to the issue and try to confirm the bug. If confirmed, the `bug` label and potentially other labels are added to classify the issue and its impact to LAMMPS. Otherwise the `unconfirmed` label will be applied and some comment about what was tried to confirm the bug added. Before confirming, further questions may be asked or requests for providing additional input files or details about the steps required to reproduce the issue. Any bugfix will be submitted as a pull request (more about that below) and since most bugs require only local changes, the bugfix may be included in a pull request specifically set up to collect such local bugfixes or small enhancements. Once the bugfix is included in the master branch, the issue will be closed.
 
 ### Pull Requests
 
-For submitting pull requests, there is a [detailed tutorial](https://lammps.sandia.gov/doc/Howto_github.html) in the LAMMPS manual. Thus only a brief breakdown of the steps is presented here. Please note, that the LAMMPS developers are still reviewing and trying to improve the process. If you are unsure about something, do not hesitate to post a question on the lammps-users mailing list or contact one fo the core LAMMPS developers.
-Immediately after the submission, the LAMMPS continuing integration server at ci.lammps.org will download your submitted branch and perform a simple compilation test, i.e. will test whether your submitted code can be compiled under various conditions. It will also do a check on whether your included documentation translates cleanly. Whether these tests are successful or fail will be recorded. If a test fails, please inspect the corresponding output on the CI server and take the necessary steps, if needed, so that the code can compile cleanly again. The test will be re-run each the pull request is updated with a push to the remote branch on GitHub.
-Next a LAMMPS core developer will self-assign and do an overall technical assessment of the submission. If you are not yet registered as a LAMMPS collaborator, you will receive an invitation for that. As part of the assessment, the pull request will be categorized with labels. There are two special labels: `needs_work` (indicates that work from the submitter of the pull request is needed) and `work_in_progress` (indicates, that the assigned LAMMPS developer will make changes, if not done by the contributor who made the submit). 
+Pull requests are the **only** way that changes get made to the LAMMPS distribution.  So also the LAMMPS core developers will submit pull requests for their own changes and discuss them on GitHub.  Thus if you submit a pull request it will be treated in a similar fashion. When you submit a pull request you may opt to submit a "Draft" pull request.  That means your changes are visible and will be subject to testing, but reviewers will not be (auto-)assigned and comments will take into account that this is not complete. On the other hand, this is a perfect way to ask the LAMMPS developers for comments on non-obvious changes and get feedback and possible suggestions for improvements or recommendations about what to avoid.
+Immediately after the submission, the LAMMPS continuing integration server at ci.lammps.org will download your submitted branch and perform a number of tests: it will tests whether it compiles cleanly under various conditions, it will also do a check on whether your included documentation translates cleanly and run some unit tests and other checks. Whether these tests are successful or fail will be recorded.  If a test fails, please inspect the corresponding output on the CI server and take the necessary steps, if needed, so that the code can compile cleanly again.  The test will be re-run each time the pull request is updated with a push to the remote branch on GitHub.  If you are unsure about what you need to change, ask a question in the discussion area of the pull request.
+Next a LAMMPS core developer will self-assign and do an overall technical assessment of the submission.  If you submitted a draft pull request, this will not happen unless you mark it "ready for review".  If you are not yet invited as a LAMMPS collaborator, and your contribution seems significant, you may also receive an invitation for collaboration on the LAMMPS repository.  As part of the assessment, the pull request will be categorized with labels. There are two special labels: `needs_work` (indicates that work from the submitter of the pull request is needed) and `work_in_progress` (indicates, that the assigned LAMMPS developer will make changes, if not done by the contributor who made the submit). 
 You may also receive comments and suggestions on the overall submission or specific details and on occasion specific requests for changes as part of the review. If permitted, also additional changes may be pushed into your pull request branch or a pull request may be filed in your LAMMPS fork on GitHub to include those changes.
 The LAMMPS developer may then decide to assign the pull request to another developer (e.g. when that developer is more knowledgeable about the submitted feature or enhancement or has written the modified code). It may also happen, that additional developers are requested to provide a review and approve the changes. For submissions, that may change the general behavior of LAMMPS, or where a possibility of unwanted side effects exists, additional tests may be requested by the assigned developer.
-If the assigned developer is satisfied and considers the submission ready for inclusion into LAMMPS, the pull request will receive approvals and be merged into the master branch by one of the core LAMMPS developers. After the pull request is merged, you may delete the feature branch used for the pull request in your personal LAMMPS fork.
-Since the learning curve for git is quite steep for efficiently managing remote repositories, local and remote branches, pull requests and more, do not hesitate to ask questions, if you are not sure about how to do certain steps that are asked of you. Even if the changes asked of you do not make sense to you, they may be important for the LAMMPS developers. Please also note, that these all are guidelines and nothing set in stone. So depending on the nature of the contribution, the workflow may be adjusted.
+If the assigned developer is satisfied and considers the submission ready for inclusion into LAMMPS, the pull request will receive approvals and be merged into the master branch by one of the core LAMMPS developers. After the pull request is merged, you may delete the feature branch used for the pull request in your personal LAMMPS fork.  The minimum requirement to merge a pull request is that all automated tests have to pass and at least one LAMMPS developer has approved integrating the submitted code. Since the approver will not be the person merging a pull request, you will have at least two LAMMPS developers that looked at your contribution.
+Since the learning curve for git is quite steep for efficiently managing remote repositories, local and remote branches, pull requests and more, do not hesitate to ask questions, if you are not sure about how to do certain steps that are asked of you. Even if the changes asked of you do not make sense to you, they may be important for the LAMMPS developers. Please also note, that these all are guidelines and nothing set in stone. So depending on the nature of the contribution, the work flow may be adjusted.
 

.github/codeql/cpp.yml

@@ -0,0 +1,4 @@
+paths:
+ - src
+ - lib
+ - tools

.github/codeql/python.yml

@@ -0,0 +1,5 @@
+paths:
+ - python/lammps
+
+queries:
+ - uses: security-and-quality

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,49 @@
+# GitHub action to run static code analysis on C++ and Python code
+name: "CodeQL Code Analysis"
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  analyze:
+    name: Analyze
+    if: ${{ github.repository == 'lammps/lammps' }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['cpp', 'python']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/${{ matrix.language }}.yml
+
+    - name: Create Build Environment
+      if: ${{ matrix.language == 'cpp' }}
+      run: mkdir build
+
+    - name: Building LAMMPS via CMake
+      if: ${{ matrix.language == 'cpp' }}
+      shell: bash
+      working-directory: build
+      run: |
+        cmake -C ../cmake/presets/most.cmake ../cmake
+        cmake --build . --parallel 2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/unittest-macos.yml

@@ -0,0 +1,54 @@
+# GitHub action to build LAMMPS on MacOS and run unit tests
+name: "Unittest for MacOS"
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build:
+    name: MacOS Unit Test
+    if: ${{ github.repository == 'lammps/lammps' }}
+    runs-on: macos-latest
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+
+    - name: Install ccache
+      run: brew install ccache
+
+    - name: Create Build Environment
+      run: mkdir build
+
+    - name: Set up ccache
+      uses: actions/cache@v2
+      with:
+        path: ${{ env.CCACHE_DIR }}
+        key: macos-ccache-${{ github.sha }}
+        restore-keys: macos-ccache-
+
+    - name: Building LAMMPS via CMake
+      shell: bash
+      working-directory: build
+      run: |
+        ccache -z
+        cmake -C ../cmake/presets/clang.cmake \
+              -C ../cmake/presets/most.cmake \
+              -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+              -D CMAKE_C_COMPILER_LAUNCHER=ccache \
+              -D ENABLE_TESTING=on \
+              -D BUILD_SHARED_LIBS=on \
+              -D LAMMPS_EXCEPTIONS=on \
+              ../cmake
+        cmake --build . --parallel 2
+        ccache -s
+
+    - name: Run Tests
+      working-directory: build
+      shell: bash
+      run: ctest -V

.gitignore

@@ -12,6 +12,7 @@
 *.sif
 *.dll
 *.pyc
+a.out
 __pycache__
 
 Obj_*
@@ -43,6 +44,8 @@ Thumbs.db
 /build*
 /CMakeCache.txt
 /CMakeFiles/
+/Testing
 /Makefile
+/Testing
 /cmake_install.cmake
 /lmp

.lgtm.yml

@@ -0,0 +1,14 @@
+extraction:
+  cpp:
+    configure:
+      command:
+      - "mkdir build"
+      - "cd build"
+      - "cmake -G Ninja -C ../cmake/presets/most.cmake ../cmake"
+    index:
+      build_command:
+      - "cd build"
+      - "ninja"
+  python:
+    python_setup:
+      version: 3

LICENSE

@@ -1,6 +1,6 @@
 GNU GENERAL PUBLIC LICENSE
 
-Version 2, June 1991 
+Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -301,9 +301,8 @@ one line to give the program's name and an idea of what it does.
 Copyright (C) yyyy  name of author
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of

README

@@ -14,10 +14,10 @@ LAMMPS is a classical molecular dynamics simulation code designed to
 run efficiently on parallel computers.  It was developed at Sandia
 National Laboratories, a US Department of Energy facility, with
 funding from the DOE.  It is an open-source code, distributed freely
-under the terms of the GNU Public License (GPL).
+under the terms of the GNU Public License (GPL) version 2.
 
 The primary author of the code is Steve Plimpton, who can be emailed
-at sjplimp@sandia.gov.  The LAMMPS WWW Site at lammps.sandia.gov has
+at sjplimp@sandia.gov.  The LAMMPS WWW Site at www.lammps.org has
 more information about the code and its uses.
 
 The LAMMPS distribution includes the following files and directories:
@@ -37,14 +37,14 @@ tools                      pre- and post-processing tools
 
 Point your browser at any of these files to get started:
 
-https://lammps.sandia.gov/doc/Manual.html         LAMMPS manual
-https://lammps.sandia.gov/doc/Intro.html          hi-level introduction
-https://lammps.sandia.gov/doc/Build.html          how to build LAMMPS
-https://lammps.sandia.gov/doc/Run_head.html       how to run LAMMPS
-https://lammps.sandia.gov/doc/Commands_all.html   Table of available commands
-https://lammps.sandia.gov/doc/Library.html        LAMMPS library interfaces
-https://lammps.sandia.gov/doc/Modify.html         how to modify and extend LAMMPS
-https://lammps.sandia.gov/doc/Developer.html      LAMMPS developer info
+https://docs.lammps.org/Manual.html         LAMMPS manual
+https://docs.lammps.org/Intro.html          hi-level introduction
+https://docs.lammps.org/Build.html          how to build LAMMPS
+https://docs.lammps.org/Run_head.html       how to run LAMMPS
+https://docs.lammps.org/Commands_all.html   Table of available commands
+https://docs.lammps.org/Library.html        LAMMPS library interfaces
+https://docs.lammps.org/Modify.html         how to modify and extend LAMMPS
+https://docs.lammps.org/Developer.html      LAMMPS developer info
 
 You can also create these doc pages locally:
 

SECURITY.md

@@ -0,0 +1,35 @@
+# Security Policy
+
+LAMMPS is designed as a user-level application to conduct computer
+simulations for research using classical mechanics.  As such LAMMPS
+depends to some degrees on users providing correctly formatted input and
+LAMMPS needs to read and write files based on uncontrolled user input.
+As a parallel application for use in high-performance computing
+environments, performance critical steps are also done without checking
+data.
+
+LAMMPS also is interfaced to a number of external libraries, including
+libraries with experimental research software, that are not validated
+and tested by the LAMMPS developers, so it is easy to import bad
+behavior from calling functions in one of those libraries.
+
+Thus is is quite easy to crash LAMMPS through malicious input and do all
+kinds of filesystem manipulations.  And because of that LAMMPS should
+**NEVER** be compiled or **run** as superuser, either from a "root" or
+"administrator" account directly or indirectly via "sudo" or "su".
+
+Therefore what could be seen as a security vulnerability is usually
+either a user mistake or a bug in the code.  Bugs can be reported in
+the LAMMPS project
+[issue tracker on GitHub](https://github.com/lammps/lammps/issues).
+
+
+# Version Updates
+
+LAMMPS follows continuous release development model.  We aim to keep all
+release versions (stable or patch) fully functional and employ a variety
+of automatic testing procedures to detect failures of existing
+functionality from adding new features before releases are made.  Thus
+bugfixes and updates are only integrated into the current development
+branch and thus the next (patch) release and users are recommended to
+update regularly.

bench/POTENTIALS/README

@@ -1,7 +1,7 @@
 These are input scripts used to run benchmark tests for many of the
 interatomic potentials in LAMMPS.  The results of running these
 scripts on different machines are shown on the Potentials section of
-the Benchmark page of the LAMMPS WWW site (lammps.sandia.gov/bench).
+the Benchmark page of the LAMMPS WWW site (https://www.lammps.org/bench.html).
 
 Examples are shown below of how to run these scripts.  Log files for
 running them on 1 and 4 processors of a Linux box are included in the

bench/POTENTIALS/in.meam

@@ -0,0 +1,24 @@
+# bulk Ni in MEAM
+
+units		metal
+atom_style	atomic
+
+lattice		fcc 3.52
+region		box block 0 20 0 20 0 20
+create_box	1 box
+create_atoms	1 box
+
+pair_style	meam
+pair_coeff	* * library.meam Ni4 Ni.meam Ni4
+
+velocity	all create 1600.0 376847 loop geom
+
+neighbor	1.0 bin
+neigh_modify    delay 5 every 1
+
+fix		1 all nve
+
+timestep	0.005
+thermo		50
+
+run		100

bench/POTENTIALS/in.meamc

@@ -1,24 +0,0 @@
-# bulk Ni in MEAM
-
-units		metal
-atom_style	atomic
-
-lattice		fcc 3.52
-region		box block 0 20 0 20 0 20
-create_box	1 box
-create_atoms	1 box
-
-pair_style	meam/c
-pair_coeff	* * library.meam Ni4 Ni.meam Ni4
-
-velocity	all create 1600.0 376847 loop geom
-
-neighbor	1.0 bin
-neigh_modify    delay 5 every 1
-
-fix		1 all nve
-
-timestep	0.005
-thermo		50
-
-run		100

bench/POTENTIALS/log.9Oct20.meam.1

@@ -0,0 +1,84 @@
+LAMMPS (9 Oct 2020)
+  using 1 OpenMP thread(s) per MPI task
+# bulk Ni in MEAM
+
+units		metal
+atom_style	atomic
+
+lattice		fcc 3.52
+Lattice spacing in x,y,z = 3.5200000 3.5200000 3.5200000
+region		box block 0 20 0 20 0 20
+create_box	1 box
+Created orthogonal box = (0.0000000 0.0000000 0.0000000) to (70.400000 70.400000 70.400000)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 32000 atoms
+  create_atoms CPU = 0.002 seconds
+
+pair_style	meam
+pair_coeff	* * library.meam Ni4 Ni.meam Ni4
+Reading potential file library.meam with DATE: 2012-06-29
+Reading potential file Ni.meam with DATE: 2007-06-11
+
+velocity	all create 1600.0 376847 loop geom
+
+neighbor	1.0 bin
+neigh_modify    delay 5 every 1
+
+fix		1 all nve
+
+timestep	0.005
+thermo		50
+
+run		100
+Neighbor list info ...
+  update every 1 steps, delay 5 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 5
+  ghost atom cutoff = 5
+  binsize = 2.5, bins = 29 29 29
+  2 neighbor lists, perpetual/occasional/extra = 2 0 0
+  (1) pair meam, perpetual
+      attributes: full, newton on
+      pair build: full/bin/atomonly
+      stencil: full/bin/3d
+      bin: standard
+  (2) pair meam, perpetual, half/full from (1)
+      attributes: half, newton on
+      pair build: halffull/newton
+      stencil: none
+      bin: none
+Per MPI rank memory allocation (min/avg/max) = 55.92 | 55.92 | 55.92 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0         1600      -142400            0   -135782.09     20259.18 
+      50    885.10702   -139411.51            0   -135750.54    32425.431 
+     100    895.50973    -139454.3            0    -135750.3    31804.185 
+Loop time of 21.655 on 1 procs for 100 steps with 32000 atoms
+
+Performance: 1.995 ns/day, 12.031 hours/ns, 4.618 timesteps/s
+99.9% CPU use with 1 MPI tasks x 1 OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 21.181     | 21.181     | 21.181     |   0.0 | 97.81
+Neigh   | 0.42787    | 0.42787    | 0.42787    |   0.0 |  1.98
+Comm    | 0.013557   | 0.013557   | 0.013557   |   0.0 |  0.06
+Output  | 0.00020766 | 0.00020766 | 0.00020766 |   0.0 |  0.00
+Modify  | 0.023456   | 0.023456   | 0.023456   |   0.0 |  0.11
+Other   |            | 0.008504   |            |       |  0.04
+
+Nlocal:        32000.0 ave       32000 max       32000 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:        13576.0 ave       13576 max       13576 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:       780360.0 ave      780360 max      780360 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+FullNghs:  1.56072e+06 ave 1.56072e+06 max 1.56072e+06 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 1560720
+Ave neighs/atom = 48.772500
+Neighbor list builds = 8
+Dangerous builds = 0
+Total wall time: 0:00:21

bench/POTENTIALS/log.9Oct20.meam.4

@@ -0,0 +1,84 @@
+LAMMPS (9 Oct 2020)
+  using 1 OpenMP thread(s) per MPI task
+# bulk Ni in MEAM
+
+units		metal
+atom_style	atomic
+
+lattice		fcc 3.52
+Lattice spacing in x,y,z = 3.5200000 3.5200000 3.5200000
+region		box block 0 20 0 20 0 20
+create_box	1 box
+Created orthogonal box = (0.0000000 0.0000000 0.0000000) to (70.400000 70.400000 70.400000)
+  1 by 2 by 2 MPI processor grid
+create_atoms	1 box
+Created 32000 atoms
+  create_atoms CPU = 0.001 seconds
+
+pair_style	meam
+pair_coeff	* * library.meam Ni4 Ni.meam Ni4
+Reading potential file library.meam with DATE: 2012-06-29
+Reading potential file Ni.meam with DATE: 2007-06-11
+
+velocity	all create 1600.0 376847 loop geom
+
+neighbor	1.0 bin
+neigh_modify    delay 5 every 1
+
+fix		1 all nve
+
+timestep	0.005
+thermo		50
+
+run		100
+Neighbor list info ...
+  update every 1 steps, delay 5 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 5
+  ghost atom cutoff = 5
+  binsize = 2.5, bins = 29 29 29
+  2 neighbor lists, perpetual/occasional/extra = 2 0 0
+  (1) pair meam, perpetual
+      attributes: full, newton on
+      pair build: full/bin/atomonly
+      stencil: full/bin/3d
+      bin: standard
+  (2) pair meam, perpetual, half/full from (1)
+      attributes: half, newton on
+      pair build: halffull/newton
+      stencil: none
+      bin: none
+Per MPI rank memory allocation (min/avg/max) = 17.42 | 17.42 | 17.42 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0         1600      -142400            0   -135782.09     20259.18 
+      50    885.10702   -139411.51            0   -135750.54    32425.431 
+     100    895.50973    -139454.3            0    -135750.3    31804.185 
+Loop time of 6.34746 on 4 procs for 100 steps with 32000 atoms
+
+Performance: 6.806 ns/day, 3.526 hours/ns, 15.754 timesteps/s
+98.0% CPU use with 4 MPI tasks x 1 OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 6.0585     | 6.1109     | 6.1535     |   1.4 | 96.27
+Neigh   | 0.11286    | 0.11651    | 0.12455    |   1.4 |  1.84
+Comm    | 0.058046   | 0.099641   | 0.15569    |  11.7 |  1.57
+Output  | 9.0122e-05 | 0.00016046 | 0.0003624  |   0.0 |  0.00
+Modify  | 0.010822   | 0.011674   | 0.014224   |   1.4 |  0.18
+Other   |            | 0.008601   |            |       |  0.14
+
+Nlocal:        8000.00 ave        8045 max        7947 min
+Histogram: 1 0 0 1 0 0 0 1 0 1
+Nghost:        6066.75 ave        6120 max        6021 min
+Histogram: 1 0 1 0 0 0 1 0 0 1
+Neighs:       195090.0 ave      196403 max      193697 min
+Histogram: 1 0 0 1 0 0 0 1 0 1
+FullNghs:     390180.0 ave      392616 max      387490 min
+Histogram: 1 0 0 1 0 0 0 1 0 1
+
+Total # of neighbors = 1560720
+Ave neighs/atom = 48.772500
+Neighbor list builds = 8
+Dangerous builds = 0
+Total wall time: 0:00:06

bench/POTENTIALS/log.9Oct20.meamc.1

@@ -1,84 +0,0 @@
-LAMMPS (9 Oct 2020)
-  using 1 OpenMP thread(s) per MPI task
-# bulk Ni in MEAM
-
-units		metal
-atom_style	atomic
-
-lattice		fcc 3.52
-Lattice spacing in x,y,z = 3.5200000 3.5200000 3.5200000
-region		box block 0 20 0 20 0 20
-create_box	1 box
-Created orthogonal box = (0.0000000 0.0000000 0.0000000) to (70.400000 70.400000 70.400000)
-  1 by 1 by 1 MPI processor grid
-create_atoms	1 box
-Created 32000 atoms
-  create_atoms CPU = 0.002 seconds
-
-pair_style	meam/c
-pair_coeff	* * library.meam Ni4 Ni.meam Ni4
-Reading potential file library.meam with DATE: 2012-06-29
-Reading potential file Ni.meam with DATE: 2007-06-11
-
-velocity	all create 1600.0 376847 loop geom
-
-neighbor	1.0 bin
-neigh_modify    delay 5 every 1
-
-fix		1 all nve
-
-timestep	0.005
-thermo		50
-
-run		100
-Neighbor list info ...
-  update every 1 steps, delay 5 steps, check yes
-  max neighbors/atom: 2000, page size: 100000
-  master list distance cutoff = 5
-  ghost atom cutoff = 5
-  binsize = 2.5, bins = 29 29 29
-  2 neighbor lists, perpetual/occasional/extra = 2 0 0
-  (1) pair meam/c, perpetual
-      attributes: full, newton on
-      pair build: full/bin/atomonly
-      stencil: full/bin/3d
-      bin: standard
-  (2) pair meam/c, perpetual, half/full from (1)
-      attributes: half, newton on
-      pair build: halffull/newton
-      stencil: none
-      bin: none
-Per MPI rank memory allocation (min/avg/max) = 55.92 | 55.92 | 55.92 Mbytes
-Step Temp E_pair E_mol TotEng Press 
-       0         1600      -142400            0   -135782.09     20259.18 
-      50    885.10702   -139411.51            0   -135750.54    32425.431 
-     100    895.50973    -139454.3            0    -135750.3    31804.185 
-Loop time of 21.655 on 1 procs for 100 steps with 32000 atoms
-
-Performance: 1.995 ns/day, 12.031 hours/ns, 4.618 timesteps/s
-99.9% CPU use with 1 MPI tasks x 1 OpenMP threads
-
-MPI task timing breakdown:
-Section |  min time  |  avg time  |  max time  |%varavg| %total
----------------------------------------------------------------
-Pair    | 21.181     | 21.181     | 21.181     |   0.0 | 97.81
-Neigh   | 0.42787    | 0.42787    | 0.42787    |   0.0 |  1.98
-Comm    | 0.013557   | 0.013557   | 0.013557   |   0.0 |  0.06
-Output  | 0.00020766 | 0.00020766 | 0.00020766 |   0.0 |  0.00
-Modify  | 0.023456   | 0.023456   | 0.023456   |   0.0 |  0.11
-Other   |            | 0.008504   |            |       |  0.04
-
-Nlocal:        32000.0 ave       32000 max       32000 min
-Histogram: 1 0 0 0 0 0 0 0 0 0
-Nghost:        13576.0 ave       13576 max       13576 min
-Histogram: 1 0 0 0 0 0 0 0 0 0
-Neighs:       780360.0 ave      780360 max      780360 min
-Histogram: 1 0 0 0 0 0 0 0 0 0
-FullNghs:  1.56072e+06 ave 1.56072e+06 max 1.56072e+06 min
-Histogram: 1 0 0 0 0 0 0 0 0 0
-
-Total # of neighbors = 1560720
-Ave neighs/atom = 48.772500
-Neighbor list builds = 8
-Dangerous builds = 0
-Total wall time: 0:00:21

bench/POTENTIALS/log.9Oct20.meamc.4

@@ -1,84 +0,0 @@
-LAMMPS (9 Oct 2020)
-  using 1 OpenMP thread(s) per MPI task
-# bulk Ni in MEAM
-
-units		metal
-atom_style	atomic
-
-lattice		fcc 3.52
-Lattice spacing in x,y,z = 3.5200000 3.5200000 3.5200000
-region		box block 0 20 0 20 0 20
-create_box	1 box
-Created orthogonal box = (0.0000000 0.0000000 0.0000000) to (70.400000 70.400000 70.400000)
-  1 by 2 by 2 MPI processor grid
-create_atoms	1 box
-Created 32000 atoms
-  create_atoms CPU = 0.001 seconds
-
-pair_style	meam/c
-pair_coeff	* * library.meam Ni4 Ni.meam Ni4
-Reading potential file library.meam with DATE: 2012-06-29
-Reading potential file Ni.meam with DATE: 2007-06-11
-
-velocity	all create 1600.0 376847 loop geom
-
-neighbor	1.0 bin
-neigh_modify    delay 5 every 1
-
-fix		1 all nve
-
-timestep	0.005
-thermo		50
-
-run		100
-Neighbor list info ...
-  update every 1 steps, delay 5 steps, check yes
-  max neighbors/atom: 2000, page size: 100000
-  master list distance cutoff = 5
-  ghost atom cutoff = 5
-  binsize = 2.5, bins = 29 29 29
-  2 neighbor lists, perpetual/occasional/extra = 2 0 0
-  (1) pair meam/c, perpetual
-      attributes: full, newton on
-      pair build: full/bin/atomonly
-      stencil: full/bin/3d
-      bin: standard
-  (2) pair meam/c, perpetual, half/full from (1)
-      attributes: half, newton on
-      pair build: halffull/newton
-      stencil: none
-      bin: none
-Per MPI rank memory allocation (min/avg/max) = 17.42 | 17.42 | 17.42 Mbytes
-Step Temp E_pair E_mol TotEng Press 
-       0         1600      -142400            0   -135782.09     20259.18 
-      50    885.10702   -139411.51            0   -135750.54    32425.431 
-     100    895.50973    -139454.3            0    -135750.3    31804.185 
-Loop time of 6.34746 on 4 procs for 100 steps with 32000 atoms
-
-Performance: 6.806 ns/day, 3.526 hours/ns, 15.754 timesteps/s
-98.0% CPU use with 4 MPI tasks x 1 OpenMP threads
-
-MPI task timing breakdown:
-Section |  min time  |  avg time  |  max time  |%varavg| %total
----------------------------------------------------------------
-Pair    | 6.0585     | 6.1109     | 6.1535     |   1.4 | 96.27
-Neigh   | 0.11286    | 0.11651    | 0.12455    |   1.4 |  1.84
-Comm    | 0.058046   | 0.099641   | 0.15569    |  11.7 |  1.57
-Output  | 9.0122e-05 | 0.00016046 | 0.0003624  |   0.0 |  0.00
-Modify  | 0.010822   | 0.011674   | 0.014224   |   1.4 |  0.18
-Other   |            | 0.008601   |            |       |  0.14
-
-Nlocal:        8000.00 ave        8045 max        7947 min
-Histogram: 1 0 0 1 0 0 0 1 0 1
-Nghost:        6066.75 ave        6120 max        6021 min
-Histogram: 1 0 1 0 0 0 1 0 0 1
-Neighs:       195090.0 ave      196403 max      193697 min
-Histogram: 1 0 0 1 0 0 0 1 0 1
-FullNghs:     390180.0 ave      392616 max      387490 min
-Histogram: 1 0 0 1 0 0 0 1 0 1
-
-Total # of neighbors = 1560720
-Ave neighs/atom = 48.772500
-Neighbor list builds = 8
-Dangerous builds = 0
-Total wall time: 0:00:06

bench/POTENTIALS/log.9Oct20.reaxc.1

@@ -24,7 +24,7 @@ velocity	all create 300.0 9999
 
 pair_style	reax/c NULL
 pair_coeff      * * ffield.reax C H O N
-WARNING: Changed valency_val to valency_boc for X (src/USER-REAXC/reaxc_ffield.cpp:315)
+WARNING: Changed valency_val to valency_boc for X (src/REAXFF/reaxc_ffield.cpp:315)
 
 timestep	0.1
 fix		1 all nve

bench/POTENTIALS/log.9Oct20.reaxc.4

@@ -24,7 +24,7 @@ velocity	all create 300.0 9999
 
 pair_style	reax/c NULL
 pair_coeff      * * ffield.reax C H O N
-WARNING: Changed valency_val to valency_boc for X (src/USER-REAXC/reaxc_ffield.cpp:315)
+WARNING: Changed valency_val to valency_boc for X (src/REAXFF/reaxc_ffield.cpp:315)
 
 timestep	0.1
 fix		1 all nve

bench/README

@@ -2,7 +2,7 @@ LAMMPS benchmark problems
 
 This directory contains 5 benchmark problems which are discussed in
 the Benchmark section of the LAMMPS documentation, and on the
-Benchmark page of the LAMMPS WWW site (lammps.sandia.gov/bench).
+Benchmark page of the LAMMPS WWW site (https://www.lammps.org/bench.html).
 
 This directory also has several sub-directories:
 
@@ -11,7 +11,7 @@ KEPLER          benchmark scripts for GPU cluster with Kepler GPUs
 POTENTIALS      benchmarks scripts for various potentials in LAMMPS
 
 The results for all of these benchmarks are displayed and discussed on
-the Benchmark page of the LAMMPS WWW site: lammps.sandia.gov/bench.
+the Benchmark page of the LAMMPS WWW site: https://www.lammps.org/bench.html
 
 The remainder of this file refers to the 5 problems in the top-level
 of this directory and how to run them on CPUs, either in serial or

cmake/.coveragerc.in

@@ -0,0 +1,10 @@
+[run]
+source = @LAMMPS_PYTHON_DIR@
+parallel=True
+branch=True
+omit=*/install.py
+     */setup.py
+
+[paths]
+sources = python
+          @LAMMPS_PYTHON_DIR@

cmake/CMakeLists.txt

@@ -7,6 +7,11 @@ cmake_minimum_required(VERSION 3.10)
 if(POLICY CMP0074)
   cmake_policy(SET CMP0074 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()
 ########################################
 
 project(lammps CXX)
@@ -22,18 +27,34 @@ set(LAMMPS_TOOLS_DIR      ${LAMMPS_DIR}/tools)
 set(LAMMPS_PYTHON_DIR     ${LAMMPS_DIR}/python)
 set(LAMMPS_POTENTIALS_DIR ${LAMMPS_DIR}/potentials)
 
+set(LAMMPS_DOWNLOADS_URL "https://download.lammps.org" CACHE STRING "Base URL for LAMMPS downloads")
+set(LAMMPS_POTENTIALS_URL "${LAMMPS_DOWNLOADS_URL}/potentials")
+set(LAMMPS_THIRDPARTY_URL "${LAMMPS_DOWNLOADS_URL}/thirdparty")
+mark_as_advanced(LAMMPS_DOWNLOADS_URL)
+
 find_package(Git)
 
 # by default, install into $HOME/.local (not /usr/local), so that no root access (and sudo!!) is needed
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local" CACHE PATH "default install path" FORCE )
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND (NOT CMAKE_CROSSCOMPILING))
+    set(CMAKE_INSTALL_PREFIX "$ENV{USERPROFILE}/LAMMPS" CACHE PATH "Default install path" FORCE)
+  else()
+    set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local" CACHE PATH "Default install path" FORCE)
+  endif()
+endif()
+
+# If enabled, no need to use LD_LIBRARY_PATH / DYLD_LIBRARY_PATH when installed
+option(LAMMPS_INSTALL_RPATH "Set runtime path for shared libraries linked to LAMMPS binaries" OFF)
+if(LAMMPS_INSTALL_RPATH)
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 endif()
 
 # Cmake modules/macros are in a subdirectory to keep this file cleaner
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
 
 # make sure LIBRARY_PATH is set if environment variable is set
-if (DEFINED ENV{LIBRARY_PATH})
+if(DEFINED ENV{LIBRARY_PATH})
   list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIBRARY_PATH}")
   message(STATUS "Appending $ENV{LIBRARY_PATH} to CMAKE_LIBRARY_PATH: ${CMAKE_LIBRARY_PATH}")
 endif()
@@ -60,7 +81,7 @@ check_for_autogen_files(${LAMMPS_SOURCE_DIR})
 include(CheckIncludeFileCXX)
 
 # set required compiler flags and compiler/CPU arch specific optimizations
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+if((CMAKE_CXX_COMPILER_ID STREQUAL "Intel") OR (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM"))
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")
   if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
     set(CMAKE_TUNE_DEFAULT "-xCOMMON-AVX512")
@@ -73,6 +94,15 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Use compiler extensions")
+# ugly hack for MSVC which by default always reports an old C++ standard in the __cplusplus macro
+if(MSVC)
+  add_compile_options(/Zc:__cplusplus)
+endif()
+
+# export all symbols when building a .dll file on windows
+if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND BUILD_SHARED_LIBS)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
 
 ########################################################################
 # User input options                                                   #
@@ -92,11 +122,23 @@ endif()
 option(BUILD_TOOLS "Build and install LAMMPS tools (msi2lmp, binary2txt, chain)" OFF)
 option(BUILD_LAMMPS_SHELL "Build and install the LAMMPS shell" OFF)
 
+# allow enabling clang-tidy for C++ files
+set(ENABLE_CLANG_TIDY OFF CACHE BOOL "Include clang-tidy processing when compiling")
+if(ENABLE_CLANG_TIDY)
+  set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*-header-filter=.*" CACHE STRING "")
+endif()
+
 include(GNUInstallDirs)
 file(GLOB ALL_SOURCES ${LAMMPS_SOURCE_DIR}/[^.]*.cpp)
 file(GLOB MAIN_SOURCES ${LAMMPS_SOURCE_DIR}/main.cpp)
 list(REMOVE_ITEM ALL_SOURCES ${MAIN_SOURCES})
 add_library(lammps ${ALL_SOURCES})
+
+# tell CMake to export all symbols to a .dll on Windows with MinGW cross-compilers
+if(BUILD_SHARED_LIBS AND (CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING)
+  set_target_properties(lammps PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+endif()
+
 add_executable(lmp ${MAIN_SOURCES})
 target_link_libraries(lmp PRIVATE lammps)
 set_target_properties(lmp PROPERTIES OUTPUT_NAME ${LAMMPS_BINARY})
@@ -104,16 +146,93 @@ install(TARGETS lmp EXPORT LAMMPS_Targets DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF)
 
-set(STANDARD_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS DIPOLE
-  GRANULAR KSPACE LATTE MANYBODY MC MESSAGE MISC MLIAP MOLECULE PERI POEMS
-  QEQ REPLICA RIGID SHOCK SPIN SNAP SRD KIM PYTHON MSCG MPIIO VORONOI
-  USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESODPD USER-CGSDK USER-COLVARS
-  USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP USER-H5MD USER-LB
-  USER-MANIFOLD USER-MEAMC USER-MESONT USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE
-  USER-NETCDF USER-PHONON USER-PLUMED USER-PTM USER-QTB USER-REACTION
-  USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY
-  USER-UEF USER-VTK USER-QUIP USER-QMMM USER-YAFF USER-ADIOS)
-set(SUFFIX_PACKAGES CORESHELL USER-OMP KOKKOS OPT USER-INTEL GPU)
+set(STANDARD_PACKAGES
+  ADIOS
+  ASPHERE
+  ATC
+  AWPMD
+  BOCS
+  BODY
+  BROWNIAN
+  CG-DNA
+  CG-SDK
+  CLASS2
+  COLLOID
+  COLVARS
+  COMPRESS
+  DIELECTRIC
+  DIFFRACTION
+  DIPOLE
+  DPD-BASIC
+  DPD-MESO
+  DPD-REACT
+  DPD-SMOOTH
+  DRUDE
+  EFF
+  EXTRA-COMPUTE
+  EXTRA-DUMP
+  EXTRA-FIX
+  EXTRA-MOLECULE
+  EXTRA-PAIR
+  FEP
+  GRANULAR
+  H5MD
+  INTERLAYER
+  KIM
+  KSPACE
+  LATBOLTZ
+  LATTE
+  MACHDYN
+  MANIFOLD
+  MANYBODY
+  MC
+  MDI
+  MEAM
+  MESONT
+  MESSAGE
+  MGPT
+  MISC
+  ML-HDNNP
+  ML-IAP
+  ML-PACE
+  ML-QUIP
+  ML-RANN
+  ML-SNAP
+  MOFFF
+  MOLECULE
+  MOLFILE
+  MPIIO
+  MSCG
+  NETCDF
+  ORIENT
+  PERI
+  PHONON
+  PLUGIN
+  PLUMED
+  POEMS
+  PTM
+  PYTHON
+  QEQ
+  QMMM
+  QTB
+  REACTION
+  REAXFF
+  REPLICA
+  RIGID
+  SCAFACOS
+  SHOCK
+  SMTBQ
+  SPH
+  SPIN
+  SRD
+  TALLY
+  UEF
+  VORONOI
+  VTK
+  YAFF)
+
+set(SUFFIX_PACKAGES CORESHELL GPU KOKKOS OPT INTEL OPENMP)
+
 foreach(PKG ${STANDARD_PACKAGES} ${SUFFIX_PACKAGES})
   option(PKG_${PKG} "Build ${PKG} Package" OFF)
 endforeach()
@@ -123,7 +242,7 @@ endforeach()
 ######################################################
 target_include_directories(lammps PUBLIC $<BUILD_INTERFACE:${LAMMPS_SOURCE_DIR}>)
 
-if(PKG_USER-ADIOS)
+if(PKG_ADIOS)
   # The search for ADIOS2 must come before MPI because
   # it includes its own MPI search with the latest FindMPI.cmake
   # script that defines the MPI::MPI_C target
@@ -133,7 +252,6 @@ if(PKG_USER-ADIOS)
 endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  set(MPI_CXX_SKIP_MPICXX TRUE)
   find_package(MPI QUIET)
   option(BUILD_MPI "Build MPI version" ${MPI_FOUND})
 else()
@@ -141,8 +259,11 @@ else()
 endif()
 
 if(BUILD_MPI)
+  # do not include the (obsolete) MPI C++ bindings which makes
+  # for leaner object files and avoids namespace conflicts
+  set(MPI_CXX_SKIP_MPICXX TRUE)
   # We use a non-standard procedure to cross-compile with MPI on Windows
-  if((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING)
+  if((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING)
     include(MPI4WIN)
     target_link_libraries(lammps PUBLIC MPI::MPI_CXX)
   else()
@@ -154,8 +275,7 @@ if(BUILD_MPI)
     endif()
   endif()
 else()
-  enable_language(C)
-  file(GLOB MPI_SOURCES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.c)
+  file(GLOB MPI_SOURCES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.cpp)
   add_library(mpi_stubs STATIC ${MPI_SOURCES})
   set_target_properties(mpi_stubs PROPERTIES OUTPUT_NAME lammps_mpi_stubs${LAMMPS_MACHINE})
   target_include_directories(mpi_stubs PUBLIC $<BUILD_INTERFACE:${LAMMPS_SOURCE_DIR}/STUBS>)
@@ -177,7 +297,7 @@ string(TOUPPER ${LAMMPS_SIZES} LAMMPS_SIZES)
 target_compile_definitions(lammps PUBLIC -DLAMMPS_${LAMMPS_SIZES})
 
 # posix_memalign is not available on Windows
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(LAMMPS_MEMALIGN "0" CACHE STRING "posix_memalign() is not available on Windows" FORCE)
 else()
   set(LAMMPS_MEMALIGN "64" CACHE STRING "enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS. Set to 0 to disable")
@@ -193,12 +313,16 @@ endif()
 
 # "hard" dependencies between packages resulting
 # in an error instead of skipping over files
-pkg_depends(MLIAP SNAP)
+pkg_depends(ML-IAP ML-SNAP)
 pkg_depends(MPIIO MPI)
-pkg_depends(USER-ATC MANYBODY)
-pkg_depends(USER-LB MPI)
-pkg_depends(USER-PHONON KSPACE)
-pkg_depends(USER-SCAFACOS MPI)
+pkg_depends(ATC MANYBODY)
+pkg_depends(LATBOLTZ MPI)
+pkg_depends(PHONON KSPACE)
+pkg_depends(SCAFACOS MPI)
+pkg_depends(DIELECTRIC KSPACE)
+pkg_depends(DIELECTRIC EXTRA-PAIR)
+pkg_depends(CG-DNA MOLECULE)
+pkg_depends(CG-DNA ASPHERE)
 
 # detect if we may enable OpenMP support by default
 set(BUILD_OMP_DEFAULT OFF)
@@ -219,8 +343,10 @@ if(BUILD_OMP)
     message(FATAL_ERROR "Cannot find the 'omp.h' header file required for full OpenMP support")
   endif()
 
-  if (((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0)) OR
-      (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") OR
+  if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0)) OR
+      (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") OR (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC") OR
+      (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM") OR (CMAKE_CXX_COMPILER_ID STREQUAL "XLClang") OR
+      ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)) OR
       ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)) OR
       ((CMAKE_CXX_COMPILER_ID STREQUAL "Intel") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0)))
     # GCC 9.x and later plus Clang 10.x and later implement strict OpenMP 4.0 semantics for consts.
@@ -232,69 +358,7 @@ if(BUILD_OMP)
   target_link_libraries(lammps PRIVATE OpenMP::OpenMP_CXX)
 endif()
 
-# Compiler specific features for testing
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  option(ENABLE_COVERAGE "Enable collecting code coverage data" OFF)
-  mark_as_advanced(ENABLE_COVERAGE)
-  if(ENABLE_COVERAGE)
-    if(CMAKE_VERSION VERSION_LESS 3.13)
-      if(CMAKE_CXX_FLAGS)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
-      else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_${CMAKE_BUILD_TYPE}_FLAGS} --coverage")
-      endif()
-    else()
-      target_compile_options(lammps PUBLIC --coverage)
-      target_link_options(lammps PUBLIC --coverage)
-    endif()
-  endif()
-endif()
-
-#######################################
-# add custom target for IWYU analysis
-#######################################
-set(ENABLE_IWYU OFF CACHE BOOL "Add 'iwyu' build target to call the include-what-you-use tool")
-mark_as_advanced(ENABLE_IWYU)
-if(ENABLE_IWYU)
-  find_program(IWYU_EXE NAMES include-what-you-use iwyu)
-  find_program(IWYU_TOOL NAMES iwyu_tool iwyu-tool iwyu_tool.py)
-  if (IWYU_EXE AND IWYU_TOOL)
-    add_custom_target(
-      iwyu
-      ${IWYU_TOOL} -o clang -p ${CMAKE_CURRENT_BINARY_DIR} -- -Xiwyu --mapping_file=${CMAKE_CURRENT_SOURCE_DIR}/iwyu/iwyu-extra-map.imp
-      COMMENT "Running IWYU")
-    add_dependencies(iwyu lammps)
-  else()
-    message(FATAL_ERROR "To use IWYU you need the include-what-you-use/iwyu executable"
-      "and the iwyu-tool/iwyu_tool script installed in your PATH")
-  endif()
-endif()
-
-set(ENABLE_SANITIZER "none" CACHE STRING "Select a code sanitizer option (none (default), address, leak, thread, undefined)")
-mark_as_advanced(ENABLE_SANITIZER)
-set(ENABLE_SANITIZER_VALUES none address leak thread undefined)
-set_property(CACHE ENABLE_SANITIZER PROPERTY STRINGS ${ENABLE_SANITIZER_VALUES})
-validate_option(ENABLE_SANITIZER ENABLE_SANITIZER_VALUES)
-string(TOLOWER ${ENABLE_SANITIZER} ENABLE_SANITIZER)
-if(NOT ENABLE_SANITIZER STREQUAL "none")
-  if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
-    if(CMAKE_VERSION VERSION_LESS 3.13)
-      if(CMAKE_CXX_FLAGS)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${ENABLE_SANITIZER}")
-      else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_${CMAKE_BUILD_TYPE}_FLAGS} -fsanitize=${ENABLE_SANITIZER}")
-      endif()
-    else()
-      target_compile_options(lammps PUBLIC -fsanitize=${ENABLE_SANITIZER})
-      target_link_options(lammps PUBLIC -fsanitize=${ENABLE_SANITIZER})
-    endif()
-  else()
-    message(WARNING "ENABLE_SANITIZER option not supported by ${CMAKE_CXX_COMPILER_ID} compilers. Ignoring.")
-    set(ENABLE_SANITIZER "none")
-  endif()
-endif()
-
-if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
+if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_LATTE)
   enable_language(C)
   find_package(LAPACK)
   find_package(BLAS)
@@ -314,6 +378,8 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
   endif()
 endif()
 
+# tweak jpeg library names to avoid linker errors with MinGW cross-compilation
+set(JPEG_NAMES libjpeg libjpeg-62)
 find_package(JPEG QUIET)
 option(WITH_JPEG "Enable JPEG support" ${JPEG_FOUND})
 if(WITH_JPEG)
@@ -345,7 +411,7 @@ find_program(GZIP_EXECUTABLE gzip)
 find_package_handle_standard_args(GZIP REQUIRED_VARS GZIP_EXECUTABLE)
 option(WITH_GZIP "Enable GZIP support" ${GZIP_FOUND})
 if(WITH_GZIP)
-  if(GZIP_FOUND OR ((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING))
+  if(GZIP_FOUND OR ((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING))
     target_compile_definitions(lammps PRIVATE -DLAMMPS_GZIP)
   else()
     message(FATAL_ERROR "gzip executable not found")
@@ -356,7 +422,7 @@ find_program(FFMPEG_EXECUTABLE ffmpeg)
 find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_EXECUTABLE)
 option(WITH_FFMPEG "Enable FFMPEG support" ${FFMPEG_FOUND})
 if(WITH_FFMPEG)
-  if(FFMPEG_FOUND OR ((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING))
+  if(FFMPEG_FOUND OR ((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING))
     target_compile_definitions(lammps PRIVATE -DLAMMPS_FFMPEG)
   else()
     message(FATAL_ERROR "ffmpeg executable not found")
@@ -373,8 +439,8 @@ else()
   set(CUDA_REQUEST_PIC)
 endif()
 
-foreach(PKG_WITH_INCL KSPACE PYTHON VORONOI USER-COLVARS USER-MOLFILE USER-NETCDF USER-PLUMED USER-QMMM
-        USER-QUIP USER-SCAFACOS USER-SMD USER-VTK KIM LATTE MESSAGE MSCG COMPRESS)
+foreach(PKG_WITH_INCL KSPACE PYTHON ML-IAP VORONOI COLVARS ML-HDNNP MDI MOLFILE NETCDF
+        PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM LATTE MESSAGE MSCG COMPRESS ML-PACE)
   if(PKG_${PKG_WITH_INCL})
     include(Packages/${PKG_WITH_INCL})
   endif()
@@ -467,11 +533,10 @@ endforeach()
 ##############################################
 # add lib sources of (simple) enabled packages
 ############################################
-foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-MESONT)
-  if(PKG_${SIMPLE_LIB})
-    string(REGEX REPLACE "^USER-" "" PKG_LIB "${SIMPLE_LIB}")
+foreach(PKG_LIB POEMS ATC AWPMD H5MD MESONT)
+  if(PKG_${PKG_LIB})
     string(TOLOWER "${PKG_LIB}" PKG_LIB)
-    if(PKG_LIB STREQUAL mesont)
+    if(PKG_LIB STREQUAL "mesont")
       enable_language(Fortran)
       file(GLOB_RECURSE ${PKG_LIB}_SOURCES
         ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.f90)
@@ -483,9 +548,9 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-MESONT)
     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})
-    if(PKG_LIB STREQUAL awpmd)
+    if(PKG_LIB STREQUAL "awpmd")
       target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
-    elseif(PKG_LIB STREQUAL h5md)
+    elseif(PKG_LIB STREQUAL "h5md")
       target_include_directories(h5md PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/h5md/include ${HDF5_INCLUDE_DIRS})
     else()
       target_include_directories(${PKG_LIB} PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB})
@@ -493,13 +558,13 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-MESONT)
   endif()
 endforeach()
 
-if(PKG_USER-AWPMD)
+if(PKG_AWPMD)
   target_link_libraries(awpmd PRIVATE ${LAPACK_LIBRARIES})
 endif()
 
-if(PKG_USER-ATC)
-  if(LAMMPS_SIZES STREQUAL BIGBIG)
-    message(FATAL_ERROR "The USER-ATC Package is not compatible with -DLAMMPS_BIGBIG")
+if(PKG_ATC)
+  if(LAMMPS_SIZES STREQUAL "BIGBIG")
+    message(FATAL_ERROR "The ATC Package is not compatible with -DLAMMPS_BIGBIG")
   endif()
   target_link_libraries(atc PRIVATE ${LAPACK_LIBRARIES})
   if(BUILD_MPI)
@@ -511,26 +576,38 @@ if(PKG_USER-ATC)
   target_compile_definitions(atc PRIVATE -DLAMMPS_${LAMMPS_SIZES})
 endif()
 
-if(PKG_USER-H5MD)
-  include(Packages/USER-H5MD)
+if(PKG_H5MD)
+  include(Packages/H5MD)
 endif()
 
 ######################################################################
 # packages which selectively include variants based on enabled styles
 # e.g. accelerator packages
 ######################################################################
-foreach(PKG_WITH_INCL CORESHELL QEQ USER-OMP USER-SDPD KOKKOS OPT USER-INTEL GPU)
+foreach(PKG_WITH_INCL CORESHELL QEQ OPENMP DPD-SMOOTH KOKKOS OPT INTEL GPU)
   if(PKG_${PKG_WITH_INCL})
     include(Packages/${PKG_WITH_INCL})
   endif()
 endforeach()
 
+if(PKG_PLUGIN)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(lammps PRIVATE -DLMP_PLUGIN)
+  else()
+    message(WARNING "Plugin loading will not work unless BUILD_SHARED_LIBS is enabled")
+  endif()
+  # link with -ldl or equivalent for plugin loading; except on Windows
+  if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    target_link_libraries(lammps PRIVATE ${CMAKE_DL_LIBS})
+  endif()
+endif()
+
 ######################################################################
 # the windows version of LAMMPS requires a couple extra libraries
 # and the MPI library - if use - has to be linked right before those
 # and after everything else that is compiled locally
 ######################################################################
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   target_link_libraries(lammps PRIVATE -lwsock32 -lpsapi)
 endif()
 
@@ -579,8 +656,8 @@ add_dependencies(lammps gitversion)
 # Actually add executable and lib to build
 ############################################
 get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
-list (FIND LANGUAGES "Fortran" _index)
-if (${_index} GREATER -1)
+list(FIND LANGUAGES "Fortran" _index)
+if(_index GREATER -1)
   target_link_libraries(lammps PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
 endif()
 set(LAMMPS_CXX_HEADERS angle.h atom.h bond.h citeme.h comm.h compute.h dihedral.h domain.h error.h fix.h force.h group.h improper.h
@@ -650,7 +727,7 @@ install(
 if(BUILD_SHARED_LIBS)
   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.8 3.7 3.6 3.5)
+    set(Python_ADDITIONAL_VERSIONS 3.9 3.8 3.7 3.6 3.5)
     find_package(PythonInterp) # Deprecated since version 3.12
     if(PYTHONINTERP_FOUND)
         set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
@@ -658,12 +735,12 @@ if(BUILD_SHARED_LIBS)
   else()
     find_package(Python COMPONENTS Interpreter)
   endif()
-  if (Python_EXECUTABLE)
+  if(Python_EXECUTABLE)
     add_custom_target(
-      install-python
-      ${Python_EXECUTABLE} install.py -v ${LAMMPS_SOURCE_DIR}/version.h
+      install-python ${CMAKE_COMMAND} -E remove_directory build
+      COMMAND ${Python_EXECUTABLE} install.py -v ${LAMMPS_SOURCE_DIR}/version.h
       -p ${LAMMPS_PYTHON_DIR}/lammps
-      -l ${CMAKE_BINARY_DIR}/liblammps${CMAKE_SHARED_LIBRARY_SUFFIX}
+      -l ${CMAKE_BINARY_DIR}/liblammps${LAMMPS_MACHINE}${CMAKE_SHARED_LIBRARY_SUFFIX}
       WORKING_DIRECTORY  ${LAMMPS_PYTHON_DIR}
       COMMENT "Installing LAMMPS Python module")
   else()
@@ -691,7 +768,7 @@ if(BUILD_SHARED_LIBS OR PKG_PYTHON)
   else()
     find_package(Python COMPONENTS Interpreter)
   endif()
-  if (Python_EXECUTABLE)
+  if(Python_EXECUTABLE)
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/python)
     install(CODE "execute_process(COMMAND ${Python_EXECUTABLE} setup.py build -b ${CMAKE_BINARY_DIR}/python install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR}/ WORKING_DIRECTORY ${LAMMPS_PYTHON_DIR})")
   endif()
@@ -700,12 +777,19 @@ endif()
 include(Testing)
 include(CodeCoverage)
 include(CodingStandard)
+find_package(ClangFormat 8.0)
+
+if(ClangFormat_FOUND)
+  add_custom_target(format-src
+    COMMAND ${ClangFormat_EXECUTABLE} --verbose -i -style=file *.cpp *.h */*.cpp */*.h
+    WORKING_DIRECTORY ${LAMMPS_SOURCE_DIR})
+endif()
 
 get_target_property(DEFINES lammps COMPILE_DEFINITIONS)
 include(FeatureSummary)
 feature_summary(DESCRIPTION "The following tools and libraries have been found and configured:" WHAT PACKAGES_FOUND)
 message(STATUS "<<< Build configuration >>>
-   Operating System: ${CMAKE_SYSTEM_NAME}
+   Operating System: ${CMAKE_SYSTEM_NAME} ${CMAKE_LINUX_DISTRO} ${CMAKE_DISTRO_VERSION}
    Build type:       ${CMAKE_BUILD_TYPE}
    Install path:     ${CMAKE_INSTALL_PREFIX}
    Generator:        ${CMAKE_GENERATOR} using ${CMAKE_MAKE_PROGRAM}")
@@ -736,15 +820,15 @@ if(OPTIONS)
   message("      Options:       ${OPTIONS}")
 endif()
 get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
-list (FIND LANGUAGES "Fortran" _index)
-if (${_index} GREATER -1)
+list(FIND LANGUAGES "Fortran" _index)
+if(_index GREATER -1)
   message(STATUS "Fortran Compiler: ${CMAKE_Fortran_COMPILER}
       Type:          ${CMAKE_Fortran_COMPILER_ID}
       Version:       ${CMAKE_Fortran_COMPILER_VERSION}
       Fortran Flags:${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${BTYPE}}")
 endif()
-list (FIND LANGUAGES "C" _index)
-if (${_index} GREATER -1)
+list(FIND LANGUAGES "C" _index)
+if(_index GREATER -1)
   message(STATUS "C compiler:       ${CMAKE_C_COMPILER}
       Type:          ${CMAKE_C_COMPILER_ID}
       Version:       ${CMAKE_C_COMPILER_VERSION}
@@ -774,11 +858,12 @@ if(BUILD_MPI)
 endif()
 if(PKG_GPU)
   message(STATUS "<<< GPU package settings >>>
--- GPU API:          ${GPU_API}")
+-- GPU API:                  ${GPU_API}")
   if(GPU_API STREQUAL "CUDA")
-    message(STATUS "GPU architecture: ${GPU_ARCH}")
-  elseif(GPU_API STREQUAL "OPENCL")
-    message(STATUS "OpenCL tuning:    ${OCL_TUNE}")
+    message(STATUS "CUDA Compiler:            ${CUDA_NVCC_EXECUTABLE}")
+    message(STATUS "GPU default architecture: ${GPU_ARCH}")
+    message(STATUS "GPU binning with CUDPP:   ${CUDPP_OPT}")
+    message(STATUS "CUDA MPS support:         ${CUDA_MPS_SUPPORT}")
   elseif(GPU_API STREQUAL "HIP")
     message(STATUS "HIP platform:     ${HIP_PLATFORM}")
     message(STATUS "HIP architecture: ${HIP_ARCH}")
@@ -788,7 +873,7 @@ if(PKG_GPU)
       message(STATUS "HIP GPU sorting: off")
     endif()
   endif()
-  message(STATUS "GPU precision:    ${GPU_PREC}")
+  message(STATUS "GPU precision:            ${GPU_PREC}")
 endif()
 if(PKG_KOKKOS)
   message(STATUS "Kokkos Arch: ${KOKKOS_ARCH}")
@@ -808,7 +893,7 @@ if(PKG_KSPACE)
   endif()
   if(PKG_KOKKOS)
     if(Kokkos_ENABLE_CUDA)
-      if (${FFT} STREQUAL "KISS")
+      if(FFT STREQUAL "KISS")
         message(STATUS "Kokkos FFT: KISS")
       else()
         message(STATUS "Kokkos FFT: cuFFT")

cmake/Modules/CodeCoverage.cmake

@@ -54,6 +54,8 @@ if(ENABLE_COVERAGE)
 
     if(COVERAGE_FOUND)
         set(PYTHON_COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/python_coverage_html)
+        configure_file(.coveragerc.in ${CMAKE_BINARY_DIR}/.coveragerc @ONLY)
+
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/unittest/python/.coverage
             COMMAND ${COVERAGE_BINARY} combine
@@ -63,16 +65,16 @@ if(ENABLE_COVERAGE)
 
         add_custom_target(
             gen_python_coverage_html
-            COMMAND ${COVERAGE_BINARY} html -d ${PYTHON_COVERAGE_HTML_DIR}
-            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage
+            COMMAND ${COVERAGE_BINARY} html --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -d ${PYTHON_COVERAGE_HTML_DIR}
+            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
             COMMENT "Generating HTML Python coverage report..."
         )
 
         add_custom_target(
             gen_python_coverage_xml
-            COMMAND ${COVERAGE_BINARY} xml -o ${CMAKE_BINARY_DIR}/python_coverage.xml
-            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage
+            COMMAND ${COVERAGE_BINARY} xml --rcfile=${CMAKE_BINARY_DIR}/.coveragerc -o ${CMAKE_BINARY_DIR}/python_coverage.xml
+            DEPENDS ${CMAKE_BINARY_DIR}/unittest/python/.coverage ${CMAKE_BINARY_DIR}/.coveragerc
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/python
             COMMENT "Generating XML Python coverage report..."
         )

cmake/Modules/CodingStandard.cmake

@@ -8,13 +8,18 @@ else()
     find_package(Python3 COMPONENTS Interpreter QUIET)
 endif()
 
-if (Python3_EXECUTABLE)
+if(Python3_EXECUTABLE)
     if(Python3_VERSION VERSION_GREATER_EQUAL 3.5)
         add_custom_target(
           check-whitespace
           ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py .
           WORKING_DIRECTORY  ${LAMMPS_DIR}
           COMMENT "Check for whitespace errors")
+        add_custom_target(
+          check-homepage
+          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py .
+          WORKING_DIRECTORY  ${LAMMPS_DIR}
+          COMMENT "Check for homepage URL errors")
         add_custom_target(
           check-permissions
           ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py .
@@ -25,6 +30,11 @@ if (Python3_EXECUTABLE)
           ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f .
           WORKING_DIRECTORY  ${LAMMPS_DIR}
           COMMENT "Fix whitespace errors")
+        add_custom_target(
+          fix-homepage
+          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/homepage.py -f .
+          WORKING_DIRECTORY  ${LAMMPS_DIR}
+          COMMENT "Fix homepage URL errors")
         add_custom_target(
           fix-permissions
           ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py -f .

cmake/Modules/Documentation.cmake

@@ -50,16 +50,20 @@ if(BUILD_DOC)
     OUTPUT ${DOC_BUILD_DIR}/requirements.txt
     DEPENDS docenv ${DOCENV_REQUIREMENTS_FILE}
     COMMAND ${CMAKE_COMMAND} -E copy ${DOCENV_REQUIREMENTS_FILE} ${DOC_BUILD_DIR}/requirements.txt
-    COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade pip
-    COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade ${LAMMPS_DOC_DIR}/utils/converters
-    COMMAND ${DOCENV_BINARY_DIR}/pip install --use-feature=2020-resolver -r ${DOC_BUILD_DIR}/requirements.txt --upgrade
+    COMMAND ${DOCENV_BINARY_DIR}/pip $ENV{PIP_OPTIONS} install --upgrade pip
+    COMMAND ${DOCENV_BINARY_DIR}/pip $ENV{PIP_OPTIONS} install --upgrade ${LAMMPS_DOC_DIR}/utils/converters
+    COMMAND ${DOCENV_BINARY_DIR}/pip $ENV{PIP_OPTIONS} install -r ${DOC_BUILD_DIR}/requirements.txt --upgrade
   )
 
+  set(MATHJAX_URL "https://github.com/mathjax/MathJax/archive/3.1.3.tar.gz" CACHE STRING "URL for MathJax tarball")
+  set(MATHJAX_MD5 "d1c98c746888bfd52ca8ebc10704f92f" CACHE STRING "MD5 checksum of MathJax tarball")
+  mark_as_advanced(MATHJAX_URL)
+
   # download mathjax distribution and unpack to folder "mathjax"
   if(NOT EXISTS ${DOC_BUILD_STATIC_DIR}/mathjax/es5)
-    file(DOWNLOAD "https://github.com/mathjax/MathJax/archive/3.1.2.tar.gz"
+    file(DOWNLOAD ${MATHJAX_URL}
       "${CMAKE_CURRENT_BINARY_DIR}/mathjax.tar.gz"
-      EXPECTED_MD5 a4a6a093a89bc2ccab1452d766b98e53)
+      EXPECTED_MD5 ${MATHJAX_MD5})
     execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf mathjax.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     file(GLOB MATHJAX_VERSION_DIR ${CMAKE_CURRENT_BINARY_DIR}/MathJax-*)
     execute_process(COMMAND ${CMAKE_COMMAND} -E rename ${MATHJAX_VERSION_DIR} ${DOC_BUILD_STATIC_DIR}/mathjax)

cmake/Modules/FindCythonize.cmake

@@ -0,0 +1,30 @@
+# Find the Cythonize tool.
+#
+# This code sets the following variables:
+#
+#  Cythonize_EXECUTABLE
+#
+# adapted from https://github.com/cmarshall108/cython-cmake-example/blob/master/cmake/FindCython.cmake
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 3.12)
+    find_package(PythonInterp 3.6 QUIET) # Deprecated since version 3.12
+    if(PYTHONINTERP_FOUND)
+        set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
+    endif()
+else()
+    find_package(Python3 3.6 COMPONENTS Interpreter QUIET)
+endif()
+
+# Use the Cython executable that lives next to the Python executable
+# if it is a local installation.
+if(Python3_EXECUTABLE)
+  get_filename_component(_python_path ${Python3_EXECUTABLE} PATH)
+  find_program(Cythonize_EXECUTABLE
+    NAMES cythonize3 cythonize cythonize.bat
+    HINTS ${_python_path})
+endif()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cythonize REQUIRED_VARS Cythonize_EXECUTABLE)
+mark_as_advanced(Cythonize_EXECUTABLE)

cmake/Modules/FindFFTW3.cmake

@@ -38,7 +38,7 @@ if(FFTW3_FOUND)
       add_library(FFTW3::FFTW3_OMP UNKNOWN IMPORTED)
       set_target_properties(FFTW3::FFTW3_OMP PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-	IMPORTED_LOCATION "${FFTW3_OMP_LIBRARY}"
+        IMPORTED_LOCATION "${FFTW3_OMP_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIRS}")
     endif()
   endif()

cmake/Modules/FindFFTW3F.cmake

@@ -37,7 +37,7 @@ if(FFTW3F_FOUND)
       add_library(FFTW3F::FFTW3F_OMP UNKNOWN IMPORTED)
       set_target_properties(FFTW3F::FFTW3F_OMP PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-	IMPORTED_LOCATION "${FFTW3F_OMP_LIBRARY}"
+        IMPORTED_LOCATION "${FFTW3F_OMP_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${FFTW3F_INCLUDE_DIRS}")
     endif()
   endif()

cmake/Modules/FindN2P2.cmake

@@ -0,0 +1,61 @@
+include(FindPackageHandleStandardArgs)
+
+# Check if N2P2_DIR is set manually.
+if (DEFINED ENV{N2P2_DIR})
+  set(N2P2_DIR "${N2P2_DIR}")
+# If not, try if directory "lib/hdnnp/n2p2" exists.
+else()
+  get_filename_component(_fullpath "${LAMMPS_LIB_SOURCE_DIR}/hdnnp/n2p2" REALPATH)
+  if (EXISTS ${_fullpath})
+    set(N2P2_DIR "${_fullpath}")
+  endif()
+endif()
+
+# Set path to include directory.
+find_path(N2P2_INCLUDE_DIR InterfaceLammps.h HINTS "${N2P2_DIR}/include")
+# Two libraries need to be linked: libnnp and libnnpif.
+find_library(N2P2_LIBNNP NAMES nnp HINTS "${N2P2_DIR}/lib")
+find_library(N2P2_LIBNNPIF NAMES nnpif HINTS "${N2P2_DIR}/lib")
+# Users could compile n2p2 with extra flags which are then also required for
+# pair_hdnnp.cpp compilation. To forward them to the LAMMPS build process n2p2
+# writes a file with cmake commands, e.g.
+#
+# target_compile_definitions(lammps PRIVATE -DN2P2_NO_SF_GROUPS)
+#
+# to "lib/lammps-extra.cmake" which is then included by ML-HDNNP.cmake.
+find_file(N2P2_CMAKE_EXTRA NAMES lammps-extra.cmake HINTS "${N2P2_DIR}/lib")
+
+find_package_handle_standard_args(N2P2 DEFAULT_MSG
+  N2P2_DIR
+  N2P2_INCLUDE_DIR
+  N2P2_LIBNNP
+  N2P2_LIBNNPIF
+  N2P2_CMAKE_EXTRA)
+
+if(N2P2_FOUND)
+  if (NOT TARGET N2P2::N2P2)
+    # n2p2 core library "libnnp"
+    add_library(N2P2::LIBNNP UNKNOWN IMPORTED)
+    set_target_properties(N2P2::LIBNNP PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${N2P2_INCLUDE_DIR}
+      IMPORTED_LOCATION ${N2P2_LIBNNP})
+    # n2p2 interface library "libnnpif"
+    add_library(N2P2::LIBNNPIF UNKNOWN IMPORTED)
+    set_target_properties(N2P2::LIBNNPIF PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${N2P2_INCLUDE_DIR}
+      IMPORTED_LOCATION ${N2P2_LIBNNPIF})
+    # Put libnnp, libnnpif and include directory together.
+    add_library(N2P2::N2P2 INTERFACE IMPORTED)
+    set_property(TARGET N2P2::N2P2 PROPERTY
+      INTERFACE_LINK_LIBRARIES N2P2::LIBNNPIF N2P2::LIBNNP)
+    set(N2P2_CMAKE_EXTRAS ${N2P2_CMAKE_EXTRA})
+  endif()
+endif()
+
+mark_as_advanced(
+  N2P2_DIR
+  N2P2_INCLUDE_DIR
+  N2P2_LIBNNP
+  N2P2_LIBNNPIF
+  N2P2_CMAKE_EXTRA
+)

cmake/Modules/GTest.cmake

@@ -1,6 +1,6 @@
 message(STATUS "Downloading and building Google Test library")
 
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(GTEST_LIB_POSTFIX d)
 else()
   set(GTEST_LIB_POSTFIX)
@@ -8,10 +8,12 @@ endif()
 
 include(ExternalProject)
 set(GTEST_URL "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" CACHE STRING "URL for GTest tarball")
+set(GTEST_MD5 "ecd1fa65e7de707cd5c00bdac56022cd" CACHE STRING "MD5 checksum of GTest tarball")
 mark_as_advanced(GTEST_URL)
+mark_as_advanced(GTEST_MD5)
 ExternalProject_Add(googletest
-                    URL ${GTEST_URL}
-                    URL_MD5         ecd1fa65e7de707cd5c00bdac56022cd
+                    URL             ${GTEST_URL}
+                    URL_MD5         ${GTEST_MD5}
                     SOURCE_DIR      "${CMAKE_BINARY_DIR}/gtest-src"
                     BINARY_DIR      "${CMAKE_BINARY_DIR}/gtest-build"
                     CMAKE_ARGS      ${CMAKE_REQUEST_PIC} ${CMAKE_EXTRA_GTEST_OPTS}
@@ -20,10 +22,10 @@ ExternalProject_Add(googletest
                                     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                                     -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                                     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                    BUILD_BYPRODUCTS <BINARY_DIR>/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${GTEST_LIB_POSTFIX}.a
-                                     <BINARY_DIR>/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${GTEST_LIB_POSTFIX}.a
-                                     <BINARY_DIR>/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${GTEST_LIB_POSTFIX}.a
-                                     <BINARY_DIR>/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main${GTEST_LIB_POSTFIX}.a
+                    BUILD_BYPRODUCTS <BINARY_DIR>/lib/libgtest${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+                                     <BINARY_DIR>/lib/libgmock${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+                                     <BINARY_DIR>/lib/libgtest_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+                                     <BINARY_DIR>/lib/libgmock_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
                     LOG_DOWNLOAD ON
                     LOG_CONFIGURE ON
                     LOG_BUILD ON
@@ -39,10 +41,10 @@ file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR})
 file(MAKE_DIRECTORY ${GMOCK_INCLUDE_DIR})
 
 ExternalProject_Get_Property(googletest BINARY_DIR)
-set(GTEST_LIBRARY_PATH ${BINARY_DIR}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${GTEST_LIB_POSTFIX}.a)
-set(GMOCK_LIBRARY_PATH ${BINARY_DIR}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${GTEST_LIB_POSTFIX}.a)
-set(GTEST_MAIN_LIBRARY_PATH ${BINARY_DIR}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${GTEST_LIB_POSTFIX}.a)
-set(GMOCK_MAIN_LIBRARY_PATH ${BINARY_DIR}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main${GTEST_LIB_POSTFIX}.a)
+set(GTEST_LIBRARY_PATH ${BINARY_DIR}/lib/libgtest${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(GMOCK_LIBRARY_PATH ${BINARY_DIR}/lib/libgmock${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(GTEST_MAIN_LIBRARY_PATH ${BINARY_DIR}/lib/libgtest_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(GMOCK_MAIN_LIBRARY_PATH ${BINARY_DIR}/lib/libgmock_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # Prevent GoogleTest from overriding our compiler/linker options
 # when building with Visual Studio

cmake/Modules/GenerateOpenCLHeader.cmake

@@ -0,0 +1,3 @@
+# utility script to call WriteOpenCLHeader function
+include(${SOURCE_DIR}/Modules/OpenCLUtils.cmake)
+WriteOpenCLHeader(${VARNAME} ${HEADER_FILE} ${SOURCE_FILES})

cmake/Modules/LAMMPSUtils.cmake

@@ -50,6 +50,7 @@ function(check_for_autogen_files source_dir)
     file(GLOB SRC_AUTOGEN_FILES ${source_dir}/style_*.h)
     file(GLOB SRC_AUTOGEN_PACKAGES ${source_dir}/packages_*.h)
     list(APPEND SRC_AUTOGEN_FILES ${SRC_AUTOGEN_PACKAGES} ${source_dir}/lmpinstalledpkgs.h ${source_dir}/lmpgitversion.h)
+    list(APPEND SRC_AUTOGEN_FILES ${SRC_AUTOGEN_PACKAGES} ${source_dir}/mliap_model_python_couple.h ${source_dir}/mliap_model_python_couple.cpp)
     foreach(_SRC ${SRC_AUTOGEN_FILES})
       get_filename_component(FILENAME "${_SRC}" NAME)
       if(EXISTS ${source_dir}/${FILENAME})
@@ -66,7 +67,7 @@ endfunction()
 
 macro(pkg_depends PKG1 PKG2)
   if(PKG_${PKG1} AND NOT (PKG_${PKG2} OR BUILD_${PKG2}))
-    message(FATAL_ERROR "${PKG1} package needs LAMMPS to be build with ${PKG2}")
+    message(FATAL_ERROR "The ${PKG1} package needs LAMMPS to be build with the ${PKG2} package")
   endif()
 endmacro()
 
@@ -85,7 +86,6 @@ endfunction(GenerateBinaryHeader)
 # fetch missing potential files
 function(FetchPotentials pkgfolder potfolder)
   if (EXISTS "${pkgfolder}/potentials.txt")
-    set(LAMMPS_POTENTIALS_URL "https://download.lammps.org/potentials")
     file(STRINGS "${pkgfolder}/potentials.txt" linelist REGEX "^[^#].")
     foreach(line ${linelist})
       string(FIND ${line} " " blank)
@@ -104,3 +104,13 @@ function(FetchPotentials pkgfolder potfolder)
     endforeach()
   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}")
+  file(STRINGS /etc/os-release disversion REGEX "^VERSION_ID=")
+  string(REGEX REPLACE "VERSION_ID=\"?([^\"]*)\"?" "\\1" disversion "${disversion}")
+  set(CMAKE_LINUX_DISTRO ${distro})
+  set(CMAKE_DISTRO_VERSION ${disversion})
+endif()

cmake/Modules/MPI4WIN.cmake

@@ -1,16 +1,25 @@
 # Download and configure custom MPICH files for Windows
 message(STATUS "Downloading and configuring MPICH-1.4.1 for Windows")
+set(MPICH2_WIN64_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/mpich2-win64-devel.tar.gz" CACHE STRING "URL for MPICH2 (win64) tarball")
+set(MPICH2_WIN32_DEVEL_URL "${LAMMPS_THIRDPARTY_URL}/mpich2-win32-devel.tar.gz" CACHE STRING "URL for MPICH2 (win32) tarball")
+set(MPICH2_WIN64_DEVEL_MD5 "4939fdb59d13182fd5dd65211e469f14" CACHE STRING "MD5 checksum of MPICH2 (win64) tarball")
+set(MPICH2_WIN32_DEVEL_MD5 "a61d153500dce44e21b755ee7257e031" CACHE STRING "MD5 checksum of MPICH2 (win32) tarball")
+mark_as_advanced(MPICH2_WIN64_DEVEL_URL)
+mark_as_advanced(MPICH2_WIN32_DEVEL_URL)
+mark_as_advanced(MPICH2_WIN64_DEVEL_MD5)
+mark_as_advanced(MPICH2_WIN32_DEVEL_MD5)
+
 include(ExternalProject)
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   ExternalProject_Add(mpi4win_build
-    URL https://download.lammps.org/thirdparty/mpich2-win64-devel.tar.gz
-    URL_MD5 4939fdb59d13182fd5dd65211e469f14
+    URL     ${MPICH2_WIN64_DEVEL_URL}
+    URL_MD5 ${MPICH2_WIN64_DEVEL_MD5}
     CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
     BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
 else()
   ExternalProject_Add(mpi4win_build
-    URL https://download.lammps.org/thirdparty/mpich2-win32-devel.tar.gz
-    URL_MD5 a61d153500dce44e21b755ee7257e031
+    URL     ${MPICH2_WIN32_DEVEL_URL}
+    URL_MD5 ${MPICH2_WIN32_DEVEL_MD5}
     CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
     BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
 endif()

cmake/Modules/OpenCLLoader.cmake

@@ -0,0 +1,50 @@
+message(STATUS "Downloading and building OpenCL loader library")
+set(OPENCL_LOADER_URL "${LAMMPS_THIRDPARTY_URL}/opencl-loader-2021.09.18.tar.gz" CACHE STRING "URL for OpenCL loader tarball")
+set(OPENCL_LOADER_MD5 "3b3882627964bd02e5c3b02065daac3c" CACHE STRING "MD5 checksum of OpenCL loader tarball")
+mark_as_advanced(OPENCL_LOADER_URL)
+mark_as_advanced(OPENCL_LOADER_MD5)
+
+include(ExternalProject)
+ExternalProject_Add(opencl_loader
+                    URL             ${OPENCL_LOADER_URL}
+                    URL_MD5         ${OPENCL_LOADER_MD5}
+                    SOURCE_DIR      "${CMAKE_BINARY_DIR}/opencl_loader-src"
+                    BINARY_DIR      "${CMAKE_BINARY_DIR}/opencl_loader-build"
+                    CMAKE_ARGS      ${CMAKE_REQUEST_PIC} ${CMAKE_EXTRA_OPENCL_LOADER_OPTS}
+                                    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                                    -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                                    -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                    BUILD_BYPRODUCTS <BINARY_DIR>/libOpenCL${CMAKE_STATIC_LIBRARY_SUFFIX}
+                    LOG_DOWNLOAD ON
+                    LOG_CONFIGURE ON
+                    LOG_BUILD ON
+                    INSTALL_COMMAND ""
+                    TEST_COMMAND    "")
+
+ExternalProject_Get_Property(opencl_loader SOURCE_DIR)
+set(OPENCL_LOADER_INCLUDE_DIR ${SOURCE_DIR}/inc)
+
+# workaround for CMake 3.10 on ubuntu 18.04
+file(MAKE_DIRECTORY ${OPENCL_LOADER_INCLUDE_DIR})
+
+ExternalProject_Get_Property(opencl_loader BINARY_DIR)
+set(OPENCL_LOADER_LIBRARY_PATH "${BINARY_DIR}/libOpenCL${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+find_package(Threads QUIET)
+if(NOT WIN32)
+  set(OPENCL_LOADER_DEP_LIBS "Threads::Threads;${CMAKE_DL_LIBS}")
+else()
+  set(OPENCL_LOADER_DEP_LIBS "cfgmgr32;runtimeobject")
+endif()
+
+add_library(OpenCL::OpenCL UNKNOWN IMPORTED)
+add_dependencies(OpenCL::OpenCL opencl_loader)
+
+set_target_properties(OpenCL::OpenCL PROPERTIES
+  IMPORTED_LOCATION ${OPENCL_LOADER_LIBRARY_PATH}
+  INTERFACE_INCLUDE_DIRECTORIES ${OPENCL_LOADER_INCLUDE_DIR}
+  INTERFACE_LINK_LIBRARIES "${OPENCL_LOADER_DEP_LIBS}")
+
+

cmake/Modules/OpenCLUtils.cmake

@@ -1,10 +1,8 @@
-function(GenerateOpenCLHeader varname outfile files)
-    message("Creating ${outfile}...")
+function(WriteOpenCLHeader varname outfile files)
     file(WRITE ${outfile} "const char * ${varname} = \n")
-    math(EXPR ARG_END   "${ARGC}-1")
+    separate_arguments(files)
 
-    foreach(IDX RANGE 2 ${ARG_END})
-        list(GET ARGV ${IDX} filename)
+    foreach(filename ${files})
         file(READ ${filename} content)
         string(REGEX REPLACE "\\s*//[^\n]*\n" "\n" content "${content}")
         string(REGEX REPLACE "\\\\" "\\\\\\\\" content "${content}")
@@ -15,4 +13,16 @@ function(GenerateOpenCLHeader varname outfile files)
     endforeach()
 
     file(APPEND ${outfile} ";\n")
+endfunction(WriteOpenCLHeader)
+
+function(GenerateOpenCLHeader varname outfile files)
+    list(REMOVE_AT ARGV 0 1)
+    add_custom_command(OUTPUT ${outfile}
+      COMMAND ${CMAKE_COMMAND} -D SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+                               -D VARNAME=${varname}
+                               -D HEADER_FILE=${outfile}
+                               -D SOURCE_FILES="${ARGV}"
+                               -P ${CMAKE_CURRENT_SOURCE_DIR}/Modules/GenerateOpenCLHeader.cmake
+      DEPENDS ${ARGV}
+      COMMENT "Generating ${outfile}...")
 endfunction(GenerateOpenCLHeader)

cmake/Modules/Packages/DPD-SMOOTH.cmake

@@ -0,0 +1,13 @@
+# Fix rigid/meso requires RIGID to be installed
+set(DPD-SMOOTH_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/DPD-SMOOTH)
+
+get_property(hlist GLOBAL PROPERTY FIX)
+if(NOT PKG_RIGID)
+  list(REMOVE_ITEM hlist ${DPD-SMOOTH_SOURCES_DIR}/fix_rigid_meso.h)
+  get_target_property(LAMMPS_SOURCES lammps SOURCES)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${DPD-SMOOTH_SOURCES_DIR}/fix_rigid_meso.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES ${LAMMPS_SOURCES})
+endif()
+set_property(GLOBAL PROPERTY FIX "${hlist}")
+
+target_include_directories(lammps PRIVATE ${DPD-SMOOTH_SOURCES_DIR})

cmake/Modules/Packages/GPU.cmake

@@ -1,7 +1,10 @@
 set(GPU_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/GPU)
 set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h
                 ${GPU_SOURCES_DIR}/fix_gpu.h
-                ${GPU_SOURCES_DIR}/fix_gpu.cpp)
+                ${GPU_SOURCES_DIR}/fix_gpu.cpp
+                ${GPU_SOURCES_DIR}/fix_nh_gpu.h
+                ${GPU_SOURCES_DIR}/fix_nh_gpu.cpp)
+target_compile_definitions(lammps PRIVATE -DLMP_GPU)
 
 set(GPU_API "opencl" CACHE STRING "API used by GPU package")
 set(GPU_API_VALUES opencl cuda hip)
@@ -32,9 +35,12 @@ if(GPU_API STREQUAL "CUDA")
   if(NOT BIN2C)
     message(FATAL_ERROR "Could not find bin2c, use -DBIN2C=/path/to/bin2c to help cmake finding it.")
   endif()
-  option(CUDPP_OPT "Enable CUDPP_OPT" ON)
+  option(CUDPP_OPT "Enable GPU binning via CUDAPP (should be off for modern GPUs)" OFF)
   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")
+    endif()
     set(GPU_CUDA_MPS_FLAGS "-DCUDA_PROXY")
   endif()
 
@@ -42,7 +48,7 @@ if(GPU_API STREQUAL "CUDA")
 
   # ensure that no *cubin.h files exist from a compile in the lib/gpu folder
   file(GLOB GPU_LIB_OLD_CUBIN_HEADERS ${LAMMPS_LIB_SOURCE_DIR}/gpu/*_cubin.h)
-  if (GPU_LIB_OLD_CUBIN_HEADERS)
+  if(GPU_LIB_OLD_CUBIN_HEADERS)
     message(FATAL_ERROR "########################################################################\n"
       "Found file(s) generated by the make-based build system in lib/gpu\n"
       "Please run\n"
@@ -65,47 +71,54 @@ if(GPU_API STREQUAL "CUDA")
   # build arch/gencode commands for nvcc based on CUDA toolkit version and use choice
   # --arch translates directly instead of JIT, so this should be for the preferred or most common architecture
   set(GPU_CUDA_GENCODE "-arch=${GPU_ARCH}")
-  # Fermi (GPU Arch 2.x) is supported by CUDA 3.2 to CUDA 8.0
-  if((CUDA_VERSION VERSION_GREATER_EQUAL "3.2") AND (CUDA_VERSION VERSION_LESS "9.0"))
-    string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_20,code=[sm_20,compute_20] ")
-  endif()
-  # 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()
+
+  # apply the following to build "fat" CUDA binaries only for known CUDA toolkits
   if(CUDA_VERSION VERSION_GREATER_EQUAL "12.0")
-    message(WARNING "Unsupported CUDA version. Use at your own risk.")
+    message(WARNING "Untested CUDA Toolkit version. Use at your own risk")
+  else()
+    # Fermi (GPU Arch 2.x) is supported by CUDA 3.2 to CUDA 8.0
+    if((CUDA_VERSION VERSION_GREATER_EQUAL "3.2") AND (CUDA_VERSION VERSION_LESS "9.0"))
+      string(APPEND GPU_CUDA_GENCODE " -gencode arch=compute_20,code=[sm_20,compute_20] ")
+    endif()
+    # 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()
   endif()
 
   cuda_compile_fatbin(GPU_GEN_OBJS ${GPU_LIB_CU} OPTIONS ${CUDA_REQUEST_PIC}
-          -DUNIX -O3 --use_fast_math -Wno-deprecated-gpu-targets -DNV_KERNEL -DUCL_CUDADR ${GPU_CUDA_GENCODE} -D_${GPU_PREC_SETTING})
+          -DUNIX -O3 --use_fast_math -Wno-deprecated-gpu-targets -DNV_KERNEL -DUCL_CUDADR ${GPU_CUDA_GENCODE} -D_${GPU_PREC_SETTING} -DLAMMPS_${LAMMPS_SIZES})
 
   cuda_compile(GPU_OBJS ${GPU_LIB_CUDPP_CU} OPTIONS ${CUDA_REQUEST_PIC}
-          -DUNIX -O3 --use_fast_math -Wno-deprecated-gpu-targets -DUCL_CUDADR ${GPU_CUDA_GENCODE} -D_${GPU_PREC_SETTING})
+          -DUNIX -O3 --use_fast_math -Wno-deprecated-gpu-targets -DUCL_CUDADR ${GPU_CUDA_GENCODE} -D_${GPU_PREC_SETTING} -DLAMMPS_${LAMMPS_SIZES})
 
   foreach(CU_OBJ ${GPU_GEN_OBJS})
     get_filename_component(CU_NAME ${CU_OBJ} NAME_WE)
@@ -121,7 +134,7 @@ if(GPU_API STREQUAL "CUDA")
   add_library(gpu STATIC ${GPU_LIB_SOURCES} ${GPU_LIB_CUDPP_SOURCES} ${GPU_OBJS})
   target_link_libraries(gpu PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
   target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu ${CUDA_INCLUDE_DIRS})
-  target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT ${GPU_CUDA_MPS_FLAGS})
+  target_compile_definitions(gpu PRIVATE -DUSE_CUDA -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT ${GPU_CUDA_MPS_FLAGS})
   if(CUDPP_OPT)
     target_include_directories(gpu PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini)
     target_compile_definitions(gpu PRIVATE -DUSE_CUDPP)
@@ -135,27 +148,20 @@ if(GPU_API STREQUAL "CUDA")
   target_include_directories(nvc_get_devices PRIVATE ${CUDA_INCLUDE_DIRS})
 
 elseif(GPU_API STREQUAL "OPENCL")
-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    # download and unpack support binaries for compilation of windows binaries.
-    set(LAMMPS_THIRDPARTY_URL "https://download.lammps.org/thirdparty")
-    file(DOWNLOAD "${LAMMPS_THIRDPARTY_URL}/opencl-win-devel.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/opencl-win-devel.tar.gz"
-            EXPECTED_MD5 2c00364888d5671195598b44c2e0d44d)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf opencl-win-devel.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    add_library(OpenCL::OpenCL UNKNOWN IMPORTED)
-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
-      set_target_properties(OpenCL::OpenCL PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/lib_win32/libOpenCL.dll")
-    elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-      set_target_properties(OpenCL::OpenCL PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/lib_win64/libOpenCL.dll")
-    endif()
-    set_target_properties(OpenCL::OpenCL PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/include")
+  # the static OpenCL loader doesn't seem to work on macOS. use the system provided
+  # version by default instead (for as long as it will be available)
+  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+    set(_opencl_static_default OFF)
+  else()
+    set(_opencl_static_default ON)
+  endif()
+  option(USE_STATIC_OPENCL_LOADER "Download and include a static OpenCL ICD loader" ${_opencl_static_default})
+  mark_as_advanced(USE_STATIC_OPENCL_LOADER)
+  if(USE_STATIC_OPENCL_LOADER)
+    include(OpenCLLoader)
   else()
     find_package(OpenCL REQUIRED)
   endif()
-  set(OCL_TUNE "generic" CACHE STRING "OpenCL Device Tuning")
-  set(OCL_TUNE_VALUES intel fermi kepler cypress generic)
-  set_property(CACHE OCL_TUNE PROPERTY STRINGS ${OCL_TUNE_VALUES})
-  validate_option(OCL_TUNE OCL_TUNE_VALUES)
-  string(TOUPPER ${OCL_TUNE} OCL_TUNE)
 
   include(OpenCLUtils)
   set(OCL_COMMON_HEADERS ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_preprocessor.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_aux_fun1.h)
@@ -199,7 +205,7 @@ elseif(GPU_API STREQUAL "OPENCL")
   add_library(gpu STATIC ${GPU_LIB_SOURCES})
   target_link_libraries(gpu PRIVATE OpenCL::OpenCL)
   target_include_directories(gpu PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gpu)
-  target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -D${OCL_TUNE}_OCL -DMPI_GERYON -DUCL_NO_EXIT)
+  target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DGERYON_NUMA_FISSION -DUCL_NO_EXIT)
   target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)
 
   target_link_libraries(lammps PRIVATE gpu)
@@ -207,21 +213,29 @@ elseif(GPU_API STREQUAL "OPENCL")
   add_executable(ocl_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
   target_compile_definitions(ocl_get_devices PRIVATE -DUCL_OPENCL)
   target_link_libraries(ocl_get_devices PRIVATE OpenCL::OpenCL)
+  add_dependencies(ocl_get_devices OpenCL::OpenCL)
 elseif(GPU_API STREQUAL "HIP")
   if(NOT DEFINED HIP_PATH)
       if(NOT DEFINED ENV{HIP_PATH})
-          set(HIP_PATH "/opt/rocm/hip" CACHE PATH "Path to which HIP has been installed")
+          set(HIP_PATH "/opt/rocm/hip" CACHE PATH "Path to HIP installation")
       else()
-          set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to which HIP has been installed")
+          set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to HIP installation")
       endif()
   endif()
-  set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
-  find_package(HIP REQUIRED)
+  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})
+  find_package(hip REQUIRED)
   option(HIP_USE_DEVICE_SORT "Use GPU sorting" ON)
 
   if(NOT DEFINED HIP_PLATFORM)
       if(NOT DEFINED ENV{HIP_PLATFORM})
-          set(HIP_PLATFORM "hcc" CACHE PATH "HIP Platform to be used during compilation")
+          set(HIP_PLATFORM "amd" CACHE PATH "HIP Platform to be used during compilation")
       else()
           set(HIP_PLATFORM $ENV{HIP_PLATFORM} CACHE PATH "HIP Platform used during compilation")
       endif()
@@ -229,7 +243,7 @@ elseif(GPU_API STREQUAL "HIP")
 
   set(ENV{HIP_PLATFORM} ${HIP_PLATFORM})
 
-  if(HIP_PLATFORM STREQUAL "hcc")
+  if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd")
     set(HIP_ARCH "gfx906" CACHE STRING "HIP target architecture")
   elseif(HIP_PLATFORM STREQUAL "nvcc")
     find_package(CUDA REQUIRED)
@@ -287,23 +301,23 @@ 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")
+    if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd")
         configure_file(${CU_FILE} ${CU_CPP_FILE} COPYONLY)
 
         if(HIP_COMPILER STREQUAL "clang")
           add_custom_command(OUTPUT ${CUBIN_FILE}
-            VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --genco --offload-arch=${HIP_ARCH} -O3 -ffast-math -DUSE_HIP -D_${GPU_PREC_SETTING} -I${LAMMPS_LIB_SOURCE_DIR}/gpu -o ${CUBIN_FILE} ${CU_CPP_FILE}
+            VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --genco --offload-arch=${HIP_ARCH} -O3 -ffast-math -DUSE_HIP -D_${GPU_PREC_SETTING} -DLAMMPS_${LAMMPS_SIZES} -I${LAMMPS_LIB_SOURCE_DIR}/gpu -o ${CUBIN_FILE} ${CU_CPP_FILE}
             DEPENDS ${CU_CPP_FILE}
             COMMENT "Generating ${CU_NAME}.cubin")
         else()
           add_custom_command(OUTPUT ${CUBIN_FILE}
-            VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --genco -t="${HIP_ARCH}" -f=\"-O3 -ffast-math -DUSE_HIP -D_${GPU_PREC_SETTING} -I${LAMMPS_LIB_SOURCE_DIR}/gpu\" -o ${CUBIN_FILE} ${CU_CPP_FILE}
+            VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --genco -t="${HIP_ARCH}" -f=\"-O3 -ffast-math -DUSE_HIP -D_${GPU_PREC_SETTING} -DLAMMPS_${LAMMPS_SIZES} -I${LAMMPS_LIB_SOURCE_DIR}/gpu\" -o ${CUBIN_FILE} ${CU_CPP_FILE}
             DEPENDS ${CU_CPP_FILE}
             COMMENT "Generating ${CU_NAME}.cubin")
         endif()
     elseif(HIP_PLATFORM STREQUAL "nvcc")
         add_custom_command(OUTPUT ${CUBIN_FILE}
-          VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --fatbin --use_fast_math -DUSE_HIP -D_${GPU_PREC_SETTING} ${HIP_CUDA_GENCODE} -I${LAMMPS_LIB_SOURCE_DIR}/gpu -o ${CUBIN_FILE} ${CU_FILE}
+          VERBATIM COMMAND ${HIP_HIPCC_EXECUTABLE} --fatbin --use_fast_math -DUSE_HIP -D_${GPU_PREC_SETTING} -DLAMMPS_${LAMMPS_SIZES} ${HIP_CUDA_GENCODE} -I${LAMMPS_LIB_SOURCE_DIR}/gpu -o ${CUBIN_FILE} ${CU_FILE}
           DEPENDS ${CU_FILE}
           COMMENT "Generating ${CU_NAME}.cubin")
     endif()
@@ -318,10 +332,11 @@ elseif(GPU_API STREQUAL "HIP")
 
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LAMMPS_LIB_BINARY_DIR}/gpu/*_cubin.h ${LAMMPS_LIB_BINARY_DIR}/gpu/*.cu.cpp")
 
-  hip_add_library(gpu STATIC ${GPU_LIB_SOURCES})
+  add_library(gpu STATIC ${GPU_LIB_SOURCES})
   target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu)
   target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT)
   target_compile_definitions(gpu PRIVATE -DUSE_HIP)
+  target_link_libraries(gpu PRIVATE hip::host)
 
   if(HIP_USE_DEVICE_SORT)
     # add hipCUB
@@ -341,11 +356,16 @@ elseif(GPU_API STREQUAL "HIP")
 
       if(DOWNLOAD_CUB)
         message(STATUS "CUB download requested")
+        set(CUB_URL "https://github.com/NVlabs/cub/archive/1.12.0.tar.gz" CACHE STRING "URL for CUB tarball")
+        set(CUB_MD5 "1cf595beacafff104700921bac8519f3" CACHE STRING "MD5 checksum of CUB tarball")
+        mark_as_advanced(CUB_URL)
+        mark_as_advanced(CUB_MD5)
+
         include(ExternalProject)
 
         ExternalProject_Add(CUB
-          GIT_REPOSITORY https://github.com/NVlabs/cub
-          TIMEOUT 5
+          URL     ${CUB_URL}
+          URL_MD5 ${CUB_MD5}
           PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
           CONFIGURE_COMMAND ""
           BUILD_COMMAND ""
@@ -357,7 +377,7 @@ elseif(GPU_API STREQUAL "HIP")
       else()
         find_package(CUB)
         if(NOT CUB_FOUND)
-          message(FATAL_ERROR "CUB library not found. Help CMake to find it by setting CUB_INCLUDE_DIR, or set DOWNLOAD_VORO=ON to download it")
+          message(FATAL_ERROR "CUB library not found. Help CMake to find it by setting CUB_INCLUDE_DIR, or set DOWNLOAD_CUB=ON to download it")
         endif()
       endif()
 
@@ -365,8 +385,9 @@ elseif(GPU_API STREQUAL "HIP")
     endif()
   endif()
 
-  hip_add_executable(hip_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
+  add_executable(hip_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
   target_compile_definitions(hip_get_devices PRIVATE -DUCL_HIP)
+  target_link_libraries(hip_get_devices hip::host)
 
   if(HIP_PLATFORM STREQUAL "nvcc")
     target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_NVCC__)
@@ -384,18 +405,21 @@ elseif(GPU_API STREQUAL "HIP")
 
     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()
 
   target_link_libraries(lammps PRIVATE gpu)
 endif()
 
-# GPU package
-FindStyleHeaders(${GPU_SOURCES_DIR} FIX_CLASS fix_ FIX)
-
 set_property(GLOBAL PROPERTY "GPU_SOURCES" "${GPU_SOURCES}")
-
-# detects styles which have GPU version
+# detect styles which have a GPU version
 RegisterStylesExt(${GPU_SOURCES_DIR} gpu GPU_SOURCES)
+RegisterFixStyle(${GPU_SOURCES_DIR}/fix_gpu.h)
 
 get_property(GPU_SOURCES GLOBAL PROPERTY GPU_SOURCES)
 

cmake/Modules/Packages/INTEL.cmake

@@ -0,0 +1,116 @@
+check_include_file_cxx(immintrin.h FOUND_IMMINTRIN)
+if(NOT FOUND_IMMINTRIN)
+  message(FATAL_ERROR "immintrin.h header not found, Intel package won't work without it")
+endif()
+
+target_compile_definitions(lammps PRIVATE -DLMP_INTEL)
+
+set(INTEL_ARCH "cpu" CACHE STRING "Architectures used by INTEL (cpu or knl)")
+set(INTEL_ARCH_VALUES cpu knl)
+set_property(CACHE INTEL_ARCH PROPERTY STRINGS ${INTEL_ARCH_VALUES})
+validate_option(INTEL_ARCH INTEL_ARCH_VALUES)
+string(TOUPPER ${INTEL_ARCH} INTEL_ARCH)
+
+find_package(Threads QUIET)
+if(Threads_FOUND)
+  set(INTEL_LRT_MODE "threads" CACHE STRING "Long-range threads mode (none, threads, or c++11)")
+else()
+  set(INTEL_LRT_MODE "none" CACHE STRING "Long-range threads mode (none, threads, or c++11)")
+endif()
+set(INTEL_LRT_VALUES none threads c++11)
+set_property(CACHE INTEL_LRT_MODE PROPERTY STRINGS ${INTEL_LRT_VALUES})
+validate_option(INTEL_LRT_MODE INTEL_LRT_VALUES)
+string(TOUPPER ${INTEL_LRT_MODE} INTEL_LRT_MODE)
+if(INTEL_LRT_MODE STREQUAL "THREADS")
+  if(Threads_FOUND)
+    target_compile_definitions(lammps PRIVATE -DLMP_INTEL_USELRT)
+    target_link_libraries(lammps PRIVATE Threads::Threads)
+  else()
+    message(FATAL_ERROR "Must have working threads library for Long-range thread support")
+  endif()
+endif()
+if(INTEL_LRT_MODE STREQUAL "C++11")
+  if(Threads_FOUND)
+    target_compile_definitions(lammps PRIVATE -DLMP_INTEL_USELRT -DLMP_INTEL_LRT11)
+    target_link_libraries(lammps PRIVATE Threads::Threads)
+  else()
+    message(FATAL_ERROR "Must have working threads library for Long-range thread support")
+  endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+    message(FATAL_ERROR "INTEL needs at least a 2016 Intel compiler, found ${CMAKE_CXX_COMPILER_VERSION}")
+  endif()
+else()
+  message(WARNING "INTEL gives best performance with Intel compilers")
+endif()
+
+find_package(TBB_MALLOC QUIET)
+if(TBB_MALLOC_FOUND)
+  target_link_libraries(lammps PRIVATE TBB::TBB_MALLOC)
+else()
+  target_compile_definitions(lammps PRIVATE -DLMP_INTEL_NO_TBB)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    message(WARNING "INTEL with Intel compilers should use TBB malloc libraries")
+  endif()
+endif()
+
+find_package(MKL QUIET)
+if(MKL_FOUND)
+  target_compile_definitions(lammps PRIVATE -DLMP_USE_MKL_RNG)
+  target_link_libraries(lammps PRIVATE MKL::MKL)
+else()
+  message(STATUS "Pair style dpd/intel will be faster with MKL libraries")
+endif()
+
+if((NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "64") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "128") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "256"))
+  message(FATAL_ERROR "INTEL only supports memory alignment of 64, 128 or 256 on this platform")
+endif()
+
+if(INTEL_ARCH STREQUAL "KNL")
+  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    message(FATAL_ERROR "Must use Intel compiler with INTEL for KNL architecture")
+  endif()
+  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -xHost -qopenmp -qoffload")
+  set(MIC_OPTIONS "-qoffload-option,mic,compiler,\"-fp-model fast=2 -mGLOB_default_function_attrs=\\\"gather_scatter_loop_unroll=4\\\"\"")
+  target_compile_options(lammps PRIVATE -xMIC-AVX512 -qoffload -fno-alias -ansi-alias -restrict -qoverride-limits ${MIC_OPTIONS})
+  target_compile_definitions(lammps PRIVATE -DLMP_INTEL_OFFLOAD)
+else()
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    include(CheckCXXCompilerFlag)
+    foreach(_FLAG -O2 "-fp-model fast=2" -no-prec-div -qoverride-limits -qopt-zmm-usage=high -qno-offload -fno-alias -ansi-alias -restrict)
+      string(REGEX REPLACE "[ =\"]" "" _FLAGX ${_FLAG})
+      check_cxx_compiler_flag("${_FLAG}" COMPILER_SUPPORTS${_FLAGX})
+      if(COMPILER_SUPPORTS${_FLAGX})
+          separate_arguments(_FLAG UNIX_COMMAND "${_FLAG}")
+          target_compile_options(lammps PRIVATE ${_FLAG})
+      endif()
+    endforeach()
+  endif()
+endif()
+
+# collect sources
+set(INTEL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/INTEL)
+set(INTEL_SOURCES ${INTEL_SOURCES_DIR}/fix_intel.cpp
+                       ${INTEL_SOURCES_DIR}/fix_nh_intel.cpp
+                       ${INTEL_SOURCES_DIR}/intel_buffers.cpp
+                       ${INTEL_SOURCES_DIR}/nbin_intel.cpp
+                       ${INTEL_SOURCES_DIR}/npair_intel.cpp)
+
+set_property(GLOBAL PROPERTY "INTEL_SOURCES" "${INTEL_SOURCES}")
+
+# detect styles which have a INTEL version
+RegisterStylesExt(${INTEL_SOURCES_DIR} intel INTEL_SOURCES)
+RegisterNBinStyle(${INTEL_SOURCES_DIR}/nbin_intel.h)
+RegisterNPairStyle(${INTEL_SOURCES_DIR}/npair_intel.h)
+RegisterFixStyle(${INTEL_SOURCES_DIR}/fix_intel.h)
+
+get_property(INTEL_SOURCES GLOBAL PROPERTY INTEL_SOURCES)
+if(PKG_KSPACE)
+  list(APPEND INTEL_SOURCES ${INTEL_SOURCES_DIR}/verlet_lrt_intel.cpp)
+  RegisterIntegrateStyle(${INTEL_SOURCES_DIR}/verlet_lrt_intel.h)
+endif()
+
+target_sources(lammps PRIVATE ${INTEL_SOURCES})
+target_include_directories(lammps PRIVATE ${INTEL_SOURCES_DIR})

cmake/Modules/Packages/KIM.cmake

@@ -35,9 +35,13 @@ if(DOWNLOAD_KIM)
   include(ExternalProject)
   enable_language(C)
   enable_language(Fortran)
+  set(KIM_URL "https://s3.openkim.org/kim-api/kim-api-2.2.1.txz" CACHE STRING "URL for KIM tarball")
+  set(KIM_MD5 "ae1ddda2ef7017ea07934e519d023dca" CACHE STRING "MD5 checksum of KIM tarball")
+  mark_as_advanced(KIM_URL)
+  mark_as_advanced(KIM_MD5)
   ExternalProject_Add(kim_build
-    URL https://s3.openkim.org/kim-api/kim-api-2.2.1.txz
-    URL_MD5 ae1ddda2ef7017ea07934e519d023dca
+    URL     ${KIM_URL}
+    URL_MD5 ${KIM_MD5}
     BINARY_DIR build
     CMAKE_ARGS ${CMAKE_REQUEST_PIC}
                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -69,14 +73,14 @@ if(DOWNLOAD_KIM)
     BUILD_RPATH "${_rpath_prefix}/kim_build-prefix/lib"
     )
 else()
-  if(KIM-API_FOUND AND KIM_API_VERSION VERSION_GREATER_EQUAL 2.2.0)
+  if(KIM-API_FOUND AND KIM-API_VERSION VERSION_GREATER_EQUAL 2.2.0)
     # For kim-api >= 2.2.0
-    find_package(KIM-API ${KIM-API_MIN_VERSION} CONFIG REQUIRED)
+    find_package(KIM-API 2.2.0 CONFIG REQUIRED)
     target_link_libraries(lammps PRIVATE KIM-API::kim-api)
   else()
     # For kim-api 2.1.3 (consistent with previous version of this file)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=KIM-API_MIN_VERSION)
+    pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=${KIM-API_MIN_VERSION})
     target_link_libraries(lammps PRIVATE PkgConfig::KIM-API)
   endif()
 endif()

cmake/Modules/Packages/KOKKOS.cmake

@@ -1,4 +1,9 @@
 ########################################################################
+# As of version 3.3.0 Kokkos requires C++14
+if(CMAKE_CXX_STANDARD LESS 14)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+########################################################################
 # consistency checks and Kokkos options/settings required by LAMMPS
 if(Kokkos_ENABLE_CUDA)
   message(STATUS "KOKKOS: Enabling CUDA LAMBDA function support")
@@ -34,9 +39,13 @@ 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.4.01.tar.gz" CACHE STRING "URL for KOKKOS tarball")
+  set(KOKKOS_MD5 "4c84698917c93a18985b311bb6caf84f" CACHE STRING "MD5 checksum of KOKKOS tarball")
+  mark_as_advanced(KOKKOS_URL)
+  mark_as_advanced(KOKKOS_MD5)
   ExternalProject_Add(kokkos_build
-    URL https://github.com/kokkos/kokkos/archive/3.2.01.tar.gz
-    URL_MD5 ba72440e285ccde05b403694ea0c92e5
+    URL     ${KOKKOS_URL}
+    URL_MD5 ${KOKKOS_MD5}
     CMAKE_ARGS ${KOKKOS_LIB_BUILD_ARGS}
     BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libkokkoscore.a
   )
@@ -48,10 +57,12 @@ if(DOWNLOAD_KOKKOS)
     INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include"
     INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
   target_link_libraries(lammps PRIVATE LAMMPS::KOKKOS)
+  target_link_libraries(lmp PRIVATE LAMMPS::KOKKOS)
   add_dependencies(LAMMPS::KOKKOS kokkos_build)
 elseif(EXTERNAL_KOKKOS)
-  find_package(Kokkos 3.2.01 REQUIRED CONFIG)
+  find_package(Kokkos 3.4.01 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)
@@ -63,12 +74,14 @@ 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)
 endif()
-target_compile_definitions(lammps PRIVATE -DLMP_KOKKOS)
+target_compile_definitions(lammps PUBLIC $<BUILD_INTERFACE:LMP_KOKKOS>)
 
 set(KOKKOS_PKG_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/KOKKOS)
 set(KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/atom_kokkos.cpp
+                       ${KOKKOS_PKG_SOURCES_DIR}/atom_map_kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/atom_vec_kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/comm_kokkos.cpp
                        ${KOKKOS_PKG_SOURCES_DIR}/comm_tiled_kokkos.cpp
@@ -89,7 +102,7 @@ if(PKG_KSPACE)
                                  ${KOKKOS_PKG_SOURCES_DIR}/gridcomm_kokkos.cpp
                                  ${KOKKOS_PKG_SOURCES_DIR}/remap_kokkos.cpp)
   if(Kokkos_ENABLE_CUDA)
-    if(NOT ${FFT} STREQUAL "KISS")
+    if(NOT (FFT STREQUAL "KISS"))
       target_compile_definitions(lammps PRIVATE -DFFT_CUFFT)
       target_link_libraries(lammps PRIVATE cufft)
     endif()
@@ -106,7 +119,7 @@ RegisterNBinStyle(${KOKKOS_PKG_SOURCES_DIR}/nbin_kokkos.h)
 RegisterNPairStyle(${KOKKOS_PKG_SOURCES_DIR}/npair_kokkos.h)
 RegisterNPairStyle(${KOKKOS_PKG_SOURCES_DIR}/npair_halffull_kokkos.h)
 
-if(PKG_USER-DPD)
+if(PKG_DPD-REACT)
   get_property(KOKKOS_PKG_SOURCES GLOBAL PROPERTY KOKKOS_PKG_SOURCES)
   list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/npair_ssa_kokkos.cpp)
   RegisterNPairStyle(${KOKKOS_PKG_SOURCES_DIR}/npair_ssa_kokkos.h)
@@ -116,4 +129,4 @@ endif()
 get_property(KOKKOS_PKG_SOURCES GLOBAL PROPERTY KOKKOS_PKG_SOURCES)
 
 target_sources(lammps PRIVATE ${KOKKOS_PKG_SOURCES})
-target_include_directories(lammps PRIVATE ${KOKKOS_PKG_SOURCES_DIR})
+target_include_directories(lammps PUBLIC $<BUILD_INTERFACE:${KOKKOS_PKG_SOURCES_DIR}>)

cmake/Modules/Packages/LATTE.cmake

@@ -15,10 +15,22 @@ 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)
+
+  # 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))
+    message(FATAL_ERROR "Cannot compile downloaded LATTE library due to a technical limitation")
+  endif()
+
   include(ExternalProject)
   ExternalProject_Add(latte_build
-    URL https://github.com/lanl/LATTE/archive/v1.2.2.tar.gz
-    URL_MD5 820e73a457ced178c08c71389a385de7
+    URL     ${LATTE_URL}
+    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}

cmake/Modules/Packages/MACHDYN.cmake

@@ -0,0 +1,37 @@
+find_package(Eigen3 NO_MODULE)
+if(EIGEN3_FOUND)
+  set(DOWNLOAD_EIGEN3_DEFAULT OFF)
+else()
+  set(DOWNLOAD_EIGEN3_DEFAULT ON)
+endif()
+option(DOWNLOAD_EIGEN3 "Download Eigen3 instead of using an already installed one)" ${DOWNLOAD_EIGEN3_DEFAULT})
+if(DOWNLOAD_EIGEN3)
+  message(STATUS "Eigen3 download requested - we will build our own")
+  set(EIGEN3_URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz" CACHE STRING "URL for Eigen3 tarball")
+  set(EIGEN3_MD5 "609286804b0f79be622ccf7f9ff2b660" CACHE STRING "MD5 checksum of Eigen3 tarball")
+  mark_as_advanced(EIGEN3_URL)
+  mark_as_advanced(EIGEN3_MD5)
+  include(ExternalProject)
+  ExternalProject_Add(Eigen3_build
+    URL     ${EIGEN3_URL}
+    URL_MD5 ${EIGEN3_MD5}
+    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
+  )
+  ExternalProject_get_property(Eigen3_build SOURCE_DIR)
+  add_library(LAMMPS::EIGEN3 INTERFACE IMPORTED)
+  set_target_properties(LAMMPS::EIGEN3 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}")
+  target_link_libraries(lammps PRIVATE LAMMPS::EIGEN3)
+  add_dependencies(LAMMPS::EIGEN3 Eigen3_build)
+else()
+  find_package(Eigen3 NO_MODULE)
+  mark_as_advanced(Eigen3_DIR)
+  if(NOT EIGEN3_FOUND)
+    message(FATAL_ERROR "Eigen3 not found, help CMake to find it by setting EIGEN3_INCLUDE_DIR, or set DOWNLOAD_EIGEN3=ON to download it")
+  endif()
+  target_link_libraries(lammps PRIVATE Eigen3::Eigen)
+endif()
+
+# PGI/Nvidia compiler internals collide with vector intrinsics support in Eigen3
+if((CMAKE_CXX_COMPILER_ID STREQUAL "PGI") OR (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC"))
+  target_compile_definitions(lammps PRIVATE -DEIGEN_DONT_VECTORIZE)
+endif()

cmake/Modules/Packages/MDI.cmake

@@ -0,0 +1,118 @@
+find_package(mdi QUIET)
+if(${mdi_FOUND})
+  set(DOWNLOAD_MDI_DEFAULT OFF)
+else()
+  set(DOWNLOAD_MDI_DEFAULT ON)
+endif()
+option(DOWNLOAD_MDI "Download and compile the MDI library instead of using an already installed one" ${DOWNLOAD_MDI_DEFAULT})
+
+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.2.9.tar.gz" CACHE STRING "URL for MDI tarball")
+  set(MDI_MD5 "ddfa46d6ee15b4e59cfd527ec7212184" CACHE STRING "MD5 checksum for MDI tarball")
+  mark_as_advanced(MDI_URL)
+  mark_as_advanced(MDI_MD5)
+  enable_language(C)
+
+  # only ON/OFF are allowed for "mpi" flag when building MDI library
+  # so translate boolean value of BUILD_MPI
+  # always disable MPI when cross-compiling to Windows.
+  if((BUILD_MPI) AND NOT((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND CMAKE_CROSSCOMPILING))
+    set(MDI_USE_MPI ON)
+  else()
+    set(MDI_USE_MPI OFF)
+  endif()
+
+  # 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)
+    find_package(PythonLibs QUIET) # Deprecated since version 3.12
+    if(PYTHONLIBS_FOUND)
+      set(MDI_USE_PYTHON_PLUGINS ON)
+    endif()
+  else()
+    find_package(Python QUIET COMPONENTS Development)
+    if(Python_Development_FOUND)
+      set(MDI_USE_PYTHON_PLUGINS ON)
+    endif()
+  endif()
+
+  # download/ build MDI library
+  # always build static library with -fpic
+  # support cross-compilation and ninja-build
+  include(ExternalProject)
+  ExternalProject_Add(mdi_build
+    URL     ${MDI_URL}
+    URL_MD5 ${MDI_MD5}
+    CMAKE_ARGS ${CMAKE_REQUEST_PIC}
+    -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+    -Dlanguage=C
+    -Dlibtype=STATIC
+    -Dmpi=${MDI_USE_MPI}
+    -Dpython_plugins=${MDI_USE_PYTHON_PLUGINS}
+    UPDATE_COMMAND ""
+    INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS "<BINARY_DIR>/MDI_Library/libmdi.a"
+    )
+
+  # where is the compiled library?
+  ExternalProject_get_property(mdi_build BINARY_DIR)
+  set(MDI_BINARY_DIR "${BINARY_DIR}/MDI_Library")
+  # workaround for older CMake versions
+  file(MAKE_DIRECTORY ${MDI_BINARY_DIR})
+
+  # 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}
+    )
+
+  set(MDI_DEP_LIBS "")
+  # if compiling with python plugins we need
+  # to add python libraries as dependency.
+  if(MDI_USE_PYTHON_PLUGINS)
+    if(CMAKE_VERSION VERSION_LESS 3.12)
+      list(APPEND MDI_DEP_LIBS ${PYTHON_LIBRARIES})
+    else()
+      list(APPEND MDI_DEP_LIBS Python::Python)
+    endif()
+
+  endif()
+  # need to add support for dlopen/dlsym, except when compiling for Windows.
+  if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Windows"))
+    list(APPEND MDI_DEP_LIBS "${CMAKE_DL_LIBS}")
+  endif()
+  if(MDI_DEP_LIBS)
+    set_target_properties(LAMMPS::MDI PROPERTIES
+      IMPORTED_LINK_INTERFACE_LIBRARIES "${MDI_DEP_LIBS}")
+  endif()
+
+  target_link_libraries(lammps PRIVATE LAMMPS::MDI)
+  target_link_libraries(lmp PRIVATE LAMMPS::MDI)
+
+else()
+
+  find_package(mdi)
+  if(NOT mdi_FOUND)
+    message(FATAL_ERROR "MDI library not found. Help CMake to find it "
+      "by setting mdi_LIBRARY and mdi_INCLUDE_DIR, or set DOWNLOAD_MDI=ON "
+      "to download and compile it")
+  endif()
+
+  # Link the lammps library against MDI
+  target_include_directories(lammps PRIVATE ${mdi_INCLUDE_DIR})
+  target_link_libraries(lammps PRIVATE ${mdi_LIBRARY})
+
+  # Link the lammps executable against MDI
+  target_include_directories(lmp PRIVATE ${mdi_INCLUDE_DIR})
+  target_link_libraries(lmp PRIVATE ${mdi_LIBRARY})
+endif()
+
+target_compile_definitions(lammps PRIVATE -DLMP_MDI)
+target_compile_definitions(lmp PRIVATE -DLMP_MDI)

cmake/Modules/Packages/MESSAGE.cmake

@@ -1,10 +1,9 @@
-if(LAMMPS_SIZES STREQUAL BIGBIG)
+if(LAMMPS_SIZES STREQUAL "BIGBIG")
   message(FATAL_ERROR "The MESSAGE Package is not compatible with -DLAMMPS_BIGBIG")
 endif()
 option(MESSAGE_ZMQ "Use ZeroMQ in MESSAGE package" OFF)
-file(GLOB_RECURSE cslib_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.F
-    ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.c
-    ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.cpp)
+file(GLOB_RECURSE cslib_SOURCES
+        ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.cpp)
 
 add_library(cslib STATIC ${cslib_SOURCES})
 target_compile_definitions(cslib PRIVATE -DLAMMPS_${LAMMPS_SIZES})

cmake/Modules/Packages/ML-HDNNP.cmake

@@ -0,0 +1,133 @@
+find_package(N2P2 QUIET)
+if(N2P2_FOUND)
+  set(DOWNLOAD_N2P2_DEFAULT OFF)
+else()
+  set(DOWNLOAD_N2P2_DEFAULT ON)
+endif()
+option(DOWNLOAD_N2P2 "Download n2p2 library instead of using an already installed one)" ${DOWNLOAD_N2P2_DEFAULT})
+if(DOWNLOAD_N2P2)
+  set(N2P2_URL "https://github.com/CompPhysVienna/n2p2/archive/v2.1.4.tar.gz" CACHE STRING "URL for n2p2 tarball")
+  set(N2P2_MD5 "9595b066636cd6b90b0fef93398297a5" CACHE STRING "MD5 checksum of N2P2 tarball")
+  mark_as_advanced(N2P2_URL)
+  mark_as_advanced(N2P2_MD5)
+
+  # adjust settings from detected compiler to compiler platform in n2p2 library
+  # set compiler specific flag to turn on C++11 syntax (required on macOS and CentOS 7)
+  if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
+    set(N2P2_COMP llvm)
+    set(N2P2_CXX_STD "-std=c++11")
+  elseif((CMAKE_CXX_COMPILER_ID STREQUAL "Intel") OR (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM"))
+    set(N2P2_COMP intel)
+    set(N2P2_CXX_STD "-std=c++11")
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(N2P2_COMP gnu)
+    set(N2P2_CXX_STD "-std=gnu++11")
+  elseif((CMAKE_CXX_COMPILER_ID STREQUAL "PGI") OR (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC"))
+    set(N2P2_COMP gnu)
+    set(N2P2_CXX_STD "--c++11")
+  else() # default
+    set(N2P2_COMP "")
+  endif()
+
+  # pass on archive creator command. prefer compiler specific version, if set.
+  # important when using cross compiler.
+  if(CMAKE_CXX_COMPILER_AR)
+    set(N2P2_AR ${CMAKE_CXX_COMPILER_AR})
+  else()
+    set(N2P2_AR ${CMAKE_AR})
+  endif()
+
+  # adjust compilation of n2p2 library to whether MPI is requested in LAMMPS or not
+  # need special care for compiling for MPICH2 with Linux-to-Windows cross compiler.
+  if(NOT BUILD_MPI)
+    set(N2P2_PROJECT_OPTIONS "-DN2P2_NO_MPI")
+  else()
+    # get path to MPI include directory when cross-compiling to windows
+    if((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING)
+      get_target_property(N2P2_MPI_INCLUDE MPI::MPI_CXX INTERFACE_INCLUDE_DIRECTORIES)
+      set(N2P2_PROJECT_OPTIONS "-I${N2P2_MPI_INCLUDE}")
+      set(MPI_CXX_COMPILER ${CMAKE_CXX_COMPILER})
+    endif()
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+      get_target_property(N2P2_MPI_INCLUDE MPI::MPI_CXX INTERFACE_INCLUDE_DIRECTORIES)
+      set(N2P2_PROJECT_OPTIONS "-I${N2P2_MPI_INCLUDE}")
+      set(MPI_CXX_COMPILER ${CMAKE_CXX_COMPILER})
+    endif()
+  endif()
+
+  # prefer GNU make, if available. N2P2 lib seems to need it.
+  find_program(N2P2_MAKE NAMES gmake make)
+
+  # override compiler (optimization) flags in n2p2 library to flags used for LAMMPS
+  # specifically -march=native can result in problems when compiling on HPC clusters or with a cross compiler
+  # this convoluted way gets correct quoting/escaping when configuring the external project
+  string(TOUPPER "${CMAKE_BUILD_TYPE}" BTYPE)
+  set(N2P2_BUILD_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}} ${N2P2_CXX_STD}")
+  set(N2P2_BUILD_OPTIONS INTERFACES=LAMMPS COMP=${N2P2_COMP} "PROJECT_OPTIONS=${N2P2_PROJECT_OPTIONS}" "PROJECT_DEBUG="
+    "PROJECT_CC=${CMAKE_CXX_COMPILER}" "PROJECT_MPICC=${MPI_CXX_COMPILER}" "PROJECT_CFLAGS=${N2P2_BUILD_FLAGS}"
+    "PROJECT_AR=${N2P2_AR}")
+  # echo final flag for debugging
+  message(STATUS "N2P2 BUILD OPTIONS: ${N2P2_BUILD_OPTIONS}")
+
+  # must have "sed" command to compile n2p2 library (for now)
+  find_program(HAVE_SED sed)
+  if(NOT HAVE_SED)
+    message(FATAL_ERROR "Must have 'sed' program installed to compile 'n2p2' library for ML-HDNNP package")
+  endif()
+
+  # download compile n2p2 library. much patch MPI calls in LAMMPS interface to accommodate MPI-2 (e.g. for cross-compiling)
+  include(ExternalProject)
+  ExternalProject_Add(n2p2_build
+    URL     ${N2P2_URL}
+    URL_MD5 ${N2P2_MD5}
+    UPDATE_COMMAND ""
+    CONFIGURE_COMMAND ""
+    PATCH_COMMAND sed -i -e "s/\\(MPI_\\(P\\|Unp\\)ack(\\)/\\1(void *) /" src/libnnpif/LAMMPS/InterfaceLammps.cpp
+    BUILD_COMMAND ${N2P2_MAKE} -f makefile libnnpif ${N2P2_BUILD_OPTIONS}
+    BUILD_ALWAYS YES
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE 1
+    LOG_BUILD ON
+    SOURCE_SUBDIR src/
+    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libnnp.a <SOURCE_DIR>/lib/libnnpif.a
+    )
+
+  # create imported target LAMMPS::N2P2 from two libraries nnp and nnpif
+  ExternalProject_get_property(n2p2_build SOURCE_DIR)
+  # n2p2 core library "libnnp"
+  add_library(LAMMPS::N2P2::LIBNNP UNKNOWN IMPORTED)
+  set_target_properties(LAMMPS::N2P2::LIBNNP PROPERTIES
+    IMPORTED_LOCATION "${SOURCE_DIR}/lib/libnnp.a"
+    INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include")
+  # n2p2 interface library "libnnpif"
+  add_library(LAMMPS::N2P2::LIBNNPIF UNKNOWN IMPORTED)
+  set_target_properties(LAMMPS::N2P2::LIBNNPIF PROPERTIES
+    IMPORTED_LOCATION "${SOURCE_DIR}/lib/libnnpif.a"
+    INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include")
+  # nnpif library has MPI calls if MPI is enabled, so we must link with MPI libs
+  if(BUILD_MPI)
+    set_target_properties(LAMMPS::N2P2::LIBNNPIF PROPERTIES
+      INTERFACE_LINK_LIBRARIES MPI::MPI_CXX)
+    if((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING)
+      add_dependencies(LAMMPS::N2P2::LIBNNPIF MPI::MPI_CXX)
+    endif()
+  endif()
+
+  # final step to define imported target
+  add_library(LAMMPS::N2P2 INTERFACE IMPORTED)
+  set_property(TARGET LAMMPS::N2P2 PROPERTY
+    INTERFACE_LINK_LIBRARIES LAMMPS::N2P2::LIBNNPIF LAMMPS::N2P2::LIBNNP)
+  target_link_libraries(lammps PRIVATE LAMMPS::N2P2)
+
+  add_dependencies(LAMMPS::N2P2 n2p2_build)
+  # work around issues with older CMake versions
+  file(MAKE_DIRECTORY "${SOURCE_DIR}/include")
+  file(MAKE_DIRECTORY "${SOURCE_DIR}/lib")
+else()
+  find_package(N2P2)
+  if(NOT N2P2_FOUND)
+    message(FATAL_ERROR "n2p2 not found, help CMake to find it by setting N2P2_DIR, or set DOWNLOAD_N2P2=ON to download it")
+  endif()
+  target_link_libraries(lammps PRIVATE N2P2::N2P2)
+  include(${N2P2_CMAKE_EXTRAS})
+endif()

cmake/Modules/Packages/ML-IAP.cmake

@@ -0,0 +1,40 @@
+# if PYTHON package is included we may also include Python support in ML-IAP
+set(MLIAP_ENABLE_PYTHON_DEFAULT OFF)
+if(PKG_PYTHON)
+  find_package(Cythonize QUIET)
+  if(Cythonize_FOUND)
+    set(MLIAP_ENABLE_PYTHON_DEFAULT ON)
+  endif()
+endif()
+
+option(MLIAP_ENABLE_PYTHON "Build ML-IAP package with Python support" ${MLIAP_ENABLE_PYTHON_DEFAULT})
+
+if(MLIAP_ENABLE_PYTHON)
+  find_package(Cythonize REQUIRED)
+  if(NOT PKG_PYTHON)
+    message(FATAL_ERROR "Must enable PYTHON package for including Python support in ML-IAP")
+  endif()
+  if(CMAKE_VERSION VERSION_LESS 3.12)
+    if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3.6)
+      message(FATAL_ERROR "Python support in ML-IAP requires Python 3.6 or later")
+    endif()
+  else()
+    if(Python_VERSION VERSION_LESS 3.6)
+      message(FATAL_ERROR "Python support in ML-IAP requires Python 3.6 or later")
+    endif()
+  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(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...")
+  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

@@ -0,0 +1,25 @@
+
+set(PACELIB_URL "https://github.com/ICAMS/lammps-user-pace/archive/refs/tags/v.2021.4.9.tar.gz" CACHE STRING "URL for PACE evaluator library sources")
+set(PACELIB_MD5 "4db54962fbd6adcf8c18d46e1798ceb5" CACHE STRING "MD5 checksum of PACE evaluator library tarball")
+mark_as_advanced(PACELIB_URL)
+mark_as_advanced(PACELIB_MD5)
+
+# download library sources to build folder
+file(DOWNLOAD ${PACELIB_URL} ${CMAKE_BINARY_DIR}/libpace.tar.gz SHOW_PROGRESS EXPECTED_HASH MD5=${PACELIB_MD5})
+
+# uncompress downloaded sources
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E remove_directory lammps-user-pace*
+  COMMAND ${CMAKE_COMMAND} -E tar xzf libpace.tar.gz
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+file(GLOB PACE_EVALUATOR_INCLUDE_DIR ${CMAKE_BINARY_DIR}/lammps-user-pace-*/USER-PACE)
+file(GLOB PACE_EVALUATOR_SOURCES ${CMAKE_BINARY_DIR}/lammps-user-pace-*/USER-PACE/*.cpp)
+list(FILTER PACE_EVALUATOR_SOURCES EXCLUDE REGEX pair_pace.cpp)
+
+add_library(pace STATIC ${PACE_EVALUATOR_SOURCES})
+set_target_properties(pace PROPERTIES CXX_EXTENSIONS ON OUTPUT_NAME lammps_pace${LAMMPS_MACHINE})
+target_include_directories(pace PUBLIC ${PACE_EVALUATOR_INCLUDE_DIR})
+target_link_libraries(lammps PRIVATE pace)
+

cmake/Modules/Packages/ML-QUIP.cmake

@@ -0,0 +1,70 @@
+enable_language(Fortran)
+find_package(QUIP QUIET)
+
+if(QUIP_FOUND)
+  set(DOWNLOAD_QUIP_DEFAULT OFF)
+else()
+  set(DOWNLOAD_QUIP_DEFAULT ON)
+endif()
+option(DOWNLOAD_QUIP "Download the QUIP library instead of using an already installed one" ${DOWNLOAD_QUIP_DEFAULT})
+if(DOWNLOAD_QUIP)
+  string(TOUPPER "${CMAKE_BUILD_TYPE}" BTYPE)
+  set(temp "F77 = ${CMAKE_Fortran_COMPILER}\nF90 = ${CMAKE_Fortran_COMPILER}\nF95 = ${CMAKE_Fortran_COMPILER}\n")
+  set(temp "${temp}CC=${CMAKE_C_COMPILER}\nCPLUSPLUS=${CMAKE_CXX_COMPILER}\nLINKER=${CMAKE_Fortran_COMPILER}\n")
+  if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
+    set(temp "${temp}FPP=${CMAKE_Fortran_COMPILER} -E\nOPTIM=${CMAKE_Fortran_FLAGS_${BTYPE}}\n")
+    set(temp "${temp}DEFINES += -DGETARG_F2003 -DFORTRAN_UNDERSCORE\n")
+    set(temp "${temp}F95FLAGS += -fpp -free -fPIC\n")
+    set(temp "${temp}F77FLAGS += -fpp -fixed -fPIC\n")
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
+    set(temp "${temp}FPP=${CMAKE_Fortran_COMPILER} -E -x f95-cpp-input\nOPTIM=${CMAKE_Fortran_FLAGS_${BTYPE}}\n")
+    set(temp "${temp}DEFINES += -DGETARG_F2003 -DGETENV_F2003 -DGFORTRAN -DFORTRAN_UNDERSCORE\n")
+    set(temp "${temp}F95FLAGS += -x f95-cpp-input -ffree-line-length-none -ffree-form -fno-second-underscore -fPIC\n")
+    set(temp "${temp}F77FLAGS += -x f77-cpp-input -fno-second-underscore -fPIC\n")
+  else()
+    message(FATAL_ERROR "The ${CMAKE_Fortran_COMPILER_ID} Fortran compiler is not (yet) supported for building QUIP")
+  endif()
+  set(temp "${temp}CFLAGS += -fPIC \nCPLUSPLUSFLAGS += -fPIC\nAR_ADD=src\n")
+  set(temp "${temp}MATH_LINKOPTS=")
+  foreach(flag ${BLAS_LIBRARIES})
+    set(temp "${temp} ${flag}")
+  endforeach()
+  foreach(flag ${LAPACK_LIBRARIES})
+    set(temp "${temp} ${flag}")
+  endforeach()
+  set(temp "${temp}\n")
+  set(temp "${temp}PYTHON=python\nPIP=pip\nEXTRA_LINKOPTS=\n")
+  set(temp "${temp}HAVE_CP2K=0\nHAVE_VASP=0\nHAVE_TB=0\nHAVE_PRECON=1\nHAVE_LOTF=0\nHAVE_ONIOM=0\n")
+  set(temp "${temp}HAVE_LOCAL_E_MIX=0\nHAVE_QC=0\nHAVE_GAP=1\nHAVE_DESCRIPTORS_NONCOMMERCIAL=1\n")
+  set(temp "${temp}HAVE_TURBOGAP=0\nHAVE_QR=1\nHAVE_THIRDPARTY=0\nHAVE_FX=0\nHAVE_SCME=0\nHAVE_MTP=0\n")
+  set(temp "${temp}HAVE_MBD=0\nHAVE_TTM_NF=0\nHAVE_CH4=0\nHAVE_NETCDF4=0\nHAVE_MDCORE=0\nHAVE_ASAP=0\n")
+  set(temp "${temp}HAVE_CGAL=0\nHAVE_METIS=0\nHAVE_LMTO_TBE=0\nHAVE_SCALAPACK=0\n")
+  file(WRITE ${CMAKE_BINARY_DIR}/quip.config "${temp}")
+
+  message(STATUS "QUIP download via git requested - we will build our own")
+  # QUIP has no releases (except for a tag marking the end of Python 2 support). We use the current "public" branch
+  # The LAMMPS interface wrapper has a compatibility constant that is being checked at runtime.
+  include(ExternalProject)
+  ExternalProject_Add(quip_build
+    GIT_REPOSITORY "https://github.com/libAtoms/QUIP/"
+    GIT_TAG origin/public
+    GIT_SHALLOW YES
+    GIT_PROGRESS YES
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/quip.config <SOURCE_DIR>/arch/Makefile.lammps
+    CONFIGURE_COMMAND env QUIP_ARCH=lammps make config
+    BUILD_COMMAND env QUIP_ARCH=lammps make libquip
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE YES
+    BUILD_BYPRODUCTS <SOURCE_DIR>/build/lammps/libquip.a
+  )
+  ExternalProject_get_property(quip_build SOURCE_DIR)
+  add_library(LAMMPS::QUIP UNKNOWN IMPORTED)
+  set_target_properties(LAMMPS::QUIP PROPERTIES
+    IMPORTED_LOCATION "${SOURCE_DIR}/build/lammps/libquip.a"
+    INTERFACE_LINK_LIBRARIES "${LAPACK_LIBRARIES}")
+  target_link_libraries(lammps PRIVATE LAMMPS::QUIP)
+  add_dependencies(LAMMPS::QUIP quip_build)
+else()
+  find_package(QUIP REQUIRED)
+  target_link_libraries(lammps PRIVATE QUIP::QUIP ${LAPACK_LIBRARIES})
+endif()

cmake/Modules/Packages/MOLFILE.cmake

@@ -0,0 +1,7 @@
+set(MOLFILE_INCLUDE_DIR "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
+add_library(molfile INTERFACE)
+target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIR})
+if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Windows"))
+  target_link_libraries(molfile INTERFACE ${CMAKE_DL_LIBS})
+endif()
+target_link_libraries(lammps PRIVATE molfile)

cmake/Modules/Packages/MSCG.cmake

@@ -7,10 +7,22 @@ else()
 endif()
 option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" ${DOWNLOAD_MSCG_DEFAULT})
 if(DOWNLOAD_MSCG)
+  set(MSCG_URL "https://github.com/uchicago-voth/MSCG-release/archive/1.7.3.1.tar.gz" CACHE STRING "URL for MSCG tarball")
+  set(MSCG_MD5 "8c45e269ee13f60b303edd7823866a91" CACHE STRING "MD5 checksum of MSCG tarball")
+  mark_as_advanced(MSCG_URL)
+  mark_as_advanced(MSCG_MD5)
+
+  # 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))
+    message(FATAL_ERROR "Cannot compile downloaded MSCG library due to a technical limitation")
+  endif()
+
   include(ExternalProject)
   ExternalProject_Add(mscg_build
-    URL https://github.com/uchicago-voth/MSCG-release/archive/1.7.3.1.tar.gz
-    URL_MD5 8c45e269ee13f60b303edd7823866a91
+    URL     ${MSCG_URL}
+    URL_MD5 ${MSCG_MD5}
     SOURCE_SUBDIR src/CMake
     CMAKE_ARGS ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS}
                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

cmake/Modules/Packages/NETCDF.cmake

@@ -0,0 +1,26 @@
+# NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary.
+# NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
+
+# may use NetCDF or PNetCDF with MPI, but must have NetCDF without
+if(NOT BUILD_MPI)
+  find_package(NetCDF REQUIRED)
+else()
+  find_package(NetCDF)
+  if(NETCDF_FOUND)
+    find_package(PNetCDF)
+  else()
+    find_package(PNetCDF REQUIRED)
+  endif()
+endif()
+
+if(NETCDF_FOUND)
+  target_link_libraries(lammps PRIVATE NetCDF::NetCDF)
+  target_compile_definitions(lammps PRIVATE -DLMP_HAS_NETCDF)
+endif(NETCDF_FOUND)
+
+if(PNETCDF_FOUND)
+  target_link_libraries(lammps PRIVATE PNetCDF::PNetCDF)
+  target_compile_definitions(lammps PRIVATE -DLMP_HAS_PNETCDF)
+endif(PNETCDF_FOUND)
+
+target_compile_definitions(lammps PRIVATE -DNC_64BIT_DATA=0x0020)

cmake/Modules/Packages/OPENMP.cmake

@@ -0,0 +1,40 @@
+  set(OPENMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/OPENMP)
+  set(OPENMP_SOURCES ${OPENMP_SOURCES_DIR}/thr_data.cpp
+                       ${OPENMP_SOURCES_DIR}/thr_omp.cpp
+                       ${OPENMP_SOURCES_DIR}/fix_omp.cpp
+                       ${OPENMP_SOURCES_DIR}/fix_nh_omp.cpp
+                       ${OPENMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp
+                       ${OPENMP_SOURCES_DIR}/domain_omp.cpp)
+  target_compile_definitions(lammps PRIVATE -DLMP_OPENMP)
+  set_property(GLOBAL PROPERTY "OMP_SOURCES" "${OPENMP_SOURCES}")
+
+  # detects styles which have OPENMP version
+  RegisterStylesExt(${OPENMP_SOURCES_DIR} omp OMP_SOURCES)
+  RegisterFixStyle(${OPENMP_SOURCES_DIR}/fix_omp.h)
+
+  get_property(OPENMP_SOURCES GLOBAL PROPERTY OMP_SOURCES)
+
+  # manually add package dependent source files from OPENMP that do not provide styles
+
+  if(PKG_ASPHERE)
+    list(APPEND OPENMP_SOURCES ${OPENMP_SOURCES_DIR}/fix_nh_asphere_omp.cpp)
+  endif()
+
+  if(PKG_RIGID)
+    list(APPEND OPENMP_SOURCES ${OPENMP_SOURCES_DIR}/fix_rigid_nh_omp.cpp)
+  endif()
+
+  if(PKG_REAXFF)
+    list(APPEND OPENMP_SOURCES ${OPENMP_SOURCES_DIR}/reaxff_bond_orders_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_hydrogen_bonds_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_nonbonded_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_bonds_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_init_md_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_torsion_angles_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_forces_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_multi_body_omp.cpp
+                                 ${OPENMP_SOURCES_DIR}/reaxff_valence_angles_omp.cpp)
+  endif()
+
+  target_sources(lammps PRIVATE ${OPENMP_SOURCES})
+  target_include_directories(lammps PRIVATE ${OPENMP_SOURCES_DIR})

cmake/Modules/Packages/PLUMED.cmake

@@ -0,0 +1,105 @@
+set(PLUMED_MODE "static" CACHE STRING "Linkage mode for Plumed2 library")
+set(PLUMED_MODE_VALUES static shared runtime)
+set_property(CACHE PLUMED_MODE PROPERTY STRINGS ${PLUMED_MODE_VALUES})
+validate_option(PLUMED_MODE PLUMED_MODE_VALUES)
+string(TOUPPER ${PLUMED_MODE} PLUMED_MODE)
+
+set(PLUMED_LINK_LIBS)
+if(PLUMED_MODE STREQUAL "STATIC")
+  find_package(LAPACK REQUIRED)
+  find_package(BLAS REQUIRED)
+  find_package(GSL REQUIRED)
+  list(APPEND PLUMED_LINK_LIBS ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} GSL::gsl)
+  find_package(ZLIB QUIET)
+  if(ZLIB_FOUND)
+    list(APPEND PLUMED_LINK_LIBS ZLIB::ZLIB)
+  endif()
+  find_package(FFTW3 QUIET)
+  if(FFTW3_FOUND)
+    list(APPEND PLUMED_LINK_LIBS FFTW3::FFTW3)
+  endif()
+endif()
+
+find_package(PkgConfig QUIET)
+set(DOWNLOAD_PLUMED_DEFAULT ON)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PLUMED QUIET plumed)
+  if(PLUMED_FOUND)
+    set(DOWNLOAD_PLUMED_DEFAULT OFF)
+  endif()
+endif()
+
+option(DOWNLOAD_PLUMED "Download Plumed package instead of using an already installed one" ${DOWNLOAD_PLUMED_DEFAULT})
+if(DOWNLOAD_PLUMED)
+  if(BUILD_MPI)
+    set(PLUMED_CONFIG_MPI "--enable-mpi")
+    set(PLUMED_CONFIG_CC  ${CMAKE_MPI_C_COMPILER})
+    set(PLUMED_CONFIG_CXX  ${CMAKE_MPI_CXX_COMPILER})
+  else()
+    set(PLUMED_CONFIG_MPI "--disable-mpi")
+    set(PLUMED_CONFIG_CC  ${CMAKE_C_COMPILER})
+    set(PLUMED_CONFIG_CXX  ${CMAKE_CXX_COMPILER})
+  endif()
+  if(BUILD_OMP)
+    set(PLUMED_CONFIG_OMP "--enable-openmp")
+  else()
+    set(PLUMED_CONFIG_OMP "--disable-openmp")
+  endif()
+  message(STATUS "PLUMED download requested - we will build our own")
+  if(PLUMED_MODE STREQUAL "STATIC")
+    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed.a")
+  elseif(PLUMED_MODE STREQUAL "SHARED")
+    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX};<INSTALL_DIR>/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  elseif(PLUMED_MODE STREQUAL "RUNTIME")
+    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumedWrapper.a")
+  endif()
+
+  set(PLUMED_URL "https://github.com/plumed/plumed2/releases/download/v2.7.2/plumed-src-2.7.2.tgz" CACHE STRING "URL for PLUMED tarball")
+  set(PLUMED_MD5 "cfa0b4dd90a81c25d3302e8d97bfeaea" CACHE STRING "MD5 checksum of PLUMED tarball")
+
+  mark_as_advanced(PLUMED_URL)
+  mark_as_advanced(PLUMED_MD5)
+
+  include(ExternalProject)
+  ExternalProject_Add(plumed_build
+    URL     ${PLUMED_URL}
+    URL_MD5 ${PLUMED_MD5}
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
+                                             ${CONFIGURE_REQUEST_PIC}
+                                             --enable-modules=all
+                                             ${PLUMED_CONFIG_MPI}
+                                             ${PLUMED_CONFIG_OMP}
+                                             CXX=${PLUMED_CONFIG_CXX}
+                                             CC=${PLUMED_CONFIG_CC}
+    BUILD_BYPRODUCTS ${PLUMED_BUILD_BYPRODUCTS}
+  )
+  ExternalProject_get_property(plumed_build INSTALL_DIR)
+  add_library(LAMMPS::PLUMED UNKNOWN IMPORTED)
+  add_dependencies(LAMMPS::PLUMED plumed_build)
+  if(PLUMED_MODE STREQUAL "STATIC")
+    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed.a INTERFACE_LINK_LIBRARIES "${PLUMED_LINK_LIBS};${CMAKE_DL_LIBS}")
+  elseif(PLUMED_MODE STREQUAL "SHARED")
+    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} INTERFACE_LINK_LIBRARIES "${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX};${CMAKE_DL_LIBS}")
+  elseif(PLUMED_MODE STREQUAL "RUNTIME")
+    set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumedWrapper.a INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}")
+  endif()
+  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+  file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
+else()
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(PLUMED REQUIRED plumed)
+  add_library(LAMMPS::PLUMED INTERFACE IMPORTED)
+  if(PLUMED_MODE STREQUAL "STATIC")
+    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)
+  elseif(PLUMED_MODE STREQUAL "SHARED")
+    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.shared)
+  elseif(PLUMED_MODE STREQUAL "RUNTIME")
+    set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime)
+  endif()
+  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_LINK_LIBRARIES "${PLUMED_LOAD}")
+  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PLUMED_INCLUDE_DIRS}")
+endif()
+target_link_libraries(lammps PRIVATE LAMMPS::PLUMED)

cmake/Modules/Packages/QEQ.cmake

@@ -1,18 +1,13 @@
 # Fix qeq/fire requires MANYBODY (i.e. COMB and COMB3) to be installed
 set(QEQ_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/QEQ)
-file(GLOB QEQ_HEADERS ${QEQ_SOURCES_DIR}/fix*.h)
-file(GLOB QEQ_SOURCES ${QEQ_SOURCES_DIR}/fix*.cpp)
 
+get_property(hlist GLOBAL PROPERTY FIX)
 if(NOT PKG_MANYBODY)
-  list(REMOVE_ITEM QEQ_HEADERS ${QEQ_SOURCES_DIR}/fix_qeq_fire.h)
-  list(REMOVE_ITEM QEQ_SOURCES ${QEQ_SOURCES_DIR}/fix_qeq_fire.cpp)
+  list(REMOVE_ITEM hlist ${QEQ_SOURCES_DIR}/fix_qeq_fire.h)
+  get_target_property(LAMMPS_SOURCES lammps SOURCES)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${QEQ_SOURCES_DIR}/fix_qeq_fire.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES ${LAMMPS_SOURCES})
 endif()
-set_property(GLOBAL PROPERTY "QEQ_SOURCES" "${QEQ_SOURCES}")
+set_property(GLOBAL PROPERTY FIX "${hlist}")
 
-foreach(MY_HEADER ${QEQ_HEADERS})
-  AddStyleHeader(${MY_HEADER} FIX)
-endforeach()
-
-get_property(QEQ_SOURCES GLOBAL PROPERTY QEQ_SOURCES)
-target_sources(lammps PRIVATE ${QEQ_SOURCES})
 target_include_directories(lammps PRIVATE ${QEQ_SOURCES_DIR})

cmake/Modules/Packages/SCAFACOS.cmake

@@ -0,0 +1,74 @@
+enable_language(Fortran)
+enable_language(C)
+
+find_package(GSL REQUIRED)
+find_package(PkgConfig QUIET)
+find_package(MPI REQUIRED)
+set(DOWNLOAD_SCAFACOS_DEFAULT ON)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(SCAFACOS QUIET scafacos)
+  if(SCAFACOS_FOUND)
+    set(DOWNLOAD_SCAFACOS_DEFAULT OFF)
+  endif()
+endif()
+option(DOWNLOAD_SCAFACOS "Download ScaFaCoS library instead of using an already installed one" ${DOWNLOAD_SCAFACOS_DEFAULT})
+if(DOWNLOAD_SCAFACOS)
+  message(STATUS "ScaFaCoS download requested - we will build our own")
+  set(SCAFACOS_URL "https://github.com/scafacos/scafacos/releases/download/v1.0.1/scafacos-1.0.1.tar.gz" CACHE STRING "URL for SCAFACOS tarball")
+  set(SCAFACOS_MD5 "bd46d74e3296bd8a444d731bb10c1738" CACHE STRING "MD5 checksum of SCAFACOS tarball")
+  mark_as_advanced(SCAFACOS_URL)
+  mark_as_advanced(SCAFACOS_MD5)
+
+  # version 1.0.1 needs a patch to compile and linke cleanly with GCC 10 and later.
+  file(DOWNLOAD ${LAMMPS_THIRDPARTY_URL}/scafacos-1.0.1-fix.diff ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
+          EXPECTED_HASH MD5=4baa1333bb28fcce102d505e1992d032)
+
+  find_program(HAVE_PATCH patch)
+  if(NOT HAVE_PATCH)
+    message(FATAL_ERROR "The 'patch' program is required to build the ScaFaCoS library")
+  endif()
+
+  include(ExternalProject)
+  ExternalProject_Add(scafacos_build
+    URL     ${SCAFACOS_URL}
+    URL_MD5 ${SCAFACOS_MD5}
+    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-doc
+                                             --enable-fcs-solvers=fmm,p2nfft,direct,ewald,p3m
+                                             --with-internal-fftw --with-internal-pfft
+                                             --with-internal-pnfft ${CONFIGURE_REQUEST_PIC}
+                                             FC=${CMAKE_MPI_Fortran_COMPILER}
+                                             CXX=${CMAKE_MPI_CXX_COMPILER}
+                                             CC=${CMAKE_MPI_C_COMPILER}
+                                             F77=
+    BUILD_BYPRODUCTS
+      <INSTALL_DIR>/lib/libfcs.a
+      <INSTALL_DIR>/lib/libfcs_direct.a
+      <INSTALL_DIR>/lib/libfcs_ewald.a
+      <INSTALL_DIR>/lib/libfcs_fmm.a
+      <INSTALL_DIR>/lib/libfcs_p2nfft.a
+      <INSTALL_DIR>/lib/libfcs_p3m.a
+      <INSTALL_DIR>/lib/libfcs_near.a
+      <INSTALL_DIR>/lib/libfcs_gridsort.a
+      <INSTALL_DIR>/lib/libfcs_resort.a
+      <INSTALL_DIR>/lib/libfcs_redist.a
+      <INSTALL_DIR>/lib/libfcs_common.a
+      <INSTALL_DIR>/lib/libfcs_pnfft.a
+      <INSTALL_DIR>/lib/libfcs_pfft.a
+      <INSTALL_DIR>/lib/libfcs_fftw3_mpi.a
+      <INSTALL_DIR>/lib/libfcs_fftw3.a
+  )
+  ExternalProject_get_property(scafacos_build INSTALL_DIR)
+  file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
+  add_library(LAMMPS::SCAFACOS UNKNOWN IMPORTED)
+  set_target_properties(LAMMPS::SCAFACOS PROPERTIES
+    IMPORTED_LOCATION "${INSTALL_DIR}/lib/libfcs.a"
+    INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include"
+    INTERFACE_LINK_LIBRARIES "${INSTALL_DIR}/lib/libfcs.a;${INSTALL_DIR}/lib/libfcs_direct.a;${INSTALL_DIR}/lib/libfcs_ewald.a;${INSTALL_DIR}/lib/libfcs_fmm.a;${INSTALL_DIR}/lib/libfcs_p2nfft.a;${INSTALL_DIR}/lib/libfcs_p3m.a;GSL::gsl;${INSTALL_DIR}/lib/libfcs_near.a;${INSTALL_DIR}/lib/libfcs_gridsort.a;${INSTALL_DIR}/lib/libfcs_resort.a;${INSTALL_DIR}/lib/libfcs_redist.a;${INSTALL_DIR}/lib/libfcs_common.a;${INSTALL_DIR}/lib/libfcs_pnfft.a;${INSTALL_DIR}/lib/libfcs_pfft.a;${INSTALL_DIR}/lib/libfcs_fftw3_mpi.a;${INSTALL_DIR}/lib/libfcs_fftw3.a;MPI::MPI_Fortran;MPI::MPI_C")
+  target_link_libraries(lammps PRIVATE LAMMPS::SCAFACOS)
+  add_dependencies(LAMMPS::SCAFACOS scafacos_build)
+else()
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(SCAFACOS REQUIRED IMPORTED_TARGET scafacos)
+  target_link_libraries(lammps PRIVATE PkgConfig::SCAFACOS)
+endif()

cmake/Modules/Packages/USER-INTEL.cmake

@@ -1,109 +0,0 @@
-check_include_file_cxx(immintrin.h FOUND_IMMINTRIN)
-if(NOT FOUND_IMMINTRIN)
-  message(FATAL_ERROR "immintrin.h header not found, Intel package won't work without it")
-endif()
-
-target_compile_definitions(lammps PRIVATE -DLMP_USER_INTEL)
-
-set(INTEL_ARCH "cpu" CACHE STRING "Architectures used by USER-INTEL (cpu or knl)")
-set(INTEL_ARCH_VALUES cpu knl)
-set_property(CACHE INTEL_ARCH PROPERTY STRINGS ${INTEL_ARCH_VALUES})
-validate_option(INTEL_ARCH INTEL_ARCH_VALUES)
-string(TOUPPER ${INTEL_ARCH} INTEL_ARCH)
-
-find_package(Threads QUIET)
-if(Threads_FOUND)
-  set(INTEL_LRT_MODE "threads" CACHE STRING "Long-range threads mode (none, threads, or c++11)")
-else()
-  set(INTEL_LRT_MODE "none" CACHE STRING "Long-range threads mode (none, threads, or c++11)")
-endif()
-set(INTEL_LRT_VALUES none threads c++11)
-set_property(CACHE INTEL_LRT_MODE PROPERTY STRINGS ${INTEL_LRT_VALUES})
-validate_option(INTEL_LRT_MODE INTEL_LRT_VALUES)
-string(TOUPPER ${INTEL_LRT_MODE} INTEL_LRT_MODE)
-if(INTEL_LRT_MODE STREQUAL "THREADS")
-  if(Threads_FOUND)
-    target_compile_definitions(lammps PRIVATE -DLMP_INTEL_USELRT)
-    target_link_libraries(lammps PRIVATE Threads::Threads)
-  else()
-    message(FATAL_ERROR "Must have working threads library for Long-range thread support")
-  endif()
-endif()
-if(INTEL_LRT_MODE STREQUAL "C++11")
-  target_compile_definitions(lammps PRIVATE -DLMP_INTEL_USELRT -DLMP_INTEL_LRT11)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-    message(FATAL_ERROR "USER-INTEL needs at least a 2016 Intel compiler, found ${CMAKE_CXX_COMPILER_VERSION}")
-  endif()
-else()
-  message(WARNING "USER-INTEL gives best performance with Intel compilers")
-endif()
-
-find_package(TBB_MALLOC QUIET)
-if(TBB_MALLOC_FOUND)
-  target_link_libraries(lammps PRIVATE TBB::TBB_MALLOC)
-else()
-  target_compile_definitions(lammps PRIVATE -DLMP_INTEL_NO_TBB)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    message(WARNING "USER-INTEL with Intel compilers should use TBB malloc libraries")
-  endif()
-endif()
-
-find_package(MKL QUIET)
-if(MKL_FOUND)
-  target_compile_definitions(lammps PRIVATE -DLMP_USE_MKL_RNG)
-  target_link_libraries(lammps PRIVATE MKL::MKL)
-else()
-  message(STATUS "Pair style dpd/intel will be faster with MKL libraries")
-endif()
-
-if((NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "64") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "128") AND (NOT ${LAMMPS_MEMALIGN} STREQUAL "256"))
-  message(FATAL_ERROR "USER-INTEL only supports memory alignment of 64, 128 or 256 on this platform")
-endif()
-
-if(INTEL_ARCH STREQUAL "KNL")
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    message(FATAL_ERROR "Must use Intel compiler with USER-INTEL for KNL architecture")
-  endif()
-  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -xHost -qopenmp -qoffload")
-  set(MIC_OPTIONS "-qoffload-option,mic,compiler,\"-fp-model fast=2 -mGLOB_default_function_attrs=\\\"gather_scatter_loop_unroll=4\\\"\"")
-  target_compile_options(lammps PRIVATE -xMIC-AVX512 -qoffload -fno-alias -ansi-alias -restrict -qoverride-limits ${MIC_OPTIONS})
-  target_compile_definitions(lammps PRIVATE -DLMP_INTEL_OFFLOAD)
-else()
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    include(CheckCXXCompilerFlag)
-    foreach(_FLAG -O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high -qno-offload -fno-alias -ansi-alias -restrict)
-      check_cxx_compiler_flag("${_FLAG}" COMPILER_SUPPORTS${_FLAG})
-      if(COMPILER_SUPPORTS${_FLAG})
-          target_compile_options(lammps PRIVATE ${_FLAG})
-      endif()
-    endforeach()
-  endif()
-endif()
-
-# collect sources
-set(USER-INTEL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-INTEL)
-set(USER-INTEL_SOURCES ${USER-INTEL_SOURCES_DIR}/fix_intel.cpp
-                       ${USER-INTEL_SOURCES_DIR}/fix_nh_intel.cpp
-                       ${USER-INTEL_SOURCES_DIR}/intel_buffers.cpp
-                       ${USER-INTEL_SOURCES_DIR}/nbin_intel.cpp
-                       ${USER-INTEL_SOURCES_DIR}/npair_intel.cpp)
-
-set_property(GLOBAL PROPERTY "USER-INTEL_SOURCES" "${USER-INTEL_SOURCES}")
-
-# detect styles which have a USER-INTEL version
-RegisterStylesExt(${USER-INTEL_SOURCES_DIR} intel USER-INTEL_SOURCES)
-RegisterNBinStyle(${USER-INTEL_SOURCES_DIR}/nbin_intel.h)
-RegisterNPairStyle(${USER-INTEL_SOURCES_DIR}/npair_intel.h)
-RegisterFixStyle(${USER-INTEL_SOURCES_DIR}/fix_intel.h)
-
-get_property(USER-INTEL_SOURCES GLOBAL PROPERTY USER-INTEL_SOURCES)
-if(PKG_KSPACE)
-  list(APPEND USER-INTEL_SOURCES ${USER-INTEL_SOURCES_DIR}/verlet_lrt_intel.cpp)
-  RegisterIntegrateStyle(${USER-INTEL_SOURCES_DIR}/verlet_lrt_intel.h)
-endif()
-
-target_sources(lammps PRIVATE ${USER-INTEL_SOURCES})
-target_include_directories(lammps PRIVATE ${USER-INTEL_SOURCES_DIR})

cmake/Modules/Packages/USER-MOLFILE.cmake

@@ -1,9 +0,0 @@
-set(MOLFILE_INCLUDE_DIR "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
-set(MOLFILE_INCLUDE_DIRS "${MOLFILE_INCLUDE_DIR}")
-add_library(molfile INTERFACE)
-target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})
-# no need to link with -ldl on windows
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-  target_link_libraries(molfile INTERFACE ${CMAKE_DL_LIBS})
-endif()
-target_link_libraries(lammps PRIVATE molfile)

cmake/Modules/Packages/USER-NETCDF.cmake

@@ -1,26 +0,0 @@
-# USER-NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary.
-# NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
-
-# may use NetCDF or PNetCDF with MPI, but must have NetCDF without
-if(NOT BUILD_MPI)
-  find_package(NetCDF REQUIRED)
-else()
-  find_package(NetCDF)
-  if(NETCDF_FOUND)
-    find_package(PNetCDF)
-  else()
-    find_package(PNetCDF REQUIRED)
-  endif()
-endif()
-
-if(NETCDF_FOUND)
-  target_link_libraries(lammps PRIVATE NetCDF::NetCDF)
-  target_compile_definitions(lammps PRIVATE -DLMP_HAS_NETCDF)
-endif(NETCDF_FOUND)
-
-if(PNETCDF_FOUND)
-  target_link_libraries(lammps PRIVATE PNetCDF::PNetCDF)
-  target_compile_definitions(lammps PRIVATE -DLMP_HAS_PNETCDF)
-endif(PNETCDF_FOUND)
-
-target_compile_definitions(lammps PRIVATE -DNC_64BIT_DATA=0x0020)

cmake/Modules/Packages/USER-OMP.cmake

@@ -1,40 +0,0 @@
-  set(USER-OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP)
-  set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp
-                       ${USER-OMP_SOURCES_DIR}/thr_omp.cpp
-                       ${USER-OMP_SOURCES_DIR}/fix_omp.cpp
-                       ${USER-OMP_SOURCES_DIR}/fix_nh_omp.cpp
-                       ${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp
-                       ${USER-OMP_SOURCES_DIR}/domain_omp.cpp)
-  target_compile_definitions(lammps PRIVATE -DLMP_USER_OMP)
-  set_property(GLOBAL PROPERTY "OMP_SOURCES" "${USER-OMP_SOURCES}")
-
-  # detects styles which have USER-OMP version
-  RegisterStylesExt(${USER-OMP_SOURCES_DIR} omp OMP_SOURCES)
-  RegisterFixStyle(${USER-OMP_SOURCES_DIR}/fix_omp.h)
-
-  get_property(USER-OMP_SOURCES GLOBAL PROPERTY OMP_SOURCES)
-
-  # manually add package dependent source files from USER-OMP that do not provide styles
-
-  if(PKG_ASPHERE)
-    list(APPEND USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/fix_nh_asphere_omp.cpp)
-  endif()
-
-  if(PKG_RIGID)
-    list(APPEND USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/fix_rigid_nh_omp.cpp)
-  endif()
-
-  if(PKG_USER-REAXC)
-    list(APPEND USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/reaxc_bond_orders_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_hydrogen_bonds_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_nonbonded_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_bonds_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_init_md_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_torsion_angles_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_forces_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_multi_body_omp.cpp
-                                 ${USER-OMP_SOURCES_DIR}/reaxc_valence_angles_omp.cpp)
-  endif()
-
-  target_sources(lammps PRIVATE ${USER-OMP_SOURCES})
-  target_include_directories(lammps PRIVATE ${USER-OMP_SOURCES_DIR})

cmake/Modules/Packages/USER-PLUMED.cmake

@@ -1,98 +0,0 @@
-set(PLUMED_MODE "static" CACHE STRING "Linkage mode for Plumed2 library")
-set(PLUMED_MODE_VALUES static shared runtime)
-set_property(CACHE PLUMED_MODE PROPERTY STRINGS ${PLUMED_MODE_VALUES})
-validate_option(PLUMED_MODE PLUMED_MODE_VALUES)
-string(TOUPPER ${PLUMED_MODE} PLUMED_MODE)
-
-set(PLUMED_LINK_LIBS)
-if(PLUMED_MODE STREQUAL "STATIC")
-  find_package(LAPACK REQUIRED)
-  find_package(BLAS REQUIRED)
-  find_package(GSL REQUIRED)
-  list(APPEND PLUMED_LINK_LIBS ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} GSL::gsl)
-  find_package(ZLIB QUIET)
-  if(ZLIB_FOUND)
-    list(APPEND PLUMED_LINK_LIBS ZLIB::ZLIB)
-  endif()
-  find_package(FFTW3 QUIET)
-  if(FFTW3_FOUND)
-    list(APPEND PLUMED_LINK_LIBS FFTW3::FFTW3)
-  endif()
-endif()
-
-find_package(PkgConfig QUIET)
-set(DOWNLOAD_PLUMED_DEFAULT ON)
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PLUMED QUIET plumed)
-  if(PLUMED_FOUND)
-    set(DOWNLOAD_PLUMED_DEFAULT OFF)
-  endif()
-endif()
-
-option(DOWNLOAD_PLUMED "Download Plumed package instead of using an already installed one" ${DOWNLOAD_PLUMED_DEFAULT})
-if(DOWNLOAD_PLUMED)
-  if(BUILD_MPI)
-    set(PLUMED_CONFIG_MPI "--enable-mpi")
-    set(PLUMED_CONFIG_CC  ${CMAKE_MPI_C_COMPILER})
-    set(PLUMED_CONFIG_CXX  ${CMAKE_MPI_CXX_COMPILER})
-  else()
-    set(PLUMED_CONFIG_MPI "--disable-mpi")
-    set(PLUMED_CONFIG_CC  ${CMAKE_C_COMPILER})
-    set(PLUMED_CONFIG_CXX  ${CMAKE_CXX_COMPILER})
-  endif()
-  if(BUILD_OMP)
-    set(PLUMED_CONFIG_OMP "--enable-openmp")
-  else()
-    set(PLUMED_CONFIG_OMP "--disable-openmp")
-  endif()
-  message(STATUS "PLUMED download requested - we will build our own")
-  if(PLUMED_MODE STREQUAL "STATIC")
-    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed.a")
-  elseif(PLUMED_MODE STREQUAL "SHARED")
-    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX};<INSTALL_DIR>/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  elseif(PLUMED_MODE STREQUAL "RUNTIME")
-    set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumedWrapper.a")
-  endif()
-  include(ExternalProject)
-  ExternalProject_Add(plumed_build
-    URL https://github.com/plumed/plumed2/releases/download/v2.7.0/plumed-src-2.7.0.tgz
-    URL_MD5 95f29dd0c067577f11972ff90dfc7d12
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
-                                             ${CONFIGURE_REQUEST_PIC}
-                                             --enable-modules=all
-                                             ${PLUMED_CONFIG_MPI}
-                                             ${PLUMED_CONFIG_OMP}
-                                             CXX=${PLUMED_CONFIG_CXX}
-                                             CC=${PLUMED_CONFIG_CC}
-    BUILD_BYPRODUCTS ${PLUMED_BUILD_BYPRODUCTS}
-  )
-  ExternalProject_get_property(plumed_build INSTALL_DIR)
-  add_library(LAMMPS::PLUMED UNKNOWN IMPORTED)
-  add_dependencies(LAMMPS::PLUMED plumed_build)
-  if(PLUMED_MODE STREQUAL "STATIC")
-    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed.a INTERFACE_LINK_LIBRARIES "${PLUMED_LINK_LIBS};${CMAKE_DL_LIBS}")
-  elseif(PLUMED_MODE STREQUAL "SHARED")
-    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} INTERFACE_LINK_LIBRARIES "${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX};${CMAKE_DL_LIBS}")
-  elseif(PLUMED_MODE STREQUAL "RUNTIME")
-    set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumedWrapper.a INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}")
-  endif()
-  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
-  file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
-else()
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(PLUMED REQUIRED plumed)
-  add_library(LAMMPS::PLUMED INTERFACE IMPORTED)
-  if(PLUMED_MODE STREQUAL "STATIC")
-    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)
-  elseif(PLUMED_MODE STREQUAL "SHARED")
-    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.shared)
-  elseif(PLUMED_MODE STREQUAL "RUNTIME")
-    set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime)
-  endif()
-  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_LINK_LIBRARIES "${PLUMED_LOAD}")
-  set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PLUMED_INCLUDE_DIRS}")
-endif()
-target_link_libraries(lammps PRIVATE LAMMPS::PLUMED)

cmake/Modules/Packages/USER-QUIP.cmake

@@ -1,3 +0,0 @@
-enable_language(Fortran)
-find_package(QUIP REQUIRED)
-target_link_libraries(lammps PRIVATE QUIP::QUIP ${LAPACK_LIBRARIES})

cmake/Modules/Packages/USER-SCAFACOS.cmake

@@ -1,65 +0,0 @@
-enable_language(Fortran)
-enable_language(C)
-
-find_package(GSL REQUIRED)
-find_package(PkgConfig QUIET)
-find_package(MPI REQUIRED)
-set(DOWNLOAD_SCAFACOS_DEFAULT ON)
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(SCAFACOS QUIET scafacos)
-  if(SCAFACOS_FOUND)
-    set(DOWNLOAD_SCAFACOS_DEFAULT OFF)
-  endif()
-endif()
-option(DOWNLOAD_SCAFACOS "Download ScaFaCoS library instead of using an already installed one" ${DOWNLOAD_SCAFACOS_DEFAULT})
-if(DOWNLOAD_SCAFACOS)
-  message(STATUS "ScaFaCoS download requested - we will build our own")
-
-  # version 1.0.1 needs a patch to compile and linke cleanly with GCC 10 and later.
-  file(DOWNLOAD https://download.lammps.org/thirdparty/scafacos-1.0.1-fix.diff ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
-          EXPECTED_HASH MD5=4baa1333bb28fcce102d505e1992d032)
-
-  include(ExternalProject)
-  ExternalProject_Add(scafacos_build
-    URL https://github.com/scafacos/scafacos/releases/download/v1.0.1/scafacos-1.0.1.tar.gz
-    URL_MD5 bd46d74e3296bd8a444d731bb10c1738
-    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_BINARY_DIR}/scafacos-1.0.1.fix.diff
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-doc
-                                             --enable-fcs-solvers=fmm,p2nfft,direct,ewald,p3m
-                                             --with-internal-fftw --with-internal-pfft
-                                             --with-internal-pnfft ${CONFIGURE_REQUEST_PIC}
-                                             FC=${CMAKE_MPI_Fortran_COMPILER}
-                                             CXX=${CMAKE_MPI_CXX_COMPILER}
-                                             CC=${CMAKE_MPI_C_COMPILER}
-                                             F77=
-    BUILD_BYPRODUCTS
-      <INSTALL_DIR>/lib/libfcs.a
-      <INSTALL_DIR>/lib/libfcs_direct.a
-      <INSTALL_DIR>/lib/libfcs_ewald.a
-      <INSTALL_DIR>/lib/libfcs_fmm.a
-      <INSTALL_DIR>/lib/libfcs_p2nfft.a
-      <INSTALL_DIR>/lib/libfcs_p3m.a
-      <INSTALL_DIR>/lib/libfcs_near.a
-      <INSTALL_DIR>/lib/libfcs_gridsort.a
-      <INSTALL_DIR>/lib/libfcs_resort.a
-      <INSTALL_DIR>/lib/libfcs_redist.a
-      <INSTALL_DIR>/lib/libfcs_common.a
-      <INSTALL_DIR>/lib/libfcs_pnfft.a
-      <INSTALL_DIR>/lib/libfcs_pfft.a
-      <INSTALL_DIR>/lib/libfcs_fftw3_mpi.a
-      <INSTALL_DIR>/lib/libfcs_fftw3.a
-  )
-  ExternalProject_get_property(scafacos_build INSTALL_DIR)
-  file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
-  add_library(LAMMPS::SCAFACOS UNKNOWN IMPORTED)
-  set_target_properties(LAMMPS::SCAFACOS PROPERTIES
-    IMPORTED_LOCATION "${INSTALL_DIR}/lib/libfcs.a"
-    INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include"
-    INTERFACE_LINK_LIBRARIES "${INSTALL_DIR}/lib/libfcs.a;${INSTALL_DIR}/lib/libfcs_direct.a;${INSTALL_DIR}/lib/libfcs_ewald.a;${INSTALL_DIR}/lib/libfcs_fmm.a;${INSTALL_DIR}/lib/libfcs_p2nfft.a;${INSTALL_DIR}/lib/libfcs_p3m.a;GSL::gsl;${INSTALL_DIR}/lib/libfcs_near.a;${INSTALL_DIR}/lib/libfcs_gridsort.a;${INSTALL_DIR}/lib/libfcs_resort.a;${INSTALL_DIR}/lib/libfcs_redist.a;${INSTALL_DIR}/lib/libfcs_common.a;${INSTALL_DIR}/lib/libfcs_pnfft.a;${INSTALL_DIR}/lib/libfcs_pfft.a;${INSTALL_DIR}/lib/libfcs_fftw3_mpi.a;${INSTALL_DIR}/lib/libfcs_fftw3.a;MPI::MPI_Fortran;MPI::MPI_C")
-  target_link_libraries(lammps PRIVATE LAMMPS::SCAFACOS)
-  add_dependencies(LAMMPS::SCAFACOS scafacos_build)
-else()
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(SCAFACOS REQUIRED IMPORTED_TARGET scafacos)
-  target_link_libraries(lammps PRIVATE PkgConfig::SCAFACOS)
-endif()

cmake/Modules/Packages/USER-SDPD.cmake

@@ -1,13 +0,0 @@
-# Fix rigid/meso requires RIGID to be installed
-set(USER-SDPD_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-SDPD)
-
-get_property(hlist GLOBAL PROPERTY FIX)
-if(NOT PKG_RIGID)
-  list(REMOVE_ITEM hlist ${USER-SDPD_SOURCES_DIR}/fix_rigid_meso.h)
-  get_target_property(LAMMPS_SOURCES lammps SOURCES)
-  list(REMOVE_ITEM LAMMPS_SOURCES ${USER-SDPD_SOURCES_DIR}/fix_rigid_meso.cpp)
-  set_property(TARGET lammps PROPERTY SOURCES ${LAMMPS_SOURCES})
-endif()
-set_property(GLOBAL PROPERTY FIX "${hlist}")
-
-target_include_directories(lammps PRIVATE ${USER-SDPD_SOURCES_DIR})

cmake/Modules/Packages/USER-SMD.cmake

@@ -1,28 +0,0 @@
-find_package(Eigen3 NO_MODULE)
-if(EIGEN3_FOUND)
-  set(DOWNLOAD_EIGEN3_DEFAULT OFF)
-else()
-  set(DOWNLOAD_EIGEN3_DEFAULT ON)
-endif()
-option(DOWNLOAD_EIGEN3 "Download Eigen3 instead of using an already installed one)" ${DOWNLOAD_EIGEN3_DEFAULT})
-if(DOWNLOAD_EIGEN3)
-  message(STATUS "Eigen3 download requested - we will build our own")
-  include(ExternalProject)
-  ExternalProject_Add(Eigen3_build
-    URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz
-    URL_MD5 9e30f67e8531477de4117506fe44669b
-    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-  )
-  ExternalProject_get_property(Eigen3_build SOURCE_DIR)
-  add_library(LAMMPS::EIGEN3 INTERFACE IMPORTED)
-  set_target_properties(LAMMPS::EIGEN3 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}")
-  target_link_libraries(lammps PRIVATE LAMMPS::EIGEN3)
-  add_dependencies(LAMMPS::EIGEN3 Eigen3_build)
-else()
-  find_package(Eigen3 NO_MODULE)
-  mark_as_advanced(Eigen3_DIR)
-  if(NOT EIGEN3_FOUND)
-    message(FATAL_ERROR "Eigen3 not found, help CMake to find it by setting EIGEN3_INCLUDE_DIR, or set DOWNLOAD_EIGEN3=ON to download it")
-  endif()
-  target_link_libraries(lammps PRIVATE Eigen3::Eigen)
-endif()

cmake/Modules/Packages/VORONOI.cmake

@@ -7,6 +7,11 @@ endif()
 option(DOWNLOAD_VORO "Download and compile the Voro++ library instead of using an already installed one" ${DOWNLOAD_VORO_DEFAULT})
 if(DOWNLOAD_VORO)
   message(STATUS "Voro++ download requested - we will build our own")
+  set(VORO_URL "${LAMMPS_THIRDPARTY_URL}/voro++-0.4.6.tar.gz" CACHE STRING "URL for Voro++ tarball")
+  set(VORO_MD5 "2338b824c3b7b25590e18e8df5d68af9" CACHE STRING "MD5 checksum for Voro++ tarball")
+  mark_as_advanced(VORO_URL)
+  mark_as_advanced(VORO_MD5)
+
   include(ExternalProject)
 
   if(BUILD_SHARED_LIBS)
@@ -21,9 +26,14 @@ if(DOWNLOAD_VORO)
     set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})
   endif()
 
+  find_program(HAVE_PATCH patch)
+  if(NOT HAVE_PATCH)
+    message(FATAL_ERROR "The 'patch' program is required to build the voro++ library")
+  endif()
+
   ExternalProject_Add(voro_build
-    URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
-    URL_MD5 2338b824c3b7b25590e18e8df5d68af9
+    URL     ${VORO_URL}
+    URL_MD5 ${VORO_MD5}
     PATCH_COMMAND patch -b -p0 < ${LAMMPS_LIB_SOURCE_DIR}/voronoi/voro-make.patch
     CONFIGURE_COMMAND ""
     BUILD_COMMAND make ${VORO_BUILD_OPTIONS}

cmake/Modules/PreventInSourceBuilds.cmake

@@ -9,7 +9,7 @@ function(prevent_in_source_builds)
   get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH)
 
   # disallow in-source builds
-  if("${srcdir}" STREQUAL "${bindir}" OR "${srcdir2}" STREQUAL "${bindir}" OR "${srcdir3}" STREQUAL "${bindir}")
+  if(("${srcdir}" STREQUAL "${bindir}") OR ("${srcdir2}" STREQUAL "${bindir}") OR ("${srcdir3}" STREQUAL "${bindir}"))
     message(FATAL_ERROR "\
 
 CMake must not to be run in the source directory. \

cmake/Modules/Testing.cmake

@@ -16,11 +16,14 @@ if(ENABLE_TESTING)
   set(MEMORYCHECK_COMMAND "${VALGRIND_BINARY}" CACHE FILEPATH "Memory Check Command")
   set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT_OPTIONS}" CACHE STRING "Memory Check Command Options")
 
-  # check if a faster linker is available.
-  # only verified with GNU and Clang compilers and new CMake
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
-    if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-        OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
+  # 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)
+  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))
+        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=lld HAVE_LLD_LINKER_FLAG)
@@ -53,3 +56,76 @@ if(ENABLE_TESTING)
   get_filename_component(LAMMPS_UNITTEST_BIN ${CMAKE_BINARY_DIR}/unittest ABSOLUTE)
   add_subdirectory(${LAMMPS_UNITTEST_DIR} ${LAMMPS_UNITTEST_BIN})
 endif()
+
+# Compiler specific features for testing
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  option(ENABLE_COVERAGE "Enable collecting code coverage data" OFF)
+  mark_as_advanced(ENABLE_COVERAGE)
+  if(ENABLE_COVERAGE)
+    if(CMAKE_VERSION VERSION_LESS 3.13)
+      if(CMAKE_CXX_FLAGS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+      else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_${CMAKE_BUILD_TYPE}_FLAGS} --coverage")
+      endif()
+    else()
+      target_compile_options(lammps PUBLIC --coverage)
+      target_link_options(lammps PUBLIC --coverage)
+    endif()
+  endif()
+endif()
+
+#######################################
+# add custom target for IWYU analysis
+#######################################
+set(ENABLE_IWYU OFF CACHE BOOL "Add 'iwyu' build target to call the include-what-you-use tool")
+mark_as_advanced(ENABLE_IWYU)
+if(ENABLE_IWYU)
+  # enforce these settings
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Enable reporting compilation commands to compile_commands.json" FORCE)
+  if(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")))
+    message(FATAL_ERROR "IWYU is only supported with Clang or GNU compilers")
+  endif()
+  # detect the "native" header folder so we can include them first
+  execute_process(COMMAND ${CMAKE_CXX_COMPILER} --print-search-dirs OUTPUT_VARIABLE IWYU_SEARCH_PATHS)
+  string(REGEX REPLACE ".*libraries: *=([^:]+):.*" "\\1/include" IWYU_EXTRA_INCLUDE_DIR ${IWYU_SEARCH_PATHS})
+  find_program(IWYU_EXE NAMES include-what-you-use iwyu)
+  find_program(IWYU_TOOL NAMES iwyu_tool iwyu-tool iwyu_tool.py)
+  if(IWYU_EXE AND IWYU_TOOL)
+    add_custom_target(
+      iwyu
+      ${IWYU_TOOL} -o clang -p ${CMAKE_CURRENT_BINARY_DIR} -- -I${IWYU_EXTRA_INCLUDE_DIR} -Xiwyu --mapping_file=${CMAKE_CURRENT_SOURCE_DIR}/iwyu/iwyu-extra-map.imp
+      COMMENT "Running IWYU")
+    add_dependencies(iwyu lammps)
+  else()
+    message(FATAL_ERROR "To use IWYU you need the include-what-you-use/iwyu executable"
+      "and the iwyu-tool/iwyu_tool script installed in your PATH")
+  endif()
+endif()
+
+#######################################
+# select code sanitizer options
+#######################################
+set(ENABLE_SANITIZER "none" CACHE STRING "Select a code sanitizer option (none (default), address, leak, thread, undefined)")
+mark_as_advanced(ENABLE_SANITIZER)
+set(ENABLE_SANITIZER_VALUES none address leak thread undefined)
+set_property(CACHE ENABLE_SANITIZER PROPERTY STRINGS ${ENABLE_SANITIZER_VALUES})
+validate_option(ENABLE_SANITIZER ENABLE_SANITIZER_VALUES)
+string(TOLOWER ${ENABLE_SANITIZER} ENABLE_SANITIZER)
+if(NOT ENABLE_SANITIZER STREQUAL "none")
+  if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
+    if(CMAKE_VERSION VERSION_LESS 3.13)
+      if(CMAKE_CXX_FLAGS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${ENABLE_SANITIZER}")
+      else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_${CMAKE_BUILD_TYPE}_FLAGS} -fsanitize=${ENABLE_SANITIZER}")
+      endif()
+    else()
+      target_compile_options(lammps PUBLIC -fsanitize=${ENABLE_SANITIZER})
+      target_link_options(lammps PUBLIC -fsanitize=${ENABLE_SANITIZER})
+    endif()
+  else()
+    message(WARNING "ENABLE_SANITIZER option not supported by ${CMAKE_CXX_COMPILER_ID} compilers. Ignoring.")
+    set(ENABLE_SANITIZER "none")
+  endif()
+endif()

cmake/Modules/Tools.cmake

@@ -9,14 +9,16 @@ if(BUILD_TOOLS)
     check_language(Fortran)
     if(CMAKE_Fortran_COMPILER)
       enable_language(Fortran)
-      add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
+      add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f90)
       target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
-      install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
+      add_executable(micelle2d.x ${LAMMPS_TOOLS_DIR}/micelle2d.f90)
+      target_link_libraries(micelle2d.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
+      install(TARGETS chain.x micelle2d.x DESTINATION ${CMAKE_INSTALL_BINDIR})
     else()
-      message(WARNING "No suitable Fortran compiler found, skipping build of 'chain.x'")
+      message(WARNING "No suitable Fortran compiler found, skipping build of 'chain.x' and 'micelle2d.x'")
     endif()
   else()
-    message(WARNING "CMake build doesn't support fortran, skipping build of 'chain.x'")
+    message(WARNING "CMake build doesn't support Fortran, skipping build of 'chain.x' and 'micelle2d.x'")
   endif()
 
   enable_language(C)
@@ -45,7 +47,7 @@ if(BUILD_LAMMPS_SHELL)
   target_include_directories(lammps-shell PRIVATE ${LAMMPS_TOOLS_DIR}/lammps-shell)
 
   # workaround for broken readline pkg-config file on FreeBSD
-  if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     target_include_directories(lammps-shell PRIVATE /usr/local/include)
   endif()
   target_link_libraries(lammps-shell PRIVATE lammps PkgConfig::READLINE)

cmake/Modules/YAML.cmake

@@ -2,17 +2,32 @@ message(STATUS "Downloading and building YAML library")
 
 include(ExternalProject)
 set(YAML_URL "https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz" CACHE STRING "URL for libyaml tarball")
+set(YAML_MD5 "bb15429d8fb787e7d3f1c83ae129a999" CACHE STRING "MD5 checksum of libyaml tarball")
 mark_as_advanced(YAML_URL)
+mark_as_advanced(YAML_MD5)
+
+# support cross-compilation to windows
+if(CMAKE_CROSSCOMPILING AND (CMAKE_SYSTEM_NAME STREQUAL "Windows"))
+  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+    set(YAML_CROSS_HOST --host=i686-mingw64)
+  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    set(YAML_CROSS_HOST --host=x86_64-mingw64)
+  else()
+    message(FATAL_ERROR "Unsupported cross-compilation "
+      " for ${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR}"
+      " on ${CMAKE_HOST_SYSTEM}/${CMAKE_HOST_SYSTEM_PROCESSOR}")
+  endif()
+endif()
+
 ExternalProject_Add(libyaml
                     URL               ${YAML_URL}
-                    URL_MD5           bb15429d8fb787e7d3f1c83ae129a999
+                    URL_MD5           ${YAML_MD5}
                     SOURCE_DIR        "${CMAKE_BINARY_DIR}/yaml-src"
                     BINARY_DIR        "${CMAKE_BINARY_DIR}/yaml-build"
                     CONFIGURE_COMMAND <SOURCE_DIR>/configure ${CONFIGURE_REQUEST_PIC}
-                                      CXX=${CMAKE_CXX_COMPILER}
-                                      CC=${CMAKE_C_COMPILER}
-                                      --prefix=<INSTALL_DIR> --disable-shared
-                    BUILD_BYPRODUCTS  <INSTALL_DIR>/lib/${CMAKE_FIND_LIBRARY_PREFIXES}yaml.a
+                                      CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
+                                      --prefix=<INSTALL_DIR> --disable-shared ${YAML_CROSS_HOST}
+                    BUILD_BYPRODUCTS  <INSTALL_DIR>/lib/libyaml${CMAKE_STATIC_LIBRARY_SUFFIX}
                     TEST_COMMAND      "")
 
 ExternalProject_Get_Property(libyaml INSTALL_DIR)
@@ -23,7 +38,7 @@ set(YAML_LIBRARY_DIR ${INSTALL_DIR}/lib)
 file(MAKE_DIRECTORY ${YAML_INCLUDE_DIR})
 file(MAKE_DIRECTORY ${YAML_LIBRARY_DIR})
 
-set(YAML_LIBRARY_PATH ${INSTALL_DIR}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}yaml.a)
+set(YAML_LIBRARY_PATH ${INSTALL_DIR}/lib/libyaml${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 add_library(Yaml::Yaml UNKNOWN IMPORTED)
 set_target_properties(Yaml::Yaml PROPERTIES

cmake/Modules/generate_lmpgitversion.cmake

@@ -17,7 +17,7 @@ if(GIT_FOUND AND EXISTS ${LAMMPS_DIR}/.git)
     ERROR_QUIET
     WORKING_DIRECTORY ${LAMMPS_DIR}
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty=-modified
+  execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty=-modified --always
     OUTPUT_VARIABLE temp_git_describe
     ERROR_QUIET
     WORKING_DIRECTORY ${LAMMPS_DIR}

cmake/iwyu/iwyu-extra-map.imp

@@ -1,7 +1,28 @@
 [
-  { include: [ "<bits/types/struct_rusage.h>", private, "<sys/resource.h>", public ] },
-  { include: [ "<bits/exception.h>", public, "<exception>", public ] },
   { include: [ "@<Eigen/.*>", private, "<Eigen/Eigen>", public ] },
   { include: [ "@<gtest/.*>", private, "\"gtest/gtest.h\"", public ] },
   { include: [ "@<gmock/.*>", private, "\"gmock/gmock.h\"", public ] },
+  { include: [ "@<gmock/.*>", private, "\"gmock/gmock.h\"", public ] },
+  { include: [ "@<(cell|c_loops|container).hh>", private, "<voro++.hh>", public ] },
+  { include: [ "@\"atom_vec_.*.h\"", public, "\"style_atom.h\"", public ] },
+  { include: [ "@\"body_.*.h\"", public, "\"style_body.h\"", public ] },
+  { include: [ "@\"compute_.*.h\"", public, "\"style_compute.h\"", public ] },
+  { include: [ "@\"fix_.*.h\"", public, "\"style_fix.h\"", public ] },
+  { include: [ "@\"dump_.*.h\"", public, "\"style_dump.h\"", public ] },
+  { include: [ "@\"min_.*.h\"", public, "\"style_minimize.h\"", public ] },
+  { include: [ "@\"reader_.*.h\"", public, "\"style_reader.h\"", public ] },
+  { include: [ "@\"region_.*.h\"", public, "\"style_region.h\"", public ] },
+  { include: [ "@\"pair_.*.h\"", public, "\"style_pair.h\"", public ] },
+  { include: [ "@\"angle_.*.h\"", public, "\"style_angle.h\"", public ] },
+  { include: [ "@\"bond_.*.h\"", public, "\"style_bond.h\"", public ] },
+  { include: [ "@\"dihedral_.*.h\"", public, "\"style_dihedral.h\"", public ] },
+  { include: [ "@\"improper_.*.h\"", public, "\"style_improper.h\"", public ] },
+  { include: [ "@\"kspace_.*.h\"", public, "\"style_kspace.h\"", public ] },
+  { include: [ "@\"nbin_.*.h\"", public, "\"style_nbin.h\"", public ] },
+  { include: [ "@\"npair_.*.h\"", public, "\"style_npair.h\"", public ] },
+  { include: [ "@\"nstenci_.*.h\"", public, "\"style_nstencil.h\"", public ] },
+  { include: [ "@\"ntopo_.*.h\"", public, "\"style_ntopo.h\"", public ] },
+  { include: [ "<float.h>",   public, "<cfloat>", public ] },
+  { include: [ "<limits.h>",  public, "<climits>", public ] },
+  { include: [ "<bits/types/struct_tm.h>", private, "<ctime>", public ] },
 ]

cmake/pkgconfig/liblammps.pc.in

@@ -24,7 +24,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: liblammps@LAMMPS_MACHINE@
 Description: Large-scale Atomic/Molecular Massively Parallel Simulator Library
-URL: http://lammps.sandia.gov
+URL: https://www.lammps.org
 Version: @PROJECT_VERSION@
 Requires:
 Libs: -L${libdir} -llammps@LAMMPS_MACHINE@

cmake/presets/all_off.cmake

@@ -1,17 +1,96 @@
-# preset that turns on all existing packages off. can be used to reset
+# Preset that turns on all existing packages off. Can be used to reset
 # an existing package selection without losing any other settings
 
-set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
-        GRANULAR KIM KOKKOS KSPACE LATTE MANYBODY MC MISC MESSAGE MLIAP
-        MOLECULE MPIIO MSCG OPT PERI POEMS PYTHON QEQ REPLICA RIGID SHOCK
-        SNAP SPIN SRD VORONOI
-        USER-ADIOS USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
-        USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP
-        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESODPD
-        USER-MESONT USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE USER-NETCDF USER-OMP
-        USER-PHONON USER-PLUMED USER-PTM USER-QMMM USER-QTB USER-QUIP
-        USER-REACTION USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ
-        USER-SPH USER-TALLY USER-UEF USER-VTK USER-YAFF)
+set(ALL_PACKAGES
+  ADIOS
+  ASPHERE
+  ATC
+  AWPMD
+  BOCS
+  BODY
+  BROWNIAN
+  CG-DNA
+  CG-SDK
+  CLASS2
+  COLLOID
+  COLVARS
+  COMPRESS
+  CORESHELL
+  DIELECTRIC
+  DIFFRACTION
+  DIPOLE
+  DPD-BASIC
+  DPD-MESO
+  DPD-REACT
+  DPD-SMOOTH
+  DRUDE
+  EFF
+  EXTRA-COMPUTE
+  EXTRA-DUMP
+  EXTRA-FIX
+  EXTRA-MOLECULE
+  EXTRA-PAIR
+  FEP
+  GPU
+  GRANULAR
+  H5MD
+  INTEL
+  INTERLAYER
+  KIM
+  KOKKOS
+  KSPACE
+  LATBOLTZ
+  LATTE
+  MACHDYN
+  MANIFOLD
+  MANYBODY
+  MC
+  MDI
+  MEAM
+  MESONT
+  MESSAGE
+  MGPT
+  MISC
+  ML-HDNNP
+  ML-IAP
+  ML-PACE
+  ML-QUIP
+  ML-RANN
+  ML-SNAP
+  MOFFF
+  MOLECULE
+  MOLFILE
+  MPIIO
+  MSCG
+  NETCDF
+  OPENMP
+  OPT
+  ORIENT
+  PERI
+  PHONON
+  PLUGIN
+  PLUMED
+  POEMS
+  PTM
+  PYTHON
+  QEQ
+  QMMM
+  QTB
+  REACTION
+  REAXFF
+  REPLICA
+  RIGID
+  SCAFACOS
+  SHOCK
+  SMTBQ
+  SPH
+  SPIN
+  SRD
+  TALLY
+  UEF
+  VORONOI
+  VTK
+  YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} OFF CACHE BOOL "" FORCE)

cmake/presets/all_on.cmake

@@ -1,19 +1,98 @@
-# preset that turns on all existing packages. using the combination
-# this preset followed by the nolib.cmake preset should configure a
-# LAMMPS binary, with as many packages included, that can be compiled
+# Preset that turns on all existing packages. Using the combination
+# of this preset followed by the nolib.cmake preset should configure
+# a LAMMPS binary, with as many packages included, that can be compiled
 # with just a working C++ compiler and an MPI library.
 
-set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
-        GRANULAR KIM KOKKOS KSPACE LATTE MANYBODY MC MISC MESSAGE MLIAP
-        MOLECULE MPIIO MSCG OPT PERI POEMS PYTHON QEQ REPLICA RIGID SHOCK
-        SNAP SPIN SRD VORONOI
-        USER-ADIOS USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
-        USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP
-        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESODPD
-        USER-MESONT USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE USER-NETCDF USER-OMP
-        USER-PHONON USER-PLUMED USER-PTM USER-QMMM USER-QTB USER-QUIP
-        USER-REACTION USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ
-        USER-SPH USER-TALLY USER-UEF USER-VTK USER-YAFF)
+set(ALL_PACKAGES
+  ADIOS
+  ASPHERE
+  ATC
+  AWPMD
+  BOCS
+  BODY
+  BROWNIAN
+  CG-DNA
+  CG-SDK
+  CLASS2
+  COLLOID
+  COLVARS
+  COMPRESS
+  CORESHELL
+  DIELECTRIC
+  DIFFRACTION
+  DIPOLE
+  DPD-BASIC
+  DPD-MESO
+  DPD-REACT
+  DPD-SMOOTH
+  DRUDE
+  EFF
+  EXTRA-COMPUTE
+  EXTRA-DUMP
+  EXTRA-FIX
+  EXTRA-MOLECULE
+  EXTRA-PAIR
+  FEP
+  GPU
+  GRANULAR
+  H5MD
+  INTEL
+  INTERLAYER
+  KIM
+  KOKKOS
+  KSPACE
+  LATBOLTZ
+  LATTE
+  MACHDYN
+  MANIFOLD
+  MANYBODY
+  MC
+  MDI
+  MEAM
+  MESONT
+  MESSAGE
+  MGPT
+  MISC
+  ML-HDNNP
+  ML-IAP
+  ML-PACE
+  ML-QUIP
+  ML-RANN
+  ML-SNAP
+  MOFFF
+  MOLECULE
+  MOLFILE
+  MPIIO
+  MSCG
+  NETCDF
+  OPENMP
+  OPT
+  ORIENT
+  PERI
+  PHONON
+  PLUGIN
+  PLUMED
+  POEMS
+  PTM
+  PYTHON
+  QEQ
+  QMMM
+  QTB
+  REACTION
+  REAXFF
+  REPLICA
+  RIGID
+  SCAFACOS
+  SHOCK
+  SMTBQ
+  SPH
+  SPIN
+  SRD
+  TALLY
+  UEF
+  VORONOI
+  VTK
+  YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)

cmake/presets/clang.cmake

@@ -1,13 +1,26 @@
 # preset that will enable clang/clang++ with support for MPI and OpenMP (on Linux boxes)
 
+# prefer flang over gfortran, if available
+find_program(CLANG_FORTRAN NAMES flang gfortran f95)
+set(ENV{OMPI_FC} ${CLANG_FORTRAN})
+
 set(CMAKE_CXX_COMPILER "clang++" CACHE STRING "" FORCE)
 set(CMAKE_C_COMPILER "clang" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER ${CLANG_FORTRAN} CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -Wextra -g -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+
 set(MPI_CXX "clang++" CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
-unset(HAVE_OMP_H_INCLUDE CACHE)
 
+unset(HAVE_OMP_H_INCLUDE CACHE)
 set(OpenMP_C "clang" CACHE STRING "" FORCE)
 set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "" FORCE)
 set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)

cmake/presets/download.cmake

@@ -1,7 +1,7 @@
-# preset that turns on packages with automatic downloads of sources of potentials
-# compilation of libraries like Plumed or ScaFaCoS can take a considerable amount of time.
+# 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 USER-PLUMED USER-SCAFACOS USER-SMD USER-MESONT)
+set(ALL_PACKAGES KIM LATTE MSCG VORONOI PLUMED SCAFACOS MACHDYN MESONT MDI ML-PACE)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
@@ -9,9 +9,11 @@ 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)
 set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
+set(DOWNLOAD_PACE ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_PLUMED ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_SCAFACOS ON CACHE BOOL "" FORCE)
 

cmake/presets/gcc.cmake

@@ -1,11 +1,23 @@
-# preset that will restore gcc/g++ with support for MPI and OpenMP (on Linux boxes)
+# preset that will explicitly request gcc/g++ compilers with support for MPI and OpenMP
 
 set(CMAKE_CXX_COMPILER "g++" CACHE STRING "" FORCE)
 set(CMAKE_C_COMPILER "gcc" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER "gfortran" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
 set(MPI_CXX "g++" CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+set(MPI_C "gcc" CACHE STRING "" FORCE)
+set(MPI_C_COMPILER "mpicc" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(MPI_Fortran "gfortran" CACHE STRING "" FORCE)
+set(MPI_Fortran_COMPILER "mpifort" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -g -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
 unset(HAVE_OMP_H_INCLUDE CACHE)
 
 set(OpenMP_C "gcc" CACHE STRING "" FORCE)

cmake/presets/hip.cmake

@@ -1,12 +1,26 @@
-# preset that will enable hipcc plus gcc with support for MPI and OpenMP (on Linux boxes)
+# preset that will enable hipcc plus gcc/gfortran with support for MPI and OpenMP (on Linux boxes)
 
 set(CMAKE_CXX_COMPILER "hipcc" CACHE STRING "" FORCE)
 set(CMAKE_C_COMPILER "gcc" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER gfortran CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
-unset(HAVE_OMP_H_INCLUDE CACHE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -Wextra -g -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
 
-set(OpenMP_CXX "hipcc" CACHE STRING "" FORCE)
+set(MPI_CXX "hipcc" CACHE STRING "" FORCE)
+set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+
+unset(HAVE_OMP_H_INCLUDE CACHE)
+set(OpenMP_C "gcc" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_LIB_NAMES "gomp" CACHE STRING "" FORCE)
 set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX "hipcc" CACHE STRING "" FORCE)
 set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
 set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)

cmake/presets/hip_amd.cmake

@@ -0,0 +1,30 @@
+# preset that will enable hip (clang/clang++) with support for MPI and OpenMP (on Linux boxes)
+
+# prefer flang over gfortran, if available
+find_program(CLANG_FORTRAN NAMES flang gfortran f95)
+set(ENV{OMPI_FC} ${CLANG_FORTRAN})
+
+set(CMAKE_CXX_COMPILER "hipcc" CACHE STRING "" FORCE)
+set(CMAKE_C_COMPILER "hipcc" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER ${CLANG_FORTRAN} CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -Wextra -g -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -std=f2003" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+
+set(MPI_CXX "hipcc" CACHE STRING "" FORCE)
+set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+
+unset(HAVE_OMP_H_INCLUDE CACHE)
+set(OpenMP_C "hipcc" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_CXX "hipcc" CACHE STRING "" FORCE)
+set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)

cmake/presets/intel.cmake

@@ -3,10 +3,20 @@
 set(CMAKE_CXX_COMPILER "icpc" CACHE STRING "" FORCE)
 set(CMAKE_C_COMPILER "icc" CACHE STRING "" FORCE)
 set(CMAKE_Fortran_COMPILER "ifort" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+
 set(MPI_CXX "icpc" CACHE STRING "" FORCE)
 set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
-unset(HAVE_OMP_H_INCLUDE CACHE)
 
+unset(HAVE_OMP_H_INCLUDE CACHE)
 set(OpenMP_C "icc" CACHE STRING "" FORCE)
 set(OpenMP_C_FLAGS "-qopenmp" CACHE STRING "" FORCE)
 set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)

cmake/presets/mingw-cross.cmake

@@ -1,13 +1,76 @@
-set(WIN_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
-                 GRANULAR KSPACE LATTE MANYBODY MC MISC MLIAP MOLECULE OPT
-                 PERI POEMS QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI
-                 USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
-                 USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF
-                 USER-FEP USER-INTEL USER-MANIFOLD USER-MEAMC USER-MESODPD
-                 USER-MESONT USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE USER-OMP
-                 USER-PHONON USER-PTM USER-QTB USER-REACTION USER-REAXC
-                 USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF
-                 USER-YAFF)
+set(WIN_PACKAGES
+  ASPHERE
+  ATC
+  AWPMD
+  BOCS
+  BODY
+  BROWNIAN
+  CG-DNA
+  CG-SDK
+  CLASS2
+  COLLOID
+  COLVARS
+  COMPRESS
+  CORESHELL
+  DIELECTRIC
+  DIFFRACTION
+  DIPOLE
+  DPD-BASIC
+  DPD-MESO
+  DPD-REACT
+  DPD-SMOOTH
+  DRUDE
+  EFF
+  EXTRA-COMPUTE
+  EXTRA-DUMP
+  EXTRA-FIX
+  EXTRA-MOLECULE
+  EXTRA-PAIR
+  FEP
+  GPU
+  GRANULAR
+  INTEL
+  INTERLAYER
+  KSPACE
+  LATTE
+  MACHDYN
+  MANIFOLD
+  MANYBODY
+  MC
+  MDI
+  MEAM
+  MESONT
+  MGPT
+  MISC
+  ML-HDNNP
+  ML-IAP
+  ML-SNAP
+  ML-RANN
+  MOFFF
+  MOLECULE
+  MOLFILE
+  OPENMP
+  OPT
+  ORIENT
+  PERI
+  PHONON
+  POEMS
+  PTM
+  QEQ
+  QTB
+  REACTION
+  REAXFF
+  REPLICA
+  RIGID
+  SHOCK
+  SMTBQ
+  SPH
+  SPIN
+  SRD
+  TALLY
+  UEF
+  VORONOI
+  YAFF)
 
 foreach(PKG ${WIN_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
@@ -16,7 +79,7 @@ endforeach()
 # these two packages require a full MPI implementation
 if(BUILD_MPI)
   set(PKG_MPIIO ON CACHE BOOL "" FORCE)
-  set(PKG_USER-LB ON CACHE BOOL "" FORCE)
+  set(PKG_LATBOLTZ ON CACHE BOOL "" FORCE)
 endif()
 
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)

cmake/presets/most.cmake

@@ -2,13 +2,66 @@
 # external libraries. Compared to all_on.cmake some more unusual packages
 # are removed. The resulting binary should be able to run most inputs.
 
-set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE
-        GRANULAR KSPACE MANYBODY MC MISC MLIAP MOLECULE OPT PERI
-        POEMS PYTHON QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI
-        USER-BOCS USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION
-        USER-DPD USER-DRUDE USER-EFF USER-FEP USER-MEAMC USER-MESODPD
-        USER-MISC USER-MOFFF USER-OMP USER-PHONON USER-REACTION
-        USER-REAXC USER-SDPD USER-SPH USER-SMD USER-UEF USER-YAFF)
+set(ALL_PACKAGES
+  ASPHERE
+  BOCS
+  BODY
+  BROWNIAN
+  CG-DNA
+  CG-SDK
+  CLASS2
+  COLLOID
+  COLVARS
+  COMPRESS
+  CORESHELL
+  DIELECTRIC
+  DIFFRACTION
+  DIPOLE
+  DPD-BASIC
+  DPD-MESO
+  DPD-REACT
+  DPD-SMOOTH
+  DRUDE
+  EFF
+  EXTRA-COMPUTE
+  EXTRA-DUMP
+  EXTRA-FIX
+  EXTRA-MOLECULE
+  EXTRA-PAIR
+  FEP
+  GRANULAR
+  INTERLAYER
+  KSPACE
+  MACHDYN
+  MANYBODY
+  MC
+  MEAM
+  MISC
+  ML-IAP
+  ML-SNAP
+  MOFFF
+  MOLECULE
+  OPENMP
+  OPT
+  ORIENT
+  PERI
+  PHONON
+  PLUGIN
+  POEMS
+  PYTHON
+  QEQ
+  REACTION
+  REAXFF
+  REPLICA
+  RIGID
+  SHOCK
+  SPH
+  SPIN
+  SRD
+  TALLY
+  UEF
+  VORONOI
+  YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)

cmake/presets/nolib.cmake

@@ -1,10 +1,34 @@
 # preset that turns off all packages that require some form of external
 # library or special compiler (fortran or cuda) or equivalent.
 
-set(PACKAGES_WITH_LIB COMPRESS GPU KIM KOKKOS LATTE MPIIO MSCG PYTHON
-        VORONOI USER-ADIOS USER-ATC USER-AWPMD USER-H5MD USER-LB
-        USER-MOLFILE USER-MESONT USER-NETCDF USER-PLUMED USER-QMMM USER-QUIP
-        USER-SCAFACOS USER-SMD USER-VTK)
+set(PACKAGES_WITH_LIB
+  ADIOS
+  ATC
+  AWPMD
+  COMPRESS
+  GPU
+  H5MD
+  KIM
+  KOKKOS
+  LATBOLTZ
+  LATTE
+  MACHDYN
+  MDI
+  MESONT
+  MESSAGE
+  ML-HDNNP
+  ML-PACE
+  ML-QUIP
+  MOLFILE
+  MPIIO
+  MSCG
+  NETCDF
+  PLUMED
+  PYTHON
+  QMMM
+  SCAFACOS
+  VORONOI
+  VTK)
 
 foreach(PKG ${PACKAGES_WITH_LIB})
   set(PKG_${PKG} OFF CACHE BOOL "" FORCE)

cmake/presets/oneapi.cmake

@@ -0,0 +1,28 @@
+# preset that will enable the LLVM based Intel compilers with support for MPI and OpenMP and Fortran (on Linux boxes)
+
+set(CMAKE_CXX_COMPILER "icpx" CACHE STRING "" FORCE)
+set(CMAKE_C_COMPILER "icx" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER "ifx" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
+
+set(MPI_CXX "icpx" CACHE STRING "" FORCE)
+set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+
+unset(HAVE_OMP_H_INCLUDE CACHE)
+set(OpenMP_C "icx" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-qopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_CXX "icpx" CACHE STRING "" FORCE)
+set(OpenMP_CXX_FLAGS "-qopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_Fortran_FLAGS "-qopenmp" CACHE STRING "" FORCE)
+set(OpenMP_omp_LIBRARY "libiomp5.so" CACHE PATH "" FORCE)
+

cmake/presets/pedantic.cmake

@@ -0,0 +1,26 @@
+# preset that will restore gcc/g++ with support for MPI and OpenMP (on Linux boxes)
+
+set(CMAKE_CXX_COMPILER "g++" CACHE STRING "" FORCE)
+set(CMAKE_C_COMPILER "gcc" CACHE STRING "" FORCE)
+set(CMAKE_Fortran_COMPILER "gfortran" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -Werror=vla -Wno-maybe-uninitialized -g" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Werror=vla -Wno-maybe-uninitialized -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(MPI_CXX "g++" CACHE STRING "" FORCE)
+set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+set(MPI_C "gcc" CACHE STRING "" FORCE)
+set(MPI_C_COMPILER "mpicc" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -Wno-maybe-uninitialized -g" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Wno-maybe-uninitialized -g -O2 -DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "-Wall -O3 -DNDEBUG" CACHE STRING "" FORCE)
+set(MPI_Fortran "gfortran" CACHE STRING "" FORCE)
+set(MPI_Fortran_COMPILER "mpifort" CACHE STRING "" FORCE)
+unset(HAVE_OMP_H_INCLUDE CACHE)
+
+set(OpenMP_C "gcc" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_LIB_NAMES "gomp" CACHE STRING "" FORCE)
+set(OpenMP_CXX "g++" CACHE STRING "" FORCE)
+set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX_LIB_NAMES "gomp" CACHE STRING "" FORCE)
+set(OpenMP_omp_LIBRARY "libgomp.so" CACHE PATH "" FORCE)

doc/Makefile

@@ -10,7 +10,6 @@ endif
 BUILDDIR       = ${CURDIR}
 RSTDIR         = $(BUILDDIR)/src
 VENV           = $(BUILDDIR)/docenv
-TXT2RST        = $(VENV)/bin/txt2rst
 ANCHORCHECK    = $(VENV)/bin/rst_anchor_check
 SPHINXCONFIG   = $(BUILDDIR)/utils/sphinx-config
 MATHJAX        = $(SPHINXCONFIG)/_static/mathjax
@@ -47,6 +46,8 @@ HAS_PDFLATEX = YES
 endif
 endif
 
+# override settings for PIP commands
+# PIP_OPTIONS = --cert /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt --proxy http://proxy.mydomain.org
 
 #SPHINXEXTRA = -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiprocessing.cpu_count())') $(shell test -f $(BUILDDIR)/doxygen/xml/run.stamp && printf -- "-E")
 
@@ -57,7 +58,7 @@ SPHINXEXTRA = -E -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiproc
 # we only want to use explicitly listed files.
 DOXYFILES      = $(shell sed -n -e 's/\#.*$$//' -e '/^ *INPUT \+=/,/^[A-Z_]\+ \+=/p' doxygen/Doxyfile.in | sed -e 's/@LAMMPS_SOURCE_DIR@/..\/src/g' -e 's/\\//g' -e 's/ \+/ /' -e 's/[A-Z_]\+ \+= *\(YES\|NO\|\)//') 
 
-.PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check xmlgen
+.PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check char_check xmlgen
 
 # ------------------------------------------
 
@@ -66,7 +67,6 @@ help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html          create HTML pages in html dir"
 	@echo "  pdf           create Manual.pdf in this dir"
-	@echo "  fetch         fetch HTML and PDF files from LAMMPS web site"
 	@echo "  epub          create ePUB format manual for e-book readers"
 	@echo "  mobi          convert ePUB to MOBI format manual for e-book readers (e.g. Kindle)"
 	@echo "                      (requires ebook-convert tool from calibre)"
@@ -94,7 +94,7 @@ $(SPHINXCONFIG)/conf.py: $(SPHINXCONFIG)/conf.py.in
 	    -e 's,@LAMMPS_PYTHON_DIR@,$(BUILDDIR)/../python,g' \
 	    -e 's,@LAMMPS_DOC_DIR@,$(BUILDDIR),g' $< > $@
 
-html: xmlgen $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJAX)
+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
 	@(\
@@ -118,7 +118,7 @@ html: xmlgen $(SPHINXCONFIG)/conf.py $(ANCHORCHECK) $(MATHJAX)
 	@rm -rf html/PDF/.[sg]*
 	@echo "Build finished. The HTML pages are in doc/html."
 
-spelling: xmlgen $(VENV) $(SPHINXCONFIG)/false_positives.txt
+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= \
@@ -183,13 +183,6 @@ pdf: xmlgen $(VENV) $(SPHINXCONFIG)/conf.py $(ANCHORCHECK)
 	@rm -rf latex/PDF/.[sg]*
 	@echo "Build finished. Manual.pdf is in this directory."
 
-fetch:
-	@rm -rf html_www Manual_www.pdf
-	@curl -s -o Manual_www.pdf http://lammps.sandia.gov/doc/Manual.pdf
-	@curl -s -o lammps-doc.tar.gz http://lammps.sandia.gov/tars/lammps-doc.tar.gz
-	@tar xzf lammps-doc.tar.gz
-	@rm -f lammps-doc.tar.gz
-
 anchor_check : $(ANCHORCHECK)
 	@(\
 		. $(VENV)/bin/activate ;\
@@ -211,6 +204,9 @@ package_check : $(VENV)
 		deactivate ;\
 	)
 
+char_check :
+	@( env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst && exit 1 || : )
+
 xmlgen : doxygen/xml/index.xml
 
 doxygen/Doxyfile: doxygen/Doxyfile.in
@@ -228,15 +224,15 @@ $(VENV):
 	@( \
 		$(VIRTUALENV) -p $(PYTHON) $(VENV); \
 		. $(VENV)/bin/activate; \
-		pip install --upgrade pip; \
-		pip install -r $(BUILDDIR)/utils/requirements.txt; \
+		pip $(PIP_OPTIONS) install --upgrade pip; \
+		pip $(PIP_OPTIONS) install -r $(BUILDDIR)/utils/requirements.txt; \
 		deactivate;\
 	)
 
 $(MATHJAX):
-	@git clone --depth 1 https://github.com/mathjax/MathJax.git $@
+	@git clone -b 3.2.0 -c advice.detachedHead=0 --depth 1 git://github.com/mathjax/MathJax.git $@
 
-$(TXT2RST) $(ANCHORCHECK): $(VENV)
+$(ANCHORCHECK): $(VENV)
 	@( \
 		. $(VENV)/bin/activate; \
 		(cd utils/converters;\

doc/README

@@ -25,16 +25,11 @@ github-development-workflow.md   notes on the LAMMPS development workflow
 include-file-conventions.md      notes on LAMMPS' include file conventions
 documentation_conventions.md     notes on writing documentation for LAMMPS
 
-If you downloaded a LAMMPS tarball from lammps.sandia.gov, then the html
+If you downloaded a LAMMPS tarball from www.lammps.org, then the html
 folder and the PDF manual should be included. If you downloaded LAMMPS
-from GitHub then you either need to download them or build them.
+from GitHub then you either need to build them.
 
-(a) You can "fetch" the current HTML and PDF files from the LAMMPS web
-site.  Just type "make fetch".  This should create a html_www directory
-and Manual_www.pdf file.  These will always represent the latest published
-patch/development version of LAMMPS.
-
-(b) You can build the HTML and PDF files yourself, by typing "make html"
+You can build the HTML and PDF files yourself, by typing "make html"
 or by "make pdf", respectively.  This requires various tools and files.
 Some of them have to be installed (more on that below).  For the rest the
 build process will attempt to download and install into a python virtual
@@ -78,4 +73,4 @@ the tool 'ebook-convert' from the 'calibre' e-book management software
 ----------------
 
 More details this can be found in the manual itself. The online
-version is at: https://lammps.sandia.gov/doc/Manual_build.html
+version is at: https://docs.lammps.org/Build_manual.html

doc/doxygen/Doxyfile.in

@@ -424,6 +424,8 @@ INPUT                  = @LAMMPS_SOURCE_DIR@/utils.cpp                 \
                          @LAMMPS_SOURCE_DIR@/input.h                   \
                          @LAMMPS_SOURCE_DIR@/tokenizer.cpp             \
                          @LAMMPS_SOURCE_DIR@/tokenizer.h               \
+                         @LAMMPS_SOURCE_DIR@/arg_info.cpp              \
+                         @LAMMPS_SOURCE_DIR@/arg_info.h                \
                          @LAMMPS_SOURCE_DIR@/text_file_reader.cpp      \
                          @LAMMPS_SOURCE_DIR@/text_file_reader.h        \
                          @LAMMPS_SOURCE_DIR@/potential_file_reader.cpp \

doc/github-development-workflow.md

@@ -6,7 +6,7 @@ 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 2018-12-19.
+adapt accordingly. Last change 2021-09-02.
 
 ## Table of Contents
 
@@ -23,10 +23,10 @@ adapt accordingly. Last change 2018-12-19.
 
 In the interest of consistency, ONLY ONE of the core LAMMPS developers
 should doing the merging itself.  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,
+[@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.
 
@@ -55,13 +55,14 @@ 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 shall be applied to the pull
+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.
+merged. In addition, a `ready_for_merge` label may also be assigned
+to signal urgency to merge this pull request quickly.
 
 ### Pull Request Reviews
 
@@ -97,108 +98,50 @@ rationale behind choices 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.
 
-### Checklist for Pull Requests
-
-Here are some items to check:
-  * source and text files should not have CR/LF line endings (use dos2unix to remove)
-  * every new command or style should have documentation. The names of
-  source files (c++ and manual) should follow the name of the style.
-  (example: `src/fix_nve.cpp`, `src/fix_nve.h` for `fix nve` command,
-  implementing the class `FixNVE`, documented in `doc/src/fix_nve.rst`)
-  * all new style names should be lower case, the must be no dashes,
-  blanks, or underscores separating words, only forward slashes.
-  * new style docs should be added to the "overview" files in
-  `doc/src/Commands_*.rst`, `doc/src/{fixes,computes,pairs,bonds,...}.rst`
-  * check whether manual cleanly translates with `make html` and `make pdf`
-  * if documentation is (still) provided as a .txt file, convert to .rst
-  and remove the .txt file. For files in doc/txt the conversion is automatic.
-  * remove all .txt files in `doc/txt` that are out of sync with their .rst counterparts in `doc/src`
-  * check spelling of manual with `make spelling` in doc folder
-  * check style tables and command lists with `make style_check`
-  * new source files in packages should be added to `src/.gitignore`
-  * removed or renamed files in packages should be added to `src/Purge.list`
-  * C++ source files should use C++ style include files for accessing
-  C-library APIs, e.g. `#include <cstdlib>` instead of `#include <stdlib.h>`.
-  And they should use angular brackets instead of double quotes. Full list:
-    * assert.h -> cassert
-    * ctype.h -> cctype
-    * errno.h -> cerrno
-    * float.h -> cfloat
-    * limits.h -> climits
-    * math.h -> cmath
-    * complex.h -> complex
-    * setjmp.h -> csetjmp
-    * signal.h -> csignal
-    * stddef.h -> cstddef
-    * stdint.h -> cstdint
-    * stdio.h -> cstdio
-    * stdlib.h -> cstdlib
-    * string.h -> cstring
-    * time.h -> ctime
-    * Do NOT replace (as they are C++-11): `inttypes.h` and `stdint.h`.
-  * Code must follow the C++-11 standard. C++98-only is no longer accepted
-  * Code should use `nullptr` instead of `NULL` where applicable.
-  in individual special purpose packages
-  * indentation is 2 spaces per level
-  * there should be NO tabs and no trailing whitespace (review the "checkstyle" test on pull requests)
-  * header files, especially of new styles, should not include any
-  other headers, except the header with the base class or cstdio.
-  Forward declarations should be used instead when possible.
-  * iostreams should be avoided. LAMMPS uses stdio from the C-library.
-  * use of STL in headers and class definitions should be avoided.
-  exception is <string>, but it won't need to be explicitly included
-  since pointers.h already includes it. so std::string can be used directly.
-  * there MUST NOT be any "using namespace XXX;" statements in headers.
-  * static class members should be avoided at all cost.
-  * anything storing atom IDs should be using `tagint` and not `int`.
-  This can be flagged by the compiler only for pointers and only when
-  compiling LAMMPS with `-DLAMMPS_BIGBIG`.
-  * when including both `lmptype.h` (and using defines or macros from it)
-  and `mpi.h`, `lmptype.h` must be included first.
-  * see https://github.com/lammps/lammps/blob/master/doc/include-file-conventions.md
-  for general include file conventions and best practices
-  * when pair styles are added, check if settings for flags like
-  `single_enable`, `writedata`, `reinitflag`, `manybody_flag`
-  and others are correctly set and supported.
-
 ## GitHub Issues
 
 The GitHub issue tracker is the location where the LAMMPS developers
 and other contributors or LAMMPS users can report issues or bugs with
-the LAMMPS code or request new features to be added. Feature requests
-are usually indicated by a `[Feature Request]` marker in the subject.
-Issues are assigned to a person, if this person is working on this
-feature or working to resolve an issue. Issues that have nobody working
-on them at the moment, have the label `volunteer needed` attached.
+the LAMMPS code or request new features to be added. Bug reports have
+a `[Bug]` marker in the subject line; suggestions for changes or
+adding new functionality are indicated by a `[Feature Request]`
+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
+`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 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.
 
 ## Milestones and 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 "master" does not get broken.
-More extensive testing (including regression testing) is performed after
-code is merged to the "master" branch. There are patch releases of
-LAMMPS every 1-3 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 marked with a
-`patch_<version date>` tag and the "unstable" branch follows only these
-versions (and thus is always supposed to be of production quality,
-unlike "master", which may be temporary broken, in the case of larger
-change sets or unexpected incompatibilities or side effects.
+testing - that the code in the branch "master" 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 "master" 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
+marked with a `patch_<version date>` tag and the "unstable" branch
+follows only these versions (and thus is always supposed to be of
+production quality, unlike "master", which may be temporary broken, in
+the case of larger change sets or unexpected incompatibilities or side
+effects.
 
-About 3-4 times each year, there are going to be "stable" releases
-of LAMMPS.  These have seen additional, manual testing and review of
+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, in the last 2-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.
-
+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.

doc/graphviz/lammps-classes.dot

@@ -18,8 +18,8 @@ digraph lammps {
     Up [shape=box label="Update" color=blue]
     Un [shape=box label="Universe" color=blue]
     Ti [shape=box label="Timer" color=blue]
-    Lt [label="Lattice"]
     Rg [label="Region" color=red]
+    Lt [label="Lattice"]
     Rb [shape=box label="RegionBlock"]
     Rs [shape=box label="RegionSphere"]
     Av [label="AtomVec" color=red]
@@ -34,6 +34,7 @@ digraph lammps {
     Du [label="Dump" color=red]
     Fi [label="Fix" color=red]
     Cp [label="Compute" color=red]
+    Cm [label="Command" color=red]
     Th [label="Thermo"]
     Va [label="Variable"]
     Ew [shape=box label="Ewald"]
@@ -71,16 +72,19 @@ digraph lammps {
     Dg [shape=box label="DumpCFG"]
     Ve [shape=box label="Verlet"]
     Rr [shape=box label="Respa"]
+    Ru [shape=box label="Run"]
+    Se [shape=box label="Set"]
     Pt [shape=box label="PPPMTIP4P"]
     Vs [shape=box label="VerletSplit"]
     Ro [shape=box label="RespaOMP"]
     Mc [shape=box label="MinCG"]
     Mf [shape=box label="MinFire"]
     La -> {At Ci Co Do Er Fo Gr In Me Mo Ne Ou Ti Up Un} [penwidth=2]
-    Do -> {Lt Rg} [penwidth=2]
+    Do -> {Rg Lt} [penwidth=2]
     Rg -> {Rb Rs} [style=dashed penwidth=2]
     Co -> {Cb Ct} [style=dashed penwidth=2]
-    In -> Va [penwidth=2]
+    In -> {Va Cm} [penwidth=2]
+    Cm -> {Ru Se} [style=dashed penwidth=2]
     Mo -> {Fi Cp} [penwidth=2]
     Fo -> {Pa Bo An Di Im Ks} [penwidth=2]
     Ks -> {Ew Pp} [style=dashed penwidth=2]

doc/include-file-conventions.md

@@ -1,128 +0,0 @@
-# Outline of include file conventions in LAMMPS
-
-This purpose of this document is to provide a point of reference
-for LAMMPS developers and contributors as to what include files
-and definitions to put where into LAMMPS source.
-Last change 2020-08-31
-
-## Table of Contents
-
-  * [Motivation](#motivation)
-  * [Rules](#rules)
-  * [Tools](#tools)
-  * [Legacy Code](#legacy-code)
-
-## Motivation
-
-The conventions outlined in this document are supposed to help make
-maintenance of the LAMMPS software easier.  By trying to achieve
-consistency across files contributed by different developers, it will
-become easier for the code maintainers to modify and adjust files and,
-overall, the chance for errors or portability issues will be reduced.
-The rules employed are supposed to minimize naming conflicts and
-simplify dependencies between files and thus speed up compilation. They
-may, as well, make otherwise hidden dependencies visible.
-
-## Rules
-
-Below are the various rules that are applied.  Not all are enforced
-strictly and automatically.  If there are no significant side effects,
-exceptions may be possible for cases where a full compliance to the
-rules may require a large effort compared to the benefit.
-
-### Core Files Versus Package Files
-
-All rules listed below are most strictly observed for core LAMMPS files,
-which are the files that are not part of a package, and the files of the
-packages MOLECULE, MANYBODY, KSPACE, and RIGID.  On the other end of
-the spectrum are USER packages and legacy packages that predate these
-rules and thus may not be fully compliant.  Also, new contributions
-will be checked more closely, while existing code will be incrementally
-adapted to the rules as time and required effort permits.
-
-### System Versus Local Header Files
-
-All system- or library-provided include files are included with angular
-brackets (examples: `#include <cstring>` or `#include <mpi.h>`) while
-include files provided with LAMMPS are included with double quotes
-(examples: `#include "pointers.h"` or `#include "compute_temp.h"`).
-
-For headers declaring functions of the C-library, the corresponding
-C++ versions should be included (examples: `#include <cstdlib>` or
-`#include <cctypes>` instead of `#include <stdlib.h>` or
-`#include<ctypes.h>` ).
-
-### C++ Standard Compliance
-
-LAMMPS core files use standard conforming C++ compatible with the
-C++11 standard, unless explicitly noted.  Also, LAMMPS uses the C-style
-stdio library for I/O instead of iostreams.  Since using both at the
-same time can cause problems, iostreams should be avoided where possible.
-
-### Lean Header Files
-
-Header files will typically contain the definition of a (single) class.
-These header files should have as few include statements as possible.
-This is particularly important for classes that implement a "style" and
-thus use a macro of the kind `SomeStyle(some/name,SomeName)`. These will
-all be included in the auto-generated `"some_style.h"` files which
-results in a high potential for direct or indirect symbol name clashes.
-
-In the ideal case, the header would only include one file defining the
-parent class. That would typically be either `#include "pointers.h"` for
-the `Pointers` class, or a header of a class derived from it like
-`#include "pair.h"` for the `Pair` class and so on.  References to other
-classes inside the class should be make through pointers, for which forward
-declarations (inside the `LAMMPS_NS` or the new class' namespace) can
-be employed.  The full definition will then be included into the corresponding
-implementation file.  In the given example from above, the header file
-would be called `some_name.h` and the implementation `some_name.cpp` (all
-lower case with underscores, while the class itself would be in camel case
-and no underscores `SomeName`, and the style name with lower case names separated by
-a forward slash).
-
-### Implementation Files
-
-In the implementation files (typically, those would have the same base name
-as the corresponding header with a .cpp extension instead of .h) include
-statements should follow the "include what you use" principle.
-
-### Order of Include Statements
-
-Include files should be included in this order:
-* the header matching the implementation (`some_class.h` for file `some_class.cpp`)
-* mpi.h  (only if needed)
-* LAMMPS local headers (preferably in alphabetical order)
-* system and library headers (anything that is using angular brackets; preferably in alphabetical order)
-* conditional include statements (i.e. anything bracketed with ifdefs)
-
-### Special Cases and Exceptions
-
-#### pointers.h
-
-The `pointer.h` header file also includes (in this order) `lmptype.h`,
-`mpi.h`, `cstddef`, `cstdio`, `string`, `utils.h`, and `fmt/format.h`
-and through `lmptype.h` indirectly also `climits`, `cstdlib`, `cinttypes`.
-This means any header including `pointers.h` can assume that `FILE`,
-`NULL`, `INT_MAX` are defined, and the may freely use the std::string
-for arguments. Corresponding implementation files do not need to include
-those headers.
-
-## Tools
-
-The [Include What You Use tool](https://include-what-you-use.org/)
-can be used to provide supporting information about compliance with
-the rules listed here.  Through setting `-DENABLE_IWYU=on` when running
-CMake, a custom build target is added that will enable recording
-the compilation commands and then run the `iwyu_tool` using the
-recorded compilation commands information when typing `make iwyu`.
-
-## Legacy Code
-
-A lot of code predates the application of the rules in this document
-and the rules themselves are a moving target.  So there are going to be
-significant chunks of code that do not fully comply.  This applies
-for example to the USER-REAXC, or the USER-ATC package.  The LAMMPS
-developers are dedicated to make an effort to improve the compliance
-and welcome volunteers wanting to help with the process.
-

doc/lammps.1

@@ -1,4 +1,4 @@
-.TH LAMMPS "24 December 2020" "2020-12-24"
+.TH LAMMPS "29 September 2021" "2021-09-29"
 .SH NAME
 .B LAMMPS
 \- Molecular Dynamics Simulator.
@@ -34,7 +34,7 @@ semiconductors) and coarse-grained or mesoscopic systems. It can be used to
 model atoms or, more generically, as a parallel particle simulator at the
 atomic, meso, or continuum scale.
 
-See https://lammps.sandia.gov/ for more information and documentation.
+See https://www.lammps.org/ for more information and documentation.
 
 .SH EXECUTABLE NAME
 The
@@ -54,7 +54,7 @@ using
 this <machine name> parameter can be chosen arbitrarily at configuration
 time, but more common is to just use
 .B lmp
-without a suffix. In this manpage we will use
+without a suffix. In this man page we will use
 .B lmp
 to represent any of those names.
 
@@ -94,7 +94,7 @@ Enable or disable general KOKKOS support, as provided by the KOKKOS
 package.  Even if LAMMPS is built with this package, this switch must
 be set to \fBon\fR to enable running with KOKKOS-enabled styles. More
 details on this switch and its optional keyword value pairs are discussed
-at: https://lammps.sandia.gov/doc/Run_options.html
+at: https://docs.lammps.org/Run_options.html
 .TP
 \fB\-l <log file>\fR or \fB\-log <log file>\fR
 Specify a log file for LAMMPS to write status information to.
@@ -122,6 +122,38 @@ to perform client/server messaging with another application.
 .B LAMMPS
 can act as either a client or server (or both).
 .TP
+\fB\-mdi '<mdi_flags>'\fR
+This flag is only recognized and used when
+.B LAMMPS
+has support for the MolSSI
+Driver Interface (MDI) included as part of the MDI package.  This flag is
+specific to the MDI library and controls how
+.B LAMMPS
+interacts with MDI.  There are usually multiple flags that have to follow it
+and those have to be placed in quotation marks.  For more information about
+how to launch LAMMPS in MDI client/server mode please refer to the
+MDI How-to at  https://docs.lammps.org/Howto_mdi.html
+.TP
+\fB\-c\fR or \fB\-cite <style or filename>\fR
+Select how and where to output a reminder about citing contributions
+to the
+.B LAMMPS
+code that were used during the run. Available keywords
+for styles are "both", "none", "screen", or "log".  Any other keyword
+will be considered a file name to write the detailed citation info to
+instead of logfile or screen.  Default is the "log" style where there
+is a short summary in the screen output and detailed citations
+in BibTeX format in the logfile.  The option "both" selects the detailed
+output for both, "none", the short output for both, and "screen" will
+write the detailed info to the screen and the short version to the log
+file.  If a dedicated citation info file is requested, the screen and
+log file output will be in the short format (same as with "none").
+
+See https://docs.lammps.org/Intro_citing.html for more details on
+how to correctly reference and cite
+.B LAMMPS
+.
+.TP
 \fB\-nc\fR or \fB\-nocite\fR
 Disable writing the "log.cite" file which is normally written to
 list references for specific cite-able features used during a
@@ -135,7 +167,7 @@ For example "-pk gpu 2" is the same as "package gpu 2" in the input
 script. The possible styles and options are discussed in the
 .B LAMMPS
 manual for the "package" command. This switch can be used multiple
-times, e.g. to set options for the USER-INTEL and USER-OMP packages
+times, e.g. to set options for the INTEL and OPENMP packages
 when used together. Along with the "-sf" or "-suffix" switch, this
 is a convenient mechanism for invoking accelerator packages and their
 options without having to edit an input script.
@@ -202,7 +234,7 @@ the standard output. If <file name> is "none", (most) screen
 output will be suppressed.  In multi-partition mode only
 some high-level all-partition information is written to the
 screen or "<file name>" file, the remainder is written in a
-per-partition file "screen.N" or "<file name>.N" 
+per-partition file "screen.N" or "<file name>.N"
 with "N" being the respective partition number, and unless
 overridden by the \-pscreen flag (see above).
 .TP
@@ -218,8 +250,19 @@ and then "omp") and thus requires two arguments. Along with the
 "-package" command-line switch, this is a convenient mechanism for
 invoking styles from accelerator packages and setting their options
 without having to edit an input script.
+.TP
+\fB\-sr\fR or \fB\-skiprun\fR
+Insert the command "timer timeout 0 every 1" at the
+beginning of an input file or after a "clear" command.
+This has the effect that the entire
+.B LAMMPS
+input script is processed without executing actual
+"run" or "minimize" or similar commands (their main loops are skipped).
+This can be helpful and convenient to test input scripts of long running
+calculations for correctness to avoid having them crash after a
+long time due to a typo or syntax error in the middle or at the end.
 
-See https://lammps.sandia.gov/doc/Run_options.html for additional
+See https://docs.lammps.org/Run_options.html for additional
 details and discussions on command-line options.
 
 .SH LAMMPS BASICS
@@ -254,7 +297,7 @@ the chapter on errors in the
 manual gives some additional information about error messages, if possible.
 
 .SH COPYRIGHT
-© 2003--2020 Sandia Corporation
+© 2003--2021 Sandia Corporation
 
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as

doc/msi2lmp.1

@@ -98,7 +98,7 @@ msi2lmp decane -c 0 -f oplsaa
 
 
 .SH COPYRIGHT
-© 2003--2019 Sandia Corporation
+© 2003--2021 Sandia Corporation
 
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as