Merge pull request #1737 from akohlmey/next_patch_release

Step version string for next patch release

.github/CONTRIBUTING.md

@@ -68,7 +68,8 @@ How quickly your contribution will be integrated depends largely on how much eff
 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.
 
 * 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 lines over 80 characters. I/O is done via the C-style stdio library, style class header files should not import any system headers outside of <cstdio>, 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.
+* 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 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.txt'.
 * 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.

bench/POTENTIALS/CH.airebo

@@ -0,0 +1 @@
+../../potentials/CH.airebo

bench/POTENTIALS/CdTe.bop.table

@@ -0,0 +1 @@
+../../potentials/CdTe.bop.table

bench/POTENTIALS/Cu_u3.eam

@@ -1,305 +0,0 @@
-Cu functions (universal 3), SM Foiles et al, PRB, 33, 7983 (1986)
-   29     63.550         3.6150    FCC
-  500  5.0100200400801306e-04  500  1.0000000000000009e-02  4.9499999999999886e+00
-  0.                     -3.1561636903424350e-01 -5.2324876182494506e-01 -6.9740831416804383e-01 -8.5202525457518519e-01
- -9.9329216586042435e-01 -1.1246331970890324e+00 -1.2481882647347859e+00 -1.3654054700363645e+00 -1.4773214276236644e+00
- -1.5847099936904741e+00 -1.6865851873526410e+00 -1.7843534091637920e+00 -1.8790616476576076e+00 -1.9710188604521761e+00
- -2.0604838665854572e+00 -2.1476762477372944e+00 -2.2327843595560068e+00 -2.3159713409697673e+00 -2.3973797031286352e+00
- -2.4771348895887826e+00 -2.5553480773272810e+00 -2.6321184083774227e+00 -2.7075347880408458e+00 -2.7816773487592030e+00
- -2.8546186529652005e+00 -2.9264246898861899e+00 -2.9971557080624507e+00 -3.0668669157065978e+00 -3.1356090736776849e+00
- -3.2034290008357829e+00 -3.2703700069757247e+00 -3.3364722658277230e+00 -3.4017731379735778e+00 -3.4663074517059016e+00
- -3.5301077484029122e+00 -3.5932044977085980e+00 -3.6556262870729199e+00 -3.7173999892229403e+00 -3.7785509106421671e+00
- -3.8391029237823773e+00 -3.8990785849196925e+00 -3.9584992397079333e+00 -4.0173851179270912e+00 -4.0744518500210916e+00
- -4.1306733564032641e+00 -4.1864034067843932e+00 -4.2416582335814326e+00 -4.2964533268445280e+00 -4.3508034838872618e+00
- -4.4047228547107977e+00 -4.4582249835318351e+00 -4.5113228468570128e+00 -4.5640288884490872e+00 -4.6163550514904443e+00
- -4.6683128082199232e+00 -4.7199131872767452e+00 -4.7711667990036801e+00 -4.8220838587683374e+00 -4.8726742087289665e+00
- -4.9229473379113813e+00 -4.9729124009208192e+00 -5.0225782353423369e+00 -5.0719533779533492e+00 -5.1210460798461668e+00
- -5.1698643205481289e+00 -5.2184158212228908e+00 -5.2667080570261362e+00 -5.3147482686812282e+00 -5.3625434733324937e+00
- -5.4101004747367369e+00 -5.4574258728391953e+00 -5.5045260727784751e+00 -5.5514072933650311e+00 -5.5980755750691458e+00
- -5.6445367875538750e+00 -5.6907966367860183e+00 -5.7368606717507191e+00 -5.7827342908000219e+00 -5.8284227476608805e+00
- -5.8739311571204382e+00 -5.9192645004390272e+00 -5.9644276303605182e+00 -6.0094252761103064e+00 -6.0542620478988169e+00
- -6.0989424413057520e+00 -6.1434708414539330e+00 -6.1878515269578429e+00 -6.2320886736884802e+00 -6.2761863583589275e+00
- -6.3201485619430571e+00 -6.3639791729330000e+00 -6.4076819904493902e+00 -6.4512607272098990e+00 -6.4947190123648113e+00
- -6.5380603942065250e+00 -6.5812883427622069e+00 -6.6243939095620874e+00 -6.6670830925929181e+00 -6.7096660473058591e+00
- -6.7521459135001862e+00 -6.7945257643836499e+00 -6.8368086085521611e+00 -6.8789973918942735e+00 -6.9210949994162263e+00
- -6.9631042569970703e+00 -7.0050279330721992e+00 -7.0468687402560874e+00 -7.0886293368973554e+00 -7.1303123285804020e+00
- -7.1719202695651916e+00 -7.2134556641788095e+00 -7.2549209681507421e+00 -7.2963185899023415e+00 -7.3376508917899628e+00
- -7.3789201913012903e+00 -7.4201287622117036e+00 -7.4612788356982946e+00 -7.5023726014152032e+00 -7.5434122085331978e+00
- -7.5843997667427345e+00 -7.6253373472216595e+00 -7.6662269835740062e+00 -7.7070706727342895e+00 -7.7478703758424388e+00
- -7.7886280190928119e+00 -7.8293454945503811e+00 -7.8700246609474789e+00 -7.9106673444489104e+00 -7.9512753393968865e+00
- -7.9918504090315139e+00 -8.0323942861870705e+00 -8.0729086739704030e+00 -8.1133952464140293e+00 -8.1538556491162808e+00
- -8.1942914998523975e+00 -8.2347043891773524e+00 -8.2750958810033808e+00 -8.3154675131659701e+00 -8.3558207979692725e+00
- -8.3961572227176475e+00 -8.4364782502312892e+00 -8.4767853193496308e+00 -8.5170798454139458e+00 -8.5573632207473906e+00
- -8.5976368151087286e+00 -8.6379019761436666e+00 -8.6781600298199919e+00 -8.7184122808490656e+00 -8.7586600130993020e+00
- -8.7989044899963460e+00 -8.8391469549140993e+00 -8.8793886315543773e+00 -8.9196307243150841e+00 -8.9598744186541239e+00
- -9.0001208814363167e+00 -9.0403712612778122e+00 -9.0806266888772029e+00 -9.1208882773446476e+00 -9.1611571225108719e+00
- -9.2014343032440138e+00 -9.2417208817437881e+00 -9.2820179038447463e+00 -9.3223263992829857e+00 -9.3626473819958278e+00
- -9.4029818503831279e+00 -9.4433307875392529e+00 -9.4836951616705960e+00 -9.5237840547885071e+00 -9.5637918926951784e+00
- -9.6038142178817338e+00 -9.6438519061474608e+00 -9.6839058194810832e+00 -9.7239768064614509e+00 -9.7640657024289226e+00
- -9.8041733297054634e+00 -9.8443004978059889e+00 -9.8844480036373170e+00 -9.9246166317080906e+00 -9.9648071543198853e+00
- -1.0005020331762637e+01 -1.0045256912501884e+01 -1.0085517633366123e+01 -1.0125803219723423e+01 -1.0166114385662183e+01
- -1.0206451834160134e+01 -1.0246816257258331e+01 -1.0287208336224353e+01 -1.0327628741713852e+01 -1.0368078133934148e+01
- -1.0408557162795717e+01 -1.0449066468066974e+01 -1.0489606679525650e+01 -1.0530178417100558e+01 -1.0570782291022510e+01
- -1.0611418901960292e+01 -1.0652088841158786e+01 -1.0692792690577562e+01 -1.0733531023022920e+01 -1.0774304402276016e+01
- -1.0815113383222808e+01 -1.0855958511980305e+01 -1.0896840326017184e+01 -1.0937759354276295e+01 -1.0978716117290730e+01
- -1.1019711127305925e+01 -1.1060744888386239e+01 -1.1101817896531486e+01 -1.1142930639787664e+01 -1.1184083598352004e+01
- -1.1225277244679319e+01 -1.1266512043589387e+01 -1.1307788452364719e+01 -1.1349106920870327e+01 -1.1390467891550486e+01
- -1.1431871799781504e+01 -1.1473319073642074e+01 -1.1514810134213008e+01 -1.1556345395619132e+01 -1.1597925265115521e+01
- -1.1639550143177303e+01 -1.1681220423591583e+01 -1.1722936493536452e+01 -1.1764698733669888e+01 -1.1806507518187232e+01
- -1.1848363215029394e+01 -1.1890266185706139e+01 -1.1932216785634637e+01 -1.1974215364086319e+01 -1.2016262264291129e+01
- -1.2058357823507606e+01 -1.2100502373105996e+01 -1.2142696238631970e+01 -1.2184939739884385e+01 -1.2227233190982815e+01
- -1.2269576900438324e+01 -1.2311971171220080e+01 -1.2354416300827552e+01 -1.2396912581348374e+01 -1.2439460299532641e+01
- -1.2482059736851909e+01 -1.2524711169562636e+01 -1.2567414868772744e+01 -1.2610171100495961e+01 -1.2652980125719694e+01
- -1.2695842200459083e+01 -1.2738757575819193e+01 -1.2781726498053729e+01 -1.2824749208615117e+01 -1.2867825944219817e+01
- -1.2910956936899197e+01 -1.2954142414054047e+01 -1.2997382598508125e+01 -1.3040677708563408e+01 -1.3084027958052218e+01
- -1.3127433556386677e+01 -1.3170894708610035e+01 -1.3214411615448739e+01 -1.3257984473359954e+01 -1.3301613474583519e+01
- -1.3345298807190659e+01 -1.3389040655121903e+01 -1.3432839198243016e+01 -1.3476694612386723e+01 -1.3520607069407617e+01
- -1.3564576737214225e+01 -1.3608603779754390e+01 -1.3652688357330362e+01 -1.3696830626228689e+01 -1.3741030739041094e+01
- -1.3785288844633044e+01 -1.3829605088192579e+01 -1.3873979611263849e+01 -1.3918412551792358e+01 -1.3962904044165157e+01
- -1.4007454219246995e+01 -1.4052063204422609e+01 -1.4096731123636516e+01 -1.4141458097424390e+01 -1.4186244242962175e+01
- -1.4231089674089560e+01 -1.4275994501358696e+01 -1.4320958832063411e+01 -1.4365982770278379e+01 -1.4411066416893846e+01
- -1.4456209869649911e+01 -1.4501413223171539e+01 -1.4546676569005058e+01 -1.4591999995647598e+01 -1.4637383588581656e+01
- -1.4682827430315228e+01 -1.4728331600403862e+01 -1.4773896175488971e+01 -1.4819521229330235e+01 -1.4865206832833337e+01
- -1.4910953054084985e+01 -1.4956759958383259e+01 -1.5002627608264334e+01 -1.5048556063539081e+01 -1.5094545381317744e+01
- -1.5140595616041765e+01 -1.5186706819511983e+01 -1.5232879040916600e+01 -1.5279112326867676e+01 -1.5325406721414765e+01
- -1.5371762266086876e+01 -1.5418178999911675e+01 -1.5464656959446415e+01 -1.5511196178805903e+01 -1.5557796689685119e+01
- -1.5604458521389688e+01 -1.5651181700861002e+01 -1.5697966252703509e+01 -1.5744812199205967e+01 -1.5791719560374304e+01
- -1.5838688353945599e+01 -1.5885718595428898e+01 -1.5932810298111235e+01 -1.5979963473102316e+01 -1.6027178129340314e+01
- -1.6074454273625634e+01 -1.6121791910645470e+01 -1.6169191042992907e+01 -1.6216651671189425e+01 -1.6264173793714576e+01
- -1.6311757407021901e+01 -1.6359402505566209e+01 -1.6407109081822910e+01 -1.6454877126310635e+01 -1.6502706627614998e+01
- -1.6550597572407241e+01 -1.6598549945469813e+01 -1.6646563729715353e+01 -1.6694638906205682e+01 -1.6742775454176012e+01
- -1.6790973351056778e+01 -1.6839232572488413e+01 -1.6887553092348412e+01 -1.6935934882766333e+01 -1.6984377914146876e+01
- -1.7032882155186826e+01 -1.7081447572897673e+01 -1.7130074132623690e+01 -1.7178761798061373e+01 -1.7227510531275698e+01
- -1.7276320292724563e+01 -1.7325191041271864e+01 -1.7374122734215121e+01 -1.7423115327299456e+01 -1.7472168774711918e+01
- -1.7521283029136725e+01 -1.7570458041655343e+01 -1.7619693762170868e+01 -1.7668990138814479e+01 -1.7718347118374936e+01
- -1.7767764646209685e+01 -1.7817242666259403e+01 -1.7866781121071881e+01 -1.7916379951810882e+01 -1.7966039098283659e+01
- -1.8015758498943796e+01 -1.8065538090918608e+01 -1.8115377810021755e+01 -1.8165277590764617e+01 -1.8215237366381530e+01
- -1.8265257068836149e+01 -1.8315336628844307e+01 -1.8365475975885602e+01 -1.8415675038220570e+01 -1.8465933742903644e+01
- -1.8516252015799409e+01 -1.8566629781600568e+01 -1.8617066963838965e+01 -1.8667563484898778e+01 -1.8718119266039025e+01
- -1.8768734227397317e+01 -1.8819408288014415e+01 -1.8870141365839345e+01 -1.8920933377750998e+01 -1.8971784239569388e+01
- -1.9022693866067016e+01 -1.9073662170983084e+01 -1.9124689067045438e+01 -1.9175774465969539e+01 -1.9226918278483254e+01
- -1.9278120414338218e+01 -1.9329380782317116e+01 -1.9380699290257098e+01 -1.9432075845048644e+01 -1.9483510352663075e+01
- -1.9535002718153464e+01 -1.9586552845676124e+01 -1.9638160638497766e+01 -1.9689825999008235e+01 -1.9741548828738019e+01
- -1.9793329028359494e+01 -1.9845166497711489e+01 -1.9897061135804051e+01 -1.9949012840833348e+01 -2.0001021510188707e+01
- -2.0053087040468540e+01 -2.0105209327494322e+01 -2.0157388266314911e+01 -2.0209623751249865e+01 -2.0261915675825890e+01
- -2.0314263932714312e+01 -2.0366668414255741e+01 -2.0419129011700647e+01 -2.0471645615726288e+01 -2.0524218116314501e+01
- -2.0576846402769888e+01 -2.0629530363722893e+01 -2.0682269887147754e+01 -2.0735064860369221e+01 -2.0787915170073120e+01
- -2.0840820702317274e+01 -2.0893781342541502e+01 -2.0946796975575580e+01 -2.0999867485656864e+01 -2.1052992756428125e+01
- -2.1106172670961428e+01 -2.1159407111702421e+01 -2.1212695960751944e+01 -2.1266039099329419e+01 -2.1319436408360275e+01
- -2.1372887768154328e+01 -2.1426393058473991e+01 -2.1479952158748461e+01 -2.1533564947619766e+01 -2.1587231303431395e+01
- -2.1640951103995235e+01 -2.1694724226644553e+01 -2.1748550548245930e+01 -2.1802429945213817e+01 -2.1856362293508028e+01
- -2.1910347468648524e+01 -2.1964385345728829e+01 -2.2018475799410339e+01 -2.2072618703948137e+01 -2.2126813933181779e+01
- -2.2181061360561898e+01 -2.2235360859143157e+01 -2.2289712301596296e+01 -2.2344115560361388e+01 -2.2398570507087584e+01
- -2.2453077013515781e+01 -2.2507634950890292e+01 -2.2562244190064348e+01 -2.2616904601590250e+01 -2.2671616055687764e+01
- -2.2726378422261405e+01 -2.2781191570901910e+01 -2.2836055370890790e+01 -2.2890969691219198e+01 -2.2945934400583837e+01
- -2.3000949367399926e+01 -2.3056014459808921e+01 -2.3111129545678523e+01 -2.3166294492618363e+01 -2.3221509167983868e+01
- -2.3276773438880355e+01 -2.3332087172173260e+01 -2.3387450234495873e+01 -2.3442862492249787e+01 -2.3498323811618320e+01
- -2.3553834058571510e+01 -2.3609393098863848e+01 -2.3665000798062465e+01 -2.3720657021526677e+01 -2.3776361634436626e+01
- -2.3832114501780552e+01 -2.3887915488378439e+01 -2.3943764458878377e+01 -2.3999661277761106e+01 -2.4055605809352301e+01
- -2.4111597917826657e+01 -2.4167637467209488e+01 -2.4223724321393092e+01 -2.4279858344124932e+01 -2.4336039399030597e+01
- -2.4392267349614485e+01 -2.4448542059257761e+01 -2.4504863391234494e+01 -2.4561231208711206e+01 -2.4617645374753693e+01
- -2.4674105752332935e+01 -2.4730612204329191e+01 -2.4787164593538137e+01 -2.4843762782677913e+01 -2.4900406634392539e+01
- -2.4957096011252133e+01 -2.5013830775771112e+01 -2.5070610790396586e+01 -2.5127435917366029e+01 -2.5184306019355063e+01
- -2.5241220958503845e+01 -2.5298180597080318e+01 -2.5355184797285347e+01 -2.5412233421340488e+01 -2.5469326331427965e+01
-  1.0000000000000000e+01  1.0801534951171448e+01  1.0617375158244670e+01  1.0436688151228793e+01  1.0259403283230313e+01
-  1.0085451405601304e+01  9.9147648356938589e+00  9.7472773253084029e+00  9.5829240298195373e+00  9.4216414779654656e+00
-  9.2633675422888473e+00  9.1080414102110012e+00  8.9556035557302494e+00  8.8059957117284853e+00  8.6591608428743143e+00
-  8.5150431191084976e+00  8.3735878897014118e+00  8.2347416578681987e+00  8.0984520559319435e+00  7.9646678210201571e+00
-  7.8333387712866624e+00  7.7044157826449009e+00  7.5778507660022569e+00  7.4535966449878401e+00  7.3316073341564731e+00
-  7.2118377176659578e+00  7.0942436284134374e+00  6.9787818276207929e+00  6.8654099848621115e+00  6.7540866585212882e+00
-  6.6447712766712357e+00  6.5374241183666584e+00  6.4320062953403578e+00  6.3284797340946000e+00  6.2268071583795574e+00
-  6.1269520720505000e+00  6.0288787422946655e+00  5.9325521832211621e+00  5.8379381398054591e+00  5.7450030721804524e+00
-  5.6537141402680220e+00  5.5640391887418730e+00  5.4759467323160322e+00  5.3894059413519244e+00  5.3043866277758980e+00
-  5.2208592313018016e+00  5.1387948059520454e+00  5.0581650068698707e+00  4.9789420774166615e+00  4.9010988365496075e+00
-  4.8246086664712777e+00  4.7494455005478358e+00  4.6755838114879396e+00  4.6029985997776066e+00  4.5316653823665547e+00
-  4.4615601815980312e+00  4.3926595143797726e+00  4.3249403815888456e+00  4.2583802577058805e+00  4.1929570806747449e+00
-  4.1286492419807814e+00  4.0654355769448500e+00  4.0032953552278059e+00  3.9422082715398403e+00  3.8821544365521561e+00
-  3.8231143680053350e+00  3.7650689820101348e+00  3.7079995845373759e+00  3.6518878630917868e+00  3.5967158785670392e+00
-  3.5424660572764992e+00  3.4891211831576925e+00  3.4366643901451397e+00  3.3850791547089756e+00  3.3343492885547761e+00
-  3.2844589314827459e+00  3.2353925444006251e+00  3.1871349024889781e+00  3.1396710885139782e+00  3.0929864862859660e+00
-  3.0470667742591075e+00  3.0018979192706325e+00  2.9574661704151453e+00  2.9137580530522627e+00  2.8707603629438552e+00
-  2.8284601605189152e+00  2.7868447652620318e+00  2.7459017502243626e+00  2.7056189366531243e+00  2.6659843887374848e+00
-  2.6269864084689516e+00  2.5886135306124487e+00  2.5508545177868598e+00  2.5136983556521244e+00  2.4771342482006986e+00
-  2.4411516131510069e+00  2.4057400774406830e+00  2.3708894728175807e+00  2.3365898315265383e+00  2.3028313820887689e+00
-  2.2696045451740474e+00  2.2368999295609058e+00  2.2047083281853901e+00  2.1730207142748128e+00  2.1418282375653348e+00
-  2.1111222206016862e+00  2.0808941551166384e+00  2.0511356984892615e+00  2.0218386702793651e+00  1.9929950488372441e+00
-  1.9645969679867363e+00  1.9366367137799969e+00  1.9091067213223525e+00  1.8819995716660998e+00  1.8553079887710169e+00
-  1.8290248365311754e+00  1.8031431158652609e+00  1.7776559618705363e+00  1.7525566410377422e+00  1.7278385485262007e+00
-  1.7034952054980579e+00  1.6795202565098251e+00  1.6559074669601728e+00  1.6326507205929630e+00  1.6097440170540054e+00
-  1.5871814695006066e+00  1.5649573022624637e+00  1.5430658485530984e+00  1.5215015482308161e+00  1.5002589456071576e+00
-  1.4793326873036463e+00  1.4587175201534635e+00  1.4384082891492156e+00  1.4183999354343300e+00  1.3986874943378140e+00
-  1.3792660934511431e+00  1.3601309507466510e+00  1.3412773727360872e+00  1.3227007526689576e+00  1.3043965687692420e+00
-  1.2863603825102174e+00  1.2685878369261090e+00  1.2510746549598935e+00  1.2338166378466084e+00  1.2168096635312082e+00
-  1.2000496851203266e+00  1.1835327293670588e+00  1.1672548951882362e+00  1.1512123522134416e+00  1.1354013393647548e+00
-  1.1198181634671940e+00  1.1044591978884952e+00  1.0893208812080033e+00  1.0743997159140335e+00  1.0596922671287743e+00
-  1.0451951613605601e+00  1.0309050852825337e+00  1.0168187845373140e+00  1.0029330625671378e+00  9.8924477946872713e-01
-  9.7575085087259694e-01  9.6244824684604424e-01  9.4933399081931213e-01  9.3640515853477169e-01  9.2365887701803118e-01
-  9.1109232357100112e-01  8.9870272478628266e-01  8.8648735558209424e-01  8.7444353825798160e-01  8.6256864157006774e-01
-  8.5086007982605949e-01  8.3931531199913678e-01  8.2793184086057892e-01  8.1670721213066955e-01  8.0563901364725510e-01
-  7.9472487455206675e-01  7.8396246449372953e-01  7.7334949284779597e-01  7.6288370795296245e-01  7.5256289636327622e-01
-  7.4238488211596021e-01  7.3234752601463171e-01  7.2244872492728618e-01  7.1268641109915265e-01  7.0305855147956464e-01
-  6.9356314706317335e-01  6.8419823224459719e-01  6.7496187418651843e-01  6.6585217220099224e-01  6.5686725714346750e-01
-  6.4800529081937697e-01  6.3926446540306614e-01  6.3064300286859520e-01  6.2213915443241774e-01  6.1375120000748140e-01
-  6.0547744766850542e-01  5.9731623312840654e-01  5.8926591922531912e-01  5.8132489542033028e-01  5.7349157730523359e-01
-  5.6576440612064971e-01  5.5814184828379609e-01  5.5062239492602316e-01  5.4320456143964790e-01  5.3588688703414888e-01
-  5.2866793430138515e-01  5.2154628878946241e-01  5.1452055858552015e-01  5.0758937390678227e-01  5.0075138669987496e-01
-  4.9400527024841523e-01  4.8734971878830358e-01  4.8078344713093557e-01  4.7430519029390972e-01  4.6791370313911962e-01
-  4.6160776001828552e-01  4.5538615442535857e-01  4.4924769865602876e-01  4.4319122347399365e-01  4.3721557778390086e-01
-  4.3131962831075654e-01  4.2550225928575891e-01  4.1976237213834899e-01  4.1409888519439697e-01  4.0851073338028954e-01
-  4.0299686793291478e-01  3.9755625611540779e-01  3.9218788093843493e-01  3.8689074088692443e-01  3.8166384965228239e-01
-  3.7650623586976018e-01  3.7141694286095728e-01  3.6639502838144544e-01  3.6143956437320846e-01  3.5654963672189943e-01
-  3.5172434501901328e-01  3.4696280232829579e-01  3.4226413495707497e-01  3.3762748223177219e-01  3.3305199627774762e-01
-  3.2853684180349596e-01  3.2408119588894380e-01  3.1968424777773841e-01  3.1534519867361155e-01  3.1106326154055530e-01
-  3.0683766090688813e-01  3.0266763267296426e-01  2.9855242392259740e-01  2.9449129273803010e-01  2.9048350801842027e-01
-  2.8652834930171167e-01  2.8262510658997009e-01  2.7877308017785829e-01  2.7497158048439907e-01  2.7121992788793392e-01
-  2.6751745256412462e-01  2.6386349432690004e-01  2.6025740247248841e-01  2.5669853562631850e-01  2.5318626159266877e-01
-  2.4971995720718354e-01  2.4629900819206618e-01  2.4292280901402563e-01  2.3959076274464408e-01  2.3630228092351846e-01
-  2.3305678342376535e-01  2.2985369832002167e-01  2.2669246175884616e-01  2.2357251783148069e-01  2.2049331844890929e-01
-  2.1745432321916880e-01  2.1445499932688783e-01  2.1149482141498144e-01  2.0857327146848004e-01  2.0568983870040114e-01
-  2.0284401943976604e-01  2.0003531702142130e-01  1.9726324167804599e-01  1.9452731043391402e-01  1.9182704700056608e-01
-  1.8916198167437770e-01  1.8653165123588344e-01  1.8393559885088084e-01  1.8137337397327791e-01  1.7884453224959973e-01
-  1.7634863542523593e-01  1.7388525125224241e-01  1.7145395339876757e-01  1.6905432136008169e-01  1.6668594037109052e-01
-  1.6434840132036665e-01  1.6204130066570688e-01  1.5976424035106618e-01  1.5751682772493769e-01  1.5529867546015819e-01
-  1.5310940147503249e-01  1.5094862885580707e-01  1.4881598578045718e-01  1.4671110544379484e-01  1.4463362598375351e-01
-  1.4258319040899092e-01  1.4055944652768915e-01  1.3856204687748974e-01  1.3659064865666881e-01  1.3464491365640630e-01
-  1.3272450819420012e-01  1.3082910304837103e-01  1.2895837339364213e-01  1.2711199873781265e-01  1.2528966285941134e-01
-  1.2349105374641756e-01  1.2171586353596986e-01  1.1996378845505173e-01  1.1823452876211782e-01  1.1652778868972380e-01
-  1.1484327638801961e-01  1.1318070386919254e-01  1.1153978695277944e-01  1.0992024521187505e-01  1.0832180192018548e-01
-  1.0674418399992769e-01  1.0518712197055757e-01  1.0365034989832456e-01  1.0213360534659532e-01  1.0063662932698936e-01
-  9.9159166251264974e-02  9.7700963883974534e-02  9.6261773295835962e-02  9.4841348817873428e-02  9.3439447996227276e-02
-  9.2055831547688260e-02  9.0690263315935660e-02  8.9342510228411331e-02  8.8012342253891429e-02  8.6699532360706044e-02
-  8.5403856475584128e-02  8.4125093443141896e-02  8.2863024985984080e-02  8.1617435665412685e-02  8.0388112842733062e-02
-  7.9174846641143493e-02  7.7977429908209661e-02  7.6795658178889781e-02  7.5629329639115728e-02  7.4478245089953710e-02
-  7.3342207912248103e-02  7.2221024031827064e-02  7.1114501885225945e-02  7.0022452385910761e-02  6.8944688890991479e-02
-  6.7881027168450458e-02  6.6831285364849169e-02  6.5795283973477225e-02  6.4772845803028556e-02  6.3763795946680801e-02
-  6.2767961751651669e-02  6.1785172789201148e-02  6.0815260825057393e-02  5.9858059790287577e-02  5.8913405752569759e-02
-  5.7981136887894191e-02  5.7061093452682510e-02  5.6153117756271964e-02  5.5257054133826422e-02  5.4372748919636837e-02
-  5.3500050420772105e-02  5.2638808891131372e-02  5.1788876505864945e-02  5.0950107336147354e-02  5.0122357324306366e-02
-  4.9305484259319243e-02  4.8499347752635869e-02  4.7703809214351578e-02  4.6918731829721727e-02  4.6143980535982010e-02
-  4.5379421999521163e-02  4.4624924593352100e-02  4.3880358374905226e-02  4.3145595064128850e-02  4.2420508021892900e-02
-  4.1704972228691739e-02  4.0998864263647405e-02  4.0302062283785300e-02  3.9614446003616965e-02  3.8935896674993531e-02
-  3.8266297067221844e-02  3.7605531447481688e-02  3.6953485561492139e-02  3.6310046614435487e-02  3.5675103252157392e-02
-  3.5048545542616605e-02  3.4430264957581835e-02  3.3820154354582632e-02  3.3218107959093635e-02  3.2624021346983278e-02
-  3.2037791427166340e-02  3.1459316424514716e-02  3.0888495862994469e-02  3.0325230549015147e-02  2.9769422555015357e-02
-  2.9220975203265720e-02  2.8679793049885216e-02  2.8145781869070463e-02  2.7618848637539717e-02  2.7098901519172047e-02
-  2.6585849849867671e-02  2.6079604122596356e-02  2.5580075972643668e-02  2.5087178163056167e-02  2.4600824570288671e-02
-  2.4120930170012267e-02  2.3647411023137499e-02  2.3180184262011627e-02  2.2719168076792418e-02  2.2264281702001121e-02
-  2.1815445403263078e-02  2.1372580464206647e-02  2.0935609173537761e-02  2.0504454812290795e-02  2.0079041641240414e-02
-  1.9659294888467183e-02  1.9245140737102040e-02  1.8836506313223755e-02  1.8433319673904158e-02  1.8035509795416238e-02
-  1.7643006561603891e-02  1.7255740752380899e-02  1.6873644032391555e-02  1.6496648939823388e-02  1.6124688875347792e-02
-  1.5757698091213634e-02  1.5395611680482646e-02  1.5038365566394485e-02  1.4685896491875350e-02  1.4338142009180710e-02
-  1.3995040469664266e-02  1.3656531013687800e-02  1.3322553560652262e-02  1.2993048799157525e-02  1.2667958177290606e-02
-  1.2347223893038994e-02  1.2030788884814458e-02  1.1718596822117511e-02  1.1410592096299910e-02  1.1106719811460941e-02
-  1.0806925775450060e-02  1.0511156490982998e-02  1.0219359146882878e-02  9.9314816094114855e-03  9.6474724137328716e-03
-  9.3672807554677773e-03  9.0908564823645177e-03  8.8181500860711193e-03  8.5491126940134832e-03  8.2836960613733579e-03
-  8.0218525631707838e-03  7.7635351864465685e-03  7.5086975225370223e-03  7.2572937594544973e-03  7.0092786743605195e-03
-  6.7646076261301813e-03  6.5232365480138998e-03  6.2851219403949887e-03  6.0502208636273869e-03  5.8184909309735300e-03
-  5.5898903016277091e-03  5.3643776738254711e-03  5.1419122780385074e-03  4.9224538702609122e-03  4.7059627253757674e-03
-  4.4923996305976099e-03  4.2817258790122659e-03  4.0739032631877392e-03  3.8688940688609841e-03  3.6666610687164924e-03
-  3.4671675162341598e-03  3.2703771396105918e-03  3.0762541357672313e-03  2.8847631644254856e-03  2.6958693422570179e-03
-  2.5095382371091990e-03  2.3257358623008373e-03  2.1444286709895732e-03  1.9655835506104946e-03  1.7891678173820869e-03
-  1.6151492108847365e-03  1.4434958887007410e-03  1.2741764211267048e-03  1.1071597859496629e-03  9.4241536328815156e-04
-  7.7991293049733956e-04  6.1962265713921827e-04  4.6151510001329887e-04  3.0556119825198014e-04  1.5173226847375876e-04
-  0.                      0.                      0.                      0.                      0.
-  0.                      5.4383329664155645e-05  9.3944898415945083e-04  4.3251847212615047e-03  1.2334244035325348e-02
-  2.7137722173468548e-02  5.0697119791449641e-02  8.4607638668976470e-02  1.3001641279549414e-01  1.8759487452762702e-01
-  2.5754900895683441e-01  3.3965493779430744e-01  4.3331024634064264e-01  5.3759384878832961e-01  6.5132908316254046e-01
-  7.7314622535699939e-01  9.0154178511424377e-01  1.0349328562818201e+00  1.1717054897399350e+00  1.3102565818166738e+00
-  1.4490291582473986e+00  1.5865412121263560e+00  1.7214084470448441e+00  1.8523614026473965e+00  1.9782575145276269e+00
-  2.0980886961566938e+00  2.2109850373516764e+00  2.3162151996095730e+00  2.4131840597491703e+00  2.5014281146549706e+00
-  2.5806091153285706e+00  2.6505063508648590e+00  2.7110079545661563e+00  2.7621015568249447e+00  2.8038645637913220e+00
-  2.8364542979766156e+00  2.8600981973448825e+00  2.8750842333755031e+00  2.8817516761559574e+00  2.8804823057701157e+00
-  2.8716921439699092e+00  2.8558237581894161e+00  2.8333391711552594e+00  2.8047133934346959e+00  2.7704285829676252e+00
-  2.7309688247181469e+00  2.6868155147671331e+00  2.6384433262347358e+00  2.5863167291097398e+00  2.5308870321738226e+00
-  2.4725899125317596e+00  2.4118433966060167e+00  2.3490462556752334e+00  2.2845767789603002e+00  2.2187918877813502e+00
-  2.1520265552815943e+00  2.0845934975626363e+00  2.0167831036919637e+00  1.9488635738636404e+00  1.8810812369508270e+00
-  1.8136610207193371e+00  1.7468070500507196e+00  1.6807033505858371e+00  1.6155146372447149e+00  1.5513871690559142e+00
-  1.4884496536383409e+00  1.4268141864958608e+00  1.3665772120042590e+00  1.3078204945836447e+00  1.2506120900523854e+00
-  1.1950073085502879e+00  1.1410496616995687e+00  1.0887717878420631e+00  1.0381963502565981e+00  9.8933690422003551e-01
-  9.4219872964247031e-01  8.9677962677415124e-01  8.5307067316958651e-01  8.1105694069385592e-01  7.7071817188505065e-01
-  7.3202941544290212e-01  6.9496162100761794e-01  6.5948219372701189e-01  6.2555550939233484e-01  5.9314339115629977e-01
-  5.6220554903693554e-01  5.3269998356387660e-01  5.0458335504023211e-01  4.7781131998032222e-01  4.5233883634534777e-01
-  4.2812043923464138e-01  4.0511048870905242e-01  3.8326339142174781e-01  3.6253379771729577e-01  3.4287677583286325e-01
-  3.2424796479760154e-01  3.0660370758054967e-01  2.8990116598452254e-01  2.7409841872609064e-01  2.5915454407883409e-01
-  2.4502968839369110e-01  2.3168512174254197e-01  2.1908328186436687e-01  2.0718780752542632e-01  1.9596356233750800e-01
-  1.8537665001230508e-01  1.7539442196444632e-01  1.6598547811304609e-01  1.5711966166996927e-01  1.4876804864444715e-01
-  1.4090293273673637e-01  1.3349780623990259e-01  1.2652733751724909e-01  1.1996734557434463e-01  1.1379477219856060e-01
-  1.0798765209582406e-01  1.0252508141368288e-01  9.7387185001678311e-02  9.2555082724584015e-02  8.8010855111109620e-02
-  8.3737508589961873e-02  7.9718940536826377e-02  7.5939904329596963e-02  7.2385974585237101e-02  6.9043512729294765e-02
-  6.5899633029043336e-02  6.2942169202580001e-02  6.0159641699440547e-02  5.7541225732930634e-02  5.5076720130546430e-02
-  5.2756517056398833e-02  5.0571572648238083e-02  4.8513378601664936e-02  4.6573934725081756e-02  4.4745722480991068e-02
-  4.3021679522073253e-02  4.1395175224364866e-02  3.9859987214311721e-02  3.8410278881708670e-02  3.7040577866510604e-02
-  3.5745755503880039e-02  3.4521007208912380e-02  3.3361833779917971e-02  3.2264023597108116e-02  3.1223635691821294e-02
-  3.0236983660070216e-02  2.9300620393215571e-02  2.8411323597772320e-02  2.7566082075896281e-02  2.6762082737777249e-02
-  2.5996698317105604e-02  2.5267475760840985e-02  2.4572125264713973e-02  2.3908509926274246e-02  2.3274635987705516e-02
-  2.2668643641204911e-02  2.2088798370316409e-02  2.1533482801290083e-02  2.1001189039288493e-02  2.0490511464994254e-02
-  2.0000139967999431e-02  1.9528853594166895e-02  1.9075514584991349e-02  1.8639062787818239e-02  1.8218510416650235e-02
-  1.7812937144080498e-02  1.7421485505751177e-02  1.7043356599549031e-02  1.6677806062561751e-02  1.6324140309613155e-02
-  1.5981713017976018e-02  1.5649921843605585e-02  1.5328205354974755e-02  1.5016040171312250e-02  1.4712938292708366e-02
-  1.4418444610242331e-02  1.4132134584901757e-02  1.3853612084676337e-02  1.3582507369821917e-02  1.3318475216818060e-02
-  1.3061193172097418e-02  1.2810359927147186e-02  1.2565693807050415e-02  1.2326931365025051e-02  1.2093826075940506e-02
-  1.1866147122233661e-02  1.1643678266026136e-02  1.1426216801644407e-02  1.1213572583084475e-02  1.1005567121320226e-02
-  1.0802032746662471e-02  1.0602811831688208e-02  1.0407756070544782e-02  1.0216725810699157e-02  1.0029589433467268e-02
-  9.8462227798860602e-03  9.6665086187306404e-03  9.4903361536790021e-03  9.3176005668363371e-03  9.1482025960089031e-03
-  8.9820481433065535e-03  8.8190479128032462e-03  8.6591170751522117e-03  8.5021749571883021e-03  8.3481447546937537e-03
-  8.1969532666261724e-03  8.0485306492223962e-03  7.9028101885199598e-03  7.7597280899136256e-03  7.6192232834934315e-03
-  7.4812372439735375e-03  7.3457138241272979e-03  7.2125991007052359e-03  7.0818412319012813e-03  6.9533903254870300e-03
-  6.8271983168139705e-03  6.7032188559211503e-03  6.5814072030662141e-03  6.4617201320263939e-03  6.3441158405819764e-03
-  6.2285538676237207e-03  6.1149950163802147e-03  6.0034012832899109e-03  5.8937357920846312e-03  5.7859627326801166e-03
-  5.6800473044990030e-03  5.5759556638887986e-03  5.4736548753111791e-03  5.3731128660109428e-03  5.2742983838981461e-03
-  5.1771809583849582e-03  5.0817308639591330e-03  4.9879190862693046e-03  4.8957172905357560e-03  4.8050977921015592e-03
-  4.7160335289582467e-03  4.6284980360953021e-03  4.5424654215287241e-03  4.4579103438822931e-03  4.3748079913988880e-03
-  4.2931340622749670e-03  4.2128647462132407e-03  4.1339767071033873e-03  4.0564470667446839e-03  3.9802533895282599e-03
-  3.9053736680121076e-03  3.8317863093158128e-03  3.7594701222811860e-03  3.6884043053326127e-03  3.6185684349951674e-03
-  3.5499424550168301e-03  3.4825066660512660e-03  3.4162417158645347e-03  3.3511285900229004e-03  3.2871486030347646e-03
-  3.2242833899080170e-03  3.1625148980992668e-03  3.1018253798278661e-03  3.0421973847258310e-03  2.9836137528083811e-03
-  2.9260576077371064e-03  2.8695123503632708e-03  2.8139616525287708e-03  2.7593894511106498e-03  2.7057799422959966e-03
-  2.6531175760685227e-03  2.6013870509009052e-03  2.5505733086344240e-03  2.5006615295404683e-03  2.4516371275501436e-03
-  2.4034857456453340e-03  2.3561932514012535e-03  2.3097457326723414e-03  2.2641294934160616e-03  2.2193310496436136e-03
-  2.1753371254977782e-03  2.1321346494441173e-03  2.0897107505768314e-03  2.0480527550303662e-03  2.0071481824917164e-03
-  1.9669847428123305e-03  1.9275503327108034e-03  1.8888330325659355e-03  1.8508211032951805e-03  1.8135029833145980e-03
-  1.7768672855772646e-03  1.7409027946878666e-03  1.7055984640891586e-03  1.6709434133182904e-03  1.6369269253308227e-03
-  1.6035384438881917e-03  1.5707675710093030e-03  1.5386040644797400e-03  1.5070378354209296e-03  1.4760589459142243e-03
-  1.4456576066784674e-03  1.4158241748004133e-03  1.3865491515145517e-03  1.3578231800324136e-03  1.3296370434173130e-03
-  1.3019816625059188e-03  1.2748480938728074e-03  1.2482275278369870e-03  1.2221112865106742e-03  1.1964908218862064e-03
-  1.1713577139624703e-03  1.1467036689077198e-03  1.1225205172586891e-03  1.0988002121543120e-03  1.0755348276031765e-03
-  1.0527165567835728e-03  1.0303377103750150e-03  1.0083907149206553e-03  9.8686811121878604e-04  9.6576255274356815e-04
-  9.4506680409354657e-04  9.2477373946662708e-04  9.0487634116191706e-04  8.8536769810608137e-04  8.6624100440530968e-04
-  8.4748955791986991e-04  8.2910675886310736e-04  8.1108610842155551e-04  7.9342120739794852e-04  7.7610575487466887e-04
-  7.5913354689786591e-04  7.4249847518158968e-04  7.2619452583109687e-04  7.1021577808524222e-04  6.9455640307671332e-04
-  6.7921066261025093e-04  6.6417290795844214e-04  6.4943757867335500e-04  6.3499920141575628e-04  6.2085238879914031e-04
-  6.0699183824991856e-04  5.9341233088238896e-04  5.8010873038847818e-04  5.6707598194186137e-04  5.5430911111587280e-04
-  5.4180322281523891e-04  5.2955350022104025e-04  5.1755520374872563e-04  5.0580367001857793e-04  4.9429431083891986e-04
-  4.8302261220136561e-04  4.7198413328763435e-04  4.6117450548847222e-04  4.5058943143359842e-04  4.4022468403297037e-04
-  4.3007610552883886e-04  4.2013960655883260e-04  4.1041116522908330e-04  4.0088682619821882e-04  3.9156269977118005e-04
-  3.8243496100300207e-04  3.7349984881274514e-04  3.6475366510662147e-04  3.5619277391102898e-04  3.4781360051482253e-04
-  3.3961263062063513e-04  3.3158640950565685e-04  3.2373154119109092e-04  3.1604468762060252e-04  3.0852256784754707e-04
-  3.0116195723081836e-04  2.9395968663908575e-04  2.8691264166377101e-04  2.8001776184017647e-04  2.7327203987681688e-04
-  2.6667252089326854e-04  2.6021630166557681e-04  2.5390052988028163e-04  2.4772240339593181e-04  2.4167916951265550e-04
-  2.3576812424967210e-04  2.2998661163024531e-04  2.2433202297460642e-04  2.1880179620031078e-04  2.1339341513026532e-04
-  2.0810440880823181e-04  2.0293235082175821e-04  1.9787485863260665e-04  1.9292959291436311e-04  1.8809425689761319e-04
-  1.8336659572205580e-04  1.7874439579616125e-04  1.7422548416372047e-04  1.6980772787763936e-04  1.6548903338088530e-04
-  1.6126734589430591e-04  1.5714064881157744e-04  1.5310696310104604e-04  1.4916434671449329e-04  1.4531089400280153e-04
-  1.4154473513841234e-04  1.3786403554466153e-04  1.3426699533172857e-04  1.3075184873951283e-04  1.2731686358694039e-04
-  1.2396034072819674e-04  1.2068061351527565e-04  1.1747604726729168e-04  1.1434503874632306e-04  1.1128601563955686e-04
-  1.0829743604811193e-04  1.0537778798212988e-04  1.0252558886227753e-04  9.9739385027582898e-05  9.7017751249615057e-05
-  9.4359290252773662e-05  9.1762632240957511e-05  8.9226434430383569e-05  8.6749380588361721e-05  8.4330180578390864e-05
-  8.1967569911181246e-05  7.9660309301724484e-05  7.7407184232279429e-05  7.5207004521348451e-05  7.3058603898526649e-05
-  7.0960839585107720e-05  6.8912591880629977e-05  6.6912763755002085e-05  6.4960280446513426e-05  6.3054089065330086e-05
-  6.1193158202771814e-05  5.9376477546041213e-05  5.7603057498502742e-05  5.5871928805544500e-05  5.4182142185708361e-05
-  5.2532767967318744e-05  5.0922895730446966e-05  4.9351633954125953e-05  4.7818109668823321e-05  4.6321468114150300e-05
-  4.4860872401664663e-05  4.3435503182825573e-05  4.2044558321957873e-05  4.0687252574273750e-05  3.9362817268785450e-05
-  3.8070499996214428e-05  3.6809564301621984e-05  3.5579289382025496e-05  3.4378969788611451e-05  3.3207915133769052e-05
-  3.2065449802711312e-05  3.0950912669766876e-05  2.9863656819185611e-05  2.8803049270468119e-05  2.7768470708167169e-05
-  2.6759315216115260e-05  2.5774990015931323e-05  2.4814915209964844e-05  2.3878523528387922e-05  2.2965260080560611e-05
-  2.2074582110528148e-05  2.1205958756658535e-05  2.0358870815317476e-05  1.9532810508535560e-05  1.8727281255713447e-05
-  1.7941797449145505e-05  1.7175884233475961e-05  1.6429077288930018e-05  1.5700922618341645e-05  1.4990976337865471e-05
-  1.4298804471386687e-05  1.3623982748522034e-05  1.2966096406226424e-05  1.2324739993882115e-05  1.1699517181902770e-05
-  1.1090040573734860e-05  1.0495931521266495e-05  9.9168199435395021e-06  9.3523441487842465e-06  8.8021506596591475e-06
-  8.2658940417265321e-06  7.7432367350197678e-06  7.2338488887770244e-06  6.7374081991923703e-06  6.2535997501888662e-06
-  5.7821158571569505e-06  5.3226559136389283e-06  4.8749262408651290e-06  4.4386399401326240e-06  4.0135167480073166e-06
-  3.5992828942305738e-06  3.1956709623667747e-06  2.8024197531120341e-06  2.4192741502208947e-06  2.0459849890155880e-06
-  1.6823089274468580e-06  1.3280083196495871e-06  9.8285109196557868e-07  6.4661062138351467e-07  3.1906561636122974e-07
-  0.                      0.                      0.                      0.                      0.
-
-

bench/POTENTIALS/Cu_u3.eam

@@ -0,0 +1 @@
+../../potentials/Cu_u3.eam

bench/POTENTIALS/Ni.adp

@@ -0,0 +1 @@
+../../potentials/Ni.adp

cmake/CMakeLists.txt

@@ -37,7 +37,7 @@ include(PreventInSourceBuilds)
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
   #release comes with -O3 by default
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" BTYPE)
 
@@ -52,8 +52,15 @@ check_for_autogen_files(${LAMMPS_SOURCE_DIR})
 include(CheckCCompilerFlag)
 include(CheckIncludeFileCXX)
 
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict -std=c++11")
+endif()
+
+option(DISABLE_CXX11_REQUIREMENT "Disable check that requires C++11 for compiling LAMMPS" OFF)
+if(DISABLE_CXX11_REQUIREMENT)
+  add_definitions(-DLAMMPS_CXX98)
+# else()
+#  set(CMAKE_CXX_STANDARD 11)
 endif()
 
 # GNU compiler features
@@ -133,6 +140,24 @@ foreach(PKG ${DEFAULT_PACKAGES} ${ACCEL_PACKAGES})
   option(PKG_${PKG} "Build ${PKG} Package" OFF)
 endforeach()
 
+######################################################
+# download and unpack support binaries for compilation
+# of windows binaries.
+######################################################
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  set(LAMMPS_THIRDPARTY_URL "http://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})
+  if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
+    set(OpenCL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/lib_win32/libOpenCL.dll")
+  elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+    set(OpenCL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/lib_win64/libOpenCL.dll")
+  endif()
+  set(OpenCL_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/include")
+endif()
+
+######################################################
 ######################################################
 # packages with special compiler needs or external libs
 ######################################################
@@ -148,6 +173,7 @@ if(PKG_USER-ADIOS)
 endif()
 
 # do MPI detection after language activation, if MPI for these language is required
+set(MPI_CXX_SKIP_MPICXX TRUE)
 find_package(MPI QUIET)
 option(BUILD_MPI "Build MPI version" ${MPI_FOUND})
 if(BUILD_MPI)
@@ -175,11 +201,13 @@ add_definitions(-DLAMMPS_${LAMMPS_SIZES})
 set(LAMMPS_API_DEFINES "${LAMMPS_API_DEFINES} -DLAMMPS_${LAMMPS_SIZES}")
 
 # posix_memalign is not available on Windows
-if(NOT ${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")
-  if(NOT ${LAMMPS_MEMALIGN} STREQUAL "0")
-    add_definitions(-DLAMMPS_MEMALIGN=${LAMMPS_MEMALIGN})
-  endif()
+endif()
+if(NOT ${LAMMPS_MEMALIGN} STREQUAL "0")
+  add_definitions(-DLAMMPS_MEMALIGN=${LAMMPS_MEMALIGN})
 endif()
 
 option(LAMMPS_EXCEPTIONS "enable the use of C++ exceptions for error messages (useful for library interface)" OFF)
@@ -219,8 +247,8 @@ if(BUILD_OMP)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 
-
-if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-PLUMED OR PKG_USER-QUIP OR PKG_LATTE)
+if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
+  enable_language(C)
   find_package(LAPACK)
   find_package(BLAS)
   if(NOT LAPACK_FOUND OR NOT BLAS_FOUND)
@@ -230,6 +258,7 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-PLUMED OR PKG_USER-QUI
     enable_language(Fortran)
     file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])
     add_library(linalg STATIC ${LAPACK_SOURCES})
+    set(BLAS_LIBRARIES linalg)
     set(LAPACK_LIBRARIES linalg)
   else()
     list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
@@ -294,15 +323,17 @@ endif()
 include(Packages/KSPACE)
 include(Packages/PYTHON)
 include(Packages/VORONOI)
-include(Packages/USER-SCAFACOS)
-include(Packages/USER-PLUMED)
+include(Packages/USER-COLVARS)
 include(Packages/USER-MOLFILE)
 include(Packages/USER-NETCDF)
-include(Packages/USER-SMD)
-include(Packages/USER-QUIP)
+include(Packages/USER-PLUMED)
 include(Packages/USER-QMMM)
+include(Packages/USER-QUIP)
+include(Packages/USER-SCAFACOS)
+include(Packages/USER-SMD)
 include(Packages/USER-VTK)
 include(Packages/KIM)
+include(Packages/LATTE)
 include(Packages/MESSAGE)
 include(Packages/MSCG)
 include(Packages/COMPRESS)
@@ -389,8 +420,7 @@ endforeach()
 ##############################################
 # add lib sources of (simple) enabled packages
 ############################################
-foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-COLVARS USER-H5MD
-  USER-QMMM)
+foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-QMMM)
   if(PKG_${SIMPLE_LIB})
     string(REGEX REPLACE "^USER-" "" PKG_LIB "${SIMPLE_LIB}")
     string(TOLOWER "${PKG_LIB}" PKG_LIB)
@@ -404,10 +434,6 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-COLVARS USER-H5MD
       target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
     elseif(PKG_LIB STREQUAL h5md)
       target_include_directories(h5md PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/h5md/include ${HDF5_INCLUDE_DIRS})
-    elseif(PKG_LIB STREQUAL colvars)
-      target_compile_options(colvars PRIVATE -DLEPTON)
-      target_include_directories(colvars PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton/include)
-      target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars)
     else()
       target_include_directories(${PKG_LIB} PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB})
     endif()
@@ -496,10 +522,43 @@ if(BUILD_LIB)
   if(LAMMPS_DEPS)
     add_dependencies(lammps ${LAMMPS_DEPS})
   endif()
+  set(LAMMPS_CXX_HEADERS
+    ${LAMMPS_SOURCE_DIR}/angle.h
+    ${LAMMPS_SOURCE_DIR}/atom.h
+    ${LAMMPS_SOURCE_DIR}/bond.h
+    ${LAMMPS_SOURCE_DIR}/citeme.h
+    ${LAMMPS_SOURCE_DIR}/comm.h
+    ${LAMMPS_SOURCE_DIR}/compute.h
+    ${LAMMPS_SOURCE_DIR}/dihedral.h
+    ${LAMMPS_SOURCE_DIR}/domain.h
+    ${LAMMPS_SOURCE_DIR}/error.h
+    ${LAMMPS_SOURCE_DIR}/fix.h
+    ${LAMMPS_SOURCE_DIR}/force.h
+    ${LAMMPS_SOURCE_DIR}/group.h
+    ${LAMMPS_SOURCE_DIR}/improper.h
+    ${LAMMPS_SOURCE_DIR}/input.h
+    ${LAMMPS_SOURCE_DIR}/kspace.h
+    ${LAMMPS_SOURCE_DIR}/lammps.h
+    ${LAMMPS_SOURCE_DIR}/lattice.h
+    ${LAMMPS_SOURCE_DIR}/lmppython.h
+    ${LAMMPS_SOURCE_DIR}/memory.h
+    ${LAMMPS_SOURCE_DIR}/modify.h
+    ${LAMMPS_SOURCE_DIR}/neighbor.h
+    ${LAMMPS_SOURCE_DIR}/neigh_list.h
+    ${LAMMPS_SOURCE_DIR}/output.h
+    ${LAMMPS_SOURCE_DIR}/pair.h
+    ${LAMMPS_SOURCE_DIR}/pointers.h
+    ${LAMMPS_SOURCE_DIR}/region.h
+    ${LAMMPS_SOURCE_DIR}/timer.h
+    ${LAMMPS_SOURCE_DIR}/universe.h
+    ${LAMMPS_SOURCE_DIR}/update.h
+    ${LAMMPS_SOURCE_DIR}/variable.h)
+
   set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_LIB_SUFFIX})
   set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})
   install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(FILES ${LAMMPS_SOURCE_DIR}/library.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lammps)
+  install(FILES ${LAMMPS_CXX_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lammps)
   configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc @ONLY)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
   configure_file(FindLAMMPS.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindLAMMPS${LAMMPS_LIB_SUFFIX}.cmake @ONLY)
@@ -534,6 +593,7 @@ if(BUILD_TOOLS)
     enable_language(Fortran)
     add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
     target_link_libraries(chain.x ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
+    install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
   endif()
 
   enable_language(C)
@@ -550,11 +610,11 @@ include(Documentation)
 ###############################################################################
 # Install potential and force field files in data directory
 ###############################################################################
-set(LAMMPS_INSTALL_POTENTIALS_DIR ${CMAKE_INSTALL_FULL_DATADIR}/lammps/potentials)
-install(DIRECTORY ${LAMMPS_POTENTIALS_DIR} DESTINATION ${LAMMPS_INSTALL_POTENTIALS_DIR})
-
-set(LAMMPS_INSTALL_FRC_FILES_DIR ${CMAKE_INSTALL_FULL_DATADIR}/lammps/frc_files)
-install(DIRECTORY ${LAMMPS_TOOLS_DIR}/msi2lmp/frc_files/ DESTINATION ${LAMMPS_INSTALL_FRC_FILES_DIR})
+set(LAMMPS_INSTALL_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/lammps)
+install(DIRECTORY ${LAMMPS_POTENTIALS_DIR} DESTINATION ${LAMMPS_INSTALL_DATADIR})
+if(BUILD_TOOLS)
+  install(DIRECTORY ${LAMMPS_TOOLS_DIR}/msi2lmp/frc_files DESTINATION ${LAMMPS_INSTALL_DATADIR})
+endif()
 
 configure_file(etc/profile.d/lammps.sh.in ${CMAKE_BINARY_DIR}/etc/profile.d/lammps.sh @ONLY)
 configure_file(etc/profile.d/lammps.csh.in ${CMAKE_BINARY_DIR}/etc/profile.d/lammps.csh @ONLY)
@@ -672,5 +732,10 @@ if(PKG_KOKKOS)
   message(STATUS "Kokkos Arch: ${KOKKOS_ARCH}")
 endif()
 if(PKG_KSPACE)
-  message(STATUS "Using ${FFT} as FFT")
+  message(STATUS "Using ${FFT} as primary FFT library")
+  if(FFT_SINGLE)
+    message(STATUS "Using single precision FFTs")
+  else()
+    message(STATUS "Using double precision FFTs")
+  endif()
 endif()

cmake/Modules/FindKIM-API.cmake

@@ -37,6 +37,26 @@
 # KIM-API-CMAKE_Fortran_COMPILER
 #
 
+function(_KIMAPI_GET_VERSION _OUT_ver _version_hdr)
+  if(NOT EXISTS ${_version_hdr})
+    message(FATAL_ERROR "Header file ${_version_hdr} not found (check value of KIM-API_INCLUDE_DIR)")
+  endif()
+  foreach(_var KIM_VERSION_MAJOR KIM_VERSION_MINOR KIM_VERSION_PATCH)  
+    file(STRINGS ${_version_hdr} _contents REGEX "#define ${_var}[ \t]+")
+    if(_contents)
+      string(REGEX REPLACE ".*#define ${_var}[ \t]+([0-9]+).*" "\\1" _${_var} "${_contents}")
+      if(${_${_var}} STREQUAL "")
+        message(FATAL_ERROR "Version parsing failed for ${_var} in ${_version_hdr}, got empty return!")
+      elseif(NOT ${_${_var}} MATCHES "^[0-9]+$")
+        message(FATAL_ERROR "Version parsing failed for ${_var} in ${_version_hdr}, excepted a number but got ${_${_var}}!")
+      endif()
+    else()
+      message(FATAL_ERROR "No ${_var} line found in include file ${_version_hdr}")
+    endif()
+  endforeach()
+  set(${_OUT_ver} ${_KIM_VERSION_MAJOR}.${_KIM_VERSION_MINOR}.${_KIM_VERSION_PATCH} PARENT_SCOPE)
+endfunction()
+
 if(KIM-API_FIND_QUIETLY)
   set(REQ_OR_QUI "QUIET")
 else()
@@ -54,6 +74,12 @@ if(KIM-API_FOUND)
   pkg_get_variable(KIM-API_CMAKE_Fortran_COMPILER libkim-api CMAKE_Fortran_COMPILER)
 endif()
 
+if(KIM-API_INCLUDEDIR)
+  _KIMAPI_GET_VERSION(KIM-API_VERSION ${KIM-API_INCLUDEDIR}/KIM_Version.h)
+else()
+  set(KIM-API_VERSION 0)
+endif()
+
 # handle the QUIETLY and REQUIRED arguments and set KIM-API_FOUND to TRUE
 # if all listed variables are TRUE
-find_package_handle_standard_args(KIM-API REQUIRED_VARS KIM-API_LIBRARIES)
+find_package_handle_standard_args(KIM-API REQUIRED_VARS KIM-API_LIBRARIES VERSION_VAR KIM-API_VERSION)

cmake/Modules/Packages/KIM.cmake

@@ -1,4 +1,5 @@
 if(PKG_KIM)
+  set(KIM-API_MIN_VERSION 2.1)
   find_package(CURL)
   if(CURL_FOUND)
     include_directories(${CURL_INCLUDE_DIRS})
@@ -7,8 +8,18 @@ if(PKG_KIM)
   endif()
   find_package(KIM-API QUIET)
   if(KIM-API_FOUND)
-    set(DOWNLOAD_KIM_DEFAULT OFF)
+    if (KIM-API_VERSION VERSION_LESS ${KIM-API_MIN_VERSION})
+      if ("${DOWNLOAD_KIM}" STREQUAL "")
+        message(WARNING "Unsuitable KIM-API version \"${KIM-API_VERSION}\" found, but required is at least \"${KIM-API_MIN_VERSION}\".  Default behavior set to download and build our own.")
+      endif()
+      set(DOWNLOAD_KIM_DEFAULT ON)
+    else()
+      set(DOWNLOAD_KIM_DEFAULT OFF)
+    endif()
   else()
+    if ("${DOWNLOAD_KIM}" STREQUAL "")
+      message(WARNING "KIM-API package not found.  Default behavior set to download and build our own")
+    endif()
     set(DOWNLOAD_KIM_DEFAULT ON)
   endif()
   option(DOWNLOAD_KIM "Download KIM-API from OpenKIM instead of using an already installed one" ${DOWNLOAD_KIM_DEFAULT})
@@ -17,12 +28,16 @@ if(PKG_KIM)
       message(FATAL_ERROR "Cannot build downloaded KIM-API library with Ninja build tool")
     endif()
     message(STATUS "KIM-API download requested - we will build our own")
-    enable_language(C)
-    enable_language(Fortran)
+    include(CheckLanguage)
     include(ExternalProject)
+    enable_language(C)
+    check_language(Fortran)
+    if(NOT CMAKE_Fortran_COMPILER)
+      message(FATAL_ERROR "Compiling the KIM-API library requires a Fortran compiler")
+    endif()
     ExternalProject_Add(kim_build
-      URL https://s3.openkim.org/kim-api/kim-api-2.0.2.txz
-      URL_MD5 537d9c0abd30f85b875ebb584f9143fa
+      URL https://s3.openkim.org/kim-api/kim-api-2.1.3.txz
+      URL_MD5 6ee829a1bbba5f8b9874c88c4c4ebff8
       BINARY_DIR build
       CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -35,7 +50,7 @@ if(PKG_KIM)
     set(KIM-API_LDFLAGS ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX})
     list(APPEND LAMMPS_DEPS kim_build)
   else()
-    find_package(KIM-API REQUIRED)
+    find_package(KIM-API ${KIM-API_MIN_VERSION} REQUIRED)
   endif()
   list(APPEND LAMMPS_LINK_LIBS "${KIM-API_LDFLAGS}")
   include_directories(${KIM-API_INCLUDE_DIRS})

cmake/Modules/Packages/KOKKOS.cmake

@@ -1,15 +1,24 @@
 if(PKG_KOKKOS)
-  set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
-  set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
+  # TODO: this option needs to be documented when this works with a
+  # regular release version of KOKKOS, and a version compatibility check
+  # of external KOKKOS lib versus what the KOKKOS package needs is required.
+  option(EXTERNAL_KOKKOS "Build against external kokkos library")
+  if(EXTERNAL_KOKKOS)
+    find_package(Kokkos REQUIRED)
+    list(APPEND LAMMPS_LINK_LIBS 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)
+    add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR})
+  
+    set(Kokkos_INCLUDE_DIRS ${LAMMPS_LIB_KOKKOS_SRC_DIR}/core/src
+                            ${LAMMPS_LIB_KOKKOS_SRC_DIR}/containers/src
+                            ${LAMMPS_LIB_KOKKOS_SRC_DIR}/algorithms/src
+                            ${LAMMPS_LIB_KOKKOS_BIN_DIR})
+    include_directories(${Kokkos_INCLUDE_DIRS})
+    list(APPEND LAMMPS_LINK_LIBS kokkos)
+  endif()
   add_definitions(-DLMP_KOKKOS)
-  add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR})
-
-  set(Kokkos_INCLUDE_DIRS ${LAMMPS_LIB_KOKKOS_SRC_DIR}/core/src
-                          ${LAMMPS_LIB_KOKKOS_SRC_DIR}/containers/src
-                          ${LAMMPS_LIB_KOKKOS_SRC_DIR}/algorithms/src
-                          ${LAMMPS_LIB_KOKKOS_BIN_DIR})
-  include_directories(${Kokkos_INCLUDE_DIRS})
-  list(APPEND LAMMPS_LINK_LIBS kokkos)
 
   set(KOKKOS_PKG_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/KOKKOS)
   set(KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/kokkos.cpp
@@ -17,12 +26,15 @@ if(PKG_KOKKOS)
                          ${KOKKOS_PKG_SOURCES_DIR}/atom_vec_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/comm_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/comm_tiled_kokkos.cpp
+                         ${KOKKOS_PKG_SOURCES_DIR}/min_kokkos.cpp
+                         ${KOKKOS_PKG_SOURCES_DIR}/min_linesearch_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/neighbor_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/neigh_list_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/neigh_bond_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/fix_nh_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/nbin_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/npair_kokkos.cpp
+                         ${KOKKOS_PKG_SOURCES_DIR}/npair_halffull_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/domain_kokkos.cpp
                          ${KOKKOS_PKG_SOURCES_DIR}/modify_kokkos.cpp)
 
@@ -38,6 +50,7 @@ if(PKG_KOKKOS)
   # register kokkos-only styles
   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)
     get_property(KOKKOS_PKG_SOURCES GLOBAL PROPERTY KOKKOS_PKG_SOURCES)

cmake/Modules/Packages/KSPACE.cmake

@@ -1,5 +1,5 @@
 if(PKG_KSPACE)
-  option(FFT_SINGLE "Use single precision FFT instead of double" OFF)
+  option(FFT_SINGLE "Use single precision FFTs instead of double precision FFTs" OFF)
   set(FFTW "FFTW3")
   if(FFT_SINGLE)
     set(FFTW "FFTW3F")
@@ -7,26 +7,30 @@ if(PKG_KSPACE)
   endif()
   find_package(${FFTW} QUIET)
   if(${FFTW}_FOUND)
-    set(FFT "${FFTW}" CACHE STRING "FFT library for KSPACE package")
+    set(FFT "FFTW3" CACHE STRING "FFT library for KSPACE package")
   else()
     set(FFT "KISS" CACHE STRING "FFT library for KSPACE package")
   endif()
-  set(FFT_VALUES KISS ${FFTW} MKL)
+  set(FFT_VALUES KISS FFTW3 MKL)
   set_property(CACHE FFT PROPERTY STRINGS ${FFT_VALUES})
   validate_option(FFT FFT_VALUES)
   string(TOUPPER ${FFT} FFT)
-  if(NOT FFT STREQUAL "KISS")
-    find_package(${FFT} REQUIRED)
-    if(NOT FFT STREQUAL "FFTW3F")
-      add_definitions(-DFFT_FFTW)
-    else()
-      add_definitions(-DFFT_${FFT})
-    endif()
-    include_directories(${${FFT}_INCLUDE_DIRS})
-    list(APPEND LAMMPS_LINK_LIBS ${${FFT}_LIBRARIES})
+
+  if(FFT STREQUAL "FFTW3")
+    find_package(${FFTW} REQUIRED)
+    add_definitions(-DFFT_FFTW3)
+    include_directories(${${FFTW}_INCLUDE_DIRS})
+    list(APPEND LAMMPS_LINK_LIBS ${${FFTW}_LIBRARIES})
+  elseif(FFT STREQUAL "MKL")
+    find_package(MKL REQUIRED)
+    add_definitions(-DFFT_MKL)
+    include_directories(${MKL_INCLUDE_DIRS})
+    list(APPEND LAMMPS_LINK_LIBS ${MKL_LIBRARIES})
   else()
+    # last option is KISSFFT
     add_definitions(-DFFT_KISS)
   endif()
+
   set(FFT_PACK "array" CACHE STRING "Optimization for FFT")
   set(FFT_PACK_VALUES array pointer memcpy)
   set_property(CACHE FFT_PACK PROPERTY STRINGS ${FFT_PACK_VALUES})

cmake/Modules/Packages/MESSAGE.cmake

@@ -1,4 +1,7 @@
 if(PKG_MESSAGE)
+  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

cmake/Modules/Packages/USER-COLVARS.cmake

@@ -0,0 +1,42 @@
+if(PKG_USER-COLVARS)
+
+  set(COLVARS_SOURCE_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars)
+
+  file(GLOB COLVARS_SOURCES ${COLVARS_SOURCE_DIR}/[^.]*.cpp)
+
+  # Build Lepton by default
+  set(COLVARS_LEPTON_DEFAULT ON)
+  # but not if C++11 is disabled per user request
+  if(DEFINED DISABLE_CXX11_REQUIREMENT)
+    if(DISABLE_CXX11_REQUIREMENT)
+      set(COLVARS_LEPTON_DEFAULT OFF)
+    endif()
+  endif()
+
+  option(COLVARS_LEPTON "Build and link the Lepton library" ${COLVARS_LEPTON_DEFAULT})
+
+  # Verify that the user's choice is consistent
+  if(DEFINED DISABLE_CXX11_REQUIREMENT)
+    if((DISABLE_CXX11_REQUIREMENT) AND (COLVARS_LEPTON))
+      message(FATAL_ERROR "Building the Lepton library requires C++11 or later.")
+    endif()
+  endif()
+
+  if(COLVARS_LEPTON)
+    set(LEPTON_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton)
+    file(GLOB LEPTON_SOURCES ${LEPTON_DIR}/src/[^.]*.cpp)
+    add_library(lepton STATIC ${LEPTON_SOURCES})
+    target_include_directories(lepton PRIVATE ${LEPTON_DIR}/include)
+  endif()
+
+  add_library(colvars STATIC ${COLVARS_SOURCES})
+  target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars)
+  list(APPEND LAMMPS_LINK_LIBS colvars)
+
+  if(COLVARS_LEPTON)
+    list(APPEND LAMMPS_LINK_LIBS lepton)
+    target_compile_options(colvars PRIVATE -DLEPTON)
+    target_include_directories(colvars PUBLIC ${LEPTON_DIR}/include)
+  endif()
+
+endif()

cmake/Modules/Packages/USER-MOLFILE.cmake

@@ -1,4 +1,8 @@
 if(PKG_USER-MOLFILE)
+  if (CMAKE_VERSION VERSION_LESS "3.10") # due to INTERFACE without a library
+    message(FATAL_ERROR "For configuring USER-MOLFILE you need CMake 3.10 or later")
+  endif()
+
   set(MOLFILE_INCLUDE_DIRS "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
   add_library(molfile INTERFACE)
   target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})

cmake/Modules/Packages/USER-PLUMED.cmake

@@ -1,11 +1,23 @@
 if(PKG_USER-PLUMED)
-  find_package(GSL REQUIRED)
   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 LAPACK_LIBRARIES ${BLAS_LIBRARIES})
+    list(APPEND PLUMED_LINK_LIBS ${LAPACK_LIBRARIES} ${GSL_LIBRARIES})
+    find_package(ZLIB QUIET)
+    if(ZLIB_FOUND)
+      list(APPEND PLUMED_LINK_LIBS ${ZLIB_LIBRARIES})
+    endif()
+  endif()
+
   find_package(PkgConfig QUIET)
   set(DOWNLOAD_PLUMED_DEFAULT ON)
   if(PKG_CONFIG_FOUND)
@@ -37,8 +49,8 @@ if(PKG_USER-PLUMED)
     message(STATUS "PLUMED download requested - we will build our own")
     include(ExternalProject)
     ExternalProject_Add(plumed_build
-      URL https://github.com/plumed/plumed2/releases/download/v2.5.1/plumed-src-2.5.1.tgz
-      URL_MD5 c2a7b519e32197a120cdf47e0f194f81
+      URL https://github.com/plumed/plumed2/releases/download/v2.5.3/plumed-src-2.5.3.tgz
+      URL_MD5 de30d6e7c2dcc0973298e24a6da24286
       BUILD_IN_SOURCE 1
       CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
                                                ${CONFIGURE_REQUEST_PIC}
@@ -53,11 +65,11 @@ if(PKG_USER-PLUMED)
     list(APPEND LAMMPS_DEPS plumed_build)
     if(PLUMED_MODE STREQUAL "STATIC")
       add_definitions(-D__PLUMED_WRAPPER_CXX=1)
-      list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.a ${GSL_LIBRARIES} ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS})
+      list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.a ${PLUMED_LINK_LIBS} ${CMAKE_DL_LIBS})
     elseif(PLUMED_MODE STREQUAL "SHARED")
-      list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.so ${PLUMED_INSTALL_DIR}/lib/libplumedKernel.so ${CMAKE_DL_LIBS})
+      list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} ${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_DL_LIBS})
     elseif(PLUMED_MODE STREQUAL "RUNTIME")
-      add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_INSTALL_DIR}/lib/libplumedKernel.so)
+      add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX})
       list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumedWrapper.a -rdynamic ${CMAKE_DL_LIBS})
     endif()
     set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")
@@ -70,7 +82,7 @@ if(PKG_USER-PLUMED)
     elseif(PLUMED_MODE STREQUAL "SHARED")
       include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.shared)
     elseif(PLUMED_MODE STREQUAL "RUNTIME")
-      add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel.so)
+      add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX})
       include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime)
     endif()
     list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LOAD})

cmake/Modules/Packages/VORONOI.cmake

@@ -18,8 +18,12 @@ if(PKG_VORONOI)
     else()
       set(VORO_BUILD_CFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
     endif()
-    string(APPEND VORO_BUILD_CFLAGS ${CMAKE_CXX_FLAGS})
-    set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})
+    if(APPLE)
+      get_filename_component(VORO_CXX ${CMAKE_CXX_COMPILER} NAME_WE)
+      set(VORO_BUILD_OPTIONS CXX=${VORO_CXX} CFLAGS=${VORO_BUILD_CFLAGS})
+    else()
+      set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})
+    endif()
 
     ExternalProject_Add(voro_build
       URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz

cmake/README.md

@@ -33,12 +33,17 @@ tasks, act as a reference and provide examples of typical use cases.
       * [Package-Specific Configuration Options](#package-specific-configuration-options)
          * [KSPACE Package](#kspace-package)
          * [MKL](#mkl)
-         * [FFTW2](#fftw2)
          * [FFTW3](#fftw3)
+         * [BLAS](#blas)
          * [LAPACK](#lapack)
          * [PYTHON Package](#python-package)
          * [GPU Package](#gpu-package)
+         * [MESSAGE Package](#message-package)
+         * [MSCG Package](#mscg-package)
          * [VORONOI Package](#voronoi-package)
+         * [USER-LATTE Package](#user-latte-package)
+         * [USER-PLUMED Package](#user-plumed-package)
+         * [USER-SCAFACOS Package](#user-scafacos-package)
          * [USER-SMD Package](#user-smd-package)
       * [Optional Features](#optional-features)
          * [zlib support](#zlib-support)
@@ -50,8 +55,6 @@ tasks, act as a reference and provide examples of typical use cases.
          * [Building with GNU Compilers](#building-with-gnu-compilers)
          * [Building with Intel Compilers](#building-with-intel-compilers)
          * [Building with LLVM/Clang Compilers](#building-with-llvmclang-compilers)
-      * [Examples](#examples)
-
 
 ## Quick Start for the Impatient
 If you want to skip ahead and just run the compilation using `cmake`, please
@@ -205,8 +208,10 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   <td>Controls if debugging symbols are added to the generated binaries</td>
   <td>
   <dl>
-  <dt><code>Release</code> (default)</dt>
+  <dt><code>RelWithDebInfo (default)</code></dt>
+  <dt><code>Release</code></dt>
   <dt><code>Debug</code></dt>
+  <dt><code>MinSizeRel</code></dt>
   </dl>
   </td>
 </tr>
@@ -249,6 +254,16 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>LAMMPS_LONGLONG_TO_LONG</code></td>
+  <td>Workaround if your system or MPI version does not recognize <code>long long</code> data types</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>LAMMPS_MEMALIGN</code></td>
   <td>controls the alignment of blocks of memory allocated by LAMMPS</td>
@@ -271,7 +286,16 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
 </tr>
 <tr>
   <td><code>LAMMPS_MACHINE</code></td>
-  <td>allows appending a machine suffix to the generate LAMMPS binary</td>
+  <td>allows appending a machine suffix to the generated LAMMPS binary</td>
+  <td>
+  <dl>
+    <dt>*none*  (default)</dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>LAMMPS_LIB_SUFFIX</code></td>
+  <td>allows appending a suffix to the generated LAMMPS library</td>
   <td>
   <dl>
     <dt>*none*  (default)</dt>
@@ -319,8 +343,8 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   </td>
 </tr>
 <tr>
-  <td><code>LAMMPS_LONGLONG_TO_LONG</code></td>
-  <td>Workaround if your system or MPI version does not recognize <code>long long</code> data types</td>
+  <td><code>BUILD_TOOLS</code></td>
+  <td>control whether to build LAMMPS tools</td>
   <td>
   <dl>
     <dt><code>off</code> (default)</dt>
@@ -561,23 +585,6 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   </dl>
   </td>
 </tr>
-<tr>
-  <td><code>PKG_MEAM</code></td>
-  <td>
-<p>A pair style for the modified embedded atom (MEAM) potential.</p>
-
-<p><strong>Please note that the MEAM package has been superseded by the USER-MEAMC package,
-which is a direct translation of the MEAM package to C++. USER-MEAMC contains
-additional optimizations making it run faster than MEAM on most machines, while
-providing the identical features and USER interface.</strong></p>
-  </td>
-  <td>
-  <dl>
-    <dt><code>off</code> (default)</dt>
-    <dt><code>on</code></dt>
-  </dl>
-  </td>
-</tr>
 <tr>
   <td><code>PKG_MISC</code></td>
   <td>
@@ -634,21 +641,6 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
-<tr>
-  <td><code>PKG_REAX</code></td>
-  <td>
-  A pair style which wraps a Fortran library which implements the ReaxFF
-  potential, which is a universal reactive force field. See the USER-REAXC
-  package for an alternate implementation in C/C++. Also a fix reax/bonds
-  command for monitoring molecules as bonds are created and destroyed.
-  </td>
-  <td>
-  <dl>
-    <dt><code>off</code> (default)</dt>
-    <dt><code>on</code></dt>
-  </dl>
-  </td>
-</tr>
 <tr>
   <td><code>PKG_REPLICA</code></td>
   <td>
@@ -695,6 +687,16 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_SPIN</code></td>
+  <td>Model atomic magnetic spins classically, coupled to atoms moving in the usual manner via MD. Various pair, fix, and compute styles.</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_SNAP</code></td>
   <td>
@@ -757,6 +759,16 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_MESSAGE</code></td>
+  <td>Commands to use LAMMPS as either a client or server and couple it to another application.</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_MSCG</code></td>
   <td>
@@ -811,6 +823,18 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_VORONOI</code></td>
+  <td>
+  A compute command which calculates the Voronoi tesselation of a collection of atoms by wrapping the Voro++ library. This can be used to calculate the local volume or each atoms or its near neighbors.
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 </tbody>
 </table>
 
@@ -825,6 +849,16 @@ providing the identical features and USER interface.</strong></p>
 </tr>
 </thead>
 <tbody>
+<tr>
+  <td><code>PKG_USER-ADIOS</code></td>
+  <td>ADIOS is a high-performance I/O library. This package implements the dump “atom/adios” and dump “custom/adios” commands to write data using the ADIOS library.</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_USER-ATC</code></td>
   <td>
@@ -853,6 +887,18 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_USER-BOCS</code></td>
+  <td>
+  This package provides fix bocs, a modified version of fix npt which includes the pressure correction to the barostat as outlined in: N. J. H. Dunn and W. G. Noid, “Bottom-up coarse-grained models that accurately describe the structure, pressure, and compressibility of molecular liquids,” J. Chem. Phys. 143, 243148 (2015).
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_USER-CGDNA</code></td>
   <td>
@@ -1142,6 +1188,30 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_USER-PLUMED</code></td>
+  <td>
+  The fix plumed command allows you to use the PLUMED free energy plugin for molecular dynamics to analyze and bias your LAMMPS trajectory on the fly. The PLUMED library is called from within the LAMMPS input script by using the <code>fix plumed</code> command.
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>PKG_USER-PTM</code></td>
+  <td>
+  A <code>compute ptm/atom</code> command that calculates local structure characterization using the Polyhedral Template Matching methodology.
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_USER-QTB</code></td>
   <td>
@@ -1197,6 +1267,33 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_USER-SCAFACOS</code></td>
+  <td>
+  A KSpace style which wraps the ScaFaCoS Coulomb solver library to compute long-range Coulombic interactions.
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>PKG_USER-SDPD</code></td>
+  <td>
+  A pair style for smoothed dissipative particle dynamics (SDPD), which is an
+  extension of smoothed particle hydrodynamics (SPH) to mesoscale where thermal
+  fluctuations are important (see the USER-SPH package). Also two fixes for
+  moving and rigid body integration of SPH/SDPD particles (particles of
+  <code>atom_style meso</code>).</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>PKG_USER-SMD</code></td>
   <td>
@@ -1280,6 +1377,23 @@ providing the identical features and USER interface.</strong></p>
   </dl>
   </td>
 </tr>
+<tr>
+  <td><code>PKG_USER-YAFF</code></td>
+  <td>
+  Some potentials that are also implemented in the Yet Another Force Field (YAFF) code.
+  The expressions and their use are discussed in the following papers:
+  <ul>
+    <li><a href="http://dx.doi.org/10.1002/jcc.23877" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 36 (13), 1015-1027 (2015)</a></li>
+    <li><a href="http://dx.doi.org/10.1002/jcc.25173" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 39 (16), 999-1011 (2018)</a></li>
+  </ul>
+  </td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 </tbody>
 </table>
 
@@ -1300,14 +1414,27 @@ providing the identical features and USER interface.</strong></p>
   <td><code>FFT</code></td>
   <td>
     <p>FFT library for KSPACE package</p>
-    <p>If either MKL or FFTW is selected <code>cmake</code> will try to locate these libraries automatically. To control which one should be used please see the options below for each FFT library.</p>
+    <p>If either MKL or FFTW is selected <code>cmake</code> will try to locate
+    these libraries automatically. To control which one should be used please see
+    the options below for each FFT library.  Otherwise it will default to KISS
+    FFT.</p>
   </td>
   <td>
   <dl>
-    <dt><code>KISS</code></dt>
     <dt><code>FFTW3</code></dt>
     <dt><code>FFTW2</code></dt>
     <dt><code>MKL</code></dt>
+    <dt><code>KISS</code> (default)</dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>FFT_SINGLE</code></td>
+  <td>Use single-precision floating-point in FFT</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default = double precision)</dt>
+    <dt><code>on</code></dt>
   </dl>
   </td>
 </tr>
@@ -1325,60 +1452,6 @@ providing the identical features and USER interface.</strong></p>
 </tbody>
 </table>
 
-### MKL
-
-<table>
-<thead>
-<tr>
-  <th>Option</th>
-  <th>Description</th>
-  <th>Values</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-  <td><code>MKL_INCLUDE_DIRS</code></td>
-  <td></td>
-  <td>
-  </td>
-</tr>
-<tr>
-  <td><code>MKL_LIBRARIES</code></td>
-  <td></td>
-  <td>
-  </td>
-</tr>
-</tbody>
-</table>
-
-TODO static vs dynamic linking
-
-### FFTW2
-
-<table>
-<thead>
-<tr>
-  <th>Option</th>
-  <th>Description</th>
-  <th>Values</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-  <td><code>FFTW2_INCLUDE_DIRS</code></td>
-  <td></td>
-  <td>
-  </td>
-</tr>
-<tr>
-  <td><code>FFTW2_LIBRARIES</code></td>
-  <td></td>
-  <td>
-  </td>
-</tr>
-</tbody>
-</table>
-
 ### FFTW3
 
 <table>
@@ -1392,24 +1465,57 @@ TODO static vs dynamic linking
 <tbody>
 <tr>
   <td><code>FFTW3_INCLUDE_DIRS</code></td>
-  <td></td>
+  <td>path to FFTW3 include files</td>
   <td>
   </td>
 </tr>
 <tr>
   <td><code>FFTW3_LIBRARIES</code></td>
-  <td></td>
+  <td>list of paths to FFTW3 libraries</td>
   <td>
   </td>
 </tr>
 </tbody>
 </table>
 
+### MKL
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>MKL_INCLUDE_DIRS</code></td>
+  <td>path to MKL include files</td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>MKL_LIBRARIES</code></td>
+  <td>list of paths to MKL libraries</td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### BLAS
+
+See [FindBLAS documentation](https://cmake.org/cmake/help/latest/module/FindBLAS.html)
+
 ### LAPACK
-TODO
+
+See [FindLAPACK documentation](https://cmake.org/cmake/help/latest/module/FindLAPACK.html)
 
 ### PYTHON Package
 
+See [FindPYTHON documentation](https://cmake.org/cmake/help/latest/module/FindPython.html)
+
 ### USER-INTEL Package
 
 <table>
@@ -1499,10 +1605,11 @@ target API.
   <td>
   <dl>
     <dt><code>sm_20</code> (Fermi)</dt>
-    <dt><code>sm_30</code> (Kepler)</dt>
+    <dt><code>sm_30</code> (Kepler) (default)</dt>
     <dt><code>sm_50</code> (Maxwell)</dt>
     <dt><code>sm_60</code> (Pascal)</dt>
     <dt><code>sm_70</code> (Volta)</dt>
+    <dt><code>sm_75</code> (Turing)</dt>
   </dl>
   </td>
 </tr>
@@ -1534,13 +1641,14 @@ target API.
 </tbody>
 </table>
 
-### VORONOI Package
+### KIM Package
 
-TODO
+Requires installation of the KIM library with API v2
 
-### USER-SMD Package
-
-Requires a Eigen3 installation
+If `DOWNLOAD_KIM` is set, the KIM library will be downloaded and built inside
+the CMake build directory. If the KIM library is already on your system (in a
+location CMake cannot find it), set the `PKG_CONFIG_PATH` environment variable
+so that `libkim-api` can be found.
 
 <table>
 <thead>
@@ -1551,9 +1659,349 @@ Requires a Eigen3 installation
 </tr>
 </thead>
 <tbody>
+<tr>
+  <td><code>DOWNLOAD_KIM</code></td>
+  <td>Download KIM API v2 and compile it as part of the build.</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### MESSAGE Package
+
+This package can optionally include support for messaging via sockets, using the open-source [ZeroMQ library](http://zeromq.org/), which must be installed on your system.
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>MESSAGE_ZMQ</code></td>
+  <td>Build with ZeroMQ support</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>ZMQ_LIBRARY</code></td>
+  <td>
+    ZMQ library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>ZMG_INCLUDE_DIR</code></td>
+  <td>
+    Provide include directory of existing ZMQ installation (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### MSCG Package
+
+Requires installation of the MSCG library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_MSCG</code></td>
+  <td>Download MSCG and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>MSCG_LIBRARY</code></td>
+  <td>
+    MSCG library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>MSCG_INCLUDE_DIR</code></td>
+  <td>
+    Provide include directory of existing MSCG installation (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### VORONOI Package
+
+Requires installation of the Voro++ library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_VORO</code></td>
+  <td>Download Voro++ and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>VORO_LIBRARY</code></td>
+  <td>
+    Voro++ library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>VORO_INCLUDE_DIR</code></td>
+  <td>
+    Provide include directory of existing Voro++ installation (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### USER-COLVARS Package
+
+Requires a C++11 compiler to compile with the Lepton library included.
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>COLVARS_LEPTON</code></td>
+  <td>Enable the use of the Lepton library inside the Colvars library.
+  <td>
+  <dl>
+    <dt><code>on</code> (default)</dt>
+    <dt><code>off</code></dt>
+  </dl>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### USER-LATTE Package
+
+Requires installation of the LATTE library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_LATTE</code></td>
+  <td>Download LATTE and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>LATTE_LIBRARY</code></td>
+  <td>
+    LATTE library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### USER-PLUMED Package
+
+Requires installation of the PLUMED library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_PLUMED</code></td>
+  <td>Download PLUMED and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>PLUMED_MODE</code></td>
+  <td>
+    Determines the linkage mode for the PLUMED library.
+  </td>
+  <td>
+  <dl>
+    <dt><code>static</code> (default)</dt>
+    <dt><code>shared</code></dt>
+    <dt><code>runtime</code></dt>
+  </dl>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### USER-LATTE Package
+
+Requires installation of the LATTE library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_LATTE</code></td>
+  <td>Download LATTE and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>LATTE_LIBRARY</code></td>
+  <td>
+    LATTE library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+### USER-SMD Package
+
+Requires installation of the Eigen3 library
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_EIGEN3</code></td>
+  <td>Download Eigen3 and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
 <tr>
   <td><code>EIGEN3_INCLUDE_DIR</code></td>
-  <td></td>
+  <td>
+    Provide include directory of existing Eigen3 installation (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+</tbody>
+</table>
+
+
+### USER-SCAFACOS Package
+
+To build with this package, you must download and build the [ScaFaCoS Coulomb solver library](http://www.scafacos.de/)
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>DOWNLOAD_SCAFACOS</code></td>
+  <td>Download SCAFACOS and compile it as part of the build</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>SCAFACOS_LIBRARY</code></td>
+  <td>
+    SCAFACOS library file (only needed if at custom location)
+  </td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>SCAFACOS_INCLUDE_DIR</code></td>
+  <td>
+    SCAFACOS include directory (only needed if at custom location)
+  </td>
   <td>
   </td>
 </tr>
@@ -1791,5 +2239,82 @@ cmake -D CMAKE_C_COMPILER=icc -D CMAKE_CXX_COMPILER=icpc -D CMAKE_Fortran_COMPIL
 cmake -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_Fortran_COMPILER=flang ../cmake
 ```
 
+## LAMMPS Developer Options
 
-## Examples
+
+<table>
+<thead>
+<tr>
+  <th>Option</th>
+  <th>Description</th>
+  <th>Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><code>ENABLE_TESTING</code></td>
+  <td>Control wheather to add tests via CTest</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>LAMMPS_TESTING_SOURCE_DIR</code></td>
+  <td>Custom location of lammps-testing repository (optional). If not specified it will download it via Git</td>
+  <td>
+  </td>
+</tr>
+<tr>
+  <td><code>LAMMPS_TESTING_GIT_TAG</code></td>
+  <td>If lammps-testing repository is cloned, this is the tag/commit that will be checked out</td>
+  <td>
+  <dl>
+    <dt><code>master</code> (default)</dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>ENABLE_COVERAGE</code></td>
+  <td>Enables code coverage support via gcov and adds a gcovr build target to generate a coverage report.</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>ENABLE_SANITIZE_ADDRESS</code></td>
+  <td>Enables Address Sanitizer support when compiling using GCC or Clang for detecting memory leaks in binaries while running them. See https://clang.llvm.org/docs/AddressSanitizer.html</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>ENABLE_SANITIZE_UNDEFINED</code></td>
+  <td>Enables Undefined Behavior Sanitizer support when compiling using GCC or Clang for detecting code that is running into undefined behavior of the language. See https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+<tr>
+  <td><code>ENABLE_SANITIZE_THREAD</code></td>
+  <td>Enables Thread Sanitizer support when compiling using GCC or Clang for detecting data races in binaries while running them. See https://clang.llvm.org/docs/ThreadSanitizer.html</td>
+  <td>
+  <dl>
+    <dt><code>off</code> (default)</dt>
+    <dt><code>on</code></dt>
+  </dl>
+  </td>
+</tr>
+</tbody>
+</table>

cmake/etc/profile.d/lammps.csh.in

@@ -1,4 +1,4 @@
 # set environment for LAMMPS and msi2lmp executables
 # to find potential and force field files
-if ( "$?LAMMPS_POTENTIALS" == 0 ) setenv LAMMPS_POTENTIALS @LAMMPS_POTENTIALS_DIR@
-if ( "$?MSI2LMP_LIBRARY" == 0 ) setenv MSI2LMP_LIBRARY @LAMMPS_FRC_FILES_DIR@
+if ( "$?LAMMPS_POTENTIALS" == 0 ) setenv LAMMPS_POTENTIALS @LAMMPS_INSTALL_DATADIR@/potentials
+if ( "$?MSI2LMP_LIBRARY" == 0 ) setenv MSI2LMP_LIBRARY @LAMMPS_INSTALL_DATADIR@/frc_files

cmake/etc/profile.d/lammps.sh.in

@@ -1,5 +1,5 @@
 # set environment for LAMMPS and msi2lmp executables
 # to find potential and force field files
-LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS-@LAMMPS_POTENTIALS_DIR@}
-MSI2LMP_LIBRARY=${MSI2LMP_LIBRARY-@LAMMPS_FRC_FILES_DIR@}
+LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS-@LAMMPS_INSTALL_DATADIR@/potentials}
+MSI2LMP_LIBRARY=${MSI2LMP_LIBRARY-@LAMMPS_INSTALL_DATADIR@/frc_files}
 export LAMMPS_POTENTIALS MSI2LMP_LIBRARY

cmake/presets/mingw-cross.cmake

@@ -3,9 +3,9 @@ set(WIN_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
                  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-MESO USER-MISC USER-MOFFF USER-MOLFILE USER-OMP
-                 USER-PHONON USER-PTM USER-QTB USER-REAXC USER-SDPD USER-SMD
-                 USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-YAFF)
+                 USER-MEAMC USER-MESO USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE
+                 USER-OMP USER-PHONON USER-PTM USER-QTB USER-REAXC USER-SDPD
+                 USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-YAFF)
 
 foreach(PKG ${WIN_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
@@ -14,4 +14,4 @@ endforeach()
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
 set(LAMMPS_MEMALIGN "0" CACHE STRING "" FORCE)
-set(INTEL_LRT_MODE "none" CACHE STRING "" FORCE)
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lammps-installer")

cmake/presets/most.cmake

@@ -4,10 +4,10 @@
 
 set(ALL_PACKAGES ASPHERE CLASS2 COLLOID CORESHELL DIPOLE
         GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI
-        PYTHON QEQ REPLICA RIGID SHOCK SRD VORONOI
+        PYTHON QEQ REPLICA RIGID SHOCK SNAP SRD VORONOI
         USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION USER-DPD
         USER-DRUDE USER-FEP USER-MEAMC USER-MESO
-        USER-MISC USER-MOFFF USER-OMP USER-PLUMED USER-PHONON USER-REAXC
+        USER-MISC USER-MOFFF USER-OMP USER-PHONON USER-REAXC
         USER-SPH USER-SMD USER-UEF USER-YAFF)
 
 foreach(PKG ${ALL_PACKAGES})

doc/Makefile

@@ -69,6 +69,7 @@ html: $(OBJECTS) $(ANCHORCHECK)
 		sphinx-build $(SPHINXEXTRA) -b html -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
 		echo "############################################" ;\
 		doc_anchor_check src/*.txt ;\
+		env LC_ALL=C grep -n '[^ -~]' src/*.txt ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)

doc/include-file-conventions.md

@@ -0,0 +1,133 @@
+# 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 2019-07-05
+
+## 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>`).  However, these includes are limited to those defined
+in the C++98 standard.  Some files thus must use the older style until
+the minimum C++ standard requirement of LAMMPS is lifted to C++11 or
+even beyond (examples: `#include <stdint.h>` versus `#include <cstdint>`
+or `#include <inttypes.h>` versus `#include <cinttypes>`).
+
+### C++ Standard Compliance
+
+LAMMPS core files currently correspond to the C++98 standard. Files
+requiring C++11 or later are only permitted in (optional) packages
+and particularly packages that are not part of the list of commonly
+used packages such as MOLECULE, KSPACE, MANYBODY, or RIGID.
+
+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
+* system and library headers (anything that is using angular brackets; C-library headers first, then C++)
+* LAMMPS local headers (preferably in alphabetical order)
+
+### Special Cases and Exceptions
+
+#### pointers.h
+
+The `pointer.h` header file also includes `cstdio` and `lmptype.h`
+(and through it `stdint.h`, `intttypes.h`, cstdlib, and `climits`).
+This means any header including `pointers.h` can assume that `FILE`,
+`NULL`, `INT_MAX` are defined.
+
+## 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.  There are some limitations and the IWYU tool
+may give incorrect advice.  The tools is activated by setting the
+CMake variable `CMAKE_CXX_INCLUDE_WHAT_YOU_USE` variable to the
+path of the `include-what-you-use` command.  When activated, the
+tool will be run after each compilation and provide suggestions for
+which include files should be added or removed.
+
+## 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 "18 June 2019" "2019-06-18"
+.TH LAMMPS "30 October 2019" "2019-10-30"
 .SH NAME
 .B LAMMPS
 \- Molecular Dynamics Simulator.

doc/src/Build.txt

@@ -29,6 +29,7 @@ as described on the "Install"_Install.html doc page.
    Build_package
    Build_extras
    Build_windows
+   Build_development
 
 END_RST -->
 
@@ -41,7 +42,8 @@ END_RST -->
 "Optional build settings"_Build_settings.html
 "Include packages in build"_Build_package.html
 "Packages with extra build options"_Build_extras.html
-"Notes for building LAMMPS on Windows"_Build_windows.html  :all(b)
+"Notes for building LAMMPS on Windows"_Build_windows.html
+"Development build options (CMake only)"_Build_development.html  :all(b)
 
 If you have problems building LAMMPS, it is often due to software
 issues on your local machine.  If you can, find a local expert to

doc/src/Build_basics.txt

@@ -51,7 +51,7 @@ Serial build (see src/MAKE/Makefile.serial):
 
 MPI_INC =       -I../STUBS
 MPI_PATH =      -L../STUBS
-MPI_LIB =	-lmpi_stubs :pre
+MPI_LIB =       -lmpi_stubs :pre
 
 For a parallel build, if MPI is installed on your system in the usual
 place (e.g. under /usr/local), you do not need to specify the 3
@@ -183,17 +183,17 @@ want.
 
 Parallel build (see src/MAKE/Makefile.mpi):
 
-CC =		mpicxx
-CCFLAGS =	-g -O3
-LINK =		mpicxx
-LINKFLAGS =	-g -O :pre
+CC =            mpicxx
+CCFLAGS =       -g -O3
+LINK =          mpicxx
+LINKFLAGS =     -g -O :pre
 
 Serial build (see src/MAKE/Makefile.serial):
 
-CC =		g++
-CCFLAGS =	-g -O3
-LINK =		g++
-LINKFLAGS =	-g -O :pre
+CC =            g++
+CCFLAGS =       -g -O3
+LINK =          g++
+LINKFLAGS =     -g -O :pre
 
 The "compiler/linker settings" section of a Makefile.machine lists
 compiler and linker settings for your C++ compiler, including
@@ -235,12 +235,16 @@ running LAMMPS from Python via its library interface.
 
 -D BUILD_EXE=value           # yes (default) or no
 -D BUILD_LIB=value           # yes or no (default)
--D BUILD_SHARED_LIBS=value   # yes or no (default) :pre
+-D BUILD_SHARED_LIBS=value   # yes or no (default)
+-D LAMMPS_LIB_SUFFIX=name    # name = mpi, serial, mybox, titan, laptop, etc
+                             # no default value :pre
+
 
 Setting BUILD_EXE=no will not produce an executable.  Setting
 BUILD_LIB=yes will produce a static library named liblammps.a.
 Setting both BUILD_LIB=yes and BUILD_SHARED_LIBS=yes will produce a
-shared library named liblammps.so.
+shared library named liblammps.so. If LAMMPS_LIB_SUFFIX is set the generated
+libraries will be named liblammps_name.a or liblammps_name.so instead.
 
 [Traditional make]:
 
@@ -310,6 +314,30 @@ current LAMMPS version (HTML and PDF files), from the website
 
 :line
 
+Build LAMMPS tools :h4,link(tools)
+
+Some tools described in "Auxiliary tools"_Tools.html can be built directly
+using CMake or Make.
+
+[CMake variable]:
+
+-D BUILD_TOOLS=value       # yes or no (default) :pre
+
+The generated binaries will also become part of the LAMMPS installation (see below)
+
+[Traditional make]:
+
+cd lammps/tools
+make all              # build all binaries of tools
+make binary2txt       # build only binary2txt tool
+make chain            # build only chain tool
+make micelle2d        # build only micelle2d tool
+make thermo_extract   # build only thermo_extract tool
+:pre
+
+:line
+
+
 Install LAMMPS after a build :h4,link(install)
 
 After building LAMMPS, you may wish to copy the LAMMPS executable of

doc/src/Build_cmake.txt

@@ -52,11 +52,17 @@ LAMMPS or need to re-compile LAMMPS repeatedly, installation of the
 ccache (= Compiler Cache) software may speed up repeated compilation
 even more.
 
-After compilation, you can optionally copy the LAMMPS executable and
-library into your system folders (by default under $HOME/.local) with:
+After compilation, you may optionally install the LAMMPS executable into
+your system with:
 
 make install    # optional, copy LAMMPS executable & library elsewhere :pre
 
+This will install the lammps executable and library (if requested), some
+tools (if configured) and additional files like library API headers,
+manpages, potential and force field files. The location of the installation
+tree is set by the CMake variable "CMAKE_INSTALL_PREFIX" which defaults
+to $\{HOME\}/.local
+
 :line
 
 There are 3 variants of CMake: a command-line version (cmake), a text mode
@@ -114,7 +120,7 @@ The argument can be preceeded or followed by various CMake
 command-line options.  Several useful ones are:
 
 -D CMAKE_INSTALL_PREFIX=path  # where to install LAMMPS executable/lib if desired
--D CMAKE_BUILD_TYPE=type      # type = Release or Debug
+-D CMAKE_BUILD_TYPE=type      # type = RelWithDebInfo (default), Release, MinSizeRel, or Debug
 -G output                     # style of output CMake generates
 -DVARIABLE=value              # setting for a LAMMPS feature to enable
 -D VARIABLE=value             # ditto, but cannot come after CMakeLists.txt dir

doc/src/Build_development.txt

@@ -0,0 +1,86 @@
+"Higher level section"_Build.html - "LAMMPS WWW Site"_lws - "LAMMPS
+Documentation"_ld - "LAMMPS Commands"_lc :c
+
+:link(lws,http://lammps.sandia.gov)
+:link(ld,Manual.html)
+:link(lc,Commands_all.html)
+
+:line
+
+Development build options (CMake only) :h3
+
+The CMake build of LAMMPS has a few extra options which are useful during
+development,  testing or debugging.
+
+:line
+
+Verify compilation flags :h4,link(compilation)
+
+Sometimes it is necessary to verify the complete sequence of compilation flags
+generated by the CMake build. To enable a more verbose output during
+compilation you can use the following option.
+
+-D CMAKE_VERBOSE_MAKEFILE=value    # value = no (default) or yes :pre
+
+Another way of doing this without reconfiguration is calling make with variable VERBOSE set to 1:
+
+make VERBOSE=1 :pre
+
+:line
+
+Address, Undefined Behavior, and Thread Sanitizer Support :h4,link(sanitizer)
+
+Compilers such as GCC and Clang support generating binaries which use different
+sanitizers to detect problems in code during run-time. They can detect "memory leaks"_https://clang.llvm.org/docs/AddressSanitizer.html,
+code that runs into "undefined behavior"_https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html of the
+language and "data races"_https://clang.llvm.org/docs/ThreadSanitizer.html in threaded code.
+
+The following settings allow you enable these features if your compiler supports
+it. Please note that they come with a performance hit. However, they are
+usually faster than using tools like Valgrind.
+
+-D ENABLE_SANITIZE_ADDRESS=value    # enable Address Sanitizer, value = no (default) or yes
+-D ENABLE_SANITIZE_UNDEFINED=value  # enable Undefined Behaviour Sanitizer, value = no (default) or yes
+-D ENABLE_SANITIZE_THREAD=value     # enable Thread Sanitizer, value = no (default) or yes
+:pre
+
+:line
+
+Code Coverage and Testing :h4,link(testing)
+
+We do extensive regression testing of the LAMMPS code base on a continuous
+basis. Some of the logic to do this has been added to the CMake build so
+developers can run the tests directly on their workstation.
+
+NOTE: this is incomplete and only represents a small subset of tests that we run
+
+-D ENABLE_TESTING=value               # enable simple run tests of LAMMPS, value = no (default) or yes
+-D LAMMPS_TESTING_SOURCE_DIR=path     # path to lammps-testing repository (option if in custom location)
+-D LAMMPS_TESTING_GIT_TAG=value       # version of lammps-testing repository that should be used, value = master (default) or custom git commit or tag
+:pre
+
+If you enable testing in the CMake build it will create an additional target called "test". You can run them with:
+
+make test
+:pre
+
+The test cases used come from the lammps-testing repository. They are
+derivatives of the examples folder with some modifications to make the run
+faster.
+
+You can also collect code coverage metrics while running the tests by enabling
+coverage support during building.
+
+-D ENABLE_COVERAGE=value  # enable coverage measurements, value = no (default) or yes :pre
+
+This will also add the following targets to generate coverage reports after running the LAMMPS executable:
+
+make test               # run tests first!
+make gen_coverage_html  # generate coverage report in HTML format
+make gen_coverage_xml   # generate coverage report in XML format
+:pre
+
+These reports require GCOVR to be installed. The easiest way to do this to install it via pip:
+
+pip install git+https://github.com/gcovr/gcovr.git :pre
+:pre

doc/src/Build_extras.txt

@@ -88,7 +88,7 @@ which GPU hardware to build for.
                           # generic (default) or intel (Intel CPU) or fermi, kepler, cypress (NVIDIA)
 -D GPU_ARCH=value         # primary GPU hardware choice for GPU_API=cuda
                           # value = sm_XX, see below
-                          # default is Cuda-compiler dependent, but typically sm_20
+                          # default is sm_30
 -D CUDPP_OPT=value        # optimization setting for GPU_API=cuda
                           # enables CUDA Performance Primitives Optimizations
                           # value = yes (default) or no
@@ -172,22 +172,17 @@ KIM package :h4,link(kim)
 
 To build with this package, the KIM library with API v2 must be downloaded
 and built on your system.  It must include the KIM models that you want to
-use with LAMMPS. If you want to use the "kim_query"_kim_query.html
+use with LAMMPS. If you want to use the "kim_query"_kim_commands.html
 command, you also need to have libcurl installed with the matching
 development headers and the curl-config tool.
 
-Note that in LAMMPS lingo, a KIM model driver is a pair style
-(e.g. EAM or Tersoff).  A KIM model is a pair style for a particular
-element or alloy and set of parameters, e.g. EAM for Cu with a
-specific EAM potential file.  Also note that downloading and installing
-the KIM API library with all its models, may take a long time (10s of
-minutes to hours) to build.  Of course you only need to do that once.
+See "Obtaining KIM Models"_http://openkim.org/doc/usage/obtaining-models to
+learn how to install a pre-build binary of the OpenKIM Repository of Models.
+See the list of all KIM models here: https://openkim.org/browse/models
 
-See the list of KIM model drivers here:
-https://openkim.org/browse/model-drivers/alphabetical
-
-See the list of all KIM models here:
-https://openkim.org/browse/models/by-model-drivers
+(Also note that when downloading and installing from source
+the KIM API library with all its models, may take a long time (tens of
+minutes to hours) to build.  Of course you only need to do that once.)
 
 [CMake build]:
 
@@ -307,7 +302,7 @@ files.
 
 KOKKOS_ABSOLUTE_PATH = $(shell cd $(KOKKOS_PATH); pwd)
 export OMPI_CXX = $(KOKKOS_ABSOLUTE_PATH)/config/nvcc_wrapper
-CC =		mpicxx :pre
+CC =            mpicxx :pre
 
 :line
 
@@ -359,6 +354,9 @@ be installed on your system.
 [CMake build]:
 
 -D MESSAGE_ZMQ=value    # build with ZeroMQ support, value = no (default) or yes
+-D ZMQ_LIBRARY=path     # ZMQ library file (only needed if a custom location)
+-D ZMQ_INCLUDE_DIR=path # ZMQ include directory (only needed if a custom location)
+:pre
 
 [Traditional make]:
 
@@ -371,6 +369,7 @@ simply invoke the lib/message/Install.py script with the specified args:
 make lib-message               # print help message
 make lib-message args="-m -z"  # build with MPI and socket (ZMQ) support
 make lib-message args="-s"     # build as serial lib with no ZMQ support
+:pre
 
 The build should produce two files: lib/message/cslib/src/libmessage.a
 and lib/message/Makefile.lammps.  The latter is copied from an
@@ -643,30 +642,61 @@ make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler :pre
 
 USER-COLVARS package :h4,link(user-colvars)
 
+This package includes into the LAMMPS distribution the Colvars library, which
+can be built for the most part with all major versions of the C++ language.
+
+A few of the most recent features require C++11 support.  In particular, the
+library is optionally built together with the
+"Lepton"_https://simtk.org/projects/lepton library, a copy of which is also
+included in the LAMMPS distribution.  Lepton implements the
+"customFunction"_http://colvars.github.io/colvars-refman-lammps/colvars-refman-lammps.html#colvar|customFunction
+feature, and requires C++11 support.
+
+See "here"_https://colvars.github.io/README-c++11.html for a detailed list of
+C++11-only features.
+
 [CMake build]:
 
-No additional settings are needed besides "-D PKG_USER-COLVARS=yes".
+This is the recommended build recipe: no additional settings are normally
+needed besides "-D PKG_USER-COLVARS=yes".
+
+Building and linking of Lepton (or other C++11-only features) is enabled
+automatically when compilation is carried out with C++11 support, and disabled
+otherwise.  Optionally, Lepton build may be manually controlled with the flag
+"-D COLVARS_LEPTON=yes|no".
 
 [Traditional make]:
 
-Before building LAMMPS, you must build the COLVARS library in
-lib/colvars.  You can do this manually if you prefer; follow the
-instructions in lib/colvars/README.  You can also do it in one step
-from the lammps/src dir, using a command like these, which simply
-invoke the lib/colvars/Install.py script with the specified args:
+Before building LAMMPS, one must build the Colvars library in lib/colvars.
+
+This can be done manually in the same folder by using or adapting one of the
+provided Makefiles: for example, Makefile.g++ for the GNU compiler.
+
+In general, it is safer to use build setting consistent with the rest of
+LAMMPS.  This is best carried out from the LAMMPS src directory using a
+command like these, which simply invoke the lib/colvars/Install.py script with
+the specified args:
 
 make lib-colvars                      # print help message
 make lib-colvars args="-m serial"     # build with GNU g++ compiler (settings as with "make serial")
 make lib-colvars args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
 make lib-colvars args="-m g++-debug"  # build with GNU g++ compiler and colvars debugging enabled :pre
 
-The build should produce two files: lib/colvars/libcolvars.a and
-lib/colvars/Makefile.lammps.  The latter is copied from an existing
-Makefile.lammps.* and has settings needed to build LAMMPS with the
-COLVARS library (though typically the settings are just blank).  If
-necessary, you can edit/create a new lib/colvars/Makefile.machine file
-for your system, which should define an EXTRAMAKE variable to specify
-a corresponding Makefile.lammps.machine file.
+The "machine" argument of the "-m" flag is used to find a Makefile.machine to
+use as build recipe.  If it does not already exist in lib/colvars, it will be
+auto-generated by using compiler flags consistent with those parsed from the
+core LAMMPS makefiles.
+
+Optional flags may be specified as environment variables:
+
+COLVARS_DEBUG=yes make lib-colvars args="-m machine"  # Build with debug code (much slower)
+COLVARS_LEPTON=no make lib-colvars args="-m machine"  # Build without Lepton (included otherwise)
+
+The build should produce two files: the library lib/colvars/libcolvars.a
+(which also includes Lepton objects if enabled) and the specification file
+lib/colvars/Makefile.lammps.  The latter is auto-generated, and normally does
+not need to be edited.
+
 
 :line
 
@@ -803,7 +833,7 @@ dir, using a command like these, which simply invoke the
 lib/h5md/Install.py script with the specified args:
 
 make lib-h5md                     # print help message
-make lib-hm5d args="-m h5cc"      # build with h5cc compiler :pre
+make lib-h5md args="-m h5cc"      # build with h5cc compiler :pre
 
 The build should produce two files: lib/h5md/libch5md.a and
 lib/h5md/Makefile.lammps.  The latter is copied from an existing
@@ -850,15 +880,15 @@ additional information.
 For CPUs:
 
 OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high
-CCFLAGS =	-g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
-LINKFLAGS =	-g -qopenmp $(OPTFLAGS)
+CCFLAGS =       -g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
+LINKFLAGS =     -g -qopenmp $(OPTFLAGS)
 LIB =           -ltbbmalloc :pre
 
 For KNLs:
 
 OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -qoverride-limits
-CCFLAGS =	-g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
-LINKFLAGS =	-g -qopenmp $(OPTFLAGS)
+CCFLAGS =       -g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
+LINKFLAGS =     -g -qopenmp $(OPTFLAGS)
 LIB =           -ltbbmalloc :pre
 
 :line

doc/src/Build_settings.txt

@@ -12,6 +12,7 @@ Optional build settings :h3
 LAMMPS can be built with several optional settings.  Each sub-section
 explain how to do this for building both with CMake and make.
 
+"C++11 standard compliance test"_#cxx11 when building all of LAMMPS
 "FFT library"_#fft for use with the "kspace_style pppm"_kspace_style.html command
 "Size of LAMMPS data types"_#size
 "Read or write compressed files"_#gzip
@@ -23,6 +24,33 @@ explain how to do this for building both with CMake and make.
 
 :line
 
+C++11 standard compliance test :h4,link(cxx11)
+
+The LAMMPS developers plan to transition to make the C++11 standard the
+minimum requirement for compiling LAMMPS.  Currently this only applies to
+some packages like KOKKOS while the rest aims to be compatible with the C++98
+standard.  Most currently used compilers are compatible with C++11; some need
+to set extra flags to switch.  To determine the impact of requiring C++11,
+we have added a simple compliance test to the source code, that will cause
+the compilation to abort, if C++11 compliance is not available or enabled.
+To bypass this check, you need to change a setting in the makefile or
+when calling CMake.
+
+[CMake variable]:
+
+-D DISABLE_CXX11_REQUIREMENT=yes :pre
+
+You can set additional C++ compiler flags (beyond those selected by CMake)
+through the CMAKE_CXX_FLAGS variable. Example for CentOS 7:
+
+-D CMAKE_CXX_FLAGS="-O3 -g -fopenmp -DNDEBUG -std=c++11" :pre
+
+[Makefile.machine setting]:
+
+LMP_INC = -DLAMMPS_CXX98 :pre
+
+:line
+
 FFT library :h4,link(fft)
 
 When the KSPACE package is included in a LAMMPS build, the

doc/src/Commands_all.txt

@@ -50,11 +50,11 @@ An alphabetic list of all general LAMMPS commands.
 "dump"_dump.html,
 "dump adios"_dump_adios.html,
 "dump image"_dump_image.html,
-"dump_modify"_dump_modify.html,
 "dump movie"_dump_image.html,
 "dump netcdf"_dump_netcdf.html,
 "dump netcdf/mpiio"_dump_netcdf.html,
 "dump vtk"_dump_vtk.html,
+"dump_modify"_dump_modify.html,
 "dynamical_matrix"_dynamical_matrix.html,
 "echo"_echo.html,
 "fix"_fix.html,
@@ -68,7 +68,9 @@ An alphabetic list of all general LAMMPS commands.
 "improper_style"_improper_style.html,
 "include"_include.html,
 "jump"_jump.html,
-"kim_query"_kim_query.html,
+"kim_init"_kim_commands.html,
+"kim_interactions"_kim_commands.html,
+"kim_query"_kim_commands.html,
 "kspace_modify"_kspace_modify.html,
 "kspace_style"_kspace_style.html,
 "label"_label.html,
@@ -122,6 +124,7 @@ An alphabetic list of all general LAMMPS commands.
 "thermo"_thermo.html,
 "thermo_modify"_thermo_modify.html,
 "thermo_style"_thermo_style.html,
+"third_order"_third_order.html,
 "timer"_timer.html,
 "timestep"_timestep.html,
 "uncompute"_uncompute.html,

doc/src/Commands_bond.txt

@@ -108,7 +108,7 @@ OPT.
 "class2 (ko)"_dihedral_class2.html,
 "cosine/shift/exp (o)"_dihedral_cosine_shift_exp.html,
 "fourier (io)"_dihedral_fourier.html,
-"harmonic (io)"_dihedral_harmonic.html,
+"harmonic (iko)"_dihedral_harmonic.html,
 "helix (o)"_dihedral_helix.html,
 "multi/harmonic (o)"_dihedral_multi_harmonic.html,
 "nharmonic (o)"_dihedral_nharmonic.html,

doc/src/Commands_compute.txt

@@ -66,6 +66,7 @@ KOKKOS, o = USER-OMP, t = OPT.
 "group/group"_compute_group_group.html,
 "gyration"_compute_gyration.html,
 "gyration/chunk"_compute_gyration_chunk.html,
+"gyration/shape"_compute_gyration_shape.html,
 "heat/flux"_compute_heat_flux.html,
 "heat/flux/tally"_compute_tally.html,
 "hexorder/atom"_compute_hexorder_atom.html,
@@ -80,6 +81,7 @@ KOKKOS, o = USER-OMP, t = OPT.
 "meso/e/atom"_compute_meso_e_atom.html,
 "meso/rho/atom"_compute_meso_rho_atom.html,
 "meso/t/atom"_compute_meso_t_atom.html,
+"momentum"_compute_momentum.html,
 "msd"_compute_msd.html,
 "msd/chunk"_compute_msd_chunk.html,
 "msd/nongauss"_compute_msd_nongauss.html,

doc/src/Commands_fix.txt

@@ -232,6 +232,7 @@ OPT.
 "wall/lj1043"_fix_wall.html,
 "wall/lj126"_fix_wall.html,
 "wall/lj93 (k)"_fix_wall.html,
+"wall/morse"_fix_wall.html,
 "wall/piston"_fix_wall_piston.html,
 "wall/reflect (k)"_fix_wall_reflect.html,
 "wall/region"_fix_wall_region.html,

doc/src/Commands_pair.txt

@@ -65,6 +65,7 @@ OPT.
 "colloid (go)"_pair_colloid.html,
 "comb (o)"_pair_comb.html,
 "comb3"_pair_comb.html,
+"cosine/squared"_pair_cosine_squared.html,
 "coul/cut (gko)"_pair_coul.html,
 "coul/cut/soft (o)"_pair_fep_soft.html,
 "coul/debye (gko)"_pair_coul.html,
@@ -165,6 +166,7 @@ OPT.
 "lj/smooth/linear (o)"_pair_lj_smooth_linear.html,
 "lj/switch3/coulgauss/long"_pair_lj_switch3_coulgauss.html,
 "lj96/cut (go)"_pair_lj96.html,
+"local/density"_pair_local_density.html,
 "lubricate (o)"_pair_lubricate.html,
 "lubricate/poly (o)"_pair_lubricate.html,
 "lubricateU"_pair_lubricateU.html,
@@ -222,6 +224,8 @@ OPT.
 "sph/rhosum"_pair_sph_rhosum.html,
 "sph/taitwater"_pair_sph_taitwater.html,
 "sph/taitwater/morris"_pair_sph_taitwater_morris.html,
+"spin/dipole/cut"_pair_spin_dipole.html,
+"spin/dipole/long"_pair_spin_dipole.html,
 "spin/dmi"_pair_spin_dmi.html,
 "spin/exchange"_pair_spin_exchange.html,
 "spin/magelec"_pair_spin_magelec.html,

doc/src/Eqs/angle_class2_p6.tex

@@ -0,0 +1,15 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+$$
+  E_{a} = K_2\left(\theta - \theta_0\right)^2 + K_3\left(\theta - \theta_0\right)^3 + K_4\left(\theta - \theta_0\right)^4 + K_5\left(\theta - \theta_0\right)^5 + K_6\left(\theta - \theta_0\right)^6
+$$
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:

doc/src/Eqs/angle_cosine_buck6d.tex

@@ -0,0 +1,15 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+$$
+  E = K \left[ 1 + \cos(n\theta - \theta_0)\right]
+$$
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:

doc/src/Eqs/compute_shape_parameters.tex

@@ -0,0 +1,13 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+\begin{eqnarray*}
+ c = l_z - 0.5(l_y+l_x) \\
+ b = l_y - l_x \\
+ k = \frac{3}{2} \frac{l_x^2+l_y^2+l_z^2}{(l_x+l_y+l_z)^2} - \frac{1}{2} 
+\end{eqnarray*}
+
+\end{document}
+

doc/src/Eqs/fix_bond_react.tex

@@ -0,0 +1,9 @@
+\documentstyle[12pt]{article}
+\pagestyle{empty}
+\begin{document}
+
+\begin{eqnarray*}
+   k = AT^{n}e^{\frac{-E_{a}}{k_{B}T}}
+\end{eqnarray*}                           
+
+\end{document}

doc/src/Eqs/improper_inversion_harmonic.tex

@@ -0,0 +1,15 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+$$
+  E = K \left(\theta - \theta_0\right)^2
+$$
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:

doc/src/Eqs/norm_inf.tex

@@ -0,0 +1,15 @@
+\documentclass[preview]{standalone}
+\usepackage{varwidth}
+\usepackage[utf8x]{inputenc}
+\usepackage{amsmath, amssymb, graphics, setspace}
+
+\begin{document}
+\begin{varwidth}{50in}
+  \begin{equation}
+    || \vec{F} ||_{inf} 
+    = {\rm max}\left(|F_1^1|, |F_1^2|, |F_1^3| \cdots, 
+    |F_N^1|, |F_N^2|, |F_N^3|\right)
+    \nonumber
+  \end{equation}
+\end{varwidth}
+\end{document}

doc/src/Eqs/norm_max.tex

@@ -0,0 +1,15 @@
+\documentclass[preview]{standalone}
+\usepackage{varwidth}
+\usepackage[utf8x]{inputenc}
+\usepackage{amsmath, amssymb, graphics, setspace}
+
+\begin{document}
+\begin{varwidth}{50in}
+  \begin{equation}
+    % \left| \left| \vec{F} \right| \right|_2 
+    || \vec{F} ||_{max} 
+    = {\rm max}\left(||\vec{F}_1||, \cdots, ||\vec{F}_N||\right)
+    \nonumber
+  \end{equation}
+\end{varwidth}
+\end{document}

doc/src/Eqs/norm_two.tex

@@ -0,0 +1,15 @@
+\documentclass[preview]{standalone}
+\usepackage{varwidth}
+\usepackage[utf8x]{inputenc}
+\usepackage{amsmath, amssymb, graphics, setspace}
+
+\begin{document}
+\begin{varwidth}{50in}
+  \begin{equation}
+    % \left| \left| \vec{F} \right| \right|_2 
+    || \vec{F} ||_{2} 
+    = \sqrt{\vec{F}_1+ \cdots + \vec{F}_N}
+    \nonumber
+  \end{equation}
+\end{varwidth}
+\end{document}

doc/src/Eqs/pair_agni.tex

@@ -0,0 +1,18 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+\begin{eqnarray*}
+  F_i^u & = & \sum_t^{N_t}\alpha_t \cdot \exp\left[-\frac{\left(d_{i,t}^u\right)^2}{2l^2}\right] \\
+  d_{i,t}^u & = & \left|\left| V_i^u(\eta) - V_t^u(\eta) \right|\right| \\
+  V_i^u(\eta) & = & \sum_{j \neq i}\frac{r^u_{ij}}{r_{ij}} \cdot e^{-\left(\frac{r_{ij}}{\eta} \right)^2} \cdot f_d\left(r_{ij}\right) \\
+  f_d\left(r_{ij}\right) & = & \frac{1}{2} \left[\cos\left(\frac{\pi r_{ij}}{R_c}\right) + 1 \right]
+\end{eqnarray*}
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:

doc/src/Eqs/pair_buck6d.tex

@@ -1,6 +1,7 @@
 \documentclass[12pt]{article}
 
 \begin{document}
+\pagestyle{empty}
 
 \begin{eqnarray*}
   E = A e^{-\kappa r} - \frac{C}{r^6} \cdot \frac{1}{1 + D r^{14}} \qquad r < r_c \\

doc/src/Eqs/pair_cosine_squared.tex

@@ -0,0 +1,16 @@
+\documentclass[12pt]{article}
+
+\usepackage{amsmath}
+
+\begin{document}
+
+\begin{align*}
+E = 
+\begin{cases}
+-\epsilon& \quad r < \sigma \\
+-\epsilon\cos\left(\frac{\pi\left(r - \sigma\right)}{2\left(r_c - \sigma\right)}\right)&\quad \sigma \leq r < r_c \\
+0& \quad r \geq r_c
+\end{cases}
+\end{align*}
+
+\end{document}

doc/src/Eqs/pair_cosine_squared_wca.tex

@@ -0,0 +1,11 @@
+\documentstyle[12pt]{article}
+
+\begin{document}
+
+$$
+ E = \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
+                       2\left(\frac{\sigma}{r}\right)^6 + 1\right]
+                       , \quad r < \sigma
+$$
+
+\end{document}

doc/src/Eqs/pair_coul_gauss.tex

@@ -0,0 +1,15 @@
+\documentclass[12pt]{article}
+
+\pagestyle{empty}
+\begin{document}
+
+$$
+  E = \frac{C_{q_i q_j}}{\epsilon r_{ij}}\,\, \textrm{erf}\left(\alpha_{ij} r_{ij}\right)\quad\quad\quad r < r_c
+$$
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:

doc/src/Eqs/pair_kolmogorov_crespi_full.tex

@@ -27,7 +27,7 @@
   V_{ij} & = & e^{-\lambda (r_{ij} -z_0)} \left [ C + f(\rho_{ij}) + f(\rho_{ji}) - A \left ( \frac{r_{ij}}{z_0}\right )^{-6} \right ] \\
   \rho_{ij}^2 & = & r_{ij}^2 - ({\bf r}_{ij}\cdot {\bf n}_{i})^2 \\[15pt]
   \rho_{ji}^2 & = & r_{ij}^2 - ({\bf r}_{ij}\cdot  {\bf n}_{j})^2 \\[15pt]
-  f(\rho) & = &  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} { \rho/\delta }^{2n}
+  f(\rho) & = &  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} { (\rho/\delta) }^{2n}
 \end{eqnarray*}
 \endgroup
 \end{document}

doc/src/Eqs/pair_local_density_energy.tex

@@ -0,0 +1,11 @@
+\documentclass[12pt]{article}
+
+\begin{document}
+
+$$
+ U_{LD} = \sum_i F(\rho_i)
+$$
+
+
+\end{document}
+~                  

doc/src/Eqs/pair_local_density_energy_implement.tex

@@ -0,0 +1,9 @@
+\documentclass[12pt]{article}
+
+\begin{document}
+
+$$
+U_{LD} = \sum_k U_{LD}^{(k)} = \sum_i \left[ \sum_k a_\alpha^{(k)} F^{(k)} \left(\rho_i^{(k)}\right) \right] 
+$$
+
+\end{document}

doc/src/Eqs/pair_local_density_energy_multi.tex

@@ -0,0 +1,9 @@
+\documentclass[12pt]{article}
+
+\begin{document}
+
+$$
+U_{LD} = \sum_i a_\alpha F(\rho_i)
+$$
+
+\end{document}

doc/src/Eqs/pair_local_density_indicator_func.tex

@@ -0,0 +1,16 @@
+\documentclass[12pt]{article}
+\usepackage[utf8]{inputenc}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+
+\begin{document}
+\[
+  \varphi(r) = 
+    \begin{cases}
+       1 & r \le R_1 \\
+       c_0 + c_2r^2 + c_4r^4 + c_6r^6  & r \in (R_1, R_2) \\
+       0 & r \ge R_2
+  \end{cases}
+\]
+
+\end{document}

doc/src/Eqs/pair_local_density_ld.tex

@@ -0,0 +1,10 @@
+\documentclass[12pt]{article}
+
+\begin{document}
+
+
+$$
+\rho_i = \sum_{j \neq i} \varphi(r_{ij})
+$$
+
+\end{document}

doc/src/Eqs/pair_local_density_ld_implement.tex

@@ -0,0 +1,10 @@
+\documentstyle[12pt]{article}
+
+\begin{document}
+
+
+$$
+\rho_i^{(k)} = \sum_j b_\beta^{(k)} \varphi^{(k)} (r_{ij})
+$$
+
+\end{document}

doc/src/Eqs/pair_local_density_ld_multi.tex

@@ -0,0 +1,10 @@
+\documentclass[12pt]{article}
+
+\begin{document}
+
+
+$$
+\rho_i = \sum_{j \neq i} b_\beta \varphi(r_{ij})
+$$
+
+\end{document}

doc/src/Errors_messages.txt

@@ -2438,6 +2438,14 @@ Self-explanatory. :dd
 
 Self-explanatory. :dd
 
+{Compute gyration ID does not exist for compute gyration/shape} :dt
+
+Self-explanatory. Provide a valid compute ID. :dd
+
+{Compute gyration/shape compute ID does not point to a gyration compute} :dt
+
+Self-explanatory. Provide and ID of a compute gyration command. :dd
+
 {Compute ID for compute reduce does not exist} :dt
 
 Self-explanatory. :dd
@@ -4783,6 +4791,22 @@ Self-explanatory. :dd
 
 This fix option cannot be used with point particles. :dd
 
+{Fix langevin gjf and respa are not compatible} :dt
+
+Self-explanatory. :dd
+
+{Fix langevin gjf cannot have period equal to dt/2} :dt
+
+If the period is equal to dt/2 then division by zero will happen. :dd
+
+{Fix langevin gjf should come before fix nve} :dt
+
+Self-explanatory. :dd
+
+{Fix langevin gjf with tbias is not yet implemented with kokkos} :dt
+
+This option is not yet available. :dd
+
 {Fix langevin omega is not yet implemented with kokkos} :dt
 
 This option is not yet available. :dd
@@ -5777,6 +5801,16 @@ definitions. :dd
 
 The data file header lists improper but no improper types. :dd
 
+{Incompatible KIM Simulator Model} :dt
+
+The requested KIM Simulator Model was defined for a different MD code
+and thus is not compatible with LAMMPS. :dd
+
+{Incompatible units for KIM Simulator Model} :dt
+
+The selected unit style is not compatible with the requested KIM
+Simulator Model. :dd
+
 {Incomplete use of variables in create_atoms command} :dt
 
 The var and set options must be used together. :dd
@@ -5890,6 +5924,11 @@ The element names in the ADP file do not match those requested. :dd
 
 The element names in the EAM file do not match those requested. :dd
 
+{Incorrect format of ... section in data file} :dt
+
+Number or type of values per line in the given section of the data file
+is not consistent with the requirements for this section. :dd
+
 {Incorrect format in COMB potential file} :dt
 
 Incorrect number of words per line in the potential file. :dd
@@ -7042,6 +7081,12 @@ The atom style defined does not have this attribute. :dd
 
 The atom style defined does not have these attributes. :dd
 
+{KIM Simulator Model has no Model definition} :dt
+
+There is no model definition (key: model-defn) in the KIM Simulator
+Model.  Please contact the OpenKIM database maintainers to verify
+and potentially correct this. :dd
+
 {KOKKOS package does not yet support comm_style tiled} :dt
 
 Self-explanatory. :dd
@@ -7546,6 +7591,18 @@ Self-explanatory. :dd
 
 Self-explanatory. :dd
 
+{Must use 'kim_style init' command before simulation box is defined} :dt
+
+Self-explanatory. :dd
+
+{Must use 'kim_style define' command after simulation box is defined} :dt
+
+Self-explanatory. :dd
+
+{Must use 'kim_style init' command before 'kim_style define'} :dt
+
+Self-explanatory. :dd
+
 {Must use 'kspace_modify pressure/scalar no' for rRESPA with kspace_style MSM} :dt
 
 The kspace scalar pressure option cannot (yet) be used with rRESPA. :dd
@@ -9489,6 +9546,11 @@ See the "read_data extra/special/per/atom" command
 for info on how to leave space in the special bonds
 list to allow for additional bonds to be formed. :dd
 
+{Species XXX is not supported by this KIM Simulator Model} :dt
+
+The kim_style define command was referencing a species that is not
+present in the requested KIM Simulator Model. :dd
+
 {Specified processors != physical processors} :dt
 
 The 3d grid of processors defined by the processors command does not

doc/src/Errors_warnings.txt

@@ -47,6 +47,11 @@ too far away. :dd
 
 Self-explanatory. :dd
 
+{Angles are defined but no angle style is set} :dt
+
+The topology contains angles, but there are no angle forces computed
+since there was no angle_style command. :dd
+
 {Atom style in data file differs from currently defined atom style} :dt
 
 Self-explanatory. :dd
@@ -73,6 +78,11 @@ short or the bond has blown apart and an atom is too far away. :dd
 
 Self-explanatory. :dd
 
+{Bonds are defined but no bond style is set} :dt
+
+The topology contains bonds, but there are no bond forces computed
+since there was no bond_style command. :dd
+
 {Bond/angle/dihedral extent > half of periodic box length} :dt
 
 This is a restriction because LAMMPS can be confused about which image
@@ -129,6 +139,16 @@ Self-explanatory. :dd
 
 Self-explanatory. :dd
 
+{Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost} :dt
+
+The communication cutoff defaults to the maximum of what is inferred from
+pair and bond styles (will be zero, if none are defined) and what is specified
+via "comm_modify cutoff"_comm_modify.html (defaults to 0.0).  If this results
+to 0.0, no ghost atoms will be generated and LAMMPS may lose atoms or use
+incorrect periodic images of atoms in interaction lists.  To avoid, either use
+"pair style zero"_pair_zero.html with a suitable cutoff or use "comm_modify
+cutoff"_comm_modify.html. :dd
+
 {Communication cutoff is too small for SNAP micro load balancing, increased to %lf} :dt
 
 Self-explanatory. :dd
@@ -176,6 +196,11 @@ to check your simulation geometry. :dd
 
 Self-explanatory. :dd
 
+{Dihedrals are defined but no dihedral style is set} :dt
+
+The topology contains dihedrals, but there are no dihedral forces computed
+since there was no dihedral_style command. :dd
+
 {Dump dcd/xtc timestamp may be wrong with fix dt/reset} :dt
 
 If the fix changes the timestep, the dump dcd file will not
@@ -238,6 +263,10 @@ included one or more of the following: kspace, triclinic, a hybrid
 pair style, an eam pair style, or no "single" function for the pair
 style. :dd
 
+{Fix langevin gjf using random gaussians is not implemented with kokkos} :dt
+
+This will most likely cause errors in kinetic fluctuations.
+
 {Fix property/atom mol or charge w/out ghost communication} :dt
 
 A model typically needs these properties defined for ghost atoms. :dd
@@ -338,6 +367,11 @@ to check your simulation geometry. :dd
 
 Self-explanatory. :dd
 
+{Impropers are defined but no improper style is set} :dt
+
+The topology contains impropers, but there are no improper forces computed
+since there was no improper_style command. :dd
+
 {Inconsistent image flags} :dt
 
 The image flags for a pair on bonded atoms appear to be inconsistent.
@@ -356,6 +390,11 @@ have fully consistent image flags, since some bonds will cross
 periodic boundaries and connect two atoms with the same image
 flag. :dd
 
+{Increasing communication cutoff for GPU style} :dt
+
+The pair style has increased the communication cutoff to be consistent with
+the communication cutoff requirements for this pair style when run on the GPU. :dd
+
 {KIM Model does not provide 'energy'; Potential energy will be zero} :dt
 
 Self-explanatory. :dd
@@ -393,6 +432,30 @@ This library function cannot be used if atom IDs are not defined or
 are not consecutively numbered, or if no atom map is defined.  See the
 atom_modify command for details about atom maps. :dd
 
+{Likewise 1-2 special neighbor interactions != 1.0} :dt
+
+The topology contains bonds, but there is no bond style defined
+and a 1-2 special neighbor scaling factor was not 1.0. This
+means that pair style interactions may have scaled or missing
+pairs in the neighbor list in expectation of interactions for
+those pairs being computed from the bond style. :dd
+
+{Likewise 1-3 special neighbor interactions != 1.0} :dt
+
+The topology contains angles, but there is no angle style defined
+and a 1-3 special neighbor scaling factor was not 1.0. This
+means that pair style interactions may have scaled or missing
+pairs in the neighbor list in expectation of interactions for
+those pairs being computed from the angle style. :dd
+
+{Likewise 1-4 special neighbor interactions != 1.0} :dt
+
+The topology contains dihedrals, but there is no dihedral style defined
+and a 1-4 special neighbor scaling factor was not 1.0. This
+means that pair style interactions may have scaled or missing
+pairs in the neighbor list in expectation of interactions for
+those pairs being computed from the dihedral style. :dd
+
 {Lost atoms via change_box: original %ld current %ld} :dt
 
 The command options you have used caused atoms to be lost. :dd

doc/src/Examples.txt

@@ -73,7 +73,7 @@ granregion: use of fix wall/region/gran as boundary on granular particles
 hugoniostat: Hugoniostat shock dynamics
 hyper:    global and local hyperdynamics of diffusion on Pt surface
 indent:   spherical indenter into a 2d solid
-kim:      use of potentials in Knowledge Base for Interatomic Models (KIM)
+kim:      use of potentials from the "OpenKIM Repository"_openkim
 latte:    examples for using fix latte for DFTB via the LATTE library
 meam:     MEAM test for SiC and shear (same as shear examples)
 melt:     rapid melt of 3d LJ system
@@ -141,6 +141,7 @@ HEAT: compute thermal conductivity for LJ and water via fix ehex
 KAPPA: compute thermal conductivity via several methods
 MC: using LAMMPS in a Monte Carlo mode to relax the energy of a system
 SPIN: examples for features of the SPIN package
+UNITS: examples that run the same simulation in lj, real, metal units
 USER: examples for USER packages and USER-contributed commands
 VISCOSITY: compute viscosity via several methods :tb(s=:)
 
@@ -153,3 +154,5 @@ illustrate how to use the command(s) provided in that package.  Many
 of the sub-directories have their own README files which give further
 instructions.  See the "Packages_details"_Packages_details.html doc
 page for more info on specific USER packages.
+
+:link(openkim,https://openkim.org)

doc/src/Howto_chunk.txt

@@ -136,7 +136,9 @@ The "compute chunk/spread/atom"_compute_chunk_spread_atom.html command
 spreads per-chunk values to each atom in the chunk, producing per-atom
 values as its output.  This can be useful for outputting per-chunk
 values to a per-atom "dump file"_dump.html.  Or for using an atom's
-associated chunk value in an "atom-style variable"_variable.html.
+associated chunk value in an "atom-style variable"_variable.html.  Or
+as input to the "fix ave/chunk"_fix_ave_chunk.html command to
+spatially average per-chunk values calculated by a per-chunk compute.
 
 The "compute reduce/chunk"_compute_reduce_chunk.html command reduces a
 peratom value across the atoms in each chunk to produce a value per
@@ -184,12 +186,20 @@ compute cc1 all chunk/atom c_cluster compress yes
 compute size all property/chunk cc1 count
 fix 1 all ave/histo 100 1 100 0 20 20 c_size mode vector ave running beyond ignore file tmp.histo :pre
 
-(6) An example of using a per-chunk value to apply per-atom forces to
+(6) An example for using a per-chunk value to apply per-atom forces to
 compress individual polymer chains (molecules) in a mixture, is
 explained on the "compute
 chunk/spread/atom"_compute_chunk_spread_atom.html command doc page.
 
-(7) An example of using one set of per-chunk values for molecule
+(7) An example for using one set of per-chunk values for molecule
 chunks, to create a 2nd set of micelle-scale chunks (clustered
 molecules, due to hydrophobicity), is explained on the "compute
 chunk/reduce"_compute_reduce_chunk.html command doc page.
+
+(8) An example for using one set of per-chunk values (dipole moment
+vectors) for molecule chunks, spreading the values to each atom in
+each chunk, then defining a second set of chunks as spatial bins, and
+using the "fix ave/chunk"_fix_ave_chunk.html command to calculate an
+average dipole moment vector for each bin.  This example is explained
+on the "compute chunk/spread/atom"_compute_chunk_spread_atom.html
+command doc page.

doc/src/Howto_spins.txt

@@ -43,19 +43,19 @@ langevin/spin"_fix_langevin_spin.html. It allows to either dissipate
 the thermal energy of the Langevin thermostat, or to perform a
 relaxation of the magnetic configuration toward an equilibrium state.
 
-The command "fix setforce/spin"_fix_setforce.html allows to set the 
-components of the magnetic precession vectors (while erasing and 
-replacing the previously computed magnetic precession vectors on 
-the atom). 
-This command can be used to freeze the magnetic moment of certain 
-atoms in the simulation by zeroing their precession vector. 
+The command "fix setforce/spin"_fix_setforce.html allows to set the
+components of the magnetic precession vectors (while erasing and
+replacing the previously computed magnetic precession vectors on
+the atom).
+This command can be used to freeze the magnetic moment of certain
+atoms in the simulation by zeroing their precession vector.
 
 The command "fix nve/spin"_fix_nve_spin.html can be used to
-perform a symplectic integration of the combined dynamics of spins 
+perform a symplectic integration of the combined dynamics of spins
 and atomic motions.
 
 The minimization style "min/spin"_min_spin.html can be applied
-to the spins to perform a minimization of the spin configuration. 
+to the spins to perform a minimization of the spin configuration.
 
 
 All the computed magnetic properties can be output by two main

doc/src/Howto_viscosity.txt

@@ -83,7 +83,7 @@ variable    d equal $p*$s   # dump interval :pre
 
 # convert from LAMMPS real units to SI :pre
 
-variable    kB equal 1.3806504e-23    # \[J/K/] Boltzmann
+variable    kB equal 1.3806504e-23    # \[J/K\] Boltzmann
 variable    atm2Pa equal 101325.0
 variable    A2m equal 1.0e-10
 variable    fs2s equal 1.0e-15

doc/src/Howto_walls.txt

@@ -59,14 +59,15 @@ granular particles; all the other commands create smooth walls.
 "fix wall/lj126"_fix_wall.html - flat walls, with Lennard-Jones 12/6 potential
 "fix wall/colloid"_fix_wall.html - flat walls, with "pair_style colloid"_pair_colloid.html potential
 "fix wall/harmonic"_fix_wall.html - flat walls, with repulsive harmonic spring potential
+"fix wall/morse"_fix_wall.html - flat walls, with Morse potential
 "fix wall/region"_fix_wall_region.html - use region surface as wall
 "fix wall/gran"_fix_wall_gran.html - flat or curved walls with "pair_style granular"_pair_gran.html potential :ul
 
-The {lj93}, {lj126}, {colloid}, and {harmonic} styles all allow the
-flat walls to move with a constant velocity, or oscillate in time.
-The "fix wall/region"_fix_wall_region.html command offers the most
-generality, since the region surface is treated as a wall, and the
-geometry of the region can be a simple primitive volume (e.g. a
+The {lj93}, {lj126}, {colloid}, {harmonic}, and {morse} styles all
+allow the flat walls to move with a constant velocity, or oscillate in
+time.  The "fix wall/region"_fix_wall_region.html command offers the
+most generality, since the region surface is treated as a wall, and
+the geometry of the region can be a simple primitive volume (e.g. a
 sphere, or cube, or plane), or a complex volume made from the union
 and intersection of primitive volumes.  "Regions"_region.html can also
 specify a volume "interior" or "exterior" to the specified primitive

doc/src/Install_linux.txt

@@ -15,7 +15,8 @@ Binaries are available for different versions of Linux:
 "Pre-built Fedora Linux executables"_#fedora
 "Pre-built EPEL Linux executables (RHEL, CentOS)"_#epel
 "Pre-built OpenSuse Linux executables"_#opensuse
-"Gentoo Linux executable"_#gentoo :all(b)
+"Gentoo Linux executable"_#gentoo
+"Arch Linux build-script"_#arch :all(b)
 
 :line
 
@@ -168,3 +169,31 @@ for details.
 
 Thanks to Nicolas Bock and Christoph Junghans (LANL) for setting up
 this Gentoo capability.
+
+:line
+
+Archlinux build-script :h4,link(arch)
+
+LAMMPS is available via Arch's unofficial Arch User repository (AUR).
+
+There are three scripts available, named lammps, lammps-beta and lammps-git.
+They respectively package the stable, patch and git releases.
+
+To install, you will need to have the git package installed. You may use
+any of the above names in-place of lammps.
+
+$ git clone https://aur.archlinux.org/lammps.git :pre
+$ cd lammps :pre
+$ makepkg -s :pre
+# makepkg -i :pre
+
+To update, you may repeat the above, or change into the cloned directory,
+and execute the following, after which, if there are any changes, you may
+use makepkg as above.
+
+$ git pull :pre
+
+Alternatively, you may use an AUR helper to install these packages.
+
+Note that the AUR provides build-scripts that download the source and
+the build the package on your machine.

doc/src/Install_mac.txt

@@ -10,47 +10,34 @@ Documentation"_ld - "LAMMPS Commands"_lc :c
 Download an executable for Mac :h3
 
 LAMMPS can be downloaded, built, and configured for OS X on a Mac with
-"Homebrew"_homebrew.  Only four of the LAMMPS packages are unavailable
-at this time because of additional needs not yet met: KIM, GPU,
-USER-INTEL, USER-ATC.
+"Homebrew"_homebrew.  The following LAMMPS packages are unavailable at this
+time because of additional needs not yet met: GPU, KOKKOS, LATTE, MSCG,
+MESSAGE, MPIIO POEMS VORONOI.
 
 After installing Homebrew, you can install LAMMPS on your system with
 the following commands:
 
-% brew tap homebrew/science
-% brew install lammps              # serial version
-% brew install lammps --with-mpi   # mpi support :pre
+% brew install lammps :pre
 
-This will install the executable "lammps", a python module named
-"lammps", and additional resources with all the standard packages.  To
-get the location of the additional resources type this:
-
-% brew info lammps :pre
-
-This command also tells you additional installation options available.
-The user-packages are available as options, just install them like
-this example for the USER-OMP package:
-
-% brew install lammps --enable-user-omp :pre
-
-It is usually best to install LAMMPS with the most up to date source
-files, which can be done with the "--HEAD" option:
-
-% brew install lammps --HEAD :pre
-
-To re-install the LAMMPS HEAD, run this command occasionally (make sure
-to use the desired options).
-
-% brew install --force lammps --HEAD $\{options\} :pre
+This will install the executables "lammps_serial" and "lammps_mpi", as well as
+the LAMMPS "doc", "potentials", "tools", "bench", and "examples" directories.
 
 Once LAMMPS is installed, you can test the installation with the
 Lennard-Jones benchmark file:
 
 % brew test lammps -v :pre
 
+The LAMMPS binary is built with the "KIM package"_Build_extras#kim which
+results in Homebrew also installing the `kim-api` binaries when LAMMPS is
+installed.  In order to use potentials from "openkim.org"_openkim, you can
+install the `openkim-models` package
+
+% brew install openkim-models :pre
+
 If you have problems with the installation you can post issues to
 "this link"_homebrew.
 
 Thanks to Derek Thomas (derekt at cello.t.u-tokyo.ac.jp) for setting
 up the Homebrew capability.
-:link(homebrew,https://github.com/Homebrew/homebrew-science/issues)
+:link(homebrew,https://github.com/Homebrew/homebrew-core/issues)
+:link(openkim,https://openkim.org)

doc/src/Intro_features.txt

@@ -92,8 +92,8 @@ commands)
   implicit solvent potentials: hydrodynamic lubrication, Debye
   force-field compatibility with common CHARMM, AMBER, DREIDING, \
     OPLS, GROMACS, COMPASS options
-  access to "KIM archive"_http://openkim.org of potentials via \
-    "pair kim"_pair_kim.html
+  access to the "OpenKIM Repository"_http://openkim.org of potentials via \
+    "kim_init, kim_interactions, and kim_query"_kim_commands.html commands
   hybrid potentials: multiple pair, bond, angle, dihedral, improper \
     potentials can be used in one simulation
   overlaid potentials: superposition of multiple pair potentials :ul

doc/src/Manual.txt

@@ -1,7 +1,7 @@
 <!-- HTML_ONLY -->
 <HEAD>
 <TITLE>LAMMPS Users Manual</TITLE>
-<META NAME="docnumber" CONTENT="18 Jun 2019 version">
+<META NAME="docnumber" CONTENT="30 Oct 2019 version">
 <META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
 <META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
 </HEAD>
@@ -21,7 +21,7 @@
 :line
 
 LAMMPS Documentation :c,h1
-18 Jun 2019 version :c,h2
+30 Oct 2019 version :c,h2
 
 "What is a LAMMPS version?"_Manual_version.html
 

doc/src/PDF/pair_gayberne_extra.tex

@@ -48,8 +48,8 @@ $$ \mathbf{G}_{12} = \mathbf{A}_1^T \mathbf{S}_1^2 \mathbf{A}_1 +
 \mathbf{G}_2. $$
 
 Let the relative energy matrices $\mathbf{E}_i = \mbox{diag}
-(\epsilon_{ia}, \epsilon_{ib}, \epsilon_{ic})$ be given by 
-the relative well depths (dimensionless energy scales 
+(\epsilon_{ia}^{-1/\mu}, \epsilon_{ib}^{-1/\mu}, \epsilon_{ic}^{-1/\mu})$
+be given by the relative well depths (dimensionless energy scales 
 inversely proportional to the well-depths of the respective 
 orthogonal configurations of the interacting molecules). The 
 $\chi$ orientation-dependent energy based on the user-specified 
@@ -62,8 +62,8 @@ $$ \hat{\mathbf{r}}_{12} = { \mathbf{r}_{12} } / |\mathbf{r}_{12}|, $$
 
 and
 
-$$ \mathbf{B}_{12} = \mathbf{A}_1^T \mathbf{E}_1^2 \mathbf{A}_1 +
-\mathbf{A}_2^T \mathbf{E}_2^2 \mathbf{A}_2 = \mathbf{B}_1 +
+$$ \mathbf{B}_{12} = \mathbf{A}_1^T \mathbf{E}_1 \mathbf{A}_1 +
+\mathbf{A}_2^T \mathbf{E}_2 \mathbf{A}_2 = \mathbf{B}_1 +
 \mathbf{B}_2. $$
 
 Here, we use the distance of closest approach approximation given by the
@@ -131,7 +131,7 @@ and
 
 $$ \frac{ \partial \chi_{12} }{ \partial \mathbf{q}_i } = 4.0 \cdot
 r^{-2} \cdot \mathbf{A}_i (- \mathbf{\iota}^T \cdot \mathbf{B}_i
-\times \mathbf{\iota} ). $$
+\times \mathbf{\iota} ) \cdot \mu \cdot \chi_{12}^{ ( \mu -1 ) / \mu}. $$
 
 For the derivative of the $\eta$ term, we were unable to find a matrix
 expression due to the determinant. Let $a_{mi}$ be the mth row of the

doc/src/Packages_details.txt

@@ -338,22 +338,37 @@ KIM package :link(PKG-KIM),h4
 
 [Contents:]
 
-A "pair_style kim"_pair_kim.html command which is a wrapper on the
-Knowledge Base for Interatomic Models (KIM) repository of interatomic
-potentials, enabling any of them to be used in LAMMPS simulations.
-Also a "kim_query"_kim_query.html command, which allows to query
-the OpenKIM database for stored properties.
+This package contains a set of commands that serve as a wrapper on the
+"Open Knowledgebase of Interatomic Models (OpenKIM)"_https://openkim.org
+repository of interatomic models (IMs)
+enabling compatible ones to be used in LAMMPS simulations.
+This includes "kim_init and kim_interactions"_kim_commands.html
+commands to select, initialize and instantiate the IM, and a
+"kim_query"_kim_commands.html command to perform web queries
+for material property predictions of OpenKIM IMs.
+Support for KIM IMs that conform to the
+"KIM Application Programming Interface (API)"_https://openkim.org/kim-api/
+is provided by the "pair_style kim"_pair_kim.html command.
 
-To use this package you must have the KIM library available on your
-system.
+NOTE: The command {pair_style kim} is called by {kim_interactions} and
+is not recommended to be directly used in input scripts.
+
+To use this package you must have the KIM API library available on your
+system. The KIM API is available for download on the
+"OpenKIM website"_https://openkim.org/kim-api/.
+When installing LAMMPS from binary, the kim-api package
+is a dependency that is automatically downloaded and installed.
 
 Information about the KIM project can be found at its website:
-https://openkim.org.  The KIM project is led by Ellad Tadmor and Ryan
-Elliott (U Minnesota).
+"https://openkim.org"_https://openkim.org.
+The KIM project is led by Ellad Tadmor and Ryan Elliott (U Minnesota)
+and is funded by the "National Science Foundation"_https://www.nsf.gov/.
 
 [Authors:] Ryan Elliott (U Minnesota) is the main developer for the KIM
-API which the "pair_style kim"_pair_kim.html command uses.  He
-developed the pair style.
+API and the {pair_style kim} command. Axel Kohlmeyer (Temple U) and
+Ellad Tadmor (U Minnesota) contributed to the "kim_commands"_kim_commands.html
+interface in close collaboration with Ryan Elliott.
+
 
 [Install:]
 
@@ -363,10 +378,11 @@ extras"_Build_extras.html doc page.
 
 [Supporting info:]
 
+"kim_commands"_kim_commands.html
+"pair_style kim"_pair_kim.html
 src/KIM: filenames -> commands
 src/KIM/README
 lib/kim/README
-"pair_style kim"_pair_kim.html
 examples/kim :ul
 
 :line
@@ -911,6 +927,8 @@ the usual manner via MD.  Various pair, fix, and compute styles.
 
 src/SPIN: filenames -> commands
 "Howto spins"_Howto_spins.html
+"pair_style spin/dipole/cut"_pair_spin_dipole.html
+"pair_style spin/dipole/long"_pair_spin_dipole.html
 "pair_style spin/dmi"_pair_spin_dmi.html
 "pair_style spin/exchange"_pair_spin_exchange.html
 "pair_style spin/magelec"_pair_spin_magelec.html
@@ -982,9 +1000,9 @@ USER-ADIOS package :link(PKG-USER-ADIOS),h4
 
 [Contents:]
 
-ADIOS is a high-performance I/O library. This package implements the 
+ADIOS is a high-performance I/O library. This package implements the
 dump "atom/adios" and dump "custom/adios" commands to write data using
-the ADIOS library. 
+the ADIOS library.
 
 [Authors:] Norbert Podhorszki (ORNL) from the ADIOS developer team.
 
@@ -1173,7 +1191,7 @@ USER-PLUMED package :link(PKG-USER-PLUMED),h4
 The fix plumed command allows you to use the PLUMED free energy plugin
 for molecular dynamics to analyze and bias your LAMMPS trajectory on
 the fly.  The PLUMED library is called from within the LAMMPS input
-script by using the "fix plumed _fix_plumed.html command.
+script by using the "fix plumed"_fix_plumed.html command.
 
 [Authors:] The "PLUMED library"_#PLUMED is written and maintained by
 Massimilliano Bonomi, Giovanni Bussi, Carlo Camiloni and Gareth
@@ -1728,11 +1746,12 @@ USER-PHONON package :link(PKG-USER-PHONON),h4
 A "fix phonon"_fix_phonon.html command that calculates dynamical
 matrices, which can then be used to compute phonon dispersion
 relations, directly from molecular dynamics simulations.
-And a "dynamical_matrix" command to compute the dynamical matrix
-from finite differences.
+And a "dynamical_matrix"_dynamical_matrix.html as well as a
+"third_order"_third_order.html command to compute the dynamical matrix
+and third order tensor from finite differences.
 
 [Authors:] Ling-Ti Kong (Shanghai Jiao Tong University) for "fix phonon"
-and Charlie Sievers (UC Davis) for "dynamical_matrix"
+and Charlie Sievers (UC Davis) for "dynamical_matrix" and "third_order"
 
 
 [Supporting info:]
@@ -1741,6 +1760,7 @@ src/USER-PHONON: filenames -> commands
 src/USER-PHONON/README
 "fix phonon"_fix_phonon.html
 "dynamical_matrix"_dynamical_matrix.html
+"third_order"_third_order.html
 examples/USER/phonon :ul
 
 :line

doc/src/Run_options.txt

@@ -126,9 +126,10 @@ are intended for computational work like running LAMMPS.  By default
 Ng = 1 and Ns is not set.
 
 Depending on which flavor of MPI you are running, LAMMPS will look for
-one of these 3 environment variables
+one of these 4 environment variables
 
 SLURM_LOCALID (various MPI variants compiled with SLURM support)
+MPT_LRANK (HPE MPI)
 MV2_COMM_WORLD_LOCAL_RANK (Mvapich)
 OMPI_COMM_WORLD_LOCAL_RANK (OpenMPI) :pre
 

doc/src/Speed_kokkos.txt

@@ -46,16 +46,15 @@ software version 7.5 or later must be installed on your system. See
 the discussion for the "GPU package"_Speed_gpu.html for details of how
 to check and do this.
 
-NOTE: Kokkos with CUDA currently implicitly assumes that the MPI
-library is CUDA-aware and has support for GPU-direct. This is not
-always the case, especially when using pre-compiled MPI libraries
-provided by a Linux distribution. This is not a problem when using
-only a single GPU and a single MPI rank on a desktop. When running
-with multiple MPI ranks, you may see segmentation faults without
-GPU-direct support.  These can be avoided by adding the flags "-pk
-kokkos gpu/direct off"_Run_options.html to the LAMMPS command line or
-by using the command "package kokkos gpu/direct off"_package.html in
-the input file.
+NOTE: Kokkos with CUDA currently implicitly assumes that the MPI library
+is CUDA-aware. This is not always the case, especially when using
+pre-compiled MPI libraries provided by a Linux distribution. This is not
+a problem when using only a single GPU with a single MPI rank. When
+running with multiple MPI ranks, you may see segmentation faults without
+CUDA-aware MPI support. These can be avoided by adding the flags "-pk
+kokkos cuda/aware off"_Run_options.html to the LAMMPS command line or by
+using the command "package kokkos cuda/aware off"_package.html in the
+input file.
 
 [Building LAMMPS with the KOKKOS package:]
 
@@ -111,10 +110,10 @@ Makefile.kokkos_mpi_only) will give better performance than the OpenMP
 back end (i.e. Makefile.kokkos_omp) because some of the overhead to make
 the code thread-safe is removed.
 
-NOTE: Use the "-pk kokkos" "command-line switch"_Run_options.html to 
-change the default "package kokkos"_package.html options. See its doc 
-page for details and default settings. Experimenting with its options 
-can provide a speed-up for specific calculations. For example: 
+NOTE: Use the "-pk kokkos" "command-line switch"_Run_options.html to
+change the default "package kokkos"_package.html options. See its doc
+page for details and default settings. Experimenting with its options
+can provide a speed-up for specific calculations. For example:
 
 mpirun -np 16 lmp_kokkos_mpi_only -k on -sf kk -pk kokkos newton on neigh half comm no -in in.lj       # Newton on, Half neighbor list, non-threaded comm :pre
 
@@ -184,15 +183,15 @@ tasks/node. The "-k on t Nt" command-line switch sets the number of
 threads/task as Nt. The product of these two values should be N, i.e.
 256 or 264.
 
-NOTE: The default for the "package kokkos"_package.html command when 
-running on KNL is to use "half" neighbor lists and set the Newton flag 
-to "on" for both pairwise and bonded interactions. This will typically 
-be best for many-body potentials. For simpler pair-wise potentials, it 
-may be faster to use a "full" neighbor list with Newton flag to "off". 
-Use the "-pk kokkos" "command-line switch"_Run_options.html to change 
-the default "package kokkos"_package.html options. See its doc page for 
-details and default settings. Experimenting with its options can provide 
-a speed-up for specific calculations. For example: 
+NOTE: The default for the "package kokkos"_package.html command when
+running on KNL is to use "half" neighbor lists and set the Newton flag
+to "on" for both pairwise and bonded interactions. This will typically
+be best for many-body potentials. For simpler pair-wise potentials, it
+may be faster to use a "full" neighbor list with Newton flag to "off".
+Use the "-pk kokkos" "command-line switch"_Run_options.html to change
+the default "package kokkos"_package.html options. See its doc page for
+details and default settings. Experimenting with its options can provide
+a speed-up for specific calculations. For example:
 
 mpirun -np 64 lmp_kokkos_phi -k on t 4 -sf kk -pk kokkos comm host -in in.reax      #  Newton on, half neighbor list, threaded comm
 mpirun -np 64 lmp_kokkos_phi -k on t 4 -sf kk -pk kokkos newton off neigh full comm no -in in.lj      # Newton off, full neighbor list, non-threaded comm :pre
@@ -207,20 +206,19 @@ supports.
 
 [Running on GPUs:]
 
-Use the "-k" "command-line switch"_Run_options.html to specify the 
-number of GPUs per node. Typically the -np setting of the mpirun command 
-should set the number of MPI tasks/node to be equal to the number of 
-physical GPUs on the node. You can assign multiple MPI tasks to the same 
-GPU with the KOKKOS package, but this is usually only faster if some 
-portions of the input script have not been ported to use Kokkos. In this 
-case, also packing/unpacking communication buffers on the host may give 
-speedup (see the KOKKOS "package"_package.html command). Using CUDA MPS 
+Use the "-k" "command-line switch"_Run_options.html to specify the
+number of GPUs per node. Typically the -np setting of the mpirun command
+should set the number of MPI tasks/node to be equal to the number of
+physical GPUs on the node. You can assign multiple MPI tasks to the same
+GPU with the KOKKOS package, but this is usually only faster if some
+portions of the input script have not been ported to use Kokkos. In this
+case, also packing/unpacking communication buffers on the host may give
+speedup (see the KOKKOS "package"_package.html command). Using CUDA MPS
 is recommended in this scenario.
 
-Using a CUDA-aware MPI library with 
-support for GPU-direct is highly recommended. GPU-direct use can be 
-avoided by using "-pk kokkos gpu/direct no"_package.html. As above for 
-multi-core CPUs (and no GPU), if N is the number of physical cores/node, 
+Using a CUDA-aware MPI library is highly recommended. CUDA-aware MPI use can be
+avoided by using "-pk kokkos cuda/aware no"_package.html. As above for
+multi-core CPUs (and no GPU), if N is the number of physical cores/node,
 then the number of MPI tasks/node should not exceed N.
 
 -k on g Ng :pre
@@ -231,18 +229,18 @@ one or more nodes, each with two GPUs:
 mpirun -np 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -in in.lj          # 1 node,   2 MPI tasks/node, 2 GPUs/node
 mpirun -np 32 -ppn 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -in in.lj  # 16 nodes, 2 MPI tasks/node, 2 GPUs/node (32 GPUs total) :pre
 
-NOTE: The default for the "package kokkos"_package.html command when 
-running on GPUs is to use "full" neighbor lists and set the Newton flag 
-to "off" for both pairwise and bonded interactions, along with threaded 
-communication. When running on Maxwell or Kepler GPUs, this will 
-typically be best. For Pascal GPUs, using "half" neighbor lists and 
-setting the Newton flag to "on" may be faster. For many pair styles, 
-setting the neighbor binsize equal to twice the CPU default value will 
-give speedup, which is the default when running on GPUs. Use the "-pk 
-kokkos" "command-line switch"_Run_options.html to change the default 
-"package kokkos"_package.html options. See its doc page for details and 
-default settings. Experimenting with its options can provide a speed-up 
-for specific calculations. For example: 
+NOTE: The default for the "package kokkos"_package.html command when
+running on GPUs is to use "full" neighbor lists and set the Newton flag
+to "off" for both pairwise and bonded interactions, along with threaded
+communication. When running on Maxwell or Kepler GPUs, this will
+typically be best. For Pascal GPUs, using "half" neighbor lists and
+setting the Newton flag to "on" may be faster. For many pair styles,
+setting the neighbor binsize equal to twice the CPU default value will
+give speedup, which is the default when running on GPUs. Use the "-pk
+kokkos" "command-line switch"_Run_options.html to change the default
+"package kokkos"_package.html options. See its doc page for details and
+default settings. Experimenting with its options can provide a speed-up
+for specific calculations. For example:
 
 mpirun -np 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -pk kokkos newton on neigh half binsize 2.8 -in in.lj      # Newton on, half neighbor list, set binsize = neighbor ghost cutoff :pre
 

doc/src/Tools.txt

@@ -76,9 +76,10 @@ Post-processing tools :h3
 "pymol_asphere"_#pymol,
 "python"_#pythontools,
 "reax"_#reax_tool,
+"replica"_#replica,
 "smd"_#smd,
 "spin"_#spin,
-"xmgrace"_#xmgrace :tb(c=6,ea=c,a=l)
+"xmgrace"_#xmgrace :tb(c=6,ea=c,a=l) 
 
 Miscellaneous tools :h3
 
@@ -86,6 +87,7 @@ Miscellaneous tools :h3
 "emacs"_#emacs,
 "i-pi"_#ipi,
 "kate"_#kate,
+"singularity"_#singularity_tool,
 "vim"_#vim :tb(c=5,ea=c,a=l)
 
 :line
@@ -485,6 +487,21 @@ README for more info on Pizza.py and how to use these scripts.
 
 :line
 
+replica tool :h4,link(replica)
+
+The tools/replica directory contains the reorder_remd_traj python script which
+can be used to reorder the replica trajectories (resulting from the use of the 
+temper command) according to temperature. This will produce discontinuous
+trajectories with all frames at the same temperature in each trajectory.
+Additional options can be used to calculate the canonical configurational
+log-weight for each frame at each temperature using the pymbar package. See
+the README.md file for further details. Try out the peptide example provided.
+
+This tool was written by (and is maintained by) Tanmoy Sanyal, 
+while at the Shell lab at UC Santa Barbara. (tanmoy dot 7989 at gmail.com) 
+
+:line
+
 reax tool :h4,link(reax_tool)
 
 The reax sub-directory contains stand-alone codes that can
@@ -515,17 +532,26 @@ Ernst Mach Institute in Germany (georg.ganzenmueller at emi.fhg.de).
 spin tool :h4,link(spin)
 
 The spin sub-directory contains a C file interpolate.c which can
-be compiled and used to perform a cubic polynomial interpolation of 
+be compiled and used to perform a cubic polynomial interpolation of
 the MEP following a GNEB calculation.
 
 See the README file in tools/spin/interpolate_gneb for more details.
 
 This tool was written by the SPIN package author, Julien
-Tranchida at Sandia National Labs (jtranch at sandia.gov, and by Aleksei 
+Tranchida at Sandia National Labs (jtranch at sandia.gov, and by Aleksei
 Ivanov, at University of Iceland (ali5 at hi.is).
 
 :line
 
+singularity tool :h4,link(singularity_tool)
+
+The singularity sub-directory contains container definitions files
+that can be used to build container images for building and testing
+LAMMPS on specific OS variants using the "Singularity"_https://sylabs.io
+container software. Contributions for additional variants are welcome.
+
+:line
+
 vim tool :h4,link(vim)
 
 The files in the tools/vim directory are add-ons to the VIM editor
@@ -549,3 +575,4 @@ simulation.
 See the README file for details.
 
 These files were provided by Vikas Varshney (vv0210 at gmail.com)
+