Compare commits

...

2856 Commits

Author SHA1 Message Date
f6c76e04b8 patch 16Mar18 2018-03-19 08:26:58 -06:00
3befd4b603 Merge pull request #843 from akohlmey/whitespace-cleanup
Whitespace cleanup for stable release
2018-03-16 14:44:30 -06:00
e9ac8ba01e cleanup embedded or trailing tabs 2018-03-16 13:21:54 -04:00
59dbb49cf9 remove trailing whitespace 2018-03-16 12:37:27 -04:00
ee862d8bf5 replace leading tabs 2018-03-16 12:34:33 -04:00
fc3de22c17 Merge pull request #841 from stanmoore1/compiler_warnings
Fix compiler warnings
2018-03-16 09:26:59 -06:00
ab914a9220 Merge pull request #840 from akohlmey/collected-small-fixes
Collected small fixes for stable release
2018-03-16 09:25:59 -06:00
7c300eebd5 Merge pull request #837 from akohlmey/reaxff-bugfix-from-scm
reaxff corrected bond order bugfix
2018-03-16 09:25:38 -06:00
94a923191a more whitespace cleanup 2018-03-15 22:02:02 -04:00
7d2ada9d80 whitespace cleanup 2018-03-15 21:57:45 -04:00
15a9600569 Fix compiler warnings 2018-03-14 13:27:03 -06:00
d62534665f correct potential out-of-bounds memory access 2018-03-14 12:11:58 -04:00
d00908ea3e whitespace cleanup 2018-03-13 23:02:55 -04:00
6965307250 print warning when "compress yes" is ignored with delete_atoms 2018-03-13 22:58:39 -04:00
d9c6278844 Merge pull request #838 from zozo123/replaced-strcmpi-with-strncmpi-to-limit-number-of-chars-compared
Tools/Matlab: Allow to read LAMMPS output fields
2018-03-12 16:39:35 -06:00
821b18641d kokkos version of reaxff corrected bond order bugfix from Tomáš Trnka trnka@scm.com posted on lammps-users 2018-03-12 16:58:03 -04:00
ce4ffe5933 Merge pull request #833 from stanmoore1/kk_update_2.6
Update Kokkos library to v2.6.00
2018-03-12 13:51:33 -06:00
9c3296aad2 Tools/Matlab: Allow to read LAMPPS output field
Some output fields have attributes attached on the same
line. e.g. "ITEM: BOX BOUNDS pp pp pp". This patch replaced all
the strcmpi to strncmpi in order to limit the number of character
compared with LAMPPS outputs.

Signed-off-by: Yossi Eliaz <eliaz123@gmail.com>
2018-03-12 13:45:13 -05:00
b2c8c40204 reaxff corrected bond order bugfix from Tomáš Trnka trnka@scm.com posted on lammps-users 2018-03-12 12:15:37 -04:00
25c46593ee protect OpenMP header include with ifdefs 2018-03-12 11:56:54 -04:00
35abbab966 Merge pull request #835 from junghans/fix_python
lammps.py: inconsistent use of tabs and spaces in indentation
2018-03-09 08:42:15 -07:00
d358e886c5 Merge pull request #834 from akohlmey/new-reax-logs
provide new reference outputs for various reaxff examples
2018-03-09 08:41:44 -07:00
62d446668c lammps.py: inconsistent use of tabs and spaces in indentation 2018-03-08 16:23:44 -07:00
fcfbdb13ab provide new reference outputs for various reaxff examples 2018-03-08 18:10:28 -05:00
39786b1740 Update Kokkos library to r2.6.00 2018-03-08 10:57:08 -07:00
0c4c002f34 patch 8Mar18 2018-03-08 08:19:46 -07:00
bad1cdde78 Merge pull request #831 from lammps/mpi4py-version
allow for mpi4py version 2 or 3 in Python wrapper
2018-03-07 14:01:22 -07:00
626ca25d05 Merge pull request #830 from akohlmey/more-fixes-for-stable
More small fixes for stable release
2018-03-07 14:00:32 -07:00
a1bb877d55 correct commented out MPI examples 2018-03-07 11:17:03 -05:00
63c0a35fab remove code that has no effect 2018-03-07 11:12:08 -05:00
812572ea97 update dependencies for colvars library 2018-03-07 10:57:56 -05:00
f91c36878c remove dead code 2018-03-07 10:57:07 -05:00
fd1edaf04f allow for mpi4py version 2 or 3 in Python wrapper 2018-03-07 08:52:46 -07:00
47e2ca6eb2 apply bugfix to reaxff taper function as described in issue #828 2018-03-07 09:52:14 -05:00
8d6fbd9829 Merge pull request #829 from lammps/restartinfo
add restartinfo=0 to manbody file it was missing from
2018-03-06 15:17:05 -07:00
070e85b44b add restartinfo=0 to manbody file it was missing from 2018-03-06 12:45:40 -07:00
3e535633e6 Merge pull request #827 from akohlmey/fixes-for-stable
Fixes for stable release
2018-03-06 12:33:33 -07:00
64779eb576 documentation update for MEAM to clarify the I,J,K indices in the MEAM parameter file 2018-03-06 13:21:34 -05:00
1ca928b331 dead code removal 2018-03-05 20:33:19 -05:00
a1bdea1dd8 avoid division by zero for pair styles meam and meam/c 2018-03-05 14:03:10 -05:00
45555b017d Merge pull request #728 from danicholson/cluster-fragment-aggregate-fixes
Cluster/fragment/aggregate bugfixes
2018-03-02 15:52:26 -07:00
54f58faab5 Merge pull request #822 from andeplane/gcmc_mpi_error
Added error if gcmc is used with molecules on more than one processor
2018-03-02 14:41:03 -07:00
22b6764304 Merge pull request #819 from stanmoore1/package_installed
Add make package-installed command
2018-03-02 14:40:36 -07:00
39a09d3a54 Merge pull request #814 from stanmoore1/kk_snap_workaround
Workaround issue in pair_snap_kokkos
2018-03-02 14:40:20 -07:00
812a45451a Merge pull request #816 from giacomofiorin/colvars-update-2018-02-23
Collected fixes and updates to Colvars library
2018-03-02 13:15:56 -07:00
0666607ceb Merge pull request #815 from akohlmey/collected-small-fixes
Collected small cleanups, fixes, and enhancements
2018-03-02 13:15:35 -07:00
d18ba3b188 Added error if gcmc is used with molecules on more than one processor 2018-03-02 11:23:34 -08:00
b1d3b56a17 apply bugfix reported in issue #820 2018-03-02 04:33:13 -05:00
8d0fdb17a6 Add make package-installed command 2018-03-01 10:39:06 -07:00
eadac15466 avoid multiple calls to delete [] on the same pointer.
thanks to @ExHP for pointing out this issue
2018-02-28 14:02:16 +01:00
58e01a9eee plug memory leak in pair style lj/class2/coul/long with coulomb tables 2018-02-25 14:03:07 +01:00
5fb2979da7 allow dynamic groups for some standard walls interacting with point particles 2018-02-24 13:50:42 -05:00
948f4783aa ring communication *is* called with outbut set to NULL, so don't error out on that. 2018-02-24 17:17:45 +01:00
fb6e7e8aea add sanity checks for ring communication
we do not call memcpy() unless nbytes != 0 and source/target pointer is not NULL
we error out on illegal combinations of nbytes and inbuf/outbuf
2018-02-24 16:41:10 +01:00
bba4bd1489 support offsets for molecule IDs (if available) in read_data similar to atomIDs
suggested by felipe perez in https://sourceforge.net/p/lammps/mailman/message/36236631/
2018-02-23 18:02:05 -05:00
4a875dc67d Workaround for compiler bug in gcc v4.9.3, manifest in KOKKOS SNAP 2018-02-23 09:01:34 -07:00
f3cf407a21 Collected fixes and updates to Colvars library
This commit includes several fixes to moving restraints; also added is support
for runtime integration of 2D and 3D PMFs from ABF.

Mostly changes to existing member functions, with few additions in classes not
directly accessible by LAMMPS.  Also removed are calls to std::pow(), replaced
by a copy of MathSpecial::powint().

Relevant commits in Colvars repository:

7307b5c 2017-12-14 Doc improvements [Giacomo Fiorin]
7f86f37 2017-12-14 Allow K-changing restraints computing accumulated work; fix staged-k TI estimator [Giacomo Fiorin]
7c1c175 2017-12-14 Fix 1D ABF trying to do pABF [Jérôme Hénin]
b94aa7e 2017-11-16 Unify PMF output for 1D, 2D and 3D in ABF [Jérôme Hénin]
771a88f 2017-11-15 Poisson integration for all BC in 2d and 3d [Jérôme Hénin]
6af4d60 2017-12-01 Print message when issuing cv delete in VMD [Giacomo Fiorin]
4413972 2017-11-30 Check for homogeneous colvar to set it periodic [Jérôme Hénin]
95fe4b2 2017-11-06 Allow abf_integrate to start in bin with 1 sample [Jérôme Hénin]
06eea27 2017-10-23 Shorten a few constructs by using the power function [Giacomo Fiorin]
3165dfb 2017-10-20 Move includes of colvarproxy.h from headers to files [Giacomo Fiorin]
32a867b 2017-10-20 Add optimized powint function from LAMMPS headers [Giacomo Fiorin]
3ad070a 2017-10-20 Remove some unused includes, isolate calls to std::pow() [Giacomo Fiorin]
0aaf540 2017-10-20 Replace all calls to std::pow() where the exponent is not an integer [Giacomo Fiorin]
2018-02-23 08:34:53 -05:00
0003bb6766 merge capture regions, so the library interface code can compiled with exceptions 2018-02-23 14:20:39 +01:00
523978b4c7 dead code and uninitialized variables detected by clang 2018-02-23 12:04:15 +01:00
939b1b2d05 Workaround issue in pair_snap_kokkos_impl 2018-02-22 14:27:23 -07:00
77efd3dfb3 Merge pull request #813 from akohlmey/correct-neighbor-build
Make default argument for virtual method Neighbor::build() explicit
2018-02-22 08:48:06 -07:00
feb9f29fad Merge pull request #812 from akohlmey/correct-integrate-setup
Make default argument for pure method Integrate::setup() explicit
2018-02-22 08:47:45 -07:00
bfdf464ee3 patch 22Feb18 2018-02-22 08:46:03 -07:00
99d5957a01 make default argument of virtual function Neighbor::build() explicit 2018-02-22 08:42:36 -05:00
65acd233ce forgot to remove one default argument on a method derived from Integrate::setup() 2018-02-22 08:13:54 -05:00
cf3887c5e0 default arguments on polymorph/pure methods can lead to unexpected overloading in derived classes
argument for Integrate::setup() made explicit
2018-02-22 07:53:58 -05:00
e1d1c87656 Merge pull request #811 from akohlmey/check-latte-version
Tiny update to fix latte for checking library version
2018-02-21 10:54:58 -07:00
bcef43c7d1 add code to check the ABI version of the LATTE library 2018-02-21 12:11:02 -05:00
aa1503b7e0 Merge pull request #800 from athomps/fix_gcmc_segfault_fix
Added warning to discourage use of group all and fixed some segfault …
2018-02-21 09:50:22 -07:00
d9d072df65 Merge pull request #809 from Jc11235/fix_neb_old_tangent_implementation
added old tangent to fix_neb for AGNI potential
2018-02-21 09:49:39 -07:00
a3cd600052 Merge pull request #786 from jrgissing/per_atom_prop_group
per-atom property dynamic group
2018-02-21 09:48:49 -07:00
53fb7f4015 Merge pull request #810 from lammps/latte-error2
2nd try on LATTE error returns, plus a couple minor doc edits
2018-02-21 09:47:17 -07:00
a672874186 Update comment
Clarify the comment as to why this else branch was added and what this represents.
2018-02-21 10:04:13 +01:00
911529ab24 correct typo 2018-02-21 08:43:33 +01:00
a5a47899a3 make XDR support for dump style xtc compile on MacOSX 2018-02-20 22:10:21 +01:00
c399b75dec 2nd try on LATTE error returns, plus a couple minor doc edits 2018-02-20 12:52:12 -07:00
9cf99ef479 Merge pull request #806 from vishalkenchan/new_pair_lj_cut_coul_wolf
Lennard-Jones with Coulomb interactions accounted through Wolf sum
2018-02-20 11:55:37 -07:00
54740a0668 Merge pull request #804 from akohlmey/collected-small-changes
Collected small changes for next patch release
2018-02-20 11:54:24 -07:00
9f7b837f34 replace non-ASCII character 2018-02-20 17:18:56 +01:00
a8a38216ae added old tangent to fix_neb for AGNI potential 2018-02-20 10:06:24 -05:00
54dc73c771 correctly compute adjusted box lengths for triclinic boxes. code taken from topotools 2018-02-19 14:06:26 +01:00
7bd089aa6d fix typo 2018-02-19 14:05:50 +01:00
7ec4a5818d add USER-OMP versions of lj/cut/coul/wolf 2018-02-18 16:38:50 +01:00
44285f818f more cleanup and respa code removal 2018-02-18 16:37:41 +01:00
98bcf51a45 there is no support for multi-cutoff r-RESPA in lj/cut/coul/wolf 2018-02-18 16:07:00 +01:00
65870843a5 fix typo in stride2() description in variable command docs reported by Jerome Guterl 2018-02-18 15:37:35 +01:00
c864e55adb Lennard-Jones potential with Coulomb interactions accounted through Wolf summations 2018-02-18 14:20:59 +01:00
c4ea2f2b34 update long-range coulomb message formatting, so it fits better into other kspace output 2018-02-16 14:24:33 +01:00
a641e40e79 use Error::message() instead of Error::warning() to report whether coulomb tables are used or not 2018-02-16 14:11:58 +01:00
3d12cff8a5 Merge branch 'patch-1' of https://github.com/evoyiatzis/lammps into collected-small-changes 2018-02-16 10:55:25 +01:00
b220b647d4 Update error.cpp
When compiling with g++ (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) an error occurs: 
error.cpp: In member function ‘void Error::generate_error(unsigned int, std::string, std::string)’:
error.cpp:146: error: ‘exit’ was not declared in this scope
The fix is to include the #include <cstdlib> where the exit() function is decleared in the error.cpp file
2018-02-16 10:49:08 +01:00
a30ede80a6 avoid triggering misformatting of manual overview table with txt2html 2018-02-15 12:12:19 +01:00
2c4287630d allow dynamics groups for fix nve/limit and fix temp/rescale 2018-02-15 05:17:15 -05:00
f8daea5f3e make dihedrals and impropers header output consistent with bonds and angles 2018-02-15 05:13:59 -05:00
2aa693c46c update authors list and packages from http://lammps.sandia.gov/authors.html 2018-02-15 05:06:54 -05:00
4210abfc79 bugifx for using compute chunk/atom with compress via rerun or right at the beginning of a run 2018-02-13 18:15:17 +01:00
69f813b22e fix up formatting of tutorials for PDF manual 2018-02-13 16:41:23 +01:00
b3693f891b different style of AtC page headers that works well with html and pdf 2018-02-13 16:40:50 +01:00
1a213363f1 add group style to create an empty group directly 2018-02-13 14:54:30 +01:00
63714c7079 remove PDF-only .txt file from Sphinx documentation processing 2018-02-13 13:10:20 +01:00
60f411d655 update manual content list for recent updates 2018-02-13 12:47:36 +01:00
7b551bb594 add a short command overview page for the PDF manual only 2018-02-13 12:47:05 +01:00
b0d8fb2170 promote header levels for better formatting in pdf manual 2018-02-13 12:43:56 +01:00
44faa8e9f5 insert new toplevel text into USER-ATC docs, change header levels. 2018-02-13 12:43:32 +01:00
3ceec36b84 improve format 2018-02-13 12:38:48 +01:00
f890cdfb9e correct formatting in fix atc docs 2018-02-13 11:44:07 +01:00
3a909e15ae remove non-functional doxygen generated navigation header from AtC doc files 2018-02-13 11:43:52 +01:00
fcf552ffe1 Merge branch 'patch-4' of https://github.com/abbatux/lammps into collected-small-changes 2018-02-13 09:51:02 +01:00
378c5071bf protect library interface from issuing lammps commands during run and minimize 2018-02-12 14:26:05 -05:00
776f588746 add support for UFM pair style support to OpenCL compilation makefile 2018-02-12 18:43:30 +01:00
b9eaf98702 avoid uninitialized memory access errors reports from valgrind with fix qeq 2018-02-11 17:09:06 +01:00
afd39eb9b8 correctly represent, that the molecule summary refers to the largest type number and not the number of types 2018-02-11 16:17:24 +01:00
6efeab0f3a avoid segfault when using a hash as map on an empty system 2018-02-10 20:40:02 +01:00
7e78738c73 patch 5Feb18 2018-02-09 14:26:21 -07:00
8a39ae8585 remove dead code 2018-02-09 17:32:42 +01:00
a6eb521468 strip off unwanted ^M characters 2018-02-09 17:32:32 +01:00
3528f9ca27 fix bugs in documentation and implementation of atom style mdpd 2018-02-09 15:19:01 +01:00
2e99e54e23 Merge branch 'patch-2' of https://github.com/amilumas/lammps into collected-small-changes 2018-02-09 14:44:11 +01:00
a0de2f27a5 avoid segfaults in USER-MESO by checking for required atom style flags 2018-02-08 19:15:09 +01:00
21fe88ffa8 remove dead code in various neighbor list related source files 2018-02-08 13:07:56 -05:00
b49806d36a correct the logic for checking if fix is right
previously had incorrect logic for checking if fix is acceptable
2018-02-07 16:35:49 -05:00
49745968f2 make link unambiguous so sphinx is not confused 2018-02-06 16:57:27 +01:00
f914da62e0 fix typo 2018-02-06 16:57:27 +01:00
669ae02a85 apply pattern to ignore OPT package sources 2018-02-06 16:57:27 +01:00
1d403b2aa3 Added warning to discourage use of group all and fixed some segfault cases 2018-02-05 13:29:14 -07:00
fa4c7fc664 Merge pull request #781 from wmbrownIntel/user-intel-2018u1p2
USER-INTEL: Adding missing backslash for two Makefiles using Intel co…
2018-02-02 14:51:23 -07:00
401bfc52e1 Merge pull request #798 from akohlmey/always-use-internal-xdr
Replace OS provided XDR support with bundled code
2018-02-02 14:47:40 -07:00
984fda5e78 Merge pull request #797 from akohlmey/multifile-restart-bugfix
Address bug in multifile restart writing with step number included
2018-02-02 14:47:09 -07:00
196b3c81ef Merge pull request #796 from akohlmey/create-bonds-sanity-check
Sanity check on created/read-in bonds/angles/dihedrals/impropers
2018-02-02 14:46:46 -07:00
f4a79b4d8e Merge pull request #794 from akohlmey/tersoff-fixes
Consistent checking of Tersoff potential parameters
2018-02-02 14:46:11 -07:00
7441b062e9 Merge pull request #792 from pastewka/18_dump_nc1
Dumping to multiple files failed with an error message complaining about a missing 'append yes' option.
2018-02-02 14:45:52 -07:00
10d80ba9c3 Merge pull request #791 from akohlmey/charmm-cmap-docs-reference
Update CMAP related docs and rebuild example input decks
2018-02-02 14:44:58 -07:00
5383035828 Merge pull request #787 from akohlmey/user-atc-dep
Make the USER-ATC package depend on MANYBODY
2018-02-02 14:44:36 -07:00
dc4dd1591f Merge pull request #785 from jrgissing/imp_dihed_print
modifications to correctly print modified dihedrals, impropers
2018-02-02 14:44:15 -07:00
e4a1826dee Merge pull request #783 from numericalfreedom/lammps-doxygen
Added double quotes to a word in Section_tools.txt file
2018-02-02 14:41:56 -07:00
160edc9532 Merge pull request #782 from hheenen/user-mofff-contribution
User mofff contribution
2018-02-02 14:41:28 -07:00
553b3ff69a Merge pull request #778 from athomps/fix_gcmc_segfault_fix
Fixed recent segfault in fix gcmc and added mcmoves keyword
2018-02-02 14:40:14 -07:00
2913d3da60 Merge pull request #777 from lammps/fix_prop_atom
Fix bug in FixPropertyAtom
2018-02-02 14:39:42 -07:00
4af14becb5 Merge pull request #710 from rpleite/add-pair-ufm
Add the UFM pair potential - (GPU/OPT/OMP)
2018-02-02 14:38:28 -07:00
85fdf9eaba make links to papers unique across files 2018-02-02 10:10:27 +01:00
2ff278defa fully integrate ufm into documentation 2018-02-02 10:02:44 +01:00
bfcb71a8be add package file to .gitignore 2018-02-02 09:27:09 +01:00
c3d1cee5f9 try to use OS-provided (and obsoleted) RPC headers for XDR. always use bundled code 2018-02-02 09:23:02 +01:00
3e0cb9b463 rename examples to match usual naming conventions and add reference output. 2018-02-01 18:56:10 +01:00
b70149e86a include added docpages in toctrees for sphinx 2018-02-01 18:50:25 +01:00
080ce422ae correct incorrect reference 2018-02-01 18:40:28 +01:00
cc54848f7b adapt to current manual conventions 2018-02-01 18:40:17 +01:00
090ce7cecb remove tab char 2018-02-01 18:19:37 +01:00
3bc1c6b59e Address bug in multifile restart writing with step number included 2018-02-01 14:25:55 +01:00
38715d7f85 do not allow illegal combination of atom IDs in data files for bonds/angles/dihedrals/impropers 2018-01-31 06:08:04 -05:00
54a3096278 do not allow single bond/angle/dihedral definitions with illegal atom ID combinations 2018-01-31 05:59:19 -05:00
17d98d0915 make checking for tersoff parameters consistent across all implementations 2018-01-30 04:53:57 -05:00
9cf4ac8b7c DOC: Added netcdf and netcdf/mpiio to dump style supporting atom attributes. 2018-01-28 14:24:28 +01:00
4e4fd5f07c BUG: Dumping to multiple files failed with an error message complaining about a missing 'append yes' option. 2018-01-28 14:23:05 +01:00
9fd1e47968 ignore generated/copied files 2018-01-28 06:24:03 -05:00
6753977837 recreate 1ac7 input deck with up to date tools and LAMMPS binary. 2018-01-28 06:23:09 -05:00
031812b2bf recreate 1gb1 input deck with CMAP included. 2018-01-28 06:22:03 -05:00
cf8dae5ef3 explain position of fix cmap command in input for data and restart files 2018-01-28 06:20:03 -05:00
ba68548e38 clarify ch2lmp commands purpose in tools section 2018-01-28 06:19:33 -05:00
448c9c8d8a add a dependency on PairEAM/MANYBODY for installing USER-ATC 2018-01-23 16:27:06 +01:00
13c08225ed per-atom property dynamic group 2018-01-23 00:16:51 -07:00
d2da49cdf9 modifications to correctly print modified dihedrals, impropers 2018-01-22 23:56:11 -07:00
e72faf3d7f Added double quotes to a word in Section_tools.txt file in order to activate
Sphinx hyperlink.
2018-01-21 20:55:04 +01:00
3f967e3d84 cmake: add USER-MOFFF 2018-01-21 08:10:38 -07:00
5212e95787 added src/USER-MOFFF/README 2018-01-21 13:34:02 +01:00
f7e2bf239f Added MOF-FF src, doc and example files 2018-01-21 11:40:48 +01:00
a802b750a6 USER-INTEL: Adding missing backslash for two Makefiles using Intel compiler. 2018-01-17 21:59:37 -08:00
9bb7f1ddf6 Fixed recent segfault in fix gcmc and added mcmoves keyword 2018-01-17 13:45:15 -07:00
5e9d257ec2 patch 17Jan18 2018-01-17 13:00:48 -07:00
415a55bc3e Fix bug in fix_property_atom 2018-01-17 10:41:56 -07:00
e1e6825eb2 Merge pull request #776 from numericalfreedom/lammps-tools-doxygen
Small character corrections to the file Developer.dox.lammps
2018-01-17 07:34:18 -07:00
88a2f9fcc6 Merge pull request #775 from wmbrownIntel/user-intel-2018u1
USER-INTEL: Adding compiler flag and small fix to tersoff/intel for 2…
2018-01-17 07:34:08 -07:00
480d7dd6ce Merge pull request #774 from lammps/neigh-tweak
small changes to recent PR to standardize with other npair styles
2018-01-17 07:33:46 -07:00
9b12984378 Small correction in image caption in Developer.dox.lammps 2018-01-17 14:46:44 +01:00
8d29f64236 Small character corrections to the file Developer.dox.lammps 2018-01-17 14:05:30 +01:00
1b91c0eab0 fix typo in docs resulting in broken link 2018-01-16 21:01:25 -05:00
0c8af0704e Tweak to npair_halffull_newtoff.cpp 2018-01-16 16:43:25 -07:00
f1901237be small changes to recent PR to standardize with other npair styles 2018-01-16 15:49:16 -07:00
0cd864134d Merge pull request #765 from stanmoore1/halffull_ghost
Add ghost option to npair_halffull
2018-01-16 15:39:07 -07:00
bf48f3e240 Merge pull request #758 from mkanski/ci-ReaxFF
Modification of ReaxFF
2018-01-16 13:04:20 -07:00
23dda3d51b Merge pull request #770 from numericalfreedom/lammps-tools-doxygen
Tools for LAMMPS documentation for developers with the "doxygen" documentation platform
2018-01-16 13:02:10 -07:00
5d254855eb Merge pull request #772 from akohlmey/improved-variable-error-reporting
More improved variable error reporting
2018-01-16 13:00:42 -07:00
9a70f2d182 Merge pull request #773 from lammps/couple-simple
update of COUPLE/simple examples
2018-01-16 12:59:51 -07:00
b95cf658c7 remove faulty line of code, left in by accident 2018-01-16 14:10:46 -05:00
709ce8a230 Merge branch 'neigh-identical-check' into couple-simple
# Conflicts:
#	src/create_bonds.cpp
#	src/delete_atoms.cpp
2018-01-16 14:09:21 -05:00
2ad823ffd4 correct check for identical requests 2018-01-16 14:08:18 -05:00
4c0cd5f1ad add short bond cutoff warning also to USER-OMP
This implements the warning about a total cutoff shorter than 2x bond cutoff also to the USER-OMP variant of reax/c
2018-01-16 13:50:49 -05:00
8d37c89cb6 different bug fix for create_bonds, delete_atoms neigh list issue 2018-01-16 11:32:37 -07:00
21ff4407ab update of COUPLE/simple examples 2018-01-16 10:48:38 -07:00
f2c0c4a7d1 Merge branch 'lammps-tools-doxygen' of https://github.com/numericalfreedom/lammps into lammps-tools-doxygen 2018-01-16 18:39:08 +01:00
1640066132 Merge remote-tracking branch 'lammps-origin/master' into lammps-tools-doxygen 2018-01-16 18:38:12 +01:00
3b1ec14a68 add a warning if the bonded cutoff is large
This should print a warning when 2x the bonded interaction cutoff list larger then other cutoffs, as was the setting before the performance optimization with the change in 2690075405
2018-01-16 12:01:47 -05:00
01cfb710ff propagate printing variable name with error deeper into the code
this now covers a large set of cases where the variable name can be printed.
it also is complete for the current code, since no more default arguments are required
2018-01-16 11:31:20 -05:00
3de39c70c1 print variable name with errors only for known variables.
this makes errors for "anonymous" evaluations (if statement, immediate variables) less confusing.
2018-01-16 11:29:48 -05:00
86ed55599d The bash shell script doxygen.sh has been revised. 2018-01-16 17:28:58 +01:00
e798cdf31f Merge pull request #771 from stanmoore1/reax_example
Add ReaxFF Example
2018-01-16 09:05:36 -07:00
97dd812647 Merge pull request #769 from rbberger/cmake_compilation_fixes
CMake compilation fixes
2018-01-16 09:04:04 -07:00
e07a6d1e34 Merge pull request #768 from akohlmey/collected-doc-fixes
collected documentation fixes
2018-01-16 09:03:45 -07:00
6e37272c9d Merge pull request #764 from akohlmey/improved-variable-error-reporting
Improved error messages when defining or evaluating variables
2018-01-16 09:02:20 -07:00
6bd6e62767 Merge pull request #763 from stanmoore1/kk_neighlist
Enhance Kokkos Neighbor lists
2018-01-16 09:01:15 -07:00
57dd6c78c1 Merge pull request #761 from stanmoore1/kk_snap
Kokkos version of Pair SNAP and ZBL
2018-01-16 09:00:52 -07:00
9e413bf57a Merge pull request #760 from akohlmey/info-coeffs
New "coeffs" keyword added to "info" command
2018-01-16 09:00:34 -07:00
b374813104 Add reax example 2018-01-16 08:50:30 -07:00
07ddb5e62c USER-INTEL: Adding compiler flag and small fix to tersoff/intel for 2018u1 compilers. 2018-01-15 23:54:48 -08:00
72b479d42e Add missing return value in pair_snap_kokkos 2018-01-15 11:01:07 -07:00
c8b5d83cc7 mention tool/doxygen folder in tools section and refer to README file 2018-01-15 10:43:30 -05:00
a5998179bf Fix issues with Kokkos skip lists 2018-01-15 08:23:39 -07:00
26d6f6d1f1 Tools for LAMMPS documentation with the "doxygen" documentation platform
are provided.

        New directory: tools/doxygen

        New file:      tools/doxygen/Developer.dox.lammps
        New file:      tools/doxygen/Doxyfile.lammps
        New file:      tools/doxygen/doxygen.sh
        New file:      tools/doxygen/README

The Developer.dox.lammps file contains a slightly revised version of the
Developer.pdf file adopted to the LAMMPS "doxygen" documentation.

The Doxyfile.lammps file is a first proposal for a LAMMPS "doxygen"
documentation flavor and can be adjusted to specific requirements.

The "doxygen.sh" shell script generates the LAMMPS "doxygen"
documentation.

Detailed instructions can be found in the README file.
2018-01-15 15:42:31 +01:00
f37f4f0041 support more cases where the variable name is reported on errors 2018-01-14 17:56:03 -05:00
d2983caad4 CMake: limit visibility of COLVARS lepton library headers 2018-01-14 18:01:19 +01:00
2b7c233791 Simplify change to CMake build for USER-COLVARS 2018-01-14 08:44:50 +01:00
9e35e76b8c Fix issues in Kokkos npair_halffull and npair_skip 2018-01-13 21:32:59 -07:00
7a78875911 Fix issues in Kokkos pair snap and zbl 2018-01-13 21:31:11 -07:00
1cfc3118cc CMake: remove BUILD_SHARED_LIBS requirement from PYTHON package 2018-01-13 22:17:23 +01:00
23e8fb0542 Update CMake build for USER-COLVARS 2018-01-13 21:57:24 +01:00
72eb2dab52 Add missing math.h header 2018-01-13 20:41:05 +01:00
f6075c9d2c One last tweak to npair_halffull_newtoff.cpp 2018-01-12 16:12:57 -07:00
24f1889b02 Only include ghosts for newton off, since this style exists as a standalone build, but the newton on method doesn't 2018-01-12 16:10:42 -07:00
dea8d592da Optimize npair_halffull styles; the number of i atoms, whether owned or ghost, must match between the child half list and parent full list 2018-01-12 15:51:54 -07:00
52d3e98f3b Fix issue in npair_skip_kokkos 2018-01-12 15:45:24 -07:00
6e3acce3be Relax restriction in neighbor.cpp 2018-01-12 15:44:11 -07:00
1ec54827d6 Add Kokkos halffull neighbor list capability 2018-01-12 15:41:59 -07:00
61ebf6265a address some formatting/markup issues reported by Nandor Tamaskovics 2018-01-12 12:50:02 -05:00
190cc78034 add dummy doc files for not-yet-implemented features 2018-01-12 12:29:03 -05:00
5863f115dd correctly escape 'a_ ' text, which is not a reference unlike 'a_b ' 2018-01-12 12:26:50 -05:00
75d259f5ee improve PDF reader compatibility for the created PDF file. 2018-01-12 12:00:53 -05:00
3b1b9a2cbf replace non-ASCII quotation marks with ASCII equivalent 2018-01-12 11:30:27 -05:00
17b6a4c3cd Added more permanent citation 2018-01-12 11:47:35 +01:00
1c10c78684 Add ghost option to npair_halffull 2018-01-11 15:15:04 -07:00
26917280be state name of the affected variable in error messages where possible 2018-01-11 15:01:08 -05:00
45674e6cd3 Add Kokkos skip list capability 2018-01-11 10:07:44 -07:00
22d2d1cdf3 Fix issue in pair_snap_kokkos memory_usage 2018-01-11 10:01:34 -07:00
0d7bee40ae Add newline at end of pair_snap_kokkos_impl.h 2018-01-11 09:41:37 -07:00
db1ed32a51 Fix minor issues in pair_snap_kokkos 2018-01-11 09:39:53 -07:00
d7d087ae67 Fix issue with peratom energy/virial in pair_snap_kokkos 2018-01-10 10:20:40 -07:00
92e2df74c1 Fix bug in Kokkos peratom energy/virial with newton on 2018-01-10 10:20:12 -07:00
92742c5373 Introduced the change in reax/c/omp 2018-01-10 18:00:22 +01:00
2047ae76e3 Move compute_bi outside of j-loop 2018-01-09 17:05:57 -07:00
4adbb882b3 Temper SNAP output 2018-01-09 17:05:34 -07:00
275c08453f Add Kokkos versions of pair_style snap and zbl 2018-01-09 17:03:49 -07:00
91107cc1f3 add a "coeffs" keyword to the info command for debugging "All XXX coeffs are not set" errors. 2018-01-09 12:47:33 -05:00
e26c170679 Added example and tabulated close-range correction 2018-01-09 15:08:08 +01:00
1bd9e175e9 Merge pull request #749 from akohlmey/collected-bugfixes-and-updates
Collected bugfixes and updates for the next patch release
2018-01-08 09:20:18 -07:00
9e9cfe5869 Merge pull request #754 from rbberger/cmake_kokkos_bugfix
CMake bugfixes for KOKKOS builds
2018-01-08 09:16:43 -07:00
85ff0c1e46 Merge pull request #750 from stanmoore1/kk_fences
Add Kokkos thread fences to comm pack/unpack routines
2018-01-08 09:16:16 -07:00
cc9b6118b8 Merge pull request #748 from stanmoore1/kk_docs
Update Kokkos docs
2018-01-08 09:15:36 -07:00
09bed0c09a Merge pull request #747 from stanmoore1/kk_reax_hist
Fix broken charge history in fix qeq/reax/kk
2018-01-08 09:15:21 -07:00
1b51efd6b8 Merge pull request #744 from akohlmey/doc-update
Documentation build updates
2018-01-08 09:15:02 -07:00
8888b05b18 Merge pull request #742 from rbberger/fix_python_move
Fix python/move
2018-01-08 09:14:36 -07:00
3bb8294f31 Merge pull request #718 from timattox/USER-DPD_es_RNG
USER-DPD: External State RNG
2018-01-08 09:13:11 -07:00
450c689ae9 Merge pull request #725 from stanmoore1/kk_update
Update the Kokkos library in LAMMPS to v2.5.00
2018-01-08 09:12:51 -07:00
a5d401e164 Fixed header for the force field file 2018-01-08 14:46:32 +01:00
b96100c0b7 Fixed header for the force field file 2018-01-08 14:42:43 +01:00
2690075405 Performance increase for charge-implicit ReaxFF/changed cutoff selection 2018-01-08 14:38:24 +01:00
f77483e437 adapt #include statements to current LAMMPS conventions 2018-01-06 19:44:07 -05:00
11cddd8798 explicitly include math.h 2018-01-06 19:42:40 -05:00
09ca7b32fc Revert "no need to include library.o in the LAMMPS executable"
This reverts commit 4a3a6b4455.
As it turns out, when using the LAMMPS python wrapper from inside
code using the PYTHON package, the library symbols *are* needed.
Thanks for Richard Berger (@rbberger) for pointing this out.
2018-01-06 19:47:33 +01:00
3af389e6cf Revert "no need to include library.o in the LAMMPS executable"
This reverts commit 4a3a6b4455.
As it turns out, when using the LAMMPS python wrapper from inside
code using the PYTHON package, the library symbols *are* needed.
Thanks for Richard Berger (@rbberger) for pointing this out.
2018-01-06 12:58:17 -05:00
46217db8a5 make python functions examples more complete by adding exception handling and initializing variables 2018-01-06 12:56:42 -05:00
d6d7dde653 Add error output if python evaluation failed 2018-01-06 18:54:55 +01:00
6070182f06 correctly account for individually added bonds, angles, and dihedrals 2018-01-06 11:03:48 -05:00
6c058fb56c avoid division by zero in ewald for empty and uncharged systems. require kspace_modify gewald 2018-01-05 20:14:25 -05:00
91993b236d avoid division by zero in PPPM for empty and uncharged systems. require kspace_modify gewald 2018-01-05 19:52:51 -05:00
5ecc3ce366 avoid division by zero when trying to run PPPM on a system without atoms 2018-01-04 20:44:40 -05:00
75f1a4f3f0 use filelink.o consistently, since filelink does not work with some compilers, e.g. nvcc 2018-01-04 20:43:53 -05:00
ffc74fca6c Merge branch 'fix_property_atom_doc_update' of https://github.com/Pakketeretet2/lammps into collected-bugfixes-and-updates
this closes PR #755
2018-01-04 19:46:31 -05:00
2896df2140 avoid that occasional neighbor lists requested from commands linger around for too long and thus cause segementation faults 2018-01-04 17:16:31 -05:00
c333401e72 Use bold font instead of underscores for emphasis. 2017-12-25 13:27:14 +01:00
a9e9a2046b Fixes/clarifies the fix_property_atom docs. 2017-12-25 13:03:18 +01:00
d4f45f4f85 correct set command example in fix property/atom 2017-12-24 17:45:58 -05:00
7d07baa8ad Better load balance fix_qeq_reax_kokkos for half neigh list 2017-12-21 11:07:51 -07:00
b9184ef441 Add special KOKKOS styles individually
This avoids unnecessary dependencies
2017-12-20 04:51:46 -05:00
ff2b61354d Bugfix for building LAMMPS+KOKKOS+DPD with CMake
Resolves issue #753, but there might be more work ahead.
2017-12-20 03:17:40 -05:00
18acc6ae47 remove some dead code 2017-12-19 15:01:11 -05:00
56e633a2cf error out on trying to compile USER-INTEL with -DLAMMPS_BIGBIG 2017-12-19 14:54:35 -05:00
798d68c607 Edits to accelerate_kokkos.txt 2017-12-18 14:50:33 -07:00
46fe0a968b Fix compiler warnings in atom_vec_hybrid_kokkos 2017-12-18 14:09:39 -07:00
00a9672524 Fix issue in fix_qeq_reax_kokkos, can't call child function from base constructor 2017-12-18 13:58:37 -07:00
a2756db66b Update to Kokkos library v2.5.00 2017-12-15 16:42:06 -07:00
da83feb8ca Merge branch 'master' into kk_update 2017-12-15 16:36:21 -07:00
a7bc3ed391 Add missing fences in comm_kokkos 2017-12-15 13:30:17 -07:00
68cf6941e1 Add Kokkos thread fences to pack/unpack routines 2017-12-15 13:01:38 -07:00
73c55ac4d1 Fix up docs after renaming 2017-12-15 14:06:16 -05:00
2a131d1416 Merge remote-tracking branch 'upstream/master' into fix_python_move 2017-12-15 13:56:54 -05:00
bcc5f49d0b Rename fix python to fix python/invoke 2017-12-15 13:53:04 -05:00
950bfb84a9 Clean up after renaming back to fix python/move 2017-12-15 13:27:27 -05:00
4d725c3153 Revert "Rename fix python/move to move/python"
This reverts commit 4d915dba08.
2017-12-15 13:17:12 -05:00
10fa54b2fd correct error messages. the atom style is called "smd" not "tlsph" 2017-12-13 18:44:31 -05:00
8a36cdc6bc correct velocity output for write_data of atom style smd 2017-12-13 18:42:24 -05:00
e5cd068cd5 Merge branch 'patch-3' of https://github.com/abbatux/lammps into collected-bugfixes-and-updates
This closes #745
2017-12-13 17:41:00 -05:00
cec22dda92 change pair style airebo/intel to compile with -DLAMMPS_BIGBIG 2017-12-13 16:20:49 -05:00
9a71efc5d5 fix neb bugfix from Emile Maras
NEB was not working fine when using multiple proc
per replica and the keywords last/efirst or last/efirst/middle

I have corrected this in the enclosed fix_neb.cpp

I also slightly modified the nudging for this free end so that
it would be applied only when the target energy is larger than
the energy. Anyway if the target energy is lower than the energy,
the replica should relax toward the target energy without adding
any nudging.

I also modified the documentation according to this change.
2017-12-13 15:19:46 -05:00
2f857c6eda correct fix neigh/history/omp to properly support -DLAMMPS_BIGBIG compilation 2017-12-13 15:12:14 -05:00
8a93f63de9 Update Kokkos docs 2017-12-13 10:05:53 -07:00
193252275f A few more tweaks to charge history in fix_qeq_reax_kokkos 2017-12-12 09:54:28 -07:00
5968850306 Fix broken charge history in fix_qeq_reax_kokkos 2017-12-12 09:20:09 -07:00
3291a4fe96 Revert "no need to include library.o in the LAMMPS executable"
This reverts commit 4a3a6b4455.
As it turns out, when using the LAMMPS python wrapper from inside
code using the PYTHON package, the library symbols *are* needed.
Thanks for Richard Berger (@rbberger) for pointing this out.
2017-12-11 08:08:49 -05:00
1b07a4edee Fix memory leak in pair python 2017-12-10 17:14:08 -05:00
16d6dfcab6 Bugfix for effective plastic strain rate calc 2017-12-08 11:40:44 +11:00
0edad83b25 Update atom_vec_smd.cpp 2017-12-08 11:29:12 +11:00
81a1c007ed correct file name for doc file 2017-12-07 16:39:41 -05:00
0b51e9b2ff add documentation for fix move/python 2017-12-07 16:36:36 -05:00
4b1bcaa1ae fix speelink in documentation files 2017-12-07 16:01:02 -05:00
ed8680d695 suspend support for sphinxcontrib.images
the sphinxcontrib.image extension was broken with sphinx 16.x.
however, sphinx 15.x breaks with newer version of the multiprocessor module.
so we suspend the thumbnail processing and lift the lock to sphinx 15.x

also, the number of parallel sphinx tasks is can be overridden with SPHINXEXTRA="-j #'.
default is to try use all local CPU cores.
2017-12-07 15:38:15 -05:00
29df5a536f Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_es_RNG 2017-12-07 10:57:01 -07:00
d029cb9002 Merge pull request #743 from stanmoore1/kk_yukawa_fix
Fix compile error in pair_yukawa_kokkos
2017-12-07 10:31:04 -07:00
3e99d1a83a Add pair yukawa/kk to Section_commands 2017-12-07 09:06:33 -07:00
c4e83be533 Fix compile error in pair_yukawa_kokkos 2017-12-07 08:42:17 -07:00
d7e5d60f90 Merge pull request #738 from rbberger/pylammps_thermo_style_fix
PyLammps bugfix to support custom thermo output with vector element addressing
2017-12-07 08:25:01 -07:00
5179efd2bb Merge pull request #741 from stanmoore1/kk_compile
Reduce Kokkos compile dependencies
2017-12-07 08:24:22 -07:00
abb2fe5be7 Merge pull request #740 from stanmoore1/improve_reax
Improve ReaxFF
2017-12-07 08:23:47 -07:00
bae45e2493 Merge pull request #737 from akohlmey/collected-bugfixes
Collected bugfixes and small updates for next patch
2017-12-07 08:23:06 -07:00
73d509f339 Merge pull request #735 from jaapkroe/extep
Add ExTeP pair style
2017-12-07 08:22:34 -07:00
fa0c28b717 Merge pull request #731 from Pakketeretet2/pair-yukawa-kk
Added a KOKKOS-enabled Yukawa pair style.
2017-12-07 08:21:20 -07:00
bc3a84b480 Merge pull request #727 from lammps/fix-gcmc-examples
new example scripts for fix gcmc
2017-12-07 08:19:56 -07:00
4d915dba08 Rename fix python/move to move/python 2017-12-05 23:42:57 -05:00
f64544a5fe Move instantiation of MemoryKokkos class 2017-12-05 08:34:24 -07:00
fc742eb2ef Remove outdated elastic constants 2017-12-05 16:23:20 +01:00
1baecc689e Merge pull request #3 from stanmoore1/kk_yukawa
Add pair_yukawa_kokkos to Install.sh and minor cleanup.

These changes look fine. Sorry for the tabs, I must have forgotten about those.
2017-12-04 14:16:53 -05:00
d916416cc5 Add pair_yukawa_kokkos to Install.sh and minor cleanup 2017-12-04 12:02:32 -07:00
2813923f15 Add multiple inheritance to pair_multi_lucy_rx_kokkos 2017-12-04 10:43:41 -07:00
4a3a6b4455 no need to include library.o in the LAMMPS executable 2017-12-03 19:37:42 -05:00
f8891a4451 Rename fix python/integrate to python/move
This is to avoid confusion to what LAMMPS considers to be an
integrator like Verlet and RESPA.
2017-12-02 01:04:46 -05:00
51688b2504 Improve performance of Python integrator (NVE_Opt version)
Removing the loop over atoms by using NumPy array indexing allows to recover
performance close to that of plain fix nve.
2017-12-02 00:40:21 -05:00
93be2d264e Detect correct integer type in lammps python interface 2017-12-02 00:39:15 -05:00
b9fd1156b2 Completed first version of fix python/integrate
This includes an example of how to implement fix NVE in Python.

The library interface was extended to provide direct access to atom data using
numpy arrays. No data copies are made and numpy operations directly manipulate
memory of the native code.

To keep this numpy dependency optional, all functions are wrapped into the
lammps.numpy sub-object which is only loaded when accessed.
2017-12-02 00:39:15 -05:00
bbfe16782b Adjust .gitignore 2017-12-02 00:37:14 -05:00
1931d2088a Started FixPythonIntegrate 2017-12-02 00:37:14 -05:00
5d9a6c1fe2 Add checks to Kokkos Install.sh so that files aren't unnecessarily recompiled 2017-12-01 16:06:50 -07:00
e7f97728c3 disable disruptive debug output 2017-12-01 17:14:11 -05:00
58ed92d905 one more file that doesn't require to include accelerator_kokkos.h 2017-12-01 16:45:22 -05:00
14aa036f36 add missing header files to USER-INTEL package 2017-12-01 15:53:02 -05:00
42e03da70c Remove redundant #include in input.cpp 2017-12-01 13:16:35 -07:00
5d2e097b27 Need dynamic cast for multiple inheritance 2017-12-01 12:53:40 -07:00
da51a8a0bb Add missing header files to GPU package 2017-12-01 12:13:14 -07:00
80dffb27e2 Add missing header files 2017-12-01 11:33:42 -07:00
5b33f153f4 Add newline to memory_kokkos.h 2017-12-01 10:33:47 -07:00
31eb12920c Use multiple inheritance to remove accelerator_kokkos.h out of region.h and kspace.h 2017-12-01 10:18:22 -07:00
31f2ca1e4c Use multiple inheritance to remove accelerator_kokkos.h out of pair.h 2017-12-01 09:51:40 -07:00
15a3364c2c Make memory_kokkos its own class 2017-12-01 09:13:31 -07:00
c3aa705d04 Improve performance of pair_reaxc, this change is safe because the non-bonded i-loop doesn't include ghost atoms; this optimization is already included in the USER-OMP version 2017-11-30 09:22:32 -07:00
8c2d38c7e9 Remove non-existent function in reaxc_forces_omp 2017-11-30 09:13:03 -07:00
e3b961b622 Improve performance of PairReaxCKokkos 2017-11-30 09:10:39 -07:00
319508bd29 fix scoping ambiguity issue that confuses nvcc 2017-11-30 10:56:58 -05:00
6f7bd78ea2 Fixes issue #701
PyLammps now supports thermo_style entries such as c_msd[4]
2017-11-29 01:06:44 -05:00
5647522906 various small cosmetic adjustments to increase conformance with LAMMPS programming conventions 2017-11-28 12:34:23 -05:00
e4b14213b4 delete old log files. new log files are approved by @athomps 2017-11-28 11:35:49 -05:00
fa6fc947f2 fix issues in FixNeighHistory and FixNeighHistoryOMP reported in https://sourceforge.net/p/lammps/mailman/message/36138319/
This supersedes and closes PR #734
2017-11-28 11:28:15 -05:00
e1189381e0 correct documentation for create_atoms rotate
This closes #736
2017-11-28 11:19:19 -05:00
39d24ab7eb ExTeP potential file header update 2017-11-27 21:25:23 +01:00
5770a20e2c added ExTeP to USER-MISC 2017-11-27 21:16:51 +01:00
83ec9815fe Merge pull request #733 from pastewka/17_dump_nc3
BUG: Proper handling of bigint data in NetCDF dump style. Affects LAMMPS version compiled with LAMMPS_BIGBIG.
2017-11-27 11:07:58 -07:00
90ee52296b Merge remote-tracking branch 'andeplane/fix_ave_chunk_bug' into collected-bugfixes
this closes PR #732
2017-11-27 11:45:09 -05:00
f02eb225c6 Merge branch '17_dump_nc3' of github.com:pastewka/lammps into 17_dump_nc3 2017-11-26 22:39:03 +01:00
a111cf640a BUG: Proper handling of bigint data. Corrects behavior when compiled with LAMMPS_BIGBIG. 2017-11-26 22:35:56 +01:00
e755a8339d BUG: openfile is called multiple times, second call stopped code with 'at keyword requires use of append yes' 2017-11-26 22:31:47 +01:00
f7f6a15ac0 MAINT: Removed superfluous code. 2017-11-26 22:31:47 +01:00
36b7aa73aa MAINT: Use proper data type for bigint when defining NetCDF file. 2017-11-26 22:31:47 +01:00
9a5723123f Set peratom_freq in fix ave/chunk 2017-11-21 23:43:52 -08:00
7d07f062b6 Remove const from variable 2017-11-20 10:21:19 -07:00
f3ed148828 Fix for big endian machines 2017-11-20 10:18:53 -07:00
5ba80662c3 Undid the removal of rad in pair_yukawa. 2017-11-17 15:07:59 -05:00
53c1558271 Updated docs for pair_yukawa 2017-11-17 14:21:54 -05:00
8e5d4fa891 Added a KOKKOS-enabled Yukawa pair style. 2017-11-17 14:12:16 -05:00
e55c90cc44 Moved rerun bug fix to individual affected styles 2017-11-14 14:01:07 -05:00
ec067bde36 fix cut-n-paste error in create_bond docs 2017-11-13 17:59:16 -05:00
751465aad3 Merge branch 'master' into cluster-fragment-aggregate-fixes 2017-11-13 14:32:26 -05:00
adbc75cae6 add alternate log files with the latest version of LAMMPS 2017-11-13 11:52:01 -05:00
dde94c28a7 new example scripts for fix gcmc 2017-11-13 09:07:25 -07:00
f2dc764d1d Merge pull request #723 from lammps/replicate_bbox
Add bounding box to Replicate command
2017-11-13 09:01:38 -07:00
c4c59b909e Merge pull request #716 from akohlmey/collected-small-changes
Collected small changes and bugfixes for next patch
2017-11-13 09:00:26 -07:00
e2e21f0661 Merge pull request #714 from Pakketeretet2/user-manifold-plane-wiggle-fix
User manifold plane wiggle fix
2017-11-13 08:59:40 -07:00
6abf68f614 Merge pull request #712 from akohlmey/linalg-for-latte
Update lib/linalg for use with lib/latte
2017-11-13 08:59:18 -07:00
a97553a92e Merge pull request #709 from abbatux/patch-1
Update pair_smd_tlsph.cpp
2017-11-13 08:58:29 -07:00
dbd4acc4d6 Merge pull request #708 from abbatux/patch-2
Update smd_material_models.cpp
2017-11-13 08:58:07 -07:00
a085ee0c55 Always build occasional lists on first step 2017-11-13 04:53:16 -05:00
c16b7a3273 Multiple run fix for cluster/aggregate computes 2017-11-12 15:57:53 -05:00
858065029d Reverse communication compute fragment/aggregate 2017-11-12 15:57:02 -05:00
40e776ebc6 Remove OpenMP from KOKKOS_DEVICES in Kokkos CUDA Makefiles since normally this doesn't improve performance 2017-11-10 09:55:11 -07:00
f043212511 USER-DPD: fix a segfault when using constant temperature (DPD vs. DPDE) 2017-11-07 13:57:29 -06:00
4342bcdafc Fix CUDA issue in USER-DPD/random_external_state.h 2017-11-07 09:17:58 -07:00
2e40c00995 add option to the print command to also print to the global universe screen and logfile 2017-11-07 10:00:57 -05:00
f39c6213e1 Change path to nvcc_wrapper 2017-11-06 13:50:16 -07:00
88474fc5c2 Remove Kokkos tpls directory 2017-11-06 13:48:26 -07:00
16b5315845 Update Kokkos to v2.04.11 2017-11-06 13:47:33 -07:00
e337db4059 Replicate bbox from Chris Knight 2017-11-06 11:31:43 -07:00
ba43465268 Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes 2017-11-06 13:30:08 -05:00
09c61ca598 correct listing of USER-OMP variants of fix rigid styles 2017-11-06 13:29:59 -05:00
0f971bf07c print name of unknown or incorrect variable in error message 2017-11-06 10:41:32 -05:00
5a8c5eb479 provide last input command line with error->one() output 2017-11-06 10:41:01 -05:00
aa0d6cd75b Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes 2017-11-04 02:49:28 -04:00
b34000a5e1 make *_gpu_reinit() functions consistent in returning void. correct prototypes in src/GPU, too.
this supersedes and closes #719
2017-11-04 02:49:22 -04:00
279339ebd0 Remove the now unused AIRct_ssa[] array from the NeighList class. 2017-11-03 13:42:36 -05:00
605fe53c07 USER-DPD: make the kokkos and non-kokkos fix_shardlow match more closely
This was accomplished with several key changes:
1) Modified fix_shardlow's control flow to match fix_shardlow_kokkos so
that random numbers are pulled fromn the RNGs in exactly the same order.

2) Created random_external_state.h, a simplified version of the Kokkos
random number generator that keeps its state variables external to itself.
Thus it can be used both with and without Kokkos enabled, as long as the
caller stores and passes in the required state variable.

3) Replaced all references to random_mars.h and Kokkos_Random.hpp code in
the fix_shardlow* files with calls to the random_external_state.h code,
guaranteeing that fix_shardlow* is using an identical RNG in all cases.

Result: most (56 of 61) of our internal tests now generate the same results
with kokkos turned on or off.  Four cases still differ due to what appear
to be vectorization caused rounding differences, and the fifth case
appears to be something triggered by the kokkos "atom_style hybrid" code.
2017-11-03 12:51:37 -05:00
65b77230fd added missing "dihedral" in compute dihedral/local docs 2017-11-02 15:04:04 -04:00
91e4bcca33 BUG: openfile is called multiple times, second call stopped code with 'at keyword requires use of append yes' 2017-11-01 21:28:14 +01:00
7ef17efe2e MAINT: Removed superfluous code. 2017-11-01 21:20:19 +01:00
8a804460f9 MAINT: Use proper data type for bigint when defining NetCDF file. 2017-11-01 21:19:55 +01:00
f6658d10b7 fix incorrect create_atoms example for selecting created atoms with a variable 2017-10-30 23:33:26 -04:00
f4d0aa3393 correct cut-n-paste bug reported by Massimo Pica Ciamarra on lammps-users 2017-10-27 11:25:57 -04:00
99a6c6edb4 Fixed a typo in manifold plane wiggle. 2017-10-26 12:33:16 -04:00
a26ffc7ff7 Reset plane wiggle in master. 2017-10-26 12:32:30 -04:00
b002e071e7 Reset some files back to upstream. 2017-10-26 12:31:30 -04:00
9f44e3e5b0 Merged upstream. 2017-10-26 12:26:34 -04:00
e79cd6c62c Moved some stuff around. 2017-10-26 12:25:55 -04:00
82c6fd609e Merge branch 'master' of https://www.github.com/lammps/lammps 2017-10-26 12:06:57 -04:00
2dbb44f2c6 provide Makefile.lammps template for use with bundled linalg lib 2017-10-24 13:38:04 -04:00
d1630bbe34 add missing BLAS/LAPACK functions used by LATTE to linalg lib 2017-10-24 13:22:20 -04:00
941ee565a1 Added lal_ufm_ext.cpp in lib/gpu 2017-10-24 11:12:51 -02:00
b63acf6843 Added the UFM files (doc/src - lib/gpu - src) 2017-10-24 11:11:10 -02:00
41c25877e8 Update smd_material_models.cpp
The pressure pFinal using ShockEOS() was of the wrong sign when Gamma = 0.
2017-10-24 11:04:11 +11:00
39df9f5d94 patch 23Oct17 2017-10-23 16:07:21 -06:00
68d04119d3 Merge pull request #707 from akohlmey/granular-omp-refactor
Updated neighbor list history processing for USER-OMP
2017-10-23 13:35:43 -06:00
0148c2ac81 updated neighbor list history processing for USER-OMP 2017-10-23 14:12:19 -04:00
253a17b6d0 Update pair_smd_tlsph.cpp
Correction of a typo in the computation of LAME_LAMBDA.
2017-10-23 12:45:58 +11:00
a7ad12491f Merge pull request #706 from lammps/doc-cs
update to doc pages for new coreshell pair styles
2017-10-21 16:12:23 -06:00
2137be3219 update to doc pages for new coreshell pair styles 2017-10-21 15:50:27 -06:00
ce78f6943d Merge pull request #705 from akohlmey/fix_rigid_bugfix
fix segfault bug in fix rigid/small found by regression testing
2017-10-20 17:01:50 -06:00
998aedc6c1 Merge pull request #670 from vishalkenchan/pair_style/coul_wolf_cs
add coul/wolf/cs and born/coul/wolf/cs pair styles for CORESHELL package
2017-10-20 16:09:33 -06:00
0a02c3c78c fix segfault bug for in fix rigid/small found by regression testing 2017-10-20 16:56:06 -04:00
aaf5e87c84 Merge pull request #703 from akohlmey/custom-rigid-body-generation
Allow rigid body generation from custom properties
2017-10-20 14:08:15 -06:00
2d0f5e277c Merge pull request #704 from akohlmey/bond-gromos-bugfix
Compute energy correctly for bond style gromos
2017-10-20 14:06:35 -06:00
260bbc6f9f Merge pull request #702 from giacomofiorin/colvars-fix-the-fix
Fix a Colvars error that was hidden by the previous segfault
2017-10-20 14:06:15 -06:00
6b34a30528 compute energy correctly for bond style gromos 2017-10-20 14:53:22 -04:00
83c7d3a1d2 update fix rigid documentation 2017-10-20 14:18:50 -04:00
961b976374 add/correct code to define rigid bodies with atomstyle/atomfile variables and via custom per-atom properties 2017-10-20 13:56:09 -04:00
ac6434e496 add input examples for custom rigid body definition 2017-10-20 13:54:45 -04:00
f479f02589 Fix a Colvars error that was hidden by the previous segfault 2017-10-20 13:41:31 -04:00
e284545c5b added some documentation and reference example 2017-10-20 12:03:22 +02:00
e368acdaeb Merge pull request #700 from giacomofiorin/colvars-fix
Import segfault fix in Colvars module
2017-10-19 11:45:36 -06:00
6e7504f153 Import segfault fix in Colvars module 2017-10-19 08:09:44 -04:00
71c4edda51 add coul/wolf/cs and born/coul/wolf/cs pair styles for CORESHELL package 2017-10-19 13:21:13 +02:00
40147a7a64 Merge pull request #699 from lammps/doc-update2
cross ref fix deform and new fix nvt/uef in doc pages
2017-10-18 16:44:18 -06:00
f709a723cd cross ref fix deform and new fix nvt/uef 2017-10-18 15:26:15 -06:00
6dd55e49cb Merge pull request #698 from lammps/doc-update
small updates to recently added docs and rename of an example dir
2017-10-18 15:24:54 -06:00
281b1dc375 small updates to recently added docs and rename of an example dir 2017-10-18 14:56:47 -06:00
e93f8f8889 Merge pull request #671 from danicholson/user-uef
USER-UEF package for extensional flow
2017-10-18 13:38:56 -06:00
35f2cfa0bf Merge pull request #669 from urpedersen/master
fix rhok - biasing long-range order
2017-10-18 13:31:15 -06:00
e44196c011 Merge pull request #694 from akohlmey/bond-gromos
Add gromos bond style
2017-10-18 13:27:15 -06:00
2fe1d1b904 Merge pull request #697 from andeplane/fix_heat_bug
Avoid checking region when not specified
2017-10-18 13:26:19 -06:00
b1b4a52b14 Merge pull request #695 from timattox/USER-DPD_small_updates
USER-DPD small updates
2017-10-18 13:25:48 -06:00
382de50341 Merge pull request #696 from wmbrownIntel/intel-update-oct17
Bug fix for unexpected case where a Intel bonded style is specified but there are no types
2017-10-18 13:25:07 -06:00
7dfc6b7eab Merge pull request #688 from lammps/history
refactoring of neighbor history
2017-10-18 13:24:36 -06:00
19eb5d3897 Avoid checking region when not specified 2017-10-18 18:05:34 +02:00
17c17ac409 update multi-threaded neighbor list build for neighbor list refactor 2017-10-18 11:25:15 -04:00
39ededd46c update respa/omp integrator style for neighbor list refactor 2017-10-18 11:24:44 -04:00
2c7528811d update several pair styles to be compliant with refactored respa lists data structures 2017-10-18 11:24:12 -04:00
0966e14e73 more changes to rRESPA neighbor lists 2017-10-17 17:33:01 -06:00
bb141aaae0 USER-INTEL: Bug fix for case where a bond/angle/dihedral/improper style is specified, but there are no bond/... types and therefore no allocation. 2017-10-16 22:51:56 -07:00
374d619769 add gromos bond style 2017-10-16 14:57:12 -04:00
59de1a71c8 Merge branch 'history' of github.com:lammps/lammps into history 2017-10-16 14:37:30 -04:00
4c6779cb0d USER-DPD Kokkos: propagate the new neigh_modify options from efaa4c67
Propogate the efaa4c67 changes to npair_ssa_kokkos from npair_kokkos that
support the new neigh_modify exclude molecule/intra and /inter options.
Note: npair_ssa_kokkos could inherit from npair_kokkos to avoid this kind
of missed change. Unfortunately, inheritance from templated classes is
both tricky and messy, and not worth the complexity in this case, IMHO.
2017-10-16 13:37:27 -05:00
5fb5f70ec6 update USER-OMP code for shear history neighbor refactoring 2017-10-16 14:37:20 -04:00
b0bba1976b USER-DPD: remove unused coord2bin() variants, and add ISFINITE checks 2017-10-16 13:36:44 -05:00
f8f13d929f Merge pull request #693 from giacomofiorin/colvars-update
Update Colvars to version 2017-10-11
2017-10-13 17:25:06 -06:00
3e89b270fd Update Colvars to version 2017-10-11
Notable features are the umbrella-integration based free energy estimator for
eABF, and the traditional thermodynamic integration estimator now available
for umbrella sampling, SMD, metadynamics.  Also included are several small fixes.

Below is a list of relevant commits in the Colvars repository since the last update.

321d06a 2017-10-10 Add macros to manage colvarscript commands [Giacomo Fiorin]
26c3bec 2017-10-09 Document coming availability of Lepton in LAMMPS [Giacomo Fiorin]
cc8f249 2017-10-04 Clarify that SMP depends on code build [Giacomo Fiorin]
0b2ffac 2017-10-04 Summarize colvar definition options, clarify some details [Giacomo Fiorin]
28002e0 2017-10-01 Separate writing of restart file from other output (e.g. PMFs) [Giacomo Fiorin]
92f7c1d 2017-10-01 Deprecate colvarsTrajAppend [Giacomo Fiorin]
12a707f 2017-09-26 Accurate Jacobian calculation for RMSD variants [Jérôme Hénin]
fe389c9 2017-09-21 Allow subtractAppliedForce with extended-L again [Jérôme Hénin]
c050ce0 2017-09-18 Silence compiler warnings, remove Tabs [Giacomo Fiorin]
cb41905 2017-01-11 Add base class for TI estimator in other biases than ABF [Giacomo Fiorin]
a1bc676 2017-09-14 Avoid writing to unopened traj file [Jérôme Hénin]
b58d8cd 2017-09-08 Function to check for overlapping groups [Jérôme Hénin]
1e5efec 2017-09-07 Check for overlapping groups in coordNum [Jérôme Hénin]
03a61a4 2017-04-06 Add UI-based estimator [fhh2626]
ae43754 2017-08-17 Fix outputCenters parsing [Josh Vermaas]
1619e0e 2017-08-14 Delete static feature arrays in cvm destructor [Jérôme Hénin]
2017-10-13 13:45:10 -04:00
f6ddc8c7c9 Fix compile errors from neigh history refactor 2017-10-13 10:49:31 -06:00
a973c65d67 Merge pull request #691 from akohlmey/collected-fixes
Collected small changes for next patch
2017-10-13 09:50:03 -06:00
1a200588bd Merge pull request #689 from rbberger/pylammps_autocomplete_fix
Limit IPython autocomplete to known commands and properties
2017-10-13 09:49:03 -06:00
18ca2292c2 Merge pull request #686 from giacomofiorin/lepton-library
Add Lepton library within lib/colvars
2017-10-13 09:48:42 -06:00
d3ef4bd594 Merge pull request #685 from ellio167/kim-api-v1.9.2
Update lib/kim for kim-api-v1.9.2
2017-10-13 09:48:16 -06:00
3df9caf435 drop const qualifier to allow bracketing of lookup index 2017-10-13 10:29:49 -04:00
fa2e5ac2d9 handle lookup exceptions consistently across energy and energy+force lookup in bond/angle style table 2017-10-13 10:13:34 -04:00
b7c7492608 handle invalid lookup for bond/angle tabulation 2017-10-13 09:50:56 -04:00
cee94da85e bugfix. avoiding operating on uninitialize data. closes #690 2017-10-13 00:15:15 -04:00
45aa7de171 Limit IPython autocomplete to known commands and properties 2017-10-12 14:43:17 -04:00
53aa92cfaf add support for neighbor list history refactoring in USER-OMP part 2 2017-10-11 10:30:29 -04:00
7e35042c42 add support for neighbor list history refactoring in USER-OMP part 1 2017-10-11 10:29:41 -04:00
01051e4cb1 refactoring of neighbor history 2017-10-10 16:53:51 -06:00
d90aad887e Add Lepton library within lib/colvars 2017-10-09 15:25:43 -04:00
775a15b9da Update lib/kim for kim-api-v1.9.2 2017-10-09 14:06:30 -05:00
93c9a92743 Merge pull request #684 from irisTa56/bugfix-in-domain.cpp
Bugfix for checking image flags
2017-10-09 08:30:48 -06:00
14dc1c698c Merge pull request #683 from wmbrownIntel/pppm_intel_fix
Fixing bug in pppm/intel for AVX-512 with single precision and ik diff.
2017-10-09 08:29:52 -06:00
a1f5693fe0 Merge pull request #681 from lammps/dump-modify
remove dependence of dump modify 'at' and 'append'
2017-10-09 08:29:12 -06:00
534b7adde4 Bugfix for checking image flags 2017-10-09 21:29:07 +09:00
02646100e9 correct handling of "at" keyword for netcdf dumps as suggested by @pastewka in PR #681 review 2017-10-09 07:49:29 -04:00
7e58f084d2 Fixing bug in pppm/intel for AVX-512 with single precision and ik diff.
This commit simplifies the code by eliminating packing optimizations that were slower
under typical parameters and had some memory bugs.
2017-10-08 08:33:07 -07:00
0f5d7dcc0f cmake: added USER-UEF 2017-10-07 12:38:41 -06:00
b6187173e6 Merge branch 'master' into HEAD 2017-10-07 12:35:51 -06:00
88a33edb50 Merge pull request #680 from lammps/map-yes
add atom_modify map yes, also timers to create_atoms and replicate
2017-10-06 17:43:52 -06:00
6820db99e2 avoid merge conflict 2017-10-06 14:41:38 -04:00
58e1969de2 rename misleading "CPU time" into "Time spent" 2017-10-06 14:34:10 -04:00
e91e505fb3 remove dependence of dump modify 'at' and 'append' 2017-10-06 09:44:29 -06:00
f7cbdcf995 Merge pull request #673 from pastewka/17_dump_nc2
Multi file support for NetCDF dump style
2017-10-06 09:14:12 -06:00
4cfa88b70f Merge pull request #674 from wmbrownIntel/user-intel-update
Mike Brown has added DPD to the USER-INTEL package with speedups over 3X for Xeon Phi and over 1.7X for some Xeon processors.
2017-10-06 09:12:39 -06:00
352a20fc1c DOC: Updated doc to separate description of 'append' and 'at' keywords. 2017-10-06 16:38:15 +02:00
dc0e20947e MAINT: Return error when 'at' keyword is used without 'append yes'. 2017-10-06 16:37:52 +02:00
05847a0e87 Merge branch 'master' into user-intel-update 2017-10-06 10:18:38 -04:00
439c2fd980 Merge pull request #677 from stanmoore1/kk_update
Update to Kokkos r2.04.04 and add workaround for performance regression
2017-10-05 17:10:00 -06:00
15853a0e38 Merge pull request #676 from stanmoore1/kokkos_reverse_comm
Add Kokkos threaded reverse communication
2017-10-05 17:08:49 -06:00
bd17ee5df7 Merge pull request #675 from wesbarnett/master
cmake: Add -restrict for Intel compilers
2017-10-05 17:08:35 -06:00
a9b7ff1154 Merge pull request #679 from stanmoore1/kk_reax_comm
ReaxC optimizations
2017-10-05 17:08:17 -06:00
0dd7ba26c0 Merge pull request #672 from akohlmey/phana-w-tricubic
Streamline compilation of "phana" tool for fix phonon
2017-10-05 17:01:37 -06:00
7a90eef527 Merge pull request #668 from ovilab/modify_deallocation_fix
Fixed proper deletion of fixes if fix is NULL
2017-10-05 17:00:10 -06:00
5d0626e50e Merge pull request #665 from akohlmey/collected-small-fixes
Collected small fixes
2017-10-05 16:58:49 -06:00
4b7ca0383a Merge pull request #664 from timattox/kokkos_atom2bin
Kokkos atom2bin
2017-10-05 16:58:16 -06:00
0ed987dc61 Merge pull request #663 from jdevemy/master
Authorize hybrid/overlay for fix srp
2017-10-05 16:56:20 -06:00
55a3fdca80 Merge pull request #660 from junghans/latte_fix
cmake: fix build with system latte
2017-10-05 16:55:22 -06:00
214c0cfb2b add atom_modify map yes, also timers to create_atoms and replicate 2017-10-05 16:44:24 -06:00
e0efdd50fa Switch to classic comm if ghost_velocity. The check_forward and check_reverse tests aren't necessary because the fix/pair/etc. comm is done in a separate routine. 2017-10-05 15:47:46 -06:00
44d2e8ff74 Add pre_reverse to verlet_kokkos and comment out timer 2017-10-05 15:28:35 -06:00
6bf2c60c07 Fix issues in Kokkos comm 2017-10-05 14:58:05 -06:00
eecd2fbaee Remove hardcoded value in fix_qeq_reax 2017-10-05 11:23:31 -06:00
2b0bfcb10f Fix memory leak in pair_reaxc_kokkos 2017-10-05 10:35:09 -06:00
3653f40120 Reduce unnecessary communication in fix_qeq_reax 2017-10-04 12:10:13 -06:00
bda0ee3aa1 Destroy unneeded fix in pair_reaxc_kokkos 2017-10-04 12:06:03 -06:00
957263431a Ensure consistency with documentation 2017-10-04 09:38:43 +02:00
f12031f84d add support for building rigid bodies from custom atom properties or atom style variables 2017-10-04 01:14:57 -04:00
c522b1b7a9 add call to fftw_cleanup() before exiting to avoid bogus leak reports when compiling with FFTW v3.x 2017-10-04 00:22:56 -04:00
a55adf4a68 Update to Kokkos r2.04.04 and add workaround for performance regression 2017-10-03 11:30:00 -06:00
2876baafd0 Use -restrict whenever Intel is used, no matter the package 2017-10-03 13:08:56 -04:00
ca032f21fb Add Kokkos threaded reverse comm option 2017-10-03 10:14:24 -06:00
197f082784 cmake: Add -restrict for Intel compilers for some packages
Some packages (USER-OMP, OPT, and USER-INTEL) require the -restrict
flag when using the Intel compiler.
2017-10-03 11:28:33 -04:00
1bb7af9ef9 integrate fix rhok into the LAMMPS source code management and documentation system 2017-10-03 10:45:08 -04:00
251f28049a make fix rhok more similar to other LAMMPS sources
- re-indent to 2 blanks
- white space cleanup
- use force->numeric() and force->inumeric() instead of atof() and atoi()
- include system headers before local LAMMPS headers
2017-10-03 10:10:38 -04:00
f07719e924 make fix rhok examples more consistent with LAMMPS conventions:
- move example folder to examples/USER/misc/
- comment out writing of trajectory files
- reduce run length (for easier testing for regressions)
- record example outputs for 1 and 4 MPI processes
- rename readme.md to README.md for visibility
2017-10-03 10:08:38 -04:00
5f527091b8 Update readme.md 2017-10-03 12:02:01 +02:00
30aaa7e47b Update readme.md 2017-10-03 12:00:43 +02:00
74dcf0bf9b Update readme.md 2017-10-03 11:54:46 +02:00
e9b07a7a10 Update readme.md 2017-10-03 11:52:48 +02:00
fd8f5f8f9e Update readme.md 2017-10-03 11:52:08 +02:00
5c59eb637b Update readme.md 2017-10-03 11:49:57 +02:00
250ef9f837 Update readme.md 2017-10-03 11:46:08 +02:00
e44f370d49 Update readme.md 2017-10-03 11:44:52 +02:00
1e790fbafe Update readme.md
Now use the standard namings.
Corrected spelling errors.
2017-10-03 11:44:23 +02:00
35cc795972 Update in.setup 2017-10-03 11:17:43 +02:00
245bf74552 Rename setup.lmp to in.setup 2017-10-03 11:16:54 +02:00
7e8bbe8481 Rename pinning.lmp to in.pinning 2017-10-03 11:16:29 +02:00
e6d687faac Rename crystal.lmp to in.crystal 2017-10-03 11:15:49 +02:00
8a2cf5ce8e reformatting and use citeme class 2017-10-03 11:13:10 +02:00
8f79f5ddb9 add the LAMMPS copyright 2017-10-03 10:59:46 +02:00
40ae6f215b add the usual LAMMPS copyright 2017-10-03 10:58:21 +02:00
4dcc49ebe2 Delete fix_rhok.cpp 2017-10-03 10:56:07 +02:00
fe14eeccac Delete fix_rhok.h 2017-10-03 10:54:22 +02:00
9dc42fd4db intel_simd.h is currently also needed by dihedral/charmm, not just sw. 2017-10-02 23:53:05 -07:00
5e89269631 Minor adjustments to intel makefiles and documentation based on the reversed
preprocessor logic and default memory align. Removing knl_coprocessor makefile.
2017-10-02 23:41:14 -07:00
11eed234f0 include dump cfg/uef in commands toctree 2017-10-03 00:14:34 -04:00
af1fc45db0 added citation to doc 2017-10-03 00:04:52 -04:00
b34109af60 formatting changes 2017-10-02 23:43:31 -04:00
1dffb0cf82 reran npt_biaxial examples 2017-10-02 23:27:10 -04:00
588b2534c9 Minor fix for FixNHUef constructor 2017-10-02 23:26:21 -04:00
d2aa05cb36 update README in USER-INTEL for recent LRT logic reversal 2017-10-02 21:24:51 -04:00
466fde6443 update documentation for the reversal in the INTEL_MKL_RNG define 2017-10-02 21:20:26 -04:00
2a24cbfe0c reverse logic for using MKL pRNG: this way, make serial and make mpi will compile LAMMPS with USER-INTEL installed 2017-10-02 21:13:51 -04:00
00aef0fe00 rerun logfiles for USER-UEF example inputs 2017-10-02 17:40:46 -04:00
92d9b361fc include USER-UEF styles in PDF version of manual 2017-10-02 17:39:59 -04:00
8acdc8020d add USER-UEF classes to .gitignore 2017-10-02 17:24:36 -04:00
cc09a633a2 small code refactor for FixNHUef class
- use forward declaration for UEFBox to avoid having to include custom header
- remove uef_arg_kludge() thanks to changes in 0c7879e902
2017-10-02 17:19:42 -04:00
81be9b37de formatting, whitespace and include file/constants cleanup 2017-10-02 17:15:13 -04:00
0c7879e902 provide compatibility entries in FixNH option parsing for new USER-UEF package 2017-10-02 16:31:41 -04:00
8d384b9149 whitespace cleanup 2017-10-02 15:03:48 -04:00
529eeb6039 Reduce GPU data transfer 2017-10-02 09:31:39 -06:00
cf24dd0265 Adding pair style dpd/intel and dihedral style fourier/intel
Adding raw performance numbers for Skylake xeon server.
Fixes for using older Intel compilers and compiling without OpenMP.
Fix adding in hooks for using USER-INTEL w/ minimization.
2017-10-02 04:53:17 -07:00
a7b0d1f521 DOC: Corrected syntax for appending at certain frame (NetCDF only) 2017-10-01 14:40:19 +02:00
fbe42cda2d MAINT: Only set append flag when not in multifile mode. 2017-10-01 14:31:33 +02:00
da7be99cc4 DOC: Added multi file example. 2017-10-01 14:28:20 +02:00
56d21bfb05 MAINT: Removed obsolete prmtop writer. 2017-10-01 14:22:04 +02:00
100231bba8 ENH: Enable multi file writes. 2017-10-01 14:21:09 +02:00
84378f8ae2 MAINT: Renamed _put_var1_x to _put_var1_bigint 2017-10-01 14:05:12 +02:00
6e342d2e45 MAINT: bigint (int64) maps onto either long or long long, depending on platform. Automatically choose the correct one. 2017-10-01 14:03:52 +02:00
091d058090 Fix typo 2017-09-30 17:44:15 -04:00
4c71beb024 cleanup/simplification of compilation for fix phonon analysis tool "phana"
- include the used tricubic functions directly as static functions
- silence compiler warnings
- define f2c.h imported data types directly or use C equivalents
- since the direct LAPACK API was called and not cLAPACK, declare LAPACK interface and depend only on LAPACK
- add proper dependencies
- disable automatic minor version number generation. step version manually.
- comment out optional spglib functionality by default
2017-09-30 12:12:15 -04:00
a86572f4fc Reduce memory churn in Kokkos package 2017-09-29 16:20:19 -06:00
4524b0fa83 rename arg_kludge to uef_arg_kludge 2017-09-29 16:54:46 -04:00
4ef63feea7 reran examples 2017-09-29 15:50:31 -04:00
9f2740b7f1 Partially revert 01d0a5c, avoid atomics, safe because of the while loop. Worst case is the resize will happen again because max wasn't accurate 2017-09-29 13:41:35 -06:00
2a06b75af8 doc revisions 2017-09-29 15:36:41 -04:00
d7aac2fed5 Add sync/modify to nbin_kokkos 2017-09-29 13:26:02 -06:00
d898afaafb use <> for system includes not "" 2017-09-29 09:19:38 -04:00
c66ddf9ac0 Update fix_rhok.txt 2017-09-29 08:03:02 +02:00
a64040ce2d citeme 2017-09-28 18:33:04 -04:00
480b087c93 doc edits, README, and citeme 2017-09-28 18:31:51 -04:00
0029583463 doc edits i missed in earlier commit 2017-09-28 17:46:39 -04:00
c0f1a32661 fixed namespace issue 2017-09-28 17:43:59 -04:00
80898b8695 first draft of doc done 2017-09-28 17:42:02 -04:00
855b6000ef initial commit. doc is in the works 2017-09-28 16:34:18 -04:00
285a123c90 Update fix_rhok.cpp 2017-09-28 18:42:15 +02:00
0f52dd7c5f Update fix_rhok.h 2017-09-28 18:41:06 +02:00
10d1741e7f Update fix_rhok.txt 2017-09-28 18:38:25 +02:00
d11733d3a0 typo in equation 2017-09-28 18:28:46 +02:00
348c4eb7f3 add .cpp and .h to root src 2017-09-28 18:18:28 +02:00
75b3f34a58 Update documentation 2017-09-28 18:16:06 +02:00
fe80c57bde more documentation 2017-09-28 17:01:12 +02:00
e49f0e396b Create fix_rhok.txt 2017-09-28 16:24:26 +02:00
37e55a825b Create fix_rhok.txt 2017-09-28 16:20:03 +02:00
67e48264d9 Update fix_rhok.cpp 2017-09-28 16:02:20 +02:00
4e1eeca869 Update fix_rhok.cpp 2017-09-28 16:02:00 +02:00
2fda041972 Update fix_rhok.cpp 2017-09-28 16:00:16 +02:00
34c1adb4dd Merge https://github.com/lammps/lammps 2017-09-28 12:28:58 +02:00
23e283f135 Fixed proper deletion of fixes if fix is NULL 2017-09-27 16:20:07 +02:00
de45fa6e71 correct bogus links in LATTE docs 2017-09-26 18:25:37 -04:00
bfdc4acb8b add missing entry for pdf version of manual 2017-09-26 16:53:36 -04:00
fd3ecd0481 fix typo in formatting 2017-09-26 16:52:24 -04:00
8bba6d3e8c correct formatting and broken/colliding link issues with LATTE package related documentation 2017-09-26 16:52:10 -04:00
53e4ee4f2d need to re-init timers after initial setup 2017-09-25 23:20:42 -04:00
b60cff7e77 USER-OMP package depends on USER-DRUDE 2017-09-25 23:15:49 -04:00
38530415c8 -ltbbmalloc is required 2017-09-25 20:03:53 -04:00
0573aaa6da update src/.gitignore for LATTE package 2017-09-25 19:37:55 -04:00
e6969002ce having plain filelink instead of filelink.o confuses KOKKOS linking with nvcc 2017-09-25 19:37:37 -04:00
0448bc9caf Merged stuff. 2017-09-25 18:31:32 -04:00
836a6d292c whitespace fixes, silence compiler warning about too few format specifiers 2017-09-25 16:31:39 -04:00
32e0de7a67 first pass at implementing atom2bin for KOKKOS neighbor lists 2017-09-25 14:06:20 -05:00
789812ec3d KOKKOS: minor typo fix 2017-09-25 14:06:20 -05:00
88a882b457 Added reference to fix rhok implimentation 2017-09-25 18:59:23 +02:00
f1aea57e30 Update readme.md 2017-09-25 18:48:21 +02:00
b35f2ff8b4 Example of Interface Pinning Computation 2017-09-25 18:44:24 +02:00
4beccf508f Move fix to USER-MISH 2017-09-25 18:35:53 +02:00
78a486c0fd Authorize hybrid/overlay for fix srp 2017-09-25 16:18:08 +02:00
f2c1172741 patch 22Sep17 2017-09-22 15:46:34 -06:00
d6316c40d9 cmake: fix build with system latte 2017-09-22 15:36:14 -06:00
bcde318ccb Merge pull request #659 from stanmoore1/kk_border_comm
Enhance Kokkos communication logic
2017-09-22 13:47:44 -06:00
3ed39ca844 Make Kokkos comm give warning and switch to classic comm instead of erroring out 2017-09-22 13:03:24 -06:00
ee487ef4aa Merge pull request #652 from junghans/latte
Add LATTE fix
2017-09-22 10:32:19 -06:00
a8ae886667 update fix latte examples and virial 2017-09-21 10:40:54 -06:00
fe8244c1c2 Rename fix 2017-09-21 16:49:46 +02:00
3381a43378 Added readme.m 2017-09-21 16:20:06 +02:00
73708b091c Added readme file, and removed old files 2017-09-21 16:17:26 +02:00
9a9af2ca5e Delete README 2017-09-21 13:58:51 +02:00
491d5f3410 Added USER-PINNING package 2017-09-21 11:38:59 +02:00
5e35ab251b fixed sucrose 2017-09-20 17:11:49 -06:00
d708e34ba6 cmake: download/build latte if not found 2017-09-20 12:01:26 -06:00
638b91bf74 Merge pull request #657 from lammps/snap-potentials
new SNAP potentials and examples
2017-09-20 09:34:51 -06:00
ad25a95297 whitespace cleanup 2017-09-20 11:13:13 -04:00
e7d042ba1a convert DOS/Windows CR-LF line endings to native format 2017-09-20 11:12:58 -04:00
dd49d54889 new SNAP potentials and examples 2017-09-20 08:54:30 -06:00
fbaa7ab8fa Merge pull request #655 from akohlmey/fixes-for-patch
collected small bugfixes for the next patch release
2017-09-20 08:51:47 -06:00
2e9803efb3 Merge pull request #645 from akohlmey/kokkos-makefile-updates
Some small kokkos makefile updates
2017-09-20 08:40:20 -06:00
59d2e13d48 add .gitignore and add Makefile.lammps.* symlinks to stay consistent with other libraries 2017-09-19 19:06:02 -04:00
76d93f21dd add fix latte command to doc pages 2017-09-19 16:55:08 -06:00
ac897ea645 LATTE package doc update and some small code changes 2017-09-19 16:27:25 -06:00
19f1f3a3e0 correct USER-INTEL installer script for verlet_lrt_intel files 2017-09-19 11:48:27 -04:00
be96486d66 compile all objects in the GPU library with -fPIC for building shared object 2017-09-19 11:24:48 -04:00
48dd824b26 ignore generated header files with OpenCL kernels 2017-09-19 11:24:38 -04:00
cdb6ec7419 reverse the pre-processor logic of the LRT mode define
with this change, the USER-INTEL package can be installed and
compiled without having to alter makefiles for adding -lpthread.
All "intel optimized" makefiles have been updated to have the
LRT feature enabled. This change will allow us to include the
USER-INTEL package in several automated testing configurations
and thus allows to detect incompatibilities and compilation issus faster.
2017-09-19 11:24:05 -04:00
aad8cd10ff allow fix viscous to be used with dynamic groups 2017-09-18 18:08:57 -04:00
1ac90815f3 fix external only needs to collect virial in case it is requested 2017-09-17 23:59:34 -04:00
5f1842829e activate virial contribution in fix lb/rigid/pc/sphere by default and protect virial computation with evflag 2017-09-17 21:10:41 -04:00
66130f5557 whether virial contributions from fixes are included depend on thermo_virial, not virial_flag. 2017-09-17 20:50:22 -04:00
388eab5eeb correctly initialize thermo_virial in fix poems and protect access to vflag_XXX by checking for evflag !=0 2017-09-17 20:49:41 -04:00
a500048c9c remove bogus version of temper/npt command 2017-09-17 19:25:22 -04:00
b4ecad7fbf remove another couple of purge items from long ago 2017-09-17 19:22:43 -04:00
b5894e2190 automatically call 'make purge' before calling 'make package-update' or 'make package-overwrite' 2017-09-17 19:19:45 -04:00
6f1935ea40 correct embarrassing typo
this always happens after too much exposure to fortran codes. :-(
2017-09-15 21:58:47 -04:00
02665e45a4 fix doc in lib/latte/Makefile.lammps.* 2017-09-15 17:52:14 -06:00
cc2a53a8da Merge branch 'exaalt' of gitlab.com:exaalt/lammps into latte 2017-09-15 17:43:48 -06:00
d614d56c34 Merge branch 'exaalt' of gitlab.com:exaalt/lammps into exaalt 2017-09-15 17:41:02 -06:00
39daf3c6f6 added fix_latte.txt 2017-09-15 17:40:34 -06:00
17aeccf19f Merge remote-tracking branch 'origin/master' into latte 2017-09-15 16:18:13 -06:00
d101fe3e79 Merge pull request #649 from akohlmey/fix-virial-aidan
Add support for selected fixes to optionally contribute to the virial
2017-09-15 15:25:09 -06:00
27f99534ec Merge pull request #654 from giacomofiorin/colvars-small-fix
Fix small typo to calculation of accumulated work in Colvars
2017-09-15 15:22:09 -06:00
5f6937dadd Merge pull request #653 from jdevemy/master
Bugfix for the limit keyword
2017-09-15 15:21:53 -06:00
3b39694f23 Merge pull request #628 from lammps/cmake_improvements
CMake improvements
2017-09-15 15:19:46 -06:00
99e5dc7104 add support for fix_modify virial yes to fix smd 2017-09-15 01:21:16 -04:00
ccb67d8dc5 correct cut-n-paste errors in the documentation of fix_modify virial 2017-09-15 01:20:56 -04:00
2cd7cbd964 correct cut-n-paste error, add docs 2017-09-15 00:54:19 -04:00
8776b81033 add virial support to fix addforce 2017-09-15 00:46:18 -04:00
f1fce64ff9 Fix small typo to calculation of accumulated work in Colvars 2017-09-14 12:58:00 -04:00
da7776f818 Bugfix for the limit keyword 2017-09-14 11:00:55 +02:00
66f59f9ec0 FindLATTE.cmake: fixed a typo 2017-09-13 15:51:03 -06:00
d84825fd7f remove useless files 2017-09-13 14:37:24 -06:00
f971cd6e45 Merge pull request #647 from rbberger/gpu_opencl_2
Use OpenCL 2.x API in GPU package when supported
2017-09-12 10:56:13 -06:00
0cb3a3821f Merge pull request #644 from akohlmey/collected-small-fixes
Collected small fixes for next patch
2017-09-12 10:31:51 -06:00
e927794696 Merge pull request #643 from andeplane/gpu_opencl_compile_fix
Fixed OpenCL compilation issues with __global keywords
2017-09-12 10:31:22 -06:00
e196a2b9e5 import changes to various fixes by aidan to include virial contributions 2017-09-11 22:24:06 -04:00
cb19ef547e update src/.gitignore 2017-09-11 22:00:58 -04:00
95d8492853 the original fix qeq went away over 7 years ago, we don't need to purge it 2017-09-11 21:59:22 -04:00
b3547a9eca add infrastructure for enabling fixes to contribute to the virial by aidan 2017-09-11 11:09:59 -04:00
84b84c10db Use OpenCL 2.x API in GPU package when supported 2017-09-09 19:53:56 -04:00
0be7f46750 cmake: added USER-MESO 2017-09-09 08:25:57 -06:00
4738fedca3 Merge remote-tracking branch 'origin/master' into cmake_improvements 2017-09-09 08:22:30 -06:00
1601433ca1 cmake: fix lib suffix 2017-09-09 07:05:51 -06:00
3fdb6f10fa cmake: OpenCL is always found if required 2017-09-09 06:51:24 -06:00
ff18cff46b Merge branch 'cmake_pkg_libs' into cmake_improvements 2017-09-08 23:34:59 -04:00
8a06a7bc6b Add OpenCL support to CMake build 2017-09-08 22:20:47 -04:00
b861ea342e cmake: fix LATTE linkage 2017-09-08 11:54:32 -06:00
fce633aa5f cmake: tweaks for EXAALT superbuild, add latte_fix 2017-09-08 11:33:49 -06:00
2f6be88c4a Merge remote-tracking branch 'origin/master' into exaalt 2017-09-08 07:04:12 -06:00
7b1542a0ba merging stable and exaalt branches into exaaltstable 2017-09-07 16:31:50 -06:00
366d087027 update docs for changes to makefiles 2017-09-06 14:20:24 -04:00
3a5d8362ff have only one common MPI makefile for KOKKOS with CUDA 2017-09-06 14:16:17 -04:00
5089b263b2 make kokkos_cuda_mpi compatible with both MPICH and OpenMPI 2017-09-06 14:15:27 -04:00
de8297ea19 recover ability to compile USER-INTEL without OpenMP enabled 2017-09-06 12:02:14 -04:00
fe557cb882 fix typo in commands table 2017-09-06 11:35:52 -04:00
c80203cb01 Merge pull request #641 from lammps/doc-tweak
small update to docs for new commands
2017-09-06 08:52:51 -06:00
4161868bcf Merge pull request #640 from ohenrich/user-cgdna
USER-CGDNA - sequence-dependent stacking and h-bonding strength
2017-09-06 08:52:05 -06:00
9ca39c89a6 Merge pull request #639 from rbberger/python_interface_improvements
Python interface improvements
2017-09-06 08:51:27 -06:00
99791ce01c Merge pull request #632 from timattox/USER-DPD_kokkos_merge
Add Kokkos version of the USER-DPD package
2017-09-06 08:50:43 -06:00
0248a7b98e remove duplicate listing of deleted USER-DPD files from Purge.list 2017-09-06 09:24:05 -05:00
dbc60d949f Fixed OpenCL compilation issues with __global keywords 2017-09-06 15:08:02 +02:00
d886cc91f3 fix syntax error in fix saed/vtk docs example
This addresses the issue reported on github
by @subhammridha closes thus clodes #642
2017-09-05 17:45:56 -04:00
4c5d901e2b fix stupid typo (too much compiling of fortran codes...) 2017-09-05 16:45:03 -04:00
c8f92c1a61 add a couple deleted files from USER-DPD to Purge.list 2017-09-05 16:42:58 -04:00
dec1d7b2dc re-indent so that gcc no longer complains about inconsistent indentation 2017-09-05 16:41:19 -04:00
45602e58f9 fix another couple of typos 2017-09-05 12:48:28 -04:00
cd72532fb9 fix typo 2017-09-05 12:47:34 -04:00
b170606052 Merge pull request #620 from amilumas/master
Temper_NPT
2017-09-05 10:08:55 -06:00
65b295e826 Merge pull request #638 from jdevemy/master
Mods for extra/special/per/atom and add toluene
2017-09-05 10:05:49 -06:00
89a0bc947f small update to docs for new commands 2017-09-05 10:04:20 -06:00
c8967a335f Included hyperlink to package 2017-09-05 11:45:32 +01:00
2105145f55 More minor changes 2017-09-05 11:40:36 +01:00
f7715ab6ce Added comment about optimised damping coefficient for BD 2017-09-05 11:35:26 +01:00
12fe614ddf Added sequence-dependent stacking and base-pairing strength 2017-09-05 10:48:38 +01:00
0b5a2e199d Add way of getting correct ctypes integer type for bigint, tagint, and imageint 2017-09-04 20:01:31 -04:00
09bb687918 Correct indentation 2017-09-04 20:01:04 -04:00
bb3ee752e5 Added optional numpy access to atom data
The library interface was extended to provide direct access to atom data using
numpy arrays. No data copies are made and numpy operations directly manipulate
memory of the native code.

To keep this numpy dependency optional, all functions are wrapped into the
lammps.numpy sub-object which is only loaded when accessed.
2017-09-04 19:59:50 -04:00
6b2d321d18 Add missing globals in library interface 2017-09-04 19:57:02 -04:00
2b9646097c Merge branch 'master' of github.com:lammps/lammps 2017-09-01 09:16:11 -06:00
f58088ae61 patch 1Sep17 2017-09-01 09:15:37 -06:00
397bc225b2 add temper/npt to src/USER-MISC/README 2017-08-31 14:56:43 -04:00
d9d9ba8244 update .gitignore 2017-08-31 14:52:56 -04:00
eba4be18c2 adapt formatting and naming conventions to fully match LAMMPS style. allow rigid and accelerated integrators. 2017-08-31 14:48:30 -04:00
4d2ed30b35 add reference outputs to temper/npt example 2017-08-31 14:13:02 -04:00
f3dda30f8e fully integrate temper/npt command into manual 2017-08-31 13:53:40 -04:00
d95a5f219e Remove all thread fences except one in verlet_kokkos 2017-08-31 10:38:36 -06:00
a5b65c1af4 Mods for extra/special/per/atom and add toluene 2017-08-31 15:03:04 +02:00
3e6cdd1400 USER-DPD: finish renaming #ifdef DEBUG_PAIR_CT to DEBUG_SSA_PAIR_CT 2017-08-30 14:58:38 -05:00
dc7f1281b8 USER-DPD: Kokkos version of Const Temperature DPD isn't implemented yet
The Constant Energy DPD (DPDE) was our primary usage case, so only stubs
for the Constant Temperature case were included in Kokkos code so far.
The non-Kokkos version works fine for Constant Temperature DPD.
2017-08-30 11:01:17 -05:00
27c962dc3b link cuda in gpu only, remove duplicated incl. dir 2017-08-30 09:45:01 -06:00
2dd202cc76 USER-DPD: remove some out-of-date FIXME comments in fix_shardlow_kokkos.cpp 2017-08-30 10:34:09 -05:00
f2d8c37f27 Rename SSA specific debug #ifdef to DEBUG_SSA_PAIR_CT 2017-08-30 10:24:29 -05:00
a4a45f1d9c Remove unnecessary check in npair_kokkos 2017-08-29 17:25:13 -06:00
f57d194920 Add files via upload
documentation for temper/npt
2017-08-29 10:40:37 -04:00
34b3fc2157 Fix GPU CMake compilation 2017-08-29 01:20:34 -04:00
098861375b SOVERSION not needed for STATIC libs 2017-08-28 16:18:58 -06:00
19b77857dc fix Fortran flags for MEAM 2017-08-28 14:59:01 -06:00
bd9dc4886d cmake: README is markdown 2017-08-28 14:27:12 -06:00
9207f6540e fix liblammps install 2017-08-28 14:11:21 -06:00
736e063971 Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge
Resolved conflicts in src/KOKKOS/npair_kokkos.cpp
2017-08-28 14:46:50 -05:00
62928a1637 make GPU flags local to libgpu 2017-08-28 13:24:41 -06:00
c8dfe0c3de drop BUILD_SHARED_PKG_LIBS and make all pkglibs static 2017-08-28 13:17:27 -06:00
6a4bbddb3b Add files via upload
data file for example
2017-08-28 14:56:37 -04:00
2add18e013 Create in.temper_npt
example for temper/npt
2017-08-28 14:55:43 -04:00
d0efd3a422 Add files via upload
Updated command to temper/npt instead of temper_npt
2017-08-28 14:48:00 -04:00
f47cc0aab5 simpilfy pkg lib build 2017-08-27 18:55:28 -06:00
57872c8b60 drop INSTALL_LIB option 2017-08-27 18:42:32 -06:00
4bff008777 enable PIC globally 2017-08-27 18:40:55 -06:00
153c771a6d Use PIC in mpi_stubs when BUILD_SHARED_LIBS=on 2017-08-27 17:27:43 -04:00
313b8bc2fa build lib/gpu as a library 2017-08-27 17:00:56 -04:00
5308ee67fa fix shared build and mscg install 2017-08-27 13:45:48 -06:00
c196025ea9 make molfile less special 2017-08-27 12:23:30 -06:00
bc11868986 cmake: fixed a typo 2017-08-27 12:13:35 -06:00
e4415735f2 check for '-fno-second-underscore' 2017-08-27 12:10:46 -06:00
98f27162ba make libmpi_stubs 2017-08-27 11:37:57 -06:00
bdc117bf10 cmake: convert mscg into a lib 2017-08-27 07:15:00 -06:00
b7ec720f91 link QUIP against LAPACK_LIB too 2017-08-27 07:13:55 -06:00
47f16c0d70 cmake: move shared libs install warning in one place 2017-08-27 07:06:08 -06:00
76926b7fcf Compile linalg as library and track link dependencies for correct link order 2017-08-27 03:54:40 -04:00
67ae2719a8 Simplify lib build by using target_include_directories 2017-08-27 03:04:32 -04:00
21893539cb Merge pull request #633 from lammps/doc-user-meso
tweak an eq in USER-MESO, also allow neigh to be built w/out styles
2017-08-25 17:41:00 -06:00
dd101db79c Merge pull request #582 from stanmoore1/kk_changes
Fixing execution space issues in KOKKOS package
2017-08-25 17:06:26 -06:00
81ba181349 tweak an eq in USER-MESO, also allow neigh to be built w/out styles 2017-08-25 17:04:36 -06:00
e52a28f8af Update docs for Kokkos version of USER-DPD package 2017-08-25 16:20:42 -06:00
01dd0e173e Merge branch 'master' into USER-DPD_kokkos_merge 2017-08-25 16:02:27 -06:00
1f8c4f2c62 Remove hardcoded map variables and debug output 2017-08-25 15:31:00 -06:00
b73999ef21 Revert change to read_data.cpp 2017-08-25 15:25:41 -06:00
1e16fed9ab Error out if using pair hybrid with Kokkos, but not pair hybrid/overlay 2017-08-25 15:16:19 -06:00
a062944de9 Fix execution space issues 2017-08-25 14:45:47 -06:00
a641289d5b Must use atomics for GPUs in pair_exp6_rx_kokkos 2017-08-25 12:36:53 -06:00
6195b3c0f6 Merge pull request #631 from akohlmey/small-fixes-and-updates
Small fixes and updates for patch release
2017-08-24 08:35:32 -06:00
de0fdbed6c moltemplate bugfix update 2017-08-24 07:12:45 -04:00
dea92fbf52 print write dump systen init warning only on MPI rank 0 2017-08-23 21:01:55 -04:00
6db3bd87ee correct typo in header formatting 2017-08-23 17:52:09 -04:00
e55fa9d320 Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks 2017-08-23 15:21:39 -06:00
cbf3646806 Merge branch 'master' into USER-DPD_kokkos 2017-08-23 15:20:56 -06:00
f5a99dece7 Remove unnecessary thread fences 2017-08-23 15:08:44 -06:00
4784506ba9 Remove unused function in rand_pool_wrap_kokkos 2017-08-23 15:02:26 -06:00
270abff2a2 Fix compile error for CUDA in pair_exp6_rx_kokkos 2017-08-23 14:59:19 -06:00
b6c93f96cf Merge pull request #629 from stanmoore1/kokkos_update
Update Kokkos library to v2.04.00
2017-08-23 14:39:42 -06:00
7b7a5076d0 Merge pull request #624 from akohlmey/compute-fragment
Add computes fragment/atom and aggregate/atom
2017-08-23 14:14:33 -06:00
1536eb5de5 Merge pull request #630 from akohlmey/moltemplate-update
Update for moltemplate to version 2017-8-22
2017-08-23 14:13:07 -06:00
f7a0a6eb70 Merge pull request #622 from akohlmey/collected-small-fixes
Collected small fixes
2017-08-23 14:12:45 -06:00
d80a6cbd31 Merge pull request #621 from lammps/user-meso
new USER-MESO package
2017-08-23 14:12:18 -06:00
c4b37039ab Merge pull request #619 from jrgissing/molecule_maxspecial
molecule maxspecial value corrected when specials autogenerated
2017-08-23 14:11:47 -06:00
b52efa2850 add compatibility to NetCDF 4.3.3 as bundled with RHEL 7.x 2017-08-23 15:28:27 -04:00
e88ff8d6f9 correct embedded help for GPU lib Install.py 2017-08-23 15:20:30 -04:00
97edf90a73 update fix qeq docs for the new, more flexible parameter file format 2017-08-23 11:22:09 -04:00
12150ffa73 add moltemplate version 2017-8-22 2017-08-23 07:54:56 -04:00
57aafba7c3 remove old moltemplate version 2017-08-23 07:54:05 -04:00
cdfb1aa043 make links unique, fix doc format warnings and add entries to administrative files 2017-08-23 00:39:52 -04:00
b80752a40c restore changes to read_data docs, that would have been lost due to merging an outdated version 2017-08-23 00:01:19 -04:00
79d5ca669d fix issues indicated by compiler warnings 2017-08-22 23:46:32 -04:00
26c15140be add USER-MESO files to .gitignore 2017-08-22 23:46:09 -04:00
5c985946d5 Merge branch 'master' into USER-DPD_kokkos 2017-08-22 13:50:19 -06:00
090c792d90 Update Kokkos library to v2.04.00 2017-08-22 13:42:02 -06:00
c5ccbbeea7 cmake: fix 'make test' 2017-08-22 07:13:04 -06:00
e2a1b666be Merge remote-tracking branch 'junghans/cmake_flags_summary' into cmake_improvements 2017-08-21 20:54:24 -04:00
ad0ecfa507 Merge remote-tracking branch 'junghans/lammps_suffix' into cmake_improvements 2017-08-21 20:53:53 -04:00
cf3f15b0a5 cmake: make h5md includes local 2017-08-21 15:04:03 -06:00
5fcc19777c cmake: fix molfile compile 2017-08-21 14:24:00 -06:00
1f4c550f9f cmake: make awpmd includes local 2017-08-21 13:09:52 -06:00
24c00b1f7a fix typo 2017-08-21 13:12:48 -04:00
5a0c3aea8a add a compute aggregate/atom, that combines the rules for compute cluster/atom and fragment/atom 2017-08-21 13:12:43 -04:00
c8aa06b959 cmake: build libs separate 2017-08-21 11:12:36 -06:00
bdccdbf2c2 cmake: make linker flags more clear 2017-08-21 10:20:56 -06:00
6d86697b3f cmake: move option in user options block 2017-08-21 10:18:20 -06:00
d1a0c040c9 add initializers for nmatch/nwant variables in molecule file parser 2017-08-20 23:28:13 -04:00
892a3f8609 cmake: make _ in LAMMPS_MACHINE implicit 2017-08-20 09:39:51 -06:00
de5883b7bb cmake: LAMMPS_SUFFIX -> LAMMPS_MACHINE 2017-08-20 09:27:12 -06:00
b1615d1839 cmake: print flag summary 2017-08-20 09:17:49 -06:00
aef2416ece Simplify CMake script 2017-08-20 10:49:30 -04:00
00a78cfa1a cmake: add LAMMPS_SUFFIX 2017-08-20 08:30:09 -06:00
f5b8f722ee remove non-portable non-ascii blanks from fix wall/ees docs 2017-08-20 10:09:21 -04:00
39e51df2c0 add missing entry in pdf manual 2017-08-20 10:02:11 -04:00
c895df73d6 skip over disabled bonds 2017-08-20 09:49:01 -04:00
4dc1195cd8 add docs for compute fragment/atom 2017-08-20 09:41:49 -04:00
35fd82b602 trim unneeded includes 2017-08-20 09:19:04 -04:00
c5ce3ffe60 use list of bonds per atom instead of bondlist, as that will work with shake as well 2017-08-20 09:18:04 -04:00
c9d41dbb47 Ignore installed package files when using cmake 2017-08-19 06:33:27 -04:00
1a80d4bc13 Remove style files in src dir while running cmake 2017-08-19 05:55:51 -04:00
aa1ce09b12 more cleanup, checks and generalization of QEQ parameter file parsing 2017-08-18 20:03:47 -04:00
f945d4567d new USER-MESO package 2017-08-18 17:33:42 -06:00
44ccdb86df add checks when reading QEQ parameter file to avoid segfaults and memory corruption on incorrect files 2017-08-18 19:24:39 -04:00
2e6a928aa3 ignore file recently added to USER-INTEL 2017-08-18 19:23:33 -04:00
6f66e6c454 add new compute fragment/atom 2017-08-18 19:07:32 -04:00
822bffdfae Merge pull request #1 from amilumas/temper_npt
Temper_NPT and example
2017-08-18 15:29:59 -04:00
6aa756968d Temper_NPT and example
New function that allows for parallel tempering (replica exchange) in MD in LAMMPS in the isothermal-isobaric ensemble (NPT)
Similar to temper which works in the canonical (NVT) ensemble.
An example is included that uses temper_npt
2017-08-18 15:21:49 -04:00
d671a04274 whitespace cleanup 2017-08-18 14:24:09 -04:00
bf7cff73d4 allocate the temporary special array on the heap and not the stack (it may get too big quickly) and clear the array before use. 2017-08-18 14:23:48 -04:00
9e85b3178a molecule maxspecial value corrected when specials autogenerated 2017-08-17 21:39:25 -06:00
b11fe2eddb Merge pull request #573 from junghans/cmake
Add secondary, cmake based build system
2017-08-17 16:06:19 -06:00
7ddcb6812b patch 17Aug17 2017-08-17 16:02:20 -06:00
76cd61350d Merge pull request #613 from akohlmey/collected-small-changes
Collected small changes and bug fixes
2017-08-17 11:34:52 -06:00
fa3c0c61d6 Merge pull request #618 from lammps/intel
USER-INTEL add-ons from Mike
2017-08-17 11:32:53 -06:00
c46d5ff422 Merge pull request #612 from giacomofiorin/colvars-update-2017-08-10
Minor fixes to Colvars module
2017-08-17 11:32:38 -06:00
dd67989c76 Merge pull request #601 from stanmoore1/kokkos_update
Update Kokkos library to v2.03.13
2017-08-17 11:32:18 -06:00
00aafef1a8 Merge pull request #597 from ndtrung81/three-body-short-nlist
Implementing short neighbor lists for three-body gpu styles
2017-08-17 11:31:59 -06:00
7175abcc71 flag more pair styles as supporting USER-INTEL to match newly added code 2017-08-16 13:58:46 -04:00
e34b20405c Fix a couple of typos in the docs 2017-08-15 21:10:05 -04:00
1d4d2155a2 USER-INTEL add-ons from Mike 2017-08-15 17:12:07 -06:00
cee87d7a54 update manual to point to packages.lammps.org instead of rpm.lammps.org 2017-08-15 16:19:09 -04:00
60e14f1490 add comment to msi2lmp README about symmetry limitations 2017-08-14 08:54:26 -04:00
81e7d4a942 fix incorrect preprocessor define for windows 2017-08-12 00:35:50 -04:00
13b804eeeb Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks as of patch 10Aug17 2017-08-11 14:53:44 -04:00
0b3f1b8a15 patch 11Aug17 2017-08-11 12:19:02 -06:00
4041db8d1a Merge branch 'master' into USER-DPD_kokkos as of patch 10Aug17 2017-08-11 13:25:28 -04:00
b209a4e246 Merge pull request #614 from akohlmey/fixes-for-stable
Fixes for stable
2017-08-11 08:35:20 -06:00
27553283c3 fix bug with pair_modify <style> compute not triggering the correct global change 2017-08-11 08:28:37 -04:00
df56b2d6a4 trigger relink after package library build through updating the time stamp on main.cpp 2017-08-11 08:16:20 -04:00
c6d923b6c8 make download function more resilient by also catching failed execution 2017-08-10 21:15:35 -04:00
6d24be8bb7 whitespace cleanup 2017-08-10 21:14:40 -04:00
52bec0f380 patch 10Aug17 2017-08-10 16:44:09 -06:00
8c16ea1bfc add automatic triggering of review requests with a code owners file 2017-08-10 15:58:51 -04:00
c8741f3a01 remove special_bonds extra keyword and refer to read_data and create_box instead 2017-08-10 15:12:56 -04:00
2a7d2dee36 add more strict checking of data when parsing molecule files to detect format errors 2017-08-10 14:49:51 -04:00
378989e065 Merge pull request #27 from timattox/USER-DPD_kokkos_update
Merge changes thru July 27, 2017 from master 6d0a2286 into USER-DPD_kokkos

Includes 67a0183b which partially reverted 7f9a331c (from May 16, 2017) in USER-DPD,
since SSA neighbor lists use ghost info, so they can't currently be used as "occasional" lists.
2017-08-10 13:21:53 -04:00
f68c6254d4 Merge pull request #611 from akohlmey/final-tweaks
More tweaks for stable release
2017-08-10 08:02:55 -06:00
da01be7c18 More robust change from initial to target restraint centers in Colvars 2017-08-10 09:22:53 -04:00
146aa4cdbd fall back to wget when curl is not available 2017-08-10 09:05:23 -04:00
2f3747eb6e we need to override compiler flags in lib/voronoi/Install.py
The default compiler flags in voro++'s config.mk file do not include
-fPIC, which makes it incompatible with building the shared object for
the python wrapper.
2017-08-10 08:34:46 -04:00
2bc6ad80d4 avoid writable string and deprecated implicit conversion warning 2017-08-10 07:45:21 -04:00
f9a515efd3 add some remarks about makefile settings on windows 2017-08-10 07:24:24 -04:00
5b55744209 fix a header line formatting issue 2017-08-10 07:21:39 -04:00
0dc3cbaa8a Revert "remove -DLAMMPS_MEMALIGN from "make mpi" and "make serial" for increased portability"
This reverts commit 4e97b57508.
2017-08-10 06:51:57 -04:00
ce62c41252 when recomputing special bonds, make certain we do not shrink atom->maxspecial and add force->special_extra only once 2017-08-10 06:47:26 -04:00
4e97b57508 remove -DLAMMPS_MEMALIGN from "make mpi" and "make serial" for increased portability 2017-08-10 05:46:42 -04:00
7f437d7690 Merge pull request #609 from akohlmey/doc-changes-for-stable
Final tweaks and doc changes for stable release
2017-08-09 17:37:35 -06:00
77a628e4ef make the deprecation warning nicer looking 2017-08-09 19:13:40 -04:00
f01103dd08 correctly use the term CUDA (instead of Cuda) when not referring to the KOKKOS device flag (which is Cuda) 2017-08-09 19:08:23 -04:00
81f4d7ecb5 rework section 4 (Packages) in the manual to match Install.py scripts 2017-08-09 19:07:20 -04:00
210a77c5a0 add a deprecation warning to pair style meam and make the reax one consistent with it 2017-08-09 16:36:51 -04:00
e86b139817 Merge pull request #25 from timattox/USER-DPD_GBhacks_cudafix
Fix CUDA runtime issues for USER-DPD Kokkos code.
2017-08-09 15:32:03 -04:00
3e9b41c6b7 Added references to GPU package citations 2017-08-09 10:09:40 -05:00
6780c73907 restore mpic++ makefile to resolve regression test failure 2017-08-09 07:10:08 -04:00
be25a7d9a4 updated comment for fix neb by steve 2017-08-08 20:37:20 -04:00
691d1b730d Merge pull request #607 from akohlmey/final-changes-for-stable
Final build system changes for stable release
2017-08-08 17:26:22 -06:00
95ece8a6c0 consistently use $(PYTHON) in the master makefile (which defaults to "python") 2017-08-08 17:03:52 -04:00
b7b1257b01 remove attempts to use urllib and use curl for all downloading. restore printing help with no flags. 2017-08-08 17:00:09 -04:00
30431d4edb rework Install.py for gpu library. make it consistent with other lib folders and support python3 2017-08-08 16:57:27 -04:00
8a7a831bd6 Remove redundant check in Makefile.kokkos 2017-08-08 12:57:22 -06:00
c53a84a967 update README file for lib/mscg 2017-08-08 13:55:12 -04:00
b7b62f6893 do not pollute global namespace by including mscg header in fix header 2017-08-08 13:20:25 -04:00
d2b0c287d2 add local makefile overrides to be compatible with standard suffixes 2017-08-08 13:19:44 -04:00
b3244f9c98 more lib compilation updates 2017-08-08 07:20:33 -04:00
8bba29d91e more lib installation cleanup 2017-08-07 17:21:45 -04:00
135b1650f1 revamp of library builds
- remove cross compiler stuff
- make use of Install.py consistent
- provide options for Makefile.serial and Makefile.mpi that match those in src
2017-08-07 17:13:01 -04:00
0a54c34e34 Merge pull request #600 from akohlmey/install-and-docs-reviewed
Installation scripts and docs reviewed for release
2017-08-07 08:02:04 -06:00
a8f6a95cba Merge pull request #605 from rbberger/bash_on_windows
Adds tutorial for using LAMMPS in Bash on Windows
2017-08-07 08:00:56 -06:00
e0f9a7c34c Adds BOW tutorial link in main menu 2017-08-07 00:06:53 -04:00
aaf17bde3f Added tutorial for using LAMMPS in Bash on Windows 2017-08-07 00:06:12 -04:00
5ad8a3332d Merge pull request #55 from GarrettTow/patch-1
Fixed typo in "compute_voronoi_atom.txt"
2017-08-04 19:18:57 -04:00
ca7a3a6316 Fixed typo in "compute_voronoi_atom.txt"
There was the typo "requiers" in the Restrictions section of compute_voronoi_atom.txt.
2017-08-04 17:48:27 -04:00
163ed27618 update .gitignore 2017-08-04 16:10:59 -04:00
23ca0099f7 more updates to kim/Install.py to restore missing functionality and align with other scripts
- build into local directory to replace existing installation is now default
- add wrapper function that calls curl in case python package has not ssl support
- have to specify -n flag to avoid wiping out the existing installation
- can specify -p to point to an existing kim-api installation (implies -n)
2017-08-04 14:47:32 -04:00
59ac6ef573 correct a link and a name for OpenKIM 2017-08-04 11:19:09 -04:00
2fa16bcd4c make overlapping links to references unique to avoid anchor label errors 2017-08-04 11:11:41 -04:00
e84b6d8067 Merge pull request #602 from rbberger/pylammps_fixes
PyLammps corrections
2017-08-04 08:35:00 -06:00
96d3712817 Add missing link flag 2017-07-31 15:52:44 -06:00
b395ef00b4 Update tutorial_pylammps.txt 2017-07-31 15:50:14 -06:00
5cd1dc93dc Revert 7edb294b44 temporarily 2017-07-31 15:32:20 -06:00
d3169eeab3 Remove Make.py reference in PyLammps examples
Also fixes some regressions due to command syntax changes
2017-07-31 13:56:20 -06:00
71553cf732 Fix PyLammps regression after output.cpp change 2017-07-31 13:53:41 -06:00
93190a548a Merge branch 'cmake' of github.com:junghans/lammps into cmake 2017-07-31 11:48:27 -06:00
72f50c91ee Add -DLAMMPS_EXCEPTIONS flag 2017-07-31 11:48:22 -06:00
408d9d99a9 cmake: improve some error messages 2017-07-31 11:35:41 -06:00
8431ca5fec Remove tpls directory 2017-07-31 10:54:07 -06:00
13f2d39f55 Update Kokkos library to v2.03.13 2017-07-31 10:34:21 -06:00
9bfd9267fa update and automate the QUIP configuration so that no environment variables are needed 2017-07-28 16:11:13 -04:00
7d0d701eaf add reference outputs for QUIP/GAP example 2017-07-28 16:05:16 -04:00
841a92c7fa remove unused variable 2017-07-28 16:03:24 -04:00
85120842dd update QUIP examples to closer match typical LAMMPS examples 2017-07-28 15:20:33 -04:00
3ebf561e0d remove tarball after unpacking 2017-07-28 14:25:47 -04:00
ffb778cf9b make Install.py for lib/smd and lib/voronoi consistent 2017-07-28 14:03:29 -04:00
f3850da9fe clean up makefiles provide "serial" and "mpi" targets for atc and awpmd 2017-07-28 13:36:06 -04:00
7edb294b44 Fix execution space issues in comm_kokkos 2017-07-28 10:44:08 -06:00
e7d9aabca6 Merge branch 'kim-install' into install-and-docs-reviewed 2017-07-28 11:25:08 -04:00
9695aa6092 Merge branch 'master' into USER-DPD_kokkos_testing 2017-07-27 15:51:56 -06:00
e3973796ba fix bug in power operator in LAMMPS variable expressions 2017-07-27 15:51:45 -04:00
c494ec35e2 correct symbolic links to shared Install.py file 2017-07-27 12:48:32 -04:00
6d0a228624 Merge pull request #599 from lammps/kim-doc
restore lost KIM doc section in Section packages
2017-07-27 10:34:44 -06:00
8e834d8be1 Add missing sync to neigh_bond_kokkos 2017-07-27 09:37:16 -06:00
8f59c0e188 Fix modify/sync issue in neigh_bond_kokkos 2017-07-27 08:51:17 -06:00
acf6d54ec1 python3 port, yet untested 2017-07-27 09:25:39 -04:00
0427f6205e fix typo 2017-07-27 09:25:02 -04:00
72419b6313 Merge remote-tracking branch 'github/kim-doc' into install-and-docs-reviewed 2017-07-26 19:35:15 -04:00
da7a5f55d3 Merge branch 'kim-install' into install-and-docs-reviewed 2017-07-26 19:32:55 -04:00
934cbbbeca restore lost KIM doc section in Section packages 2017-07-26 16:07:08 -06:00
2806f070a4 Merge pull request #598 from akohlmey/last-minute-changes
last minute changes for stable release
2017-07-26 15:46:51 -06:00
715c797df0 simplify Install.py for voronoi 2017-07-26 15:14:12 -04:00
fd6e11f821 convert copies of Install.py files to symlinks 2017-07-26 14:29:52 -04:00
f7a243a4d9 convert explicit copies back into symbolic links 2017-07-26 14:20:03 -04:00
f0d286358e must not include system headers within 'extern "C"' blocks. breaks with MPICH 2017-07-26 14:02:02 -04:00
51a06334ad avoid invalid calls to memcpy(): when ndot == 0, pointers may be NULL 2017-07-26 12:08:42 -04:00
aa5ea95a0f avoid integer overflow and remove unused function argument causing it 2017-07-26 11:55:50 -04:00
60c67b07dc import updated fix msst file with some additional cleanup and simplification 2017-07-26 10:45:11 -04:00
0231cc38a3 cmake: some more typo fixes 2017-07-25 19:09:20 -06:00
c3c9f357fd Fix concurrent modification issue in comm_kokkos 2017-07-25 14:37:41 -06:00
76fb4e0815 Merge branch 'master' into kk_changes 2017-07-25 14:16:31 -06:00
d3fa882280 Fix execution space issues in Kokkos EAM pairstyles 2017-07-25 13:49:23 -06:00
557e5b964a Fixing Kokkos execution space issue with regions 2017-07-25 13:37:01 -06:00
633ca33f2f Fix issue in Kokkos neighborlist 2017-07-25 13:08:24 -06:00
bc446bb8b0 Merge branch 'master' into USER-DPD_kokkos_testing 2017-07-25 12:12:30 -06:00
6716de5320 allow user to override PYTHON_INSTDIR 2017-07-24 20:17:17 -06:00
f2023431f6 cmake: fixed another typo 2017-07-24 12:54:26 -06:00
a59b7e4d56 patch 24Jul17 2017-07-24 09:09:22 -06:00
2eaea2d274 Merge pull request #594 from junghans/license
LICENSE: update address of Free Software Foundation
2017-07-24 08:56:11 -06:00
1ddace4dba Merge pull request #595 from libAtoms/idces2quip
Add a (contrived) molecular example for USER-QUIP
2017-07-24 08:55:03 -06:00
af3d0ca381 Merge pull request #593 from akohlmey/collected-bug-fixes-and-small-updates
Collected bug fixes and small updates
2017-07-24 08:54:16 -06:00
aa60ef6ed8 Cleaned up 3-body kernels, reverted some mistaken changes to vashishta 2017-07-23 00:08:55 -05:00
a71f5a0c20 Enabled again neigh no with tpa > 1 for 3-body gpu styles for backward compatibility, could be slower than neigh no tpa 1 in many cases 2017-07-22 22:57:37 -05:00
c24e316baa avoid floating point overflows in iterative solvers of fix shake 2017-07-22 23:15:01 -04:00
2c6e177d5c avoid reporting negative memory allocation when memory_usage() is called before initialized 2017-07-22 23:14:17 -04:00
126d9cd3bc add GZIP and FFMPEG status 2017-07-22 13:57:15 -06:00
7b2182833f disallow binary output with dump style local. fixes #596 2017-07-22 10:35:16 -04:00
1afab981b0 Clarified some points in in.molecular example 2017-07-22 14:40:33 +01:00
1af937e99d Update in.molecular
- expand comments to provide more details on the choice of exclusion settings
- comment out dump file generation
2017-07-21 22:00:29 -04:00
4e0a249e27 Add a (contrived) molecular example for USER-QUIP
This example showcases the use of different 'special_bonds' settings for
different pair styles, so quip gets all the bonded neighbours but lj can
exclude them if it needs to.

The results have been checked against a pure quip implementation of the
potential; the expected lammps output is included.

DISCLAIMER: This example mixes parameters for methane and silane and is
NOT intended to be a realistic representation of either system.
2017-07-22 01:33:15 +01:00
edc756a65f LICENSE: update address of Free Software Foundation 2017-07-21 17:13:28 -06:00
8d485ea128 Remove hardcoded execution spaces 2017-07-21 16:04:18 -06:00
f4b6b67f6e Fixing more execution space issues in KOKKOS package 2017-07-21 15:04:14 -06:00
8ed881947f Fix execution space in manybody potentials 2017-07-21 14:28:13 -06:00
a477f26477 add support for trapping floating point exception as an optional compile time feature
we may make this a run time setting by connecting this code to a command.
2017-07-21 15:37:40 -04:00
b1b399d5c3 update readme for examples 2017-07-21 15:06:15 -04:00
74deeeca58 cmake: fixed another typo 2017-07-21 11:50:13 -06:00
c010edc4fd cmake: fixed two typos 2017-07-21 11:38:02 -06:00
3d1d0c58c7 Cleaned up 3-body gpu styles, and fixed a bug for tersoff/zbl/gpu.
There is a unresolved bug for neigh no with tpa > 1 with BaseThree, enforce tpa = 1 for neigh no in BaseThree for now.
2017-07-21 12:08:04 -05:00
00474ab09d handle one more case where allowing shifted potential with cutoff 0.0 would create NaNs 2017-07-21 10:30:11 -04:00
733ea61bf1 correct typo in USER-REAXC code 2017-07-21 01:15:24 -04:00
5c13b087e4 Merge pull request #592 from akohlmey/reaxc-bugfix
Bugfix for USER-REAXC and reaxc in KOKKOS and USER-OMP
2017-07-20 16:26:20 -06:00
ec23aef20b fix reaxc division by zero bug also for USER-OMP variant 2017-07-20 18:19:53 -04:00
61b1487cbd avoid division by zero in reaxff bond interaction computations in very rare cases
this addresses the issue reported by stan and ishan
2017-07-20 18:17:19 -04:00
e8e9ea8392 added one trivial test 2017-07-20 16:14:02 -06:00
3449d42267 include pair style kim doc changes that were accidentally included in PR #590 2017-07-20 17:58:49 -04:00
e53583d9c6 Merge pull request #590 from lammps/fortran-dftb
update of Fortran-DFTB interface to be compatible with fix msst
2017-07-20 15:30:23 -06:00
c88d1e5510 make ENABLE_ALL work out of the box 2017-07-20 15:15:29 -06:00
551001f172 revert change, that is part of the kim-install branch and changeset 2017-07-20 17:08:19 -04:00
5dbe2df854 revert change that accidentally undoes part of PRs #583 and #588 2017-07-20 17:07:31 -04:00
427ca88dd4 cmake: error for POEMS + BODY package 2017-07-20 15:02:41 -06:00
3f83396837 Merge pull request #588 from akohlmey/colvars-quickfix
avoid makefile failure, if LAMMPS has not been configured yet
2017-07-20 14:45:25 -06:00
59db5f6a17 update of Fortran-DFTB interface to be compatible with fix msst 2017-07-20 14:40:35 -06:00
1749d643c7 GPU: bring back CUDPP_OPT 2017-07-20 14:30:52 -06:00
f037f89f5f fix GPU + BUILD_SHARED_LIBS
X-Thanks: Robert Maynard <robert.maynard@kitware.com>
2017-07-20 14:12:23 -06:00
1b704bab18 Merge branch 'colvars-safer-makefiles' of https://github.com/giacomofiorin/lammps into colvars-quickfix 2017-07-20 15:59:23 -04:00
c98f6140e7 Change order of targets in Makefiles for Colvars 2017-07-20 15:49:31 -04:00
5031f5b807 Comment out use by Colvars of Makefile.lammps from other packages 2017-07-20 15:48:10 -04:00
9d0d90c038 README clarification from giacomo 2017-07-20 15:25:27 -04:00
66154e8a8b avoid makefile failure, if LAMMPS has not been configured yet 2017-07-20 15:05:58 -04:00
d2f76ae394 Merge pull request #586 from ellio167/kim-install
Refactor lib/kim/Install.py; works with python 3 and 2.7
2017-07-20 14:40:57 -04:00
3cd597e948 Merge pull request #585 from akohlmey/make-py-manual-cleanup
Make.py removal and manual cleanup
2017-07-20 12:05:04 -06:00
eca61226c2 Merge pull request #583 from giacomofiorin/colvars-update-2017-07-19
Update Colvars to version 2017-07-15 and support automated builds for it
2017-07-20 12:04:49 -06:00
fac3e3daa2 Merge pull request #581 from libAtoms/idces2quip
Modified USER-QUIP interface to pass lammps atom IDs
2017-07-20 12:04:32 -06:00
72e5f537c8 Merge pull request #576 from akohlmey/sanitizer-changes
Collected changes for issues detected by gcc -fsanitize
2017-07-20 12:03:40 -06:00
84065dde21 Refactor lib/kim/Install.py; works with phtyon 3 2.7 2017-07-20 12:02:50 -05:00
bdd2f3a6b2 remove references to Make.py and USER-CUDA 2017-07-20 12:25:42 -04:00
a351977c59 update manual links that got broken when removing and renumbering a section 2017-07-20 12:25:42 -04:00
8499e72cdc updates to USER-REAXC code in USER-OMP from Chris Knight. addresses issues with multiple threads in use 2017-07-20 12:11:46 -04:00
ef9fb944c7 Detect number of processors for make 2017-07-20 10:53:08 -04:00
187a80be77 Add forgotten decode() in Install.py 2017-07-19 22:21:49 -04:00
488609a5fd make FFT a selective option 2017-07-19 18:54:15 -06:00
01bcb79bdc cmake: clean up and updated comments 2017-07-19 18:34:07 -06:00
babba1870e added FFTW2 support 2017-07-19 15:33:02 -06:00
355aad9691 restore python3 support. this now can run with python 2.7.13 and 3.5.3. 2017-07-19 17:19:44 -04:00
a99e3ef4f0 cmake: fix typo and pkg info 2017-07-19 15:15:59 -06:00
c95db97b83 fix PYTHON install 2017-07-19 15:15:24 -06:00
ec42a60587 Merge pull request #584 from ellio167/kim-install
Update lib/kim/Install.py for phthon 2.7 conversion
2017-07-19 16:21:04 -04:00
ee6cac826e Update Colvars to version 2017-07-15 and support automated builds for it 2017-07-19 14:24:07 -04:00
f181a0bfab Update lib/kim/Install.py for phthon 2.7 conversion 2017-07-19 12:54:33 -05:00
52a1c54d50 support QUIP wrapper API version query, relax hybrid restriction to allow hybrid/overlay, update docs 2017-07-19 13:17:35 -04:00
fcf9607a66 Update USER_QUIP docs to clarify use of "special_bonds" 2017-07-19 17:47:21 +01:00
2961ba7ebb added MKL support 2017-07-19 10:35:48 -06:00
e2ad4fa745 GPU: cubin not needed 2017-07-18 19:29:40 -06:00
acbc60319f GPU: clean up part 2 2017-07-18 18:43:51 -06:00
e6f5f77edf GPU: clean up 2017-07-18 18:38:36 -06:00
864fd9cd87 remove cubin_headers hack 2017-07-18 18:20:23 -06:00
4d65c327f5 added minimal README 2017-07-18 16:06:29 -06:00
81f342aafa fix variable name bug and synchronize with other ported Install.py files 2017-07-18 18:06:18 -04:00
c3d9786616 GPU compiles 2017-07-18 16:01:35 -06:00
7ccb0d37cd port USER-SMD folder. make voronoi consistent with it 2017-07-18 17:37:48 -04:00
03cd4c5255 ported lib/voronoi/Install.py to python 3.x and tested with 2.7 2017-07-18 17:16:10 -04:00
148364949e fix memory corruption issue in fix reax/c/species 2017-07-18 16:11:49 -04:00
17aff29fe2 fix off-by-one bug when copying strings 2017-07-18 15:48:31 -04:00
f96b9e0dcf add various checks and improvements to identify incompatible uses and warn or exit with error message 2017-07-18 15:48:18 -04:00
a9eaeb4d95 working on GPU build 2017-07-18 13:47:03 -06:00
5cbaf7ca1d correct commands table format issue 2017-07-18 14:47:54 -04:00
02572a4099 add workaround that allows pair style quip to work with -DLAMMPS_BIGBIG, assuming tags are still only 32-bit signed integer 2017-07-18 14:41:38 -04:00
49b4cf9a77 remove references to Make.py and USER-CUDA 2017-07-18 13:24:32 -04:00
49e6c2eb7d remove references to Make.py from the manual and instead refer to section 4 2017-07-18 13:14:03 -04:00
1b34bec81a Prefer DeviceType specification over RangePolicy 2017-07-18 10:59:34 -06:00
a92d792537 update manual links that got broken when removing and renumbering a section 2017-07-18 12:55:55 -04:00
9df61b642e Removing stray file 2017-07-18 10:44:45 -06:00
3c88b2a980 Fixing execution space issues in KOKKOS package 2017-07-18 09:53:26 -06:00
085cbee116 protect LAMMPS from calling incompatible QUIP library with -DLAMMPS_BIGBIG 2017-07-18 11:17:25 -04:00
4ad9528999 safer handling of memory management for lists in reax/c 2017-07-18 07:37:14 -04:00
358915d16e avoid division by zero in peri pair styles 2017-07-18 07:26:45 -04:00
d9186c8fde Revert "use neighbor list exclusions instead of a zero cutoff"
This reverts commit bbb4d63db9.
2017-07-18 01:17:34 -04:00
bc5186bc30 fix unitialized pointer issue in USER-OMP with pppm/disp 2017-07-18 00:44:24 -04:00
c083d5d6f3 fix memory leak in list of neighbor list requests 2017-07-18 00:18:03 -04:00
c3a2ed0d1b plug small memory leak in USER-OMP variants of pppm kspace styles 2017-07-17 23:56:38 -04:00
23033404b0 skip table consistency check for bitmapped tables 2017-07-17 18:18:21 -04:00
3c3baf34c4 GPU: added cuda includedir 2017-07-17 15:04:07 -06:00
8bc3184611 added support for LAMMPS_FFMPEG 2017-07-17 14:01:05 -06:00
050a82af58 fix LAMMPS_LONGLONG_TO_LONG description 2017-07-17 13:28:34 -06:00
99f5f82b02 added support for LAMMPS_MEMALIGN and LAMMPS_LONGLONG_TO_LONG 2017-07-17 13:26:46 -06:00
a3885b78ad added support -DLAMMPS_XDR and -DPACK_* 2017-07-17 13:21:42 -06:00
08c920029f added lammps size option 2017-07-17 12:22:28 -06:00
2411192ab4 cmake: add cross-configure warning 2017-07-17 11:52:06 -06:00
5ee2c31038 split PACKAGES, get ENABLE-ALL right 2017-07-17 11:01:08 -06:00
bda0730169 Modified the quip/lammps interface to pass lammps atom ids 2017-07-17 16:55:05 +01:00
1c1a1db366 Fix typo 2017-07-17 11:55:05 -04:00
80e4448614 added GPU 2017-07-16 23:03:11 -06:00
385c6f7f2b cmake: clean up 2017-07-16 22:53:53 -06:00
fc1be074b2 added USER-INTEL 2017-07-16 22:52:59 -06:00
7605f72c9a finish USER-QMMM 2017-07-16 22:37:51 -06:00
22ecd9b8d2 started on USER-QMMM 2017-07-16 22:07:21 -06:00
7dd5068740 allow internal lapack 2017-07-16 21:43:29 -06:00
fa0f8a9e2a added USER-QUIP 2017-07-16 21:31:57 -06:00
d6f05ea309 USER_OMP -> USER-OMP 2017-07-16 20:19:20 -06:00
b6385d6ce2 add OpenKIM support 2017-07-16 20:17:41 -06:00
2978cce8db Added OPT 2017-07-16 20:52:38 -04:00
9991f679ae added USER-VTK 2017-07-16 20:41:42 -04:00
fc2e8b3c5e more USER packages 2017-07-16 17:52:43 -06:00
bb87bd4ac7 enable more user packages 2017-07-16 17:01:28 -06:00
d50b62837b add USER-AWPMD 2017-07-16 16:45:28 -06:00
c64424754d added USER-ATC 2017-07-16 16:18:58 -06:00
992ce79701 add sanity checks to EAM potential file reader subroutine 2017-07-16 14:37:30 -04:00
c549a16a85 enable REPLICA RIGID SHOCK SNAP SRD VORONOI 2017-07-16 11:30:09 -06:00
140182fb0b added support for QEQ 2017-07-16 11:14:08 -06:00
742eee1966 added support for POEMS 2017-07-16 11:07:36 -06:00
4812d4c659 enable PERI 2017-07-16 10:48:29 -06:00
95d9d32307 add support for MSCG 2017-07-16 10:37:24 -06:00
f50a757dc6 added MPIIO support 2017-07-16 08:32:14 -06:00
01f5136584 cmake: clean up 2017-07-16 08:22:19 -06:00
fa1f38596c Add support for PYTHON in CMake build 2017-07-15 18:29:33 -05:00
23540cfc94 enable MISC 2017-07-15 16:54:27 -06:00
fdb5ccefc7 Merge branch 'cmake' of github.com:junghans/lammps into cmake 2017-07-15 17:47:53 -05:00
629f112915 add support for MEAM 2017-07-15 16:44:03 -06:00
acd315e97a Add basic KOKKOS support to CMake build 2017-07-15 15:33:36 -05:00
d7355801df Make KIM Install.py Python 3 compatible 2017-07-15 12:03:04 -05:00
4ec07422f0 avoid division by zero when using cutoff 0.0 with pair_modify shift yes 2017-07-14 23:33:00 -04:00
b15f75d37b Merge branch 'cmake' of github.com:junghans/lammps into cmake 2017-07-14 22:08:06 -05:00
5e841bfe15 Added USER-OMP support to CMake build 2017-07-14 22:07:53 -05:00
3f297382ac Revert "do not allow pairwise cutoffs <= 0.0. avoids undefined behavior and division by zero errors"
This reverts commit a04711b21f.
2017-07-14 22:41:59 -04:00
d079b2f758 CreateStyleHeader: use temp file 2017-07-14 18:37:06 -06:00
54f2b02ac8 cmake: fix install 2017-07-14 18:33:27 -06:00
0a6e9c8bf6 added ENABLE_ALL option 2017-07-14 17:41:13 -06:00
b85979503f Add CMake support for more packages
BODY, COLLOID, CLASS2, COMPRESS, CORESHELL, DIPOLE, GRANULAR, MC, MOLECULE, MANYBODY, RIGID
2017-07-14 18:19:59 -05:00
c7e218f310 Merge branch 'cmake' of github.com:junghans/lammps into cmake 2017-07-14 18:06:27 -05:00
335ef11a7b Added style header generation with CMake 2017-07-14 17:49:05 -05:00
296e572e69 better Install.py script for KIM from Ryan Elliott 2017-07-14 16:25:16 -06:00
cc9b3864bf Merge pull request #577 from v0i0/airebo-kim-difference
AIREBO: Add doc about OpenKIM issue
2017-07-14 16:22:15 -06:00
d5dcb3d329 add support for KSPACE 2017-07-14 15:55:36 -06:00
c07adac22d add support for LAMMPS_GZIP 2017-07-14 14:49:53 -06:00
e4e1252152 fix LAMMPS_PNG 2017-07-14 14:44:44 -06:00
842dc1b58c cmake: collect link libs 2017-07-14 14:21:21 -06:00
bbb4d63db9 use neighbor list exclusions instead of a zero cutoff 2017-07-14 14:52:08 -04:00
1c92eecea7 move updated gauss_flow example to the correct folder 2017-07-14 14:01:41 -04:00
a04711b21f do not allow pairwise cutoffs <= 0.0. avoids undefined behavior and division by zero errors 2017-07-14 13:49:28 -04:00
e084d4dad6 print warnings in Pair::init() only on MPI rank 0 2017-07-14 13:48:21 -04:00
522bc13d67 avoid casts to the wrong derived class, which upsets code analysis tools. seems to improve performance, too. 2017-07-14 13:47:49 -04:00
14f1d646ad provide working examples for all four peridynamics models and reference outputs 2017-07-14 13:46:19 -04:00
3b1134c164 correct formatting error in peridynamics pair style docs 2017-07-14 13:42:02 -04:00
4d4c03a1e4 restore gaussian flow example that was lost. tweak input to make it usable for comparing 2017-07-14 12:33:40 -04:00
60faca2896 added tilt factors 2017-07-14 10:05:38 -06:00
e5405cdb04 AIREBO: Add doc about OpenKIM issue 2017-07-14 17:57:25 +02:00
8a1db83b73 silence static code analysis warning 2017-07-14 10:31:51 -04:00
a566419ca6 Add LAMMPS_LIB_SOURCE_DIR variable in CMakeLists.txt 2017-07-14 04:36:52 -05:00
fdd3d802f0 Clean up CMakeList.txt by introducing LAMMPS_SOURCE_DIR variable 2017-07-14 04:00:38 -05:00
a86b0d4c1b Add PNG library detection to CMakeList.txt 2017-07-14 03:53:07 -05:00
7f1789a0c4 cmake: add support for REAX and hence Fortran 2017-07-13 23:30:46 -06:00
bfb449cec9 cmake: furhter improvments
* Add support for one package
* Add support for JPEG as external package
* Use pre-generated style header
  * TODO write a script to generate them
2017-07-13 22:54:51 -06:00
de45a46529 Merge branch 'compute_rdf_dynamic' into sanitizer-changes 2017-07-13 17:39:12 -04:00
32ca58bdf2 whitespace cleanup 2017-07-13 17:34:30 -04:00
111786e92e avoid trying to free NULL pointers and reallocate storage for OpenMP, when not using OpenMP styles 2017-07-13 17:33:56 -04:00
132cee9840 protect warning printf()s to be only printed on rank 0 2017-07-13 17:33:00 -04:00
609c8b1e87 add flag to reax/c system struct to signaling, whether OpenMP is active 2017-07-13 17:32:27 -04:00
9988030409 Merge pull request #563 from akohlmey/airebo-example
Add AIREBO and AIREBO-M example input deck
2017-07-13 13:12:30 -06:00
fc36754ca2 Merge pull request #561 from v0i0/fix-airebo-various
Fix Various AIREBO issues
2017-07-13 13:10:42 -06:00
3a46c34c2f Merge pull request #574 from lammps/snap-virial
changes to SNAP virial from Aidan
2017-07-13 13:07:29 -06:00
cb935730c0 Merge branch 'master' into compute_rdf_dynamic 2017-07-13 15:02:50 -04:00
983eb0e80d Merge pull request #572 from junghans/data2xmovie
tools/Makefile: remove remains of data2xmovie
2017-07-13 11:27:46 -06:00
fc6c10c9a9 Merge pull request #571 from hasanmetin/reaxc-omp-credits-update
updated the credits and citations for pair style reaxc/omp and qeq/reax/omp
2017-07-13 11:27:18 -06:00
a3a0c9b144 Merge pull request #570 from akohlmey/collected-small-changes
Collected small changes
2017-07-13 11:26:47 -06:00
b64849d574 Merge pull request #569 from ellio167/kim-install-py
Kim install py
2017-07-13 11:24:43 -06:00
e58bcd8b4a Merge pull request #568 from akohlmey/fix_gcmc_parallel_workaround
Workaround for data corruption when using fix gcmc in parallel with shake or fix rigid
2017-07-13 11:23:49 -06:00
ef2f4980e9 Merge pull request #566 from akohlmey/compute_rdf_dynamic
Dynamic group and normalization support for compute rdf
2017-07-13 11:23:22 -06:00
d3a45f6d50 Merge pull request #560 from aershadinia/master
EES wall potential
2017-07-13 11:22:47 -06:00
d0cc1dfbb8 changes to SNAP virial from Aidan 2017-07-13 11:19:35 -06:00
de8d417aec fix off-by-one memory allocation bug 2017-07-13 10:55:13 -04:00
0af9203fdc remove useless and incorrect neighbor list request in fix qeq/comb/omp 2017-07-12 18:32:04 -04:00
6b19016deb cmake: initial commit 2017-07-12 16:23:38 -06:00
c24fca61f3 fix possible uninitialized data access with pppm and pppm/disp 2017-07-12 18:14:11 -04:00
01e848387a avoid accessing uninitialized data when exiting LAMMPS early 2017-07-12 18:00:38 -04:00
734729b0a4 avoid small memory leak with USER-REAXC + USER-OMP, spotted by GCC's address sanitizer 2017-07-12 17:27:49 -04:00
a419c7c57c update src/.gitignore for fix wall*/ees sources 2017-07-12 11:40:35 -04:00
69d97fa60c fix enforce2d has to be defined after fixes with enforce2d_flag set
this check currently only applies to rigid fixes and is needed
so that their respective enforce2d function is called _after_
the post force functions. this is required in combination with
commit a9ff593763 to allow rigid
fixes use the langevin option correctly for 2d systems
2017-07-12 11:26:16 -04:00
a9ff593763 avoid segfault when calling enforce2d before langevin data has been initialized 2017-07-12 09:48:07 -04:00
ddc9621325 remove absolutely last reference to xmovie 2017-07-11 18:30:41 -04:00
f717a70638 tools/Makefile: remove remains of data2xmovie
data2xmovie was removed in e110d6961a
2017-07-11 16:16:03 -06:00
f7f4a24930 whitspace cleanup 2017-07-11 15:01:15 -04:00
338fc28970 combine citeme.log entry for pair reax/c/omp and fix qeq/reax/omp 2017-07-11 14:59:08 -04:00
5a1e020bf0 updated the credits and citations for pair style reaxc/omp and qeq/reax/omp 2017-07-11 08:05:36 -07:00
c8939d8df6 clarify explanation of body style molecule in rigid fixes 2017-07-11 09:43:54 -04:00
cdac5f496c Built 3-body short neighbor list for the 3-body kernels using per-pair cutoffs for vashishta gpu style 2017-07-11 00:13:56 -05:00
8c9db3ea00 Built 2-body short neighbor list and used for 2-body kernels in tersoff gpu styles 2017-07-10 23:50:21 -05:00
e30c5fc956 Fixed shebang and renamed to lib/kim/Install.py 2017-07-10 21:05:29 -05:00
c29e8fba9b Updated lib/kim/README file to go along with new install.py 2017-07-10 17:00:30 -05:00
8d592f4b9e Finalized code for lib/kim/install.py 2017-07-10 16:43:23 -05:00
c9a0d38a3e mention restriction for use with fix shake or fix rigid in fix gcmc docs 2017-07-10 17:34:00 -04:00
b5e9e90bb6 white space cleanup 2017-07-10 17:21:20 -04:00
92395e9bb4 disallow MC moves with fix rigid and fix shake active. update examples and add shake example 2017-07-10 17:19:37 -04:00
ea2b01e83b Refactored 3-body gpu styles to remove code duplication 2017-07-08 20:17:31 -05:00
34fe2273f6 Added short neighbor list implementation for tersoff/zbl/gpu and tersoff/mod/gpu 2017-07-08 14:59:48 -05:00
77c60189b8 Minor cleanups for tersoff/gpu 2017-07-08 14:43:53 -05:00
1c6533e53d Working on short neighbor list for tersoff/gpu 2017-07-08 14:15:26 -05:00
68206079da Supported short neighbor lists for 3-body kernels in sw/gpu and vashishta/gpu 2017-07-07 16:47:24 -05:00
71ddcaf0b6 whitespace cleanup 2017-07-07 15:50:19 -04:00
fe888e4622 add support for recomputing normalization factors and finite size correction during 2017-07-07 15:39:25 -04:00
b0be8b24ea Further work on lib/kim/install.py 2017-07-06 15:50:03 -05:00
16fc2d6fe1 Add install.py and update config for kim lib 2017-07-06 15:49:58 -05:00
7193fffe0d make example input / output conform with LAMMPS conventions (no dump files, no log command) and update reference outputs 2017-07-06 16:08:25 -04:00
4339379948 patch 6Jul17 2017-07-06 13:58:26 -06:00
23925b3a57 update fix wall/ees and wall/region/ees file to conform more to common formatting
also fix some typos and formatting issues
2017-07-06 14:47:44 -04:00
423e3b6389 integrate fix wall/ees and wall/region/ees into doc system 2017-07-06 14:45:51 -04:00
87af3b1fd9 Merge pull request #564 from lammps/fix-external
bugfix for fix msst
2017-07-06 08:58:20 -06:00
8be6d5bfd8 Merged two doc files 2017-07-06 20:21:55 +09:00
a62eb43791 Delete "fix_wall_region_ees.txt" 2017-07-06 20:20:12 +09:00
33be51af54 Deleted "fix wall/region/ees" doc file 2017-07-06 20:19:40 +09:00
47649ff50f some edits to make examples more illustrative. 2017-07-06 15:35:06 +09:00
0423971205 whitespace cleanup 2017-07-06 00:24:00 -04:00
4ee7c6f5ca remove code without effect 2017-07-06 00:23:50 -04:00
7f63c09667 correct comment for Fix::ev_setup() 2017-07-05 22:35:58 -04:00
a5234d7aea fix bug reported by richard berger via https://ci.lammps.org/job/lammps/job/master/job/regression/160/testReport/junit/examples/msst/msst/ 2017-07-05 22:34:34 -04:00
fa469ae1d0 add polyethylene airebo example for future reference 2017-07-05 17:44:18 -04:00
e493b6a648 Fix sigcut class variable actually used 2017-07-05 22:52:29 +02:00
be8360ac4b Merge pull request #562 from lammps/fix-external
additional fix external hooks for calling programs
2017-07-05 14:46:10 -06:00
4de9cec1b6 make old_velocities allocation safer while retaining the test for nlocal 2017-07-05 16:22:39 -04:00
8c3f6947ad remove unused variables to silence compiler warnings 2017-07-05 16:19:59 -04:00
894e0c3cf5 simplify parsing of optional arguments 2017-07-05 16:19:24 -04:00
09ad293425 remove dead code 2017-07-05 15:04:35 -04:00
e625e79171 safer handling of processors w/o local atoms 2017-07-05 15:04:27 -04:00
f1088a5003 changes requested by @sjplimp 2017-07-05 15:03:58 -04:00
d451dbb1a0 adjust EES wall input example to print out some thermodynamic info that can be used for testing 2017-07-05 13:54:56 -04:00
6eddc1a2ee coding style and whitespace cleanup to match LAMMPS style 2017-07-05 12:33:41 -04:00
1bf1cb150f Updated credits 2017-07-05 18:26:32 +02:00
ea4f16bd79 additional fix external hooks for calling programs 2017-07-05 10:01:19 -06:00
9fa4588eb7 fixed a typo 2017-07-05 23:46:48 +09:00
f5440a777b Merge branch 'master' of https://github.com/aershadinia/lammps
hello
2017-07-05 23:25:03 +09:00
92831f185b Merge branch 'master' of https://github.com/aershadinia/lammps 2017-07-05 23:23:09 +09:00
8e279d4ec8 Examples moved 2017-07-05 23:16:42 +09:00
cbd8f99754 Restrictions Added 2017-07-05 23:15:27 +09:00
b720f39163 Restrictions Added 2017-07-05 23:15:23 +09:00
ff761d639a Sync AIREBO USER-OMP implementation. 2017-07-05 15:29:40 +02:00
d2f7f4843a AIREBO Fix Credits 2017-07-05 15:16:45 +02:00
7e42af18bc Feature: AIREBO parametrize cutoff switching
In #514 it has been raised that the switching function that
ensures a smooth transition to the cutoff is only correct if
cutlj = 3.0. This patch gives users an opportunity to configure
the switching function together with the cutoff by specifying
the start of the transition region. Behaviour in the default case
remaing unchanged.
This allows users to specify larger cutoffs than 3 (which used to
have no effect) and get correct cutoff behaviour for values less
then 3.
2017-07-05 15:11:58 +02:00
74d63c24fd Fix AIREBO missing derivative in bondorderLJ
This change replaces the bondorderLJ() function with code provided
by Github user CF17, which is based on the bondorder() code.
It could be fixed with a shorter patch [1], but layering fix upon
fix seems to be unwise in this case.
While the code at this point departs from following the Fortran
code closely, the reason is that the bug is present in the Fortran
code as well.
Instead, the new code follows closely the bondorder() code that
already exists, which should be easier to maintain in the future.
This patch makes the two functions consistent with each other,
and makes outside contributions easier.
Since it uses a different approach to compute its value, some
explanation of that reasoning has been added on top.

1: e8c5c662b2
2017-07-05 14:51:34 +02:00
769870cfc9 Proper spline coefficient calculation for AIREBO 2017-07-05 12:55:53 +02:00
e0521f27b4 Added reference to example directory. 2017-07-05 15:08:07 +09:00
5eb5391b20 Add reference to example 2017-07-05 15:06:34 +09:00
d3b8e688c9 Files Added to MISC 2017-07-05 14:57:43 +09:00
67d474df2a deleteing USER-EES 2017-07-05 14:39:37 +09:00
d0a397d6cb Merge pull request #559 from lammps/fortran3
3rd variant of Fortran wrapper for DFTB+ calling LAMMPS
2017-07-03 14:50:33 -06:00
f670dba3d0 3rd variant of Fortran wrapper for DFTB+ calling LAMMPS 2017-07-03 14:24:16 -06:00
6fc0a94e87 Merge pull request #524 from martok/package-meamc
Package USER-MEAMC
2017-07-03 12:30:01 -06:00
5c0c8bb4cd Merge pull request #558 from lammps/intel
memory allocation bugfix for USER-INTEL pppm from M Brown
2017-07-03 12:25:12 -06:00
9eeb97b039 Merge pull request #544 from akohlmey/tip4p-triclinic
Correct handling of triclinic box support in pppm/tip4p and pppm/tip4p/omp
2017-07-03 12:24:18 -06:00
9ca9b5e2ff add authors tag to pull request template 2017-07-03 12:06:36 -04:00
db73eca29f correct example inputs for recent changes to create_bonds command 2017-07-03 11:43:55 -04:00
2d1941ed9b make USER-INTEL compilable again with gcc and without OpenMP active 2017-07-03 11:33:08 -04:00
e634c5a2de memory allocation bugfix for USER-INTEL pppm from M Brown 2017-07-03 08:53:53 -06:00
22f3db4723 remove some dead code and prune argument lists accordingly 2017-07-01 18:16:36 -04:00
a1574fc03d remove unused variables 2017-07-01 17:55:13 -04:00
d68fb1cbb8 avoid repeated computation of deltaik and deltajk, calls to pow() 2017-07-01 17:49:14 -04:00
060e32973e another speedup by folding dsij() into meam_force() 2017-07-01 17:07:56 -04:00
a4a15f24bd fold screen() function into getscreen() and avoid some repeated operations 2017-06-30 18:44:51 -04:00
883b7aaa0e Merge pull request #557 from lammps/create-bonds
add single options to create_bonds command
2017-06-30 14:18:15 -06:00
1fff30af90 update or create example outputs for meam and meam/c 2017-06-30 15:30:06 -04:00
a490e04d24 add backward compatibility item to pull request template 2017-06-30 15:07:43 -04:00
b445f8eadf spell-check new additions to create_bonds doc page 2017-06-30 14:59:08 -04:00
b79044d4f6 Merge pull request #554 from jewettaij/master
Have extra/XXX/per/atom set by keyword to the read_data command
2017-06-30 11:47:46 -06:00
711afe5062 add single options to create_bonds command 2017-06-30 11:30:43 -06:00
3bf2c60276 Merge pull request #553 from Pakketeretet2/USER-MANIFOLD-gaussian-bump
Update to USER-MANIFOLD gaussian bump
2017-06-30 11:08:47 -06:00
d5119b2d75 Merge pull request #550 from stanmoore1/kokkos_leakfix
Fix Memory Leak in Kokkos NeighList
2017-06-30 11:08:30 -06:00
b2b621a2e1 Merge pull request #547 from akohlmey/collected-bugfixes
Collected small bugfixes and updates
2017-06-30 11:08:02 -06:00
b5250d11f6 Merge pull request #545 from akohlmey/issue-and-pull-request-templates
Add folder .github containing administrative files for use with GitHub
2017-06-30 11:06:58 -06:00
9dad95d101 performance improvement through moving inlinable functions to header file 2017-06-30 13:04:09 -04:00
f6faad335c update documentation for nb3/harmonic pair style according to e-mail to lammps-users 2017-06-30 11:37:18 -04:00
5548704700 Move stateless functions to separate module, improve style
- use static/const
- return instead of ptr-parameter, &ref if more than one return
- replace macros from header with inline functions
- remove useless/old comments
2017-06-30 15:37:26 +02:00
e0939ac795 Re-Run clang-format 2017-06-30 12:28:22 +02:00
d5921e9fb9 consolidate and update error message and read_data documentation for the updated read_data command 2017-06-29 16:30:49 -04:00
aa3f4b7690 change the handling of reading "extra XXX per atom", so that the final choice is the larger of the value in the file and the keyword 2017-06-29 16:09:23 -04:00
38075455b6 new keywords for read_data: extra/X/per/atoms + changes to docs 2017-06-28 17:55:30 -07:00
fa30635465 Revert "added feature to write_data.cpp to support "extra bonds" (angles,dihedrals,impropers,special)."
This reverts commit 0c2f7c74be.
2017-06-28 17:48:32 -07:00
0c2f7c74be added feature to write_data.cpp to support "extra bonds" (angles,dihedrals,impropers,special). 2017-06-28 14:12:03 -07:00
91bce7ccf9 Replaced std::fabs with fabs. 2017-06-28 09:48:00 -04:00
d0470799ac consistently check for all per-atom-type masses being set only when per-atom masses are not set
rather than placing an if statement around every incidence of calling atom->check_mass() to ensure it is only called when per atom masses are not set, we place that check _inside_ Atom::check_mass(). This avoids unexpected error messages.
2017-06-28 06:26:21 -04:00
076990c28a Updated Gaussian bump so that it has a better taper function. 2017-06-27 16:48:33 -04:00
661e51b607 remove non-ascii characters and spell check 2017-06-27 00:38:53 -04:00
d076040471 use itemized list instead of paragraphs for links at the top 2017-06-27 00:24:04 -04:00
2f9c0a3b8e more formatting issues addressed 2017-06-27 00:23:10 -04:00
b9d213ee2b update formatting for contributing ToC 2017-06-27 00:21:29 -04:00
fa3c7727e1 contributing guidelines, issue and pull request template are now feature complete
This is still a draft and in need of editing, proofreading and testing for formatting.
2017-06-27 00:17:37 -04:00
9fec8a0470 Remove clean_copy function from pair_vashishta_kokkos 2017-06-26 10:56:03 -06:00
b889776557 Fixing memory leak in Kokkos neighborlist 2017-06-26 10:51:26 -06:00
8fca667e4b Change indexing of remaining variables and locals
- Voigt index tables
- local variables
- remove shims from header
2017-06-26 18:09:11 +02:00
ea4d11fc5e Merge branch 'master' into USER-DPD_kokkos_testing 2017-06-26 09:36:30 -06:00
f7077d9672 Merge branch 'collected-bugfixes' of github.com:akohlmey/lammps into collected-bugfixes 2017-06-26 11:27:31 -04:00
f89a7266bf make USER-INTEL compilable again with gcc and without OpenMP active 2017-06-25 23:57:42 -04:00
1257955662 Merge branch 'master' of https://www.github.com/lammps/lammps 2017-06-23 19:31:43 -04:00
1370385c8c patch 23Jun17 2017-06-23 17:10:59 -06:00
2240c3d7d3 Merge pull request #548 from lammps/doc-update
doc page clarifications for CHARMM energy and dipole pre-factors
2017-06-23 16:48:37 -06:00
4fcbd58d5a doc page clarifications for CHARMM energy and dipole pre-factors 2017-06-23 15:54:14 -06:00
c2c6dc1458 remove spurious comment line 2017-06-23 16:24:37 -04:00
18983c307e fix qeq/reax/omp bugfix from metin 2017-06-23 16:24:00 -04:00
25a5d12af3 Merge pull request #541 from lammps/charmm
use CHARMM energy conversion factor with new CHARMM pair styles
2017-06-23 09:10:04 -06:00
05fbf93455 skip deleting internal data before setup has been run 2017-06-23 10:37:00 -04:00
73b948dcfc pppm must be fully reinitialized after switching to triclinic box to avoid memory corruption 2017-06-23 10:01:45 -04:00
374eef2b17 add first draft of issue template 2017-06-23 01:13:10 -04:00
dc7243838b first draft of a contributor's guide file 2017-06-23 00:54:20 -04:00
57d5cfede3 add first draft of a pull request template 2017-06-22 23:07:09 -04:00
feb500b526 reword the kspace_modify fftbench keyword docs to reflect the current state (i.e. off by default) of code 2017-06-22 19:17:41 -04:00
a714b57741 make neighbor list reset message for minimization more explicit 2017-06-22 19:07:57 -04:00
c5430b0a26 print info messages when changing qqr2e constant in fully CHARMM compatible pair styles 2017-06-22 18:41:44 -04:00
c081d383d1 Merge branch 'master' of https://www.github.com/lammps/lammps 2017-06-22 18:37:37 -04:00
f8364342c2 port corrected triclinic handling from pppm/tip4p to pppm/tip4p/omp 2017-06-22 18:12:28 -04:00
488d1b7a79 correct find_M() function in pppm/tip4p to properly account for ghost atoms not being in lamda space with triclinic cells 2017-06-22 17:36:18 -04:00
dadd1c8b4d Remove neigh_f2c/c2f, related cleanup
- neighbour lists now use C indexing
- removed many arr*v() macros
- removed some unneccessary pointers
- minor reformatting
2017-06-22 19:02:14 +02:00
60c3f3d64c use CHARMM energy conversion factor with new CHARMM pair styles 2017-06-22 09:15:15 -06:00
7a4a569859 Merge pull request #540 from lammps/neighrespa
fix issue with rRESPA inner/middle neighbor lists
2017-06-22 07:54:12 -06:00
4fc3f4f7e5 Merge pull request #538 from akohlmey/collected-small-changes
Collected small changes and bugfixes
2017-06-22 07:52:21 -06:00
f092da80a9 Fix some shadowing warnings 2017-06-22 13:28:12 +02:00
b0ddabbcde update examples for fix filter/corotate to comply with new CHARMM restrictions 2017-06-22 00:19:21 -04:00
b9029ada77 fix bug in incorrect use of O coordinate instead of M coordinate in pppm/tip4p 2017-06-22 00:07:59 -04:00
de3157f720 document new restrictions to CHARMM compatible dihedral styles 2017-06-21 19:31:40 -04:00
0c6a751751 may check for 1-4 scaling factors in CHARMM dihedral styles only when "weightflag" is set, since they may be used with amber 2017-06-21 19:29:31 -04:00
612b44a895 enforce using 'special_bonds charmm' for dihedral styles charmm and charmmfsw 2017-06-21 19:15:52 -04:00
684b7334a5 enforce that CHARMM dihedral styles are run at the same r-RESPA level as pair 2017-06-21 19:08:02 -04:00
1fc2eb1e3e fix issue with rRESPA inner/middle neighbor lists 2017-06-21 15:12:51 -06:00
e69ef56f10 Merge pull request #539 from lammps/neighsize
insure compute pair/property local will use a copy of granular neighbor list
2017-06-21 15:03:12 -06:00
7dc380b113 insure compute pair/property local will use a copy of granular neigh list 2017-06-21 12:44:35 -06:00
f47aaa5f3c Merge branch 'master' of https://www.github.com/lammps/lammps 2017-06-21 14:11:12 -04:00
5e165e6782 fix array bounds issue due to typo. spotted by GCC. 2017-06-21 13:33:26 -04:00
02625b2855 fix typos introduced in original translation: results are correct again 2017-06-21 18:54:21 +02:00
1a77135ed6 whitespace cleanup in docs 2017-06-21 09:38:10 -04:00
f45c7e1fb0 update fix ti/spring docs to reflect it is part of USER-MISC 2017-06-21 09:36:30 -04:00
0cfe8980d4 dead code removal 2017-06-20 22:07:40 -04:00
2988508cee correct indexing bug in pair style lj/long/tip4p/long 2017-06-20 17:53:45 -04:00
15c596153a remove dead code 2017-06-20 17:38:28 -04:00
e13c94ed4f fix uninitialized variable bug spotted by coverity scan 2017-06-20 17:25:01 -04:00
812f1a8fab remove local variables shadowing global ones in BondsOMP() 2017-06-20 17:20:57 -04:00
218bc92c82 make pre-processor defines for using libc's qsort() consistent 2017-06-20 17:13:42 -04:00
ffa906de6f add C++ format identifiers to .h files 2017-06-20 16:18:34 -04:00
cccf72a21d make certain class member list is initialized to NULL before assigned to a neighbor list 2017-06-20 16:09:11 -04:00
87c028ed02 patch 20Jun17 2017-06-20 12:06:02 -06:00
bb47fa8783 Change indexing of all MEAM element arrays
- arrays in MEAM class
- eltind setting
- remove fmap translation
2017-06-20 19:56:14 +02:00
c79dc53c6a code improvement, less pointer params 2017-06-20 19:36:07 +02:00
72a1364d85 Merge branch 'master' into package-meamc 2017-06-20 13:21:46 -04:00
198fe7ecd7 fix storing of invalid memory pointer 2017-06-20 19:00:57 +02:00
84b530cca1 Merge pull request #537 from lammps/neb
minor changes to NEB doc pages and examples
2017-06-20 09:38:32 -06:00
50c9167913 small formatting correction in fix neb docs 2017-06-20 10:36:30 -04:00
d2610d9e7c minor changes to NEB doc pages and examples 2017-06-20 08:19:23 -06:00
326a8a1289 Merge pull request #536 from akohlmey/fix-nvcc-openmp-conflicts
Implement workaround for NVCC incompatibilities with OpenMP directives
2017-06-20 07:44:40 -06:00
b5300724bb Merge pull request #533 from lammps/user-intel
Updates for USER-INTEL package and NEB command flags/docs updates and issues
2017-06-20 07:44:17 -06:00
e129f18e6f Merge pull request #530 from akohlmey/no_static_sort_in_dump
Refactor Dump and Irregular classes to remove static class members
2017-06-20 07:43:49 -06:00
8c54fcd1b6 cleanup from aidan for fix reax/c/species and its KOKKOS version
this version eliminates the need for the PBCconnected list and avoids having to access the spec_atom array for ghost atoms
2017-06-19 17:31:54 -04:00
67a0183b33 Removing atom2bin change since ssa neighlists aren't be used for occasional lists 2017-06-19 15:23:33 -06:00
f5047ac3c7 augment fix shardlow check for ordering fixes to be KOKKOS compatible 2017-06-19 17:23:23 -04:00
b96b6b9cd7 Fixing error checks 2017-06-19 14:04:16 -06:00
164cedf353 protect all OpenMP pragmas with ifdefs and add special conditions for nvcc to ignore unsupported directives 2017-06-19 15:31:20 -04:00
3c329d1707 massive whitespace cleanup in USER-INTEL
removed are:
- DOS/Windows text format carriage return characters (^M)
- tabs replaced with spaces (tabs are evil!!)
- trailing whitespace
2017-06-19 13:23:01 -04:00
b687d16177 insert C++ file format indicator comments 2017-06-19 13:03:23 -04:00
da0dcbe0bb Updating to master 2017-06-19 10:56:24 -06:00
9d3e34e492 add missing reference for lj/smooth/linear 2017-06-19 11:23:30 -04:00
8988b692a3 modified the documentation, first and last freeend can have different spring constants 2017-06-19 16:30:42 +02:00
c97415aefa corrected the initial free end 2017-06-19 14:57:39 +02:00
a9f3f90025 fix uninitialized members 2017-06-19 12:51:18 +02:00
9b8de3ba29 remove ifdefs for selecting between plain and hybrid merge sort. use hybrid only. 2017-06-17 09:30:41 -04:00
cd88b31450 same PR, also has cosmetic changes to new fix neb options 2017-06-16 17:02:05 -06:00
9b9f6d6fe2 USER-INTEL upgrade from M Brown 2017-06-16 16:56:28 -06:00
c1b0b1b3f9 restore old qsort() based code and add preprocessor directives to switch
-DLMP_USE_LIBC_QSORT will use qsort() from libc to sort (requires static/global variables).
-DLMP_USE_MERGE_SORT will use a plain merge sort. slightly slower for expensive comparisons.
-DLMP_USE_HYBRID_SORT will use hybrid merge sort. faster than merge sort (no static/global variables)
2017-06-16 18:17:48 -04:00
bc0241576f Merge pull request #532 from akohlmey/restore-heuristics-in-fix-shardlow
recover running USER-DPD with USER-OMP and suffixes
2017-06-16 09:46:58 -06:00
2a6f026853 mergesort performance improvements
- use insertion sort to pre-sort data in 32-element chunks
- swap pointers between merge runs instead of copying the data
2017-06-16 08:05:55 -04:00
8728a8ddae restore heuristics for checking against integrators that broke after PR #499 was merged 2017-06-15 15:16:50 -04:00
9aa450b832 Merge pull request #528 from akohlmey/no_static_in_ring_comm
Refactor ring communication to no longer require static class variables
2017-06-15 11:13:07 -06:00
0588c382f0 Merge pull request #513 from v0i0/bugfix-airebo-nconj-kronecker
Bugfix in AIREBO as reported in #59 by @KammIma
2017-06-15 11:12:29 -06:00
d3c90f3c14 Merge pull request #510 from akohlmey/collected-small-changes
Collected small changes
2017-06-15 11:12:14 -06:00
b62d526cc9 Revert "avoid undesired negative forces for high particle velocities in granular models"
This reverts commit 066123007c.
2017-06-15 11:01:36 -04:00
1a29048940 Merge pull request #531 from ohenrich/user-cgdna
Affiliation Update for USER-CGDNA
2017-06-15 08:54:52 -06:00
0a6b3f8790 Merge pull request #527 from dstelter92/master
Added compute_scalar to fix_grem
2017-06-15 08:54:22 -06:00
7227bc415d Merge pull request #526 from andeplane/vashishta_gpu
Implemented pair style vashishta in GPU package
2017-06-15 08:52:13 -06:00
a4bc233d86 Merge pull request #525 from akohlmey/user-tally-refactor
Refactoring of USER-TALLY computes to handle sparse/hybrid system for many processors plus bugfixes
2017-06-15 08:51:24 -06:00
5c5b4ffadb Merge pull request #522 from akohlmey/tip4p-cleanup-refactor
Refactor and bugfix for some TIP4P pair styles
2017-06-15 08:48:52 -06:00
30177c4eae Merge pull request #521 from pastewka/17_dump_nc
Updated NetCDF dump style (dump netcdf)
2017-06-15 08:47:29 -06:00
178eff237b Merge pull request #520 from stanmoore1/kokkos_update
Kokkos library update to v2.03.05
2017-06-15 08:47:09 -06:00
576b7f1d97 Merge pull request #519 from Pakketeretet2/USER-MANIFOLD-gaussian-bump
Some extensions/cleanup in USER-MANIFOLD
2017-06-15 08:46:55 -06:00
86369fec6b Merge pull request #517 from akohlmey/select-rigid-reinit-option
Add `reinit` keyword to rigid body fixes
2017-06-15 08:46:29 -06:00
79341ac5d1 Merge pull request #516 from akohlmey/check-rigid-overlap
Implement check whether commands or styles try to change cached properties in rigid body integrators
2017-06-15 08:44:05 -06:00
66945294a9 Merge pull request #515 from stanmoore1/remove_fences
Remove unnecessary thread fences in Kokkos package
2017-06-15 08:40:43 -06:00
9a7207e34c Merge pull request #511 from akohlmey/add-compute-cnp
Integrate compute cnp/atom contributed by Paulo Branicio (USC)
2017-06-15 08:38:05 -06:00
d41c617d1d Merge pull request #509 from akohlmey/add-atomonly-npair-for-omp
add "atomonly" optimized neighbor list build styles to USER-OMP
2017-06-15 08:24:44 -06:00
1ec9e588ff Merge pull request #504 from andeplane/hexorder_fix
Using correct ndegree instead of nnn
2017-06-15 08:24:25 -06:00
3c7417fb59 Merge pull request #497 from lammps/add-user-reaxc-omp
Add USER-OMP compatible OpenMP support to USER-REAXC
2017-06-15 08:24:03 -06:00
34cfc7bd51 Merge pull request #490 from EmileMaras/NEB-Change
added several features to the NEB
2017-06-15 08:23:04 -06:00
c98bb7fa5f Corrected minor bug in utility script 2017-06-15 12:57:44 +01:00
77ca68a2b4 Changed affiliation 2017-06-15 12:52:19 +01:00
06fe703eed add missing mergesort header 2017-06-14 23:22:49 -04:00
8500a197ae whitespace cleanup 2017-06-14 23:13:10 -04:00
1f17e8ebbb remove need for static class member variables in Dump and Irregular
The dump and irregular classes were using qsort() from the C-library
for sorting lists through custom comparison functions, which required
access to additional data, which was passed via static class variables,
i.e. globals. This collides with having multiple LAMMPS instances in
the same address space.

the calls to qsort() are replaced with a custom merge sort, which passes
a void pointer to the comparison functions, which can contain any kind
of desired information, e.g. a class handle or a list
2017-06-14 23:10:53 -04:00
fcc387f232 change ring communication API to no longer require a static variable pointing to 'this' of the caller 2017-06-14 17:01:06 -04:00
e7634a44f4 updated thermo_modify in example 2017-06-14 13:11:54 -04:00
3214d639aa removed unneeded .gitignore 2017-06-14 12:26:52 -04:00
0ad66ecb89 Added compute_scalar to fix_grem for easier output managment, updated example to show use 2017-06-14 12:18:22 -04:00
e139a7fd45 Updated docs for vashishta/gpu 2017-06-14 13:52:03 +02:00
d7646aeeed Fixed opencl error 2017-06-14 12:03:47 +02:00
5f9341813d Removed debug output 2017-06-14 10:57:54 +02:00
8441307185 Removed non-general CUDA-dir in makefile 2017-06-14 10:28:46 +02:00
720af5c360 Added vashishta to OpenCL makefile 2017-06-14 10:27:52 +02:00
eeff0b8633 Added vashishta GPU package for NVidia 2017-06-14 10:24:16 +02:00
32b967ed9c add rigid body overlap warnings to change_box and delete_atoms 2017-06-13 16:26:49 -04:00
3d066283b6 fix compilation, move meam_cleanup to destructor 2017-06-13 19:41:29 +02:00
29e60fa53a Move rho/gamma arrays to fields of MEAM, remove arguments and arrdim macros 2017-06-13 18:39:40 +02:00
11751521e7 remove dead code 2017-06-12 22:49:31 -04:00
7a05d87f7c update USER-TALLY examples 2017-06-12 22:20:36 -04:00
b01143102d refactoring of USER-TALLY computes to handle sparse and hybrid systems
with sparse and hybrid systems, Pair::ev_tally() may not be called on
every processor and thus the computes in USER-TALLY may hang during
reverse communication because of the error->all() call after checking
whether callback from Pair::ev_tally() has been called at least once.
To address this cleanly, a second callback function needs to be added,
which is run during Pair::ev_setup() and will now handle all memory
re-allocation and clearing of accumulators, just like it is done for
regular tallied data.
2017-06-12 22:12:12 -04:00
e530ba46f4 cleanup and bugfix for compute heat/flux/tally
- make heatj a pointer instead of a static array
- fix memory leaks for eatom, stress
- simplify and streamline computation
2017-06-12 21:46:00 -04:00
420db44596 print incompatible pair style warnings in USER-TALLY only on MPI rank 0 2017-06-12 20:05:15 -04:00
cfeb9b5ba5 Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes 2017-06-12 14:20:50 -04:00
0c805d0b70 correctly skip over point particles and point dipoles when counting extendend particles in fix rigid/small 2017-06-12 14:20:38 -04:00
6b289b0794 change incorrect EINERTIA constant in rigid body integrators from 4.0 to 2.0 (same as in other integrators) 2017-06-12 14:07:40 -04:00
078f2a0a47 Convert/Reindex phir* arrays 2017-06-12 17:41:09 +02:00
bdd908c303 update documentation for USER-MEAMC package and pair style meam/c 2017-06-11 21:54:18 -04:00
b45a95107d remove ambiguous access conflict to fm_exp() in pair style agni/omp after moving fm_exp() to math_special.h 2017-06-11 18:45:40 -04:00
9f852f5f58 Improve C++-ness, eliminate some macros
- fm_exp moved to math_special (exp2 was already there)
- use std::min/max template instead of macros
- use memory->create for dynamic arrays (still 1-indexed with macro)
- remove _ from function names, adjust method visibility
2017-06-11 16:55:41 +02:00
fea28d8028 ensure that allocatable_double_2d types are initialized 2017-06-11 07:29:44 -04:00
afed8bb978 make changes to pass compilation test
- move MEAM class into LAMMPS_NS namespace
- move inclusion of meam.h header to pair_meamc.cpp to reduce namespace pollution
- use forward declaration for MEAM class reference
- make that class reference a pointer and add a destructor
- replace MAX/MIN macros with versions compatible with older compilers
2017-06-11 07:18:13 -04:00
03c93b31d6 Convert to C++, allow multiple instances 2017-06-11 11:29:24 +02:00
d3f31547f9 Reformat code with clang-format (Mozilla style guide) 2017-06-11 11:29:24 +02:00
7c7468ffc2 Change c->cpp for better integration with makefile 2017-06-11 11:29:23 +02:00
bab292b551 Create package USER-MEAMC
Step 1: very literal translation of lib/meam
2017-06-11 11:29:23 +02:00
daa77176ad add restart support to fix deform. only "initial" data is restored and some consistency check performed 2017-06-10 17:28:17 -04:00
8f18c284d3 add crude check to print warning when using compute cnp/atom on multi-type system 2017-06-10 17:08:07 -04:00
06915162b0 whitespace cleanup 2017-06-10 16:56:54 -04:00
a849f35dcd adjust compute cnp/atom to match the documentation. need to skip atoms not in compute group. 2017-06-10 16:55:42 -04:00
4c69bbcf5c apply rigid body check to displace_atoms command 2017-06-10 11:37:54 -04:00
dd44189d1f fix bug in compute orientorder/atom argument parsing 2017-06-10 04:35:11 -04:00
2f6bbcfbbc output detailed multi-thread performance data only with "timer full" 2017-06-09 15:11:40 -04:00
2686b7f830 simplify compatibility check for fix reax/c/bonds with pair styles 2017-06-09 14:39:52 -04:00
d3a863e7af when identifying molecules/clusters fall back to unfiltered coordinates for ghost atoms 2017-06-09 14:35:12 -04:00
3c8e75ad59 Add missing sync/modify to fix_shardlow_kokkos 2017-06-09 10:57:35 -06:00
64e8000720 expand error message requiring a reax/c derived pair style 2017-06-09 11:42:35 -04:00
c51cadcc6c Fixing CUDA runtime issues in fix_shardlow_kokkos 2017-06-09 09:31:37 -06:00
c160d0cd5e fix reax/c/species/omp doesn't is not needed anymore 2017-06-09 11:04:11 -04:00
9222278fb5 match reax/c pair style variants against prefix and not full name 2017-06-09 11:00:16 -04:00
bdf03757e6 MAINT: Simplified GPL headers. 2017-06-08 23:20:21 +02:00
c81bc108f9 DOC: Updated dump_modify and dump netcdf documentation. 2017-06-08 23:19:38 +02:00
10d2e7c380 MAINT: DumpNetCDF and DumpNetCDFMPIIO need access to thermo output. 2017-06-08 23:18:54 +02:00
bd83c7c7f9 MAINT: Updated contact data and fixed typos. 2017-06-08 23:02:22 +02:00
d51cee1b82 MAINT: Turned 'global' options into a 'thermo yes'/'thermo no' option that enables dumping of thermo data to the netcdf file (for parallel NetCDF/MPIIO variant). 2017-06-08 22:58:27 +02:00
be476c9e1d MAINT: Turned 'global' options into a 'thermo yes'/'thermo no' option that enables dumping of thermo data to the netcdf file. 2017-06-08 22:43:10 +02:00
86497949f2 Fixing CUDA runtime issues in fix_shardlow_kokkos 2017-06-08 13:40:20 -06:00
b4b7310884 Fixing CUDA runtime issues in pair_exp6_rx_kokkos 2017-06-08 13:33:23 -06:00
0ecdb99885 fix uninitialized data access as reported by @martok in #174 2017-06-08 13:50:17 -04:00
046900cd51 Merge pull request #26 from timattox/USER-DPD_GBhacks_optimize
Reduce memory churn in several files
2017-06-08 10:50:36 -06:00
00ce15d043 Remove tpls dir 2017-06-08 10:43:19 -06:00
5c1d17d1c0 Updating Kokkos lib to v2.03.05 2017-06-08 10:42:08 -06:00
43cfa10ea4 Reduce memory churn in pair_multi_lucy_rx_kokkos 2017-06-08 09:58:10 -06:00
6f24c58c1a Reduce memory churn in fix_rx_kokkos 2017-06-08 09:52:00 -06:00
611bb6f130 Reduce memory churn in pair_table_rx_kokkos 2017-06-08 09:31:51 -06:00
afd4f5b0a6 Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes 2017-06-07 17:37:13 -04:00
31a734b03d sbmask function should be flagged as const indicating no side effects 2017-06-07 17:10:33 -04:00
2e728972e2 make pair styles lj/cut/tip4p/long/omp, lj/long/tip4p/long and lj/long/tip4p/long/omp consistent with the reset of tip4p styles 2017-06-07 17:09:45 -04:00
520ab26bd9 Fixing more CUDA runtime issues 2017-06-07 15:07:53 -06:00
36c8b26fef BUG: DumpNCMPIIO is now called DumpNetCDFMPIIO 2017-06-07 14:01:36 +02:00
99ef36f440 MAINT: Switched NetCDF from 64BIT_OFFSET to 64BIT_DATA which can handle frames (of unlimited dimension) > 2 GB. This becomes important for system sizes 100 Mio atoms and upwards. 2017-06-07 13:52:33 +02:00
a2edef7c9c local variable fp in pair style eam/cd was shadowing class member. renamed local variable to fptr 2017-06-07 00:23:53 -04:00
1f9504c546 some more bookkeeping updates triggered by the lj/sf style removal 2017-06-06 17:31:45 -04:00
04ebd81ac5 minor whitespace cleanup 2017-06-06 17:26:18 -04:00
5cb56796a2 alias pair style lj/sf to lj/smooth/linear and remove/update related files 2017-06-06 17:26:06 -04:00
0c1b87c8cf Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes 2017-06-06 16:27:07 -04:00
cd67eaa5f4 update e-mail and affiliation for stefan paquay in USER-MANIFOLD related files 2017-06-06 16:26:57 -04:00
18dee3f78e Added Gaussian bump. Updated e-mail address. 2017-06-06 16:03:09 -04:00
13643e185c Merge branch 'USER-MANIFOLD-gaussian-bump' 2017-06-06 15:47:41 -04:00
efe60bf991 Fixing more CUDA runtime issues 2017-06-06 13:10:04 -06:00
36cbe43978 Fixing some CUDA runtime issues in npair_ssa_kokkos 2017-06-06 10:51:26 -06:00
06c8e95774 corrected the fix_neb documentation 2017-06-06 14:20:54 +02:00
d437650c77 make certain Domain::box_change is initialized before use 2017-06-06 08:08:10 -04:00
46c5cbae8f update rigid fix documentation for added reinit keyword 2017-06-05 18:04:09 -04:00
deff6c666e add flag "reinit" with args "yes" / "no" to fixes rigid & rigid/small 2017-06-05 17:31:43 -04:00
3a01836325 simplify code for rigid body overlap checks 2017-06-05 16:39:17 -04:00
0034d2db35 apply the rigid body checks to some more example codes 2017-06-05 16:30:30 -04:00
ed50bd2254 Removing unnecessary fences 2017-06-05 13:54:13 -06:00
90ca0852c7 use "body" list via Fix::extract() to correctly identify atoms in bodies 2017-06-05 15:48:23 -04:00
968de8548c apply test for overlap with rigid bodies to set and velocity command 2017-06-05 13:06:53 -04:00
95d6f05a76 add 3 APIs to Modify for checking if atoms overlap with any rigid fixes 2017-06-05 12:41:37 -04:00
ff58ccac28 add clarification to impact of special bonds to manybody potentials 2017-06-04 21:21:32 -04:00
e03cc99467 made the command options more lammps standard style 2017-06-02 23:42:16 +02:00
f59ee5bd62 enable support for dynamic groups in fix planeforce and fix lineforce 2017-06-02 08:45:15 -04:00
af5f19604c remove no longer correct sentence from set command docs 2017-05-31 23:36:39 -04:00
3025996407 Merge branch 'master' into add-user-reaxc-omp
This updates the code base with several required updates from master
2017-05-31 12:53:38 -04:00
d2b6559039 Fixing issue in fix_qeq_reax 2017-05-31 10:52:03 -06:00
3c0cef9927 Merge branch 'fix_domain_pointer' of https://github.com/andeplane/lammps into collected-small-changes 2017-05-31 07:10:16 -04:00
937cf0b996 Bugfix: Kronecker term ignored in spline forces.
The code ignored the kronecker(ktype, 0) or kronecker(ltype, 0)
terms in the contributing terms to NconjtmpI and NconjtmpJ.
The issue was present both in ::bondorder and ::bondorderLJ and
led to energy conservation issues.
It has been fixed by checking for the atom type before entering
the offending calculations and adding clarifying comments.
2017-05-31 12:20:12 +02:00
f57f1efdff Setting lattice to NULL before creating 2017-05-31 00:34:26 -07:00
2b3c124e61 add example input for compute cnp/atom 2017-05-31 00:43:53 -04:00
85e917ae52 integrate compute cnp/atom contributed by Paulo Branicio (USC) 2017-05-31 00:38:44 -04:00
0be2cd3d43 fix bug reported on lammps-users, when not using the first molecule template 2017-05-30 23:58:56 -04:00
066123007c avoid undesired negative forces for high particle velocities in granular models 2017-05-30 21:54:16 -04:00
167a51538e support atom style variables for assigning image flags with the set command 2017-05-30 21:52:32 -04:00
5c6f63d8b4 Merge branch 'fix_adapt_doc_fix' of https://github.com/Pakketeretet2/lammps into collected-small-changes 2017-05-30 17:06:25 -04:00
03ab8d0f48 major neighbor list style whitespace cleanup 2017-05-30 17:04:48 -04:00
75b567a457 add "atomonly" optimized neighbor list build styles to USER-OMP 2017-05-30 16:50:38 -04:00
cace3e3530 Added missing :pre to doc/src/fix_adapt.txt 2017-05-30 16:08:32 -04:00
286d4f2743 Merge pull request #506 from lammps/snap
SNAP changes by Aidan
2017-05-30 13:32:00 -06:00
952b18fc02 Merge pull request #494 from rbberger/small_updates
Collection of minor updates
2017-05-30 10:51:24 -06:00
816fa93429 Merge pull request #499 from akohlmey/add-fix-compute-style-bugfix
Fix bug where fix/compute style names were not correctly set with suffixes
2017-05-30 10:49:27 -06:00
f4f975edd6 Merge pull request #495 from akohlmey/doc-fixes
Collected small updates and bugfixes
2017-05-30 10:48:57 -06:00
cff4e4a837 Merge pull request #468 from andeplane/gcmc_fix_nlocal
Using correct value for atom->nlocal in translate/rotate in fix_gcmc.cpp
2017-05-30 10:45:39 -06:00
32db4660bd Merge pull request #460 from andeplane/gcmc_fix
Setting molecule COM to 0 after moving atoms
2017-05-30 10:45:23 -06:00
22fdb1fc14 SNAP changes by Aidan 2017-05-30 10:21:07 -06:00
412cb8f089 avoid hang in fix reax/c/species when multiple atoms have the exact same x-coordinate 2017-05-30 08:15:55 -04:00
092806ad4f no need for special whitespace handling in library interface 2017-05-30 07:55:48 -04:00
4ae314731d must not use strtok() in library function as it is not re-entrant and may be used inside LAMMPS commands 2017-05-30 07:42:10 -04:00
4b8d2e829c triclinic member variable is referenced in destructor and thus must be initialized in constructor 2017-05-30 07:41:01 -04:00
d93938f7e1 displace_atom rotate needs to operate on unwrapped coordinates with image flags set to zero 2017-05-29 16:57:35 -04:00
c904cfb8bc removed a bug in fix_neb.cpp which prevented the freeend to work properly, plus added an example for the neb freeend 2017-05-29 15:49:04 +02:00
32c87f3131 removed a bug in fix_neb.cpp which prevented the freeend to work properly, plus added an example for the neb freeend 2017-05-29 14:00:13 +02:00
ba0ddea5e1 Using correct ndegree instead of nnn 2017-05-28 15:44:12 -07:00
c0339120d2 add missing neighbor list class definitions to USER-OMP 2017-05-26 21:28:41 -04:00
5a23d2d1da fix bug in computing mixed EAM potentials introduced by TI modifications 2017-05-26 20:28:45 -04:00
de446ace2f Merge branch 'user-manifold-doc-fix' of https://github.com/Pakketeretet2/lammps into doc-fixes 2017-05-26 18:44:29 -04:00
2055110e05 Fixed typo in dox. 2017-05-26 17:38:21 -04:00
5b1e582f03 prevent segfault when defining pair_style comb3 without arguments 2017-05-26 10:52:20 -04:00
f1ec6dc41a dead code removal and reformatting 2017-05-25 18:55:07 -04:00
c3f6e27bfe augment documentation for newly added multi-threaded reax/c styles 2017-05-25 17:00:19 -04:00
0a2fe70511 remove redundant code from fix qeq/reax and qeq/reax/omp 2017-05-25 16:31:31 -04:00
2cf83d9fca Updating from master to 19May17 2017-05-25 11:21:10 -06:00
53e7fee5b7 Merge branch 'doc-fixes' of github.com:akohlmey/lammps into doc-fixes 2017-05-25 10:11:31 -04:00
5291f2ed6e fix bug in fix shear/history reported by kevin hanley. see #500 2017-05-25 10:11:24 -04:00
99a68e487f fix suffix style handling bug for adding fixes and computes 2017-05-25 02:01:04 -04:00
271431ab18 clean up code so it can be compiled with and without OpenMP enabled regardless of whether the USER-OMP package is installed 2017-05-24 17:25:57 -04:00
88d4150d2b remove trailing whitespace 2017-05-24 16:29:56 -04:00
0e3cfbc007 remove trailing whitespace 2017-05-24 16:29:26 -04:00
5345ad2da7 merge in the remainder of the USER-REAXC-OMP code. still a lot of work to do. compiles only with -fopenmp active 2017-05-24 16:24:43 -04:00
ead05f81c0 Merge branch 'pair_morse_soft-doc-fix' of https://github.com/Pakketeretet2/lammps into doc-fixes 2017-05-24 13:56:54 -04:00
4f9e7cbd16 Cleaned up docs for pair_mores, a missing :pre ruined formatting. 2017-05-24 13:36:14 -04:00
bb890941ca first chunk of code from USER-REAXC-OMP imported and adapted into USER-REAXC 2017-05-24 00:19:36 -04:00
4002dce639 restore explicit NAN constants in output 2017-05-22 22:39:52 -04:00
c801cdd81f some more formatting cleanup in fix neb 2017-05-22 22:33:14 -04:00
9008a31190 more formatting cleanup
This cleans up and simplifies the neb command code some more
2017-05-22 21:55:55 -04:00
bdfb7c69ea Remove unused code detected by coverity CID 177700 2017-05-22 17:51:40 -04:00
084626e60b Fixes coverity issue CID 179426 2017-05-22 17:36:16 -04:00
a7d790a827 Fixes coverity issue CID 179439 2017-05-22 17:33:47 -04:00
8a630ff4ec Fixes coverity issue CID 179440 2017-05-22 17:32:07 -04:00
617ca4e0c8 Fixes coverity issue CID 179436 2017-05-22 17:30:46 -04:00
62601678cd when growing arrays with reallocate, always check against atom->nmax and not atom->nlocal or else these arrays may be of inconsistent size and communication can lead to data corruption 2017-05-22 17:16:19 -04:00
081910adbc do not try to free null communicators 2017-05-22 17:15:14 -04:00
f73fd0625d rename nall class member to numall to avoid confusion with the common convention nall = atom->nlocal+atom->nghost 2017-05-22 17:14:38 -04:00
06a4f47a4c Merge remote-tracking branch 'upstream/master' into small_updates 2017-05-22 17:14:29 -04:00
7185db98b4 NEBLongRange was incorrectly set to false by default. revert to true. 2017-05-22 17:13:38 -04:00
4780d72809 use '&&' and '||' instead of 'and' and 'or' operators for consistency 2017-05-22 14:42:42 -04:00
3fd91a239f avoid use '&&' and '||' instead of 'and' and 'or' for consistency 2017-05-22 14:41:01 -04:00
8bc829c7f1 change example inputs to be backward compatible 2017-05-22 14:40:01 -04:00
97d3c843c4 small documentation fixes to fix typos and formatting issues 2017-05-21 11:13:47 -04:00
546aed7ccd plug some memory leaks 2017-05-19 16:14:59 -04:00
6ef79d3715 silence several compiler warnings 2017-05-19 15:13:19 -04:00
c2bf3269ac formatting cleanup. combine 8 MPI_Allreduce() calls into 1 2017-05-19 15:02:29 -04:00
aca16745e4 restore spelling fix and semantic fix from upstream 2017-05-19 12:17:19 -04:00
a5110d81ea correct a bunch of documentation formatting issues for updated neb and fix neb commands 2017-05-19 12:13:23 -04:00
2225fce94e patch 19May17 2017-05-19 07:35:36 -06:00
9593e05c9e Force PDF documentation build to fail on first error 2017-05-18 19:37:08 -04:00
941b737319 Merge pull request #493 from akohlmey/doc-and-example-fixes
Doc and example fixes
2017-05-18 16:40:46 -06:00
654e09e999 correct input examples affected by the Pair::settings() bugfix 2017-05-18 18:34:27 -04:00
8751850eca a few formatting fixes for pair style python 2017-05-18 18:34:03 -04:00
0f88348917 Merge pull request #492 from lammps/pre-patch
update docs before patch release
2017-05-18 13:44:34 -06:00
d4ee03c778 changed doc links 2017-05-18 21:31:39 +02:00
069f3e746b small formating changes 2017-05-18 21:23:29 +02:00
b28ecd44c2 update docs before patch release 2017-05-18 13:14:47 -06:00
9db9fc9de3 Merge pull request #491 from akohlmey/fix-bigint-thermo-in-variables-bug
convert bigint values for bonds/angles/dihedrals/impropers to doubles
2017-05-18 13:08:42 -06:00
6ac9b7a1b0 Merge pull request #482 from akohlmey/add-pair-python
Add python pair style for implementing simple pairwise additive potentials in python
2017-05-18 11:15:58 -06:00
34dbf6b225 do not compute properties twice 2017-05-18 12:45:43 -04:00
26d71b66e4 convert bigint values for bonds/angles/dihedrals/impropers to doubles when evaluating those keywords in variable expressions 2017-05-18 12:41:48 -04:00
65eacb6b90 Fix compilation warnings in fix_python 2017-05-18 12:20:39 -04:00
cb3344a337 Merge pull request #489 from akohlmey/thread-safe-biasing
port thread-safe temperature biasing from LAMMPS-ICMS
2017-05-18 09:15:07 -06:00
5d38cbbce9 Merge pull request #487 from akohlmey/pair_edip_multi_element
Import multi-element compatible pair style edip as edip/multi
2017-05-18 09:13:30 -06:00
30babd8157 Merge pull request #485 from akohlmey/pair_settings_cut_bugfix
Bugfix for correct resetting of previously set cutoffs to various Pair::settings() functions
2017-05-18 09:12:47 -06:00
aa09f45b7e Merge pull request #484 from akohlmey/add-gao-weber-styles
Add Gao-Weber manybody styles
2017-05-18 09:10:03 -06:00
4b61cf6f52 Merge pull request #483 from akohlmey/airebo-spline-bugfix-refactor
AIREBO spline code out-of-bounds and bondorder derivative bugfix and refactor
2017-05-18 09:01:33 -06:00
683f3d9d2a Merge pull request #481 from akohlmey/collected-small-changes
Collected small updates and bugfixes
2017-05-18 09:01:04 -06:00
ce18524251 Merge pull request #480 from akohlmey/pair_morse_smooth_linear_bugfix
corrections to pair style morse/smooth/linear
2017-05-18 08:57:24 -06:00
95dae9737b Merge pull request #488 from lammps/neigh_occasional_bugfix
bugfix for 2 recenty reported neighbor issues, also a ReaxFF fix species update from Stan
2017-05-18 08:53:54 -06:00
8daba01151 some small formating change but does not work anymore 2017-05-18 16:48:20 +02:00
640edbc1d4 added several features to the NEB 2017-05-18 11:08:08 +02:00
4b1914aa1f update citations for multi-element edip potential 2017-05-18 01:07:52 -04:00
bd11479a16 lock the sphinx command to version 1.5.6, since version 1.6.x seems to break one of the extensions we use 2017-05-18 00:50:35 -04:00
0208fe9996 update example outputs 2017-05-18 00:46:49 -04:00
24654ad28f small formatting corrections to pair python style 2017-05-18 00:38:36 -04:00
8d46aa6056 add readme file to discuss various python pair style usage examples 2017-05-18 00:31:54 -04:00
09f3b687f7 new long-rance example with using hybrid/overlay and table only for lj part 2017-05-18 00:31:15 -04:00
436d3fd761 make hybrid example use half the atoms with python, half with lj/cut 2017-05-18 00:30:41 -04:00
9833f38499 change coulomb example to use cutoff coulomb 2017-05-18 00:30:19 -04:00
9725708b90 update pair style python docs 2017-05-18 00:29:02 -04:00
67962b15fc a bunch refactoring changes in the python pair style and the examples
- make all python potential classes derived from LAMMPSPairPotential
  which contains shared functionality. We currently don't check
  for supported atom types. may want to add that again later.
- keep track of skipped atom types in the C++ code.
- add test against units setting. must set self.units='...' in constructor
- make compute_force method consistent with Pair::single() in LAMMPS and return force/r instead of force.
- rename potentials.py to py_pot.py
- update test runs. some small tweaks.
2017-05-17 20:55:48 -04:00
1d48f287f0 add partial documentation for pair style python 2017-05-17 19:05:18 -04:00
43efe9e417 adding Pair::single() support to python pair style and examples
with the single function, python pair styles can be massively
sped up and made compatible to accelerators, as one can translate
the analytic force and energy functions through LAMMPS into suitable
tables and then simply use the on-the-fly tables for production runs
2017-05-17 17:20:56 -04:00
278b9f7fba move pair gw and gw/zbl to USER-MISC package 2017-05-17 14:59:46 -04:00
6032b8846e Merge branch 'exaalt' of gitlab.com:exaalt/lammps into exaalt 2017-05-17 11:36:50 -06:00
98713680ec added alternative linking line for intel mkl 2017-05-17 11:36:31 -06:00
085f3afdfb fix typo in docs 2017-05-17 09:59:30 -04:00
45becfb235 correct author attributions 2017-05-17 09:59:01 -04:00
a34c935e20 update log files in python pair style example 2017-05-17 08:00:21 -04:00
13e16dc3f1 update log files for pair style python examples 2017-05-17 07:52:13 -04:00
96f0a82aa5 simplify class names in pair style python examples. add SPC/E water example 2017-05-17 07:48:15 -04:00
7caf6cf459 Change how a Python pair style is loaded
Implements a class loader which takes a fully qualified Python class
name, loads the module and creates an object instance.

To add flexibility, the current working directory and the
directory specified by the LAMMPS_POTENTIALS environment variable are
added to the module search path.
2017-05-16 23:29:48 -04:00
8936b99e9f add contributed SiC.edip potential file 2017-05-16 18:15:53 -04:00
d2810f9f83 port thread-safe temperature biasing from LAMMPS-ICMS 2017-05-16 18:15:13 -04:00
597f95fb1b fix duplicate reference 2017-05-16 17:53:12 -04:00
7f9a331c73 bugfix for 2 recenty reported neighbor issues, also a ReaxFF fix species issue 2017-05-16 15:51:41 -06:00
35e92733e9 import multi-element compatible pair style edip as edip/multi 2017-05-16 17:40:59 -04:00
c11e87618b implement second bugfix suggestion from @CF17 on issue #59 2017-05-16 14:18:56 -04:00
ca87e57129 improved version of AIREBO splines based on a suggestion by markus hoehnerbach 2017-05-16 11:58:34 -04:00
66084ad1f4 fix typo in rerun docs. closes #486 2017-05-16 04:27:15 -04:00
d807ba1974 whitespace cleanup 2017-05-16 00:26:39 -04:00
51fc386e72 correct the inner loop range for resetting cutoffs when redefining a pair style
this was reported by frank uhlig on lammps-users for lj/cut, but it applies to many more pair styles
2017-05-16 00:26:18 -04:00
a6f0d700f1 Merge branch 'add-pair-python' of github.com:akohlmey/lammps into add-pair-python 2017-05-15 18:44:52 -04:00
14f3deed6b Minor coefficient lookup improvement 2017-05-15 18:43:46 -04:00
d66a696a84 avoid preprocessor warnings, by placing Python.h include file on the top, as suggested by python docs 2017-05-15 18:02:02 -04:00
69ccbd1562 Extract common wrappers to Python compatibility header 2017-05-15 17:46:57 -04:00
d9d4ef17c8 add gao-weber potentials (regular and with ZBL core) with SiC potential files
NOTE: documentation is missing
2017-05-15 17:44:25 -04:00
93cc6f4a5d Use in syntax for key lookup for Python 3 compatibility 2017-05-15 17:34:48 -04:00
0a40a7af7b whitespace cleanup 2017-05-15 17:00:41 -04:00
eb6f6a77e5 dead code removal 2017-05-15 16:16:12 -04:00
fb7164a811 replace pow(x,-0.5) with 1.0/sqrt(x) 2017-05-15 16:16:01 -04:00
64cf52d3b5 address spline out-of-bounds bug reported in issue #59 and refactor high-level spline code for consistency and efficiency 2017-05-15 15:55:15 -04:00
6a1f7e61f2 provide reference output for python pair style inputs 2017-05-15 00:25:11 -04:00
d662f5d429 whitspace cleanup and gitignore update 2017-05-15 00:22:22 -04:00
df55a90ef6 some example input file tweaks 2017-05-15 00:22:03 -04:00
6e113c1eaf basic feature complete version of lj melt example with python interaction function 2017-05-15 00:15:41 -04:00
f484ab6dfb completed lj parameter set and compute functions for melt example 2017-05-15 00:14:36 -04:00
86283c6309 make melt input consistent with melt example again 2017-05-15 00:13:32 -04:00
34cc3946b8 first few pieces of pair style python 2017-05-14 18:29:06 -04:00
6aa0250bc5 corrections to pair style morse/smooth/linear contributed by David R. Heine 2017-05-12 23:40:24 -04:00
c5db3ff401 two small doc corrections from Andrew Jewett for pair style gauss and dihedral style spherical 2017-05-12 23:27:58 -04:00
06c151421c Merge pull request #478 from akohlmey/add-python-source-cmd
Add python support features
2017-05-12 13:28:20 -06:00
0008b6fc2d Merge pull request #477 from lammps/renamings
rename some USER/misc dirs
2017-05-12 08:54:12 -06:00
b6a70ec6fd fixup docs after last change 2017-05-12 00:34:47 -04:00
c4d0f07093 Allow fix python to only execute every N steps 2017-05-12 00:29:58 -04:00
93f6033061 Add documentation about fix python 2017-05-11 23:50:40 -04:00
110bb79b14 Implement fix python mentioned in issue #454
Allows to call a python function at defined points in the integration loop
2017-05-11 23:50:30 -04:00
d84f8898b7 implement functions to execute arbitrary python code from strings or files and recast the python source keyword through using them. 2017-05-11 22:39:08 -04:00
27a6371f9b implement a python source command as suggested in issue #454 2017-05-11 19:18:09 -04:00
7c3b8e014c rename some USER/misc dirs 2017-05-11 10:15:28 -06:00
a069d21621 Merge pull request #476 from akohlmey/dump_custom_bugfix
dump custom memory allocation bugfix
2017-05-11 09:27:08 -06:00
d7f54464c6 Merge pull request #474 from rbberger/dump_vtk_fixes
Various dump vtk fixes
2017-05-11 09:25:42 -06:00
998eb44e83 Merge pull request #473 from akohlmey/compress-for-reaxc-fixes
compressed output via gzip for some ReaxFF fixes
2017-05-11 09:25:18 -06:00
96d1de8575 Merge pull request #471 from akohlmey/fix-4may2017-issues
Fix a bunch of remaining issues in the 4 may 2017 release
2017-05-11 09:24:35 -06:00
deff6ffaac Merge pull request #466 from DallasTrinkle/meam-spline-multicomponent
Meam spline multicomponent
2017-05-11 09:22:25 -06:00
328ef873d8 fix mixed memory alloc bug in dump custom. this closes #475 2017-05-10 22:41:41 -04:00
4ecf876a64 Added two examples of using the VTK dump style 2017-05-10 19:52:00 -04:00
c4ac5773cb Fix segmentation fault in dump vtk 2017-05-10 19:51:14 -04:00
cac1bf83ef Work around VTK 7 API change 2017-05-10 19:41:48 -04:00
abeb1e096a add support for gzip compressed output to fix reax/bonds, reax/c/bonds and reax/c/species 2017-05-10 11:19:18 -04:00
9f7ce39f9f correct some more omitted updates 2017-05-09 18:14:34 -04:00
29ae8d4ca3 correct broken links and references in documentation 2017-05-09 17:15:07 -04:00
3f4aee1046 implement overlooked changes from 4may2017 patch 2017-05-09 15:57:35 -04:00
d0da0639f0 add a couple of simple example single/multi-elment inputs for meam/spline pair styles 2017-05-09 15:51:59 -04:00
390ceb1475 whitespace cleanup 2017-05-09 15:49:37 -04:00
6c5edf6c70 performance improvement through avoiding function call and dereference overhead
- make i_to_potl() and ij_to_potl() functions inline and const
- don't dereference inside the functions, but cache, if possible in external variables
=> up to 15% speedup.
2017-05-09 15:38:10 -04:00
9cd994f57c fix issues with potential file parser
- use Force::open_potential()
- replace ftell()/fseek() with rewind()/fgets() which is safer on windows and other platforms with automatic CR/LF to LF conversion on text files
- make parser use properly NULL terminated strings through using strtok()
2017-05-09 15:35:48 -04:00
a6e2d5b5f7 Merge pull request #470 from lammps/integration
neighbor list bugfix to prevent cycle in copy lists
2017-05-09 10:32:25 -06:00
08ec55743e neighbor list bugfix to prevent cycle in copy lists 2017-05-09 08:55:18 -06:00
c4f90b3841 Merge pull request #449 from rbberger/python_refactoring
Add Python 3 compatibility and expand Python interface availability
2017-05-08 08:29:24 -06:00
f8af7edf92 Merge remote-tracking branch 'upstream/master' into python_refactoring 2017-05-06 16:00:22 -04:00
a73402ad93 update src/Purge.list with renamed reaxc src files 2017-05-04 14:53:08 -06:00
d7dbff0f54 jive Kokkos/reaxc file names with new user-reaxc file names 2017-05-04 14:46:59 -06:00
42531389df Cleanup of style (removing all tabs, shortened long lines). 2017-05-04 15:28:11 -05:00
f7230006fe OpenMP version added. 2017-05-04 15:08:04 -05:00
754b40cb31 Removed unused functions. 2017-05-04 13:16:46 -05:00
ffdc8b556d Cleanup. 2017-05-04 13:03:09 -05:00
5accce976a Cleanup. 2017-05-04 13:02:09 -05:00
349c1443a1 Cleanup. 2017-05-04 13:01:45 -05:00
2f71245d82 Removed extra "helper" functions. 2017-05-04 13:00:06 -05:00
51c6d50268 patch 4May17 2017-05-04 11:46:58 -06:00
6499cfcf52 Merge pull request #458 from stanmoore1/kokkos_sync_bugfix
Fixing auto_sync logic bug in modify_kokkos
2017-05-04 11:24:11 -06:00
f08e206991 Merge pull request #457 from stanmoore1/kokkos_ubuf
Adding ubuf union to Kokkos atom_vec styles
2017-05-04 11:23:55 -06:00
fbddfe2729 Merge pull request #455 from stanmoore1/kokkos_update
Updating Kokkos library to version 2.03.00
2017-05-04 11:23:39 -06:00
dcc5472cba Merge pull request #452 from akohlmey/small-fixes-and-updates
Small fixes and updates
2017-05-04 11:23:23 -06:00
addd87c0f7 new Section package and start doc pages and build scripts 2017-05-04 11:22:20 -06:00
480727815a Starting to refactor in preparation to contruct OMP version. 2017-05-04 11:27:55 -05:00
45187a0fc7 Fix system header #include style. 2017-05-04 11:05:50 -05:00
7409c6d781 Cleaned up atom->x and atom->f deferences. 2017-05-03 16:56:07 -05:00
11cb0212b7 Cleanup: two space indent + no trailing spaces on lines. 2017-05-03 16:49:43 -05:00
7f49ee8fd7 print warning about minimization energy with fix box/relax 2017-05-03 15:33:22 -04:00
7adc7f02e0 Stopped working on gaussian bump. 2017-05-03 11:21:18 -04:00
f5cf1f1314 Merge pull request #464 from akohlmey/rename-cg-cmm-to-cgsdk
Rename USER-CG-CMM package to USER-CGSDK
2017-05-03 08:37:20 -06:00
50c7234f26 Fix to communication for mpi. Tested, and now working correctly with MPI. 2017-05-02 09:43:57 -05:00
f58fc9488f Fixed neighbor list building that caused error in parallel runs with pair_meam_spline. 2017-05-01 21:56:19 -05:00
408cc19885 Fix for seg fault. 2017-05-01 20:36:09 -05:00
c76d27373e Another fix for seg fault in parallel allocation. 2017-05-01 20:33:07 -05:00
fb08dc09f3 Small error in elements allocation causing seg. fault for parallel runs; fixed. 2017-05-01 13:38:37 -05:00
914848433a Using correct value for atom->nlocal 2017-05-01 00:02:57 +02:00
8bddf105bf Updated version of equations, documentation. 2017-04-28 20:22:22 -05:00
31446e35b9 Cleanup on equations; JPG to be constructed. 2017-04-28 15:31:49 -05:00
9bdc43bb66 Updates to pair/meam/spline documentation. 2017-04-28 15:15:21 -05:00
a0b61d17b5 Updates to documentation: equation. 2017-04-28 15:08:59 -05:00
8cc8441367 Cleanup on pair_meam_spline.cpp 2017-04-28 14:53:25 -05:00
7d9670bc6c Addition of potential, code modifications to incorporate multicomponent spline MEAM in pair_meam_spline.
Backwards compatible with previous version of pair_meam_spline.
2017-04-28 14:48:34 -05:00
b8cb80b219 rename files in GPU library from cg_cmm to lj_sdk 2017-04-26 19:46:10 -04:00
cd435c0c58 change references from cg_cmm to lj_sdk and from cmm to sdk 2017-04-26 19:44:25 -04:00
548c589f82 update the README for USER-CGSDK 2017-04-26 19:35:54 -04:00
5c7a631988 rename USER-CG-CMM folder to USER-CGSDK 2017-04-26 19:29:39 -04:00
af74874516 rename references to USER-CG-CMM to USER-CGSDK 2017-04-26 19:27:13 -04:00
949d61e01e rename examples folder for USER-CGSDK package 2017-04-26 19:26:27 -04:00
3e60f79f1d remove cg/cmm style name aliases 2017-04-26 17:24:25 -04:00
8f9cb3590a correct units for some improper force constants in docs 2017-04-26 15:34:12 -04:00
67fced37c8 Setting molecule COM to 0 after moving atoms 2017-04-26 20:10:18 +02:00
0565b1df5f Fixing auto_sync logic bug in modify_kokkos 2017-04-26 10:49:20 -06:00
d73d70fa1f Adding ubuf union to Kokkos atom_vec styles 2017-04-26 08:15:42 -06:00
cc6104aeaf Merge branch 'master' into kokkos_update 2017-04-25 14:11:36 -06:00
8910ec6e59 Updating Kokkos lib to 2.03.00 2017-04-25 13:48:51 -06:00
ddc1e4e86e detect and refuse to run pair style srp together with fix rigid 2017-04-25 13:27:20 -04:00
2e1f8b4aef make Python::init() method public and remove the now redundant Python::request() method 2017-04-25 10:21:02 -04:00
958f05a6f3 Allow requesting Python interpreter without having to define a function just for that 2017-04-25 01:09:05 -04:00
0ac22e034c turn errors from manybody potentials for */tally computes into warnings 2017-04-22 21:50:27 -04:00
197ce4580b avoid division by zero also for ewald/disp 2017-04-21 17:27:08 -04:00
8f14511831 avoid division by zero by initializing unset (=automatic) g_ewald parameters to some number > 0. 2017-04-21 16:46:27 -04:00
396e0b5423 correct broken link in html bond doc overview 2017-04-21 14:02:17 -04:00
4e411364ff add support to pair_modify to selectively disable compute/tally callbacks in sub-styles for pair hybrid and hybrid/overlay 2017-04-21 14:01:38 -04:00
f0681f7e12 add support for USER-TALLY to pair styles hybrid and hybrid/overlay 2017-04-20 14:42:01 -04:00
dfa9815246 update for fix gle docs from michele ceriotti 2017-04-18 17:07:28 -04:00
25e8ed63a2 whitespace cleanup in VMD plugin headers 2017-04-18 11:46:19 -04:00
8d390100e0 update .gitignore and Purge.list for recent changes 2017-04-18 11:44:23 -04:00
dee3536144 update VMD molfile plugin headers and move them to lib/molfile (where they belong) 2017-04-18 11:42:31 -04:00
73c210b665 Merge branch 'unstable' of https://github.com/ketankhare/lammps into small-fixes-and-updates 2017-04-18 11:20:23 -04:00
4bad52f30c fix typos 2017-04-17 17:52:06 -04:00
481927ff16 correct 'thrid' instead of 'third' 2017-04-17 17:49:49 -04:00
dec36e9bfe fix typos and remove trailing whitespace 2017-04-17 17:40:57 -04:00
dd90c860ee refactor msi2lmp documentation to emphasize lack of active development
- put a note into the manual
- reorder contents of the README file
- request for information should be sent to lammps-users
- add list of known missing features
2017-04-17 17:40:21 -04:00
c9bc141335 remove doc text explaining restrictions that are lifted with the changes in this branch 2017-04-14 12:57:35 -04:00
3cbf4f3b58 correct logic bug in else branch of the conditional 2017-04-14 11:57:53 -04:00
6c2dd7ebb1 pass the name of the python interpreter compatible with the python package to 'make install-python' 2017-04-14 11:44:36 -04:00
d3187b22c4 restore lost change to PYTHON/Install.sh 2017-04-13 18:11:57 -04:00
2f32fb7f8b patch 13Apr17 2017-04-13 11:19:48 -06:00
e6f30ebc9c Merge remote-tracking branch 'origin/master' into python_refactoring 2017-04-12 20:26:57 -04:00
cb867ea91d Merge pull request #450 from rbberger/python_destruction_fix
Prevent segfault if Python was never initialized
2017-04-12 13:58:23 -06:00
961096f9df Prevent segfault if Python was never initialized 2017-04-12 11:17:15 -04:00
3fa9f0a27b Delete python_wrapper.h 2017-04-11 21:51:21 -04:00
05d7bc556f Initialize Python interpreter in PythonImpl constructor 2017-04-11 21:46:33 -04:00
2d8bce78a6 Refactor PYTHON package and wrapper classes 2017-04-11 21:22:30 -04:00
9a027a01da Add Python 3 compatibility to PYTHON package 2017-04-11 20:24:42 -04:00
ca4619e227 Fix format issue in pair_exp6_rx_kokkos 2017-04-11 09:14:21 -06:00
6c0b691882 Removing more memory churn in pair_exp6_rx_kokkos 2017-04-11 09:12:46 -06:00
4da8c1c4e2 patch 11Apr17 2017-04-11 09:00:37 -06:00
49dd9449b8 fix gcmc updates from Aidan, trimming of output for replica commands 2017-04-11 08:35:09 -06:00
76fd936972 Merge pull request #443 from Pakketeretet2/user-manifold-fix-every-keyword
User manifold fix every keyword
2017-04-11 08:27:53 -06:00
06cebb9fb4 Merge pull request #445 from Pakketeretet2/extract_for_bond
Extract for bond
2017-04-11 08:27:31 -06:00
b9d844ca8d Merge pull request #444 from ohenrich/user-cgdna
Minor updates to docu of USER-CGDNA package
2017-04-11 08:25:09 -06:00
ccc9367de7 Merge pull request #442 from akohlmey/small-updates-and-bugfixes
collected small updates and bugfixes
2017-04-11 08:24:32 -06:00
4c4a3fe5d1 Merge pull request #439 from rbberger/python_mixed_use_support
Support mixed Python use by honoring Python GIL
2017-04-11 08:24:06 -06:00
84ea8a79e6 correct link for dispersion parameter how-to and reformat 2017-04-10 20:43:24 -04:00
3d3d1061d3 README for updated header files from VMD 1.9.3 2017-04-10 18:41:36 -04:00
b9177fd6dc Updated to 1.108 from 1.103 2017-04-10 18:40:30 -04:00
8051b12ffc Updated to 1.33 from 1.32 2017-04-10 18:39:37 -04:00
035d0a80d7 Reducing memory churn in pair_exp6_rx_kokkos 2017-04-10 16:38:58 -06:00
f19f558220 Removed changed bond_harmonic from wrong position. 2017-04-10 10:06:03 -04:00
1ad7d856fe Added forgotten #include string to bond_harmonic.cpp 2017-04-10 09:57:54 -04:00
d6357420ae propagate global package installation bugfix to explicit package scripts 2017-04-07 15:29:56 -04:00
62b9fa22b8 when computing only rotational temperature, we must not subtract the default n-dim extra DOFs 2017-04-07 15:11:26 -04:00
1725832b6c address issue where uninstalling an empty package will erase all code in src 2017-04-06 11:08:57 -04:00
178af2ec9e USER-DPD Kokkos: use a parallel_for() to build the ghosts workplan for SSA 2017-04-06 03:53:57 -04:00
9e272cb393 USER-DPD Kokkos: use a parallel_for() to build the locals workplan for SSA 2017-04-06 02:31:45 -04:00
ad5481831f Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_ssa_mem as of patch 31March17 2017-04-05 16:38:44 -04:00
456926a321 Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks as of patch 31March17 2017-04-05 16:18:39 -04:00
bceaa57614 Merge branch 'master' into USER-DPD_kokkos as of patch 31Mar17 2017-04-05 15:05:47 -04:00
4d4b6f66b7 Changing default gb/test to on 2017-04-05 11:42:25 -06:00
874944f2ec Made fix adapt support bond harmonic. 2017-04-04 19:37:17 -04:00
497a5d88af Merge branch 'master' into user-cgdna 2017-04-04 20:03:57 +01:00
8993daaa31 Minor update to docu 2017-04-04 19:54:22 +01:00
e190eb15f5 remove debug printf 2017-04-04 17:54:33 +00:00
b6bc33bac6 Merge branch 'user_manifold_fix' into user-manifold-fix-every-keyword 2017-04-04 13:31:22 -04:00
03a6f5237f Made every keyword for user-manifold work as advertised. 2017-04-04 13:30:49 -04:00
28e86917a0 Made fix adapt work with bond_harmonic. 2017-04-04 12:35:26 -04:00
aedd7c57f3 Reset atom map values from restart file 2017-04-03 16:42:18 -06:00
6f1bbd3cec protect fix ave/histo from segfaulting on non-existing computes, fixes or variables 2017-04-03 18:08:15 -04:00
2b2f3bd57c USER-DPD Kokkos: #ifdef DEBUG_SSA_BUILD_LOCALS the new debug output 2017-04-02 00:07:24 -04:00
c4c3d490c7 USER-DPD Kokkos: preflight storage needed for SSA threaded neigh list build 2017-04-01 23:52:14 -04:00
e0021a3ff5 USER-DPD Kokkos: preflight SSA neigh list workplan to reduce allocated storage 2017-04-01 14:41:52 -04:00
ac4c35ce8d USER-DPD Kokkos: more WIP on preflighting SSA neighbor list build, with debugging 2017-04-01 13:45:29 -04:00
ac64183ecf USER-DPD Kokkos: WIP on preflighting SSA neighbor list build, with debugging 2017-04-01 12:11:55 -04:00
6ba59cb458 fix memory leak in fix_shardlow_kokkos 2017-03-31 17:04:39 -06:00
fe82926c1f fix memory leaks in pair_tabl_rx_kokkos 2017-03-31 17:04:27 -06:00
697b072552 Merge pull request #21 from ibaned/dpd-memleaks
DPD memory leaks: round 2
2017-03-31 16:43:25 -06:00
5edbd63920 fix memory leak in fix_shardlow_kokkos 2017-03-31 16:03:05 -06:00
bf4f0817d4 fix memory leaks in pair_tabl_rx_kokkos 2017-03-31 15:57:00 -06:00
085958f065 Merge remote-tracking branch 'timattox/USER-DPD_GBhacks' into dpd-memleaks 2017-03-31 15:02:02 -06:00
ae56b9ad89 patch 31Mar17 for stable release 2017-03-30 10:07:27 -06:00
4466d9fb4a Merge pull request #440 from ohenrich/user-cgdna
Updated lammps.book, USER-CGDNA install script
2017-03-30 09:34:35 -06:00
ac1aa9edea Updated README 2017-03-29 11:18:04 +01:00
c733204a70 Updated lammps.book and install script 2017-03-29 08:28:03 +01:00
1544b51dcb Support mixed Python use by honoring Python GIL
This enables support to both drive LAMMPS with a Python interpreter and
evaluating Python expressions inside of LAMMPS using that same interpreter.
Previously this has been avoided through an error message because the
binding code did not ensure that the necessary GIL (global interpreter lock)
structures exist (see issue #438).

All code paths which call Python C API functions must first acquire the
GIL through a call PyGILState_Ensure and release it with PyGILState_Release.
2017-03-29 01:49:15 -04:00
4b9d0a9566 sync with SVN 2017-03-28 13:26:12 -06:00
0637f23875 patch 28Mar17 2017-03-28 13:12:23 -06:00
b3d6d9f8cf fix memory leak via NeighListKokkos::clean_copy()
There were several clean_copy() calls in pair
styles *outside device code*.
They seem to have been left over from an abandoned
effort to copy the Kokkos neighbor list as
a member of the pair style, instead of copying
out the individual views needed.
These leftover clean_copy() calls were setting
pointers to NULL that had not been freed,
leading to large memory leaks.
I've removed the clean_copy() function entirely,
and replaced it with the copymode flag system used
in many other Kokkos objects.
The copymode flag is only set to one in
functors that hold copies of the neighbor list.
2017-03-28 13:01:22 -06:00
7041f75fce Merge pull request #20 from ibaned/dpd-memleaks
fix memory leak via NeighListKokkos::clean_copy()
2017-03-28 12:53:34 -06:00
9f6e126a2f Merge pull request #437 from ohenrich/user-cgdna
User cgdna
2017-03-28 12:52:26 -06:00
645f56cf70 Merge pull request #436 from Pakketeretet2/better_incorrect_input_handling_nh
Changed the check on initial and final temperature to <= 0 for both.
2017-03-28 12:51:17 -06:00
80e5111dca Merge pull request #434 from akohlmey/imgflags-in-library
improved image flag handling in library interface
2017-03-28 12:50:13 -06:00
7e9f05b617 Merge pull request #433 from akohlmey/fixes-for-stable
More small fixes for stable release
2017-03-28 12:49:09 -06:00
1d8f0c762d Merge branch 'master' into fixes-for-stable 2017-03-28 14:37:30 -04:00
ef6070cbde remove executable permissions for potential files 2017-03-28 14:35:58 -04:00
61f3ff1d2b Merge branch 'master' of github.com:lammps/lammps 2017-03-28 12:35:33 -06:00
111d350a22 fix gcmc units change for chemical potential 2017-03-28 12:34:46 -06:00
1dfd61f532 Merge pull request #432 from Pakketeretet2/user_manifold_fix
Fixed a bug with equal-style variables as manifold params.
2017-03-28 12:33:45 -06:00
5c1f5462e7 Removed contribution line from header files 2017-03-28 19:08:24 +01:00
66a6375405 Resolved merge conflict 2017-03-28 18:58:31 +01:00
20ae05055d fix memory leak via NeighListKokkos::clean_copy()
There were several clean_copy() calls in pair
styles *outside device code*.
They seem to have been left over from an abandoned
effort to copy the Kokkos neighbor list as
a member of the pair style, instead of copying
out the individual views needed.
These leftover clean_copy() calls were setting
pointers to NULL that had not been freed,
leading to large memory leaks.
I've removed the clean_copy() function entirely,
and replaced it with the copymode flag system used
in many other Kokkos objects.
The copymode flag is only set to one in
functors that hold copies of the neighbor list.
2017-03-28 11:38:26 -06:00
604afebf6f Update to oxDNA2 2017-03-28 18:22:02 +01:00
8afed61db1 Upgrade to oxDNA2 2017-03-28 18:16:36 +01:00
ee55a98103 Changed the check on initial and final temperature to <= 0 for both. 2017-03-28 11:22:10 -04:00
f8da9a866a synchronize dump custom/vtk documentation with that of dump custom 2017-03-28 11:00:22 -04:00
28bdebd3c0 avoid segfault when calling PPPM*::memory_usage() before grid communication is initialized 2017-03-28 07:50:48 -04:00
fc51c38abb add some docs for the special treatment of image flags 2017-03-28 02:22:45 -04:00
443ea13eff add image flag packing/unpacking to library/python interface 2017-03-28 02:05:05 -04:00
661bd37e15 Make read_restart evenly divide the work of reading when using mpiio.
Currently only affects restart files written without any per-atom fix data.
2017-03-27 15:03:34 -05:00
5feeb79c13 one more line of dead code removed 2017-03-27 15:16:28 -04:00
a241b2d0f7 fix problems with references 2017-03-27 15:01:32 -04:00
61e7595a94 remove references to xmovie, streamline dump and viz descriptions 2017-03-27 14:59:58 -04:00
da9096750e update .gitignore for newly added files 2017-03-27 14:30:21 -04:00
87ea9ba661 bugfix for library interface 2017-03-27 14:29:13 -04:00
c041727e4f remove dead code and reduce trivial compiler warnings (clang++) 2017-03-27 14:28:50 -04:00
3feffbe1de Removed diagnostics. 2017-03-27 13:49:53 -04:00
04fd038d35 Fixed a bug with equal-style variables as manifold params. 2017-03-27 13:46:57 -04:00
0463923e33 USER-DPD Kokkos: tighten up the SSA data allocation to what is needed.
A future version was planned to use more space for a ghost work queue.
2017-03-27 11:04:41 -05:00
28784a4ce2 Now with the correct math, make read_restart properly size the atom_vec_* data 2017-03-27 08:38:40 -05:00
5f0823172c Make read_restart properly size the atom_vec_* data when reading via mpiio 2017-03-27 06:56:28 -04:00
b418b46a03 USER-DPD: bugfix for an array that changed length in the non-kokkos version. 2017-03-27 06:56:16 -04:00
3dfe4505dd 24Mar17 patch sync with SVN 2017-03-24 15:17:51 -06:00
394e9b42b0 new CHARMM pair styles with force swithing/shifting 2017-03-24 13:53:07 -06:00
e6fcaefe95 Merge pull request #431 from v0i0/fix-airebo-morse
Fix airebo/morse
2017-03-24 10:03:29 -06:00
f5a85d68ad Merge pull request #429 from akohlmey/updates-for-stable
Collected updates for stable release
2017-03-24 10:01:23 -06:00
277b93cb89 Merge pull request #417 from tonnamb/add-pair-zhou
add new pair potential for metal-organic interactions - pair style momb
2017-03-24 09:41:30 -06:00
df95b2c566 testing simple ci, more complex #1 2017-03-23 22:27:42 -06:00
8820315ff9 Merge branch 'master' into updates-for-stable 2017-03-23 17:57:02 -04:00
44841f6891 fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof 2017-03-23 15:31:27 -06:00
2cdcd6d630 remove one more reference to xmovie 2017-03-23 16:03:25 -04:00
47cade2bcf re-arranged functions to make it easier to compare with non-threaded. port bugfixes to airebo to USER-OMP 2017-03-23 15:19:02 -04:00
a72efbea36 whitespace cleanup 2017-03-23 15:18:23 -04:00
5c9892c083 apply airebo/m bugfix also to USER-OMP version 2017-03-23 14:14:49 -04:00
9ecc5c8cf7 Merge branch 'fix-airebo-morse' of https://github.com/v0i0/lammps into pull-431 2017-03-23 14:12:37 -04:00
47cebb0d23 And getting it right... 2017-03-23 17:43:27 +01:00
f127e428cc Fix airebo/morse
Introduced in b3d2fb91, PCCf_2_0 does not get initialized in ::settings
in PairAIREBOMorse. Future proof by calling super-class.
2017-03-23 17:37:49 +01:00
969325bf44 testing simple ci, attempt 4 2017-03-23 10:08:09 -06:00
e598762857 testing simple ci, attempt 3 2017-03-23 10:04:03 -06:00
8d793d4223 testing simple ci, attempt 2 2017-03-23 10:03:24 -06:00
756c899564 testing simple ci 2017-03-23 10:01:21 -06:00
568b67eee9 include citation for reference paper into pair style momb 2017-03-23 12:00:53 -04:00
865b41e201 make pair style momb example follow LAMMPS conventions more closely 2017-03-23 11:50:10 -04:00
b88a749680 rename a couple more references to pair style zhou into momb 2017-03-23 11:38:33 -04:00
02e65900e6 add example log file generated from 17Nov16 version of lammps, make minimize and run short in system.in 2017-03-23 11:03:00 -04:00
343c9eda82 change zhou to momb in src/USER-MISC/README 2017-03-23 10:24:13 -04:00
df8dbec676 rename pair_zhou to pair_momb in src and change class name from PairZhou to PairMomb 2017-03-23 10:22:49 -04:00
1075be7eca rename zhou to momb in examples 2017-03-23 10:18:15 -04:00
6d395ec511 change name zhou to momb in docs, fix grammar 2017-03-23 10:08:47 -04:00
bf560e78f3 edit description and add related commands and default 2017-03-22 16:56:40 -04:00
daae76c465 Add names Tonnam and Ya to README 2017-03-22 15:59:00 -04:00
1ea9a14121 Add Tonnam and Ya names 2017-03-22 15:55:34 -04:00
1db5834b99 Revert "Cleanup of a few more references to obsoleted and removed tools like xmovie"
This reverts commit 127597023d.
2017-03-22 15:12:49 -04:00
3070b043be Revert "correct inconsistent anchors"
This reverts commit a14d58259c.
2017-03-22 15:12:47 -04:00
ef3f323fc4 Revert "remove reference to removed section on VMD scripts"
This reverts commit 66eb9c2486.
2017-03-22 15:12:43 -04:00
43a304f564 remove reference to removed section on VMD scripts 2017-03-22 15:12:09 -04:00
a79aef65e8 correct inconsistent anchors 2017-03-22 15:12:09 -04:00
dc1d93a491 some more whitespace cleanup 2017-03-22 15:08:09 -04:00
66eb9c2486 remove reference to removed section on VMD scripts 2017-03-22 15:01:11 -04:00
a14d58259c correct inconsistent anchors 2017-03-22 15:00:57 -04:00
127597023d Cleanup of a few more references to obsoleted and removed tools like xmovie 2017-03-22 14:57:37 -04:00
3ec16f3630 fully integrate support for doc_anchor_check into docs makefile 2017-03-22 14:40:30 -04:00
cb9059652d a few more small changes to integrate pair style zhou properly 2017-03-22 14:39:46 -04:00
43f27250b5 Merge branch 'add-pair-zhou' of https://github.com/tonnamb/lammps into pull-417 2017-03-22 14:05:16 -04:00
af0b5b0e84 Removed dead code 2017-03-22 16:23:29 +00:00
c5d561a312 pair_zhou docs: add equation, add link in section_commands and pairs 2017-03-22 12:00:32 -04:00
7435084375 Verified oxDNA with modified nucleotide layout 2017-03-22 15:59:10 +00:00
3533df38d8 Merge branch 'virial1' into 'exaalt'
cleaned fix latte

See merge request !1
2017-03-22 15:48:36 +00:00
f7bdf128ea cleaned fix latte 2017-03-22 09:35:47 -06:00
7ed500e829 added virial 2017-03-21 17:09:42 -06:00
3c91f9734d make RK solver check in fix_rx_kokkos.cpp be as lenient as in fix_rx.cpp
NOTE: the (y < -MY_EPSILON) test was too strict, but don't know by how much
This needs to be revisited before merging back to LAMMPS master.
2017-03-21 17:12:09 -04:00
734e639c5d correct typo reported on lammps-users 2017-03-21 14:12:00 -04:00
dcede304df changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution 2017-03-21 08:56:37 -06:00
145e682ad3 Merge pull request #427 from akohlmey/small-updates-and-corrections
Various updates and corrections for upcoming stable release
2017-03-21 08:18:21 -06:00
6482df6c2f remove references to deleted tools. update/clarify section on restart2data 2017-03-20 18:57:30 -04:00
0c9cd11b4e have the relevant LAMMPS version embedded into top part of the html manual 2017-03-20 18:25:11 -04:00
82d952ae0e mention NumPy dependency instead of Numeric for python tools 2017-03-20 17:26:19 -04:00
47d6451d03 fix compilation for pymol_asphere tool 2017-03-20 17:18:24 -04:00
e110d6961a remove obsolete tools and files 2017-03-20 17:17:35 -04:00
a42b0b7dcb update colvars abf integrate tool from git repo 2017-03-20 17:04:16 -04:00
03828b5836 adapt binary2txt.cpp source to current coding conventions 2017-03-20 16:57:32 -04:00
3b44c3ff1d remove non-ASCII characters from doc source files 2017-03-20 16:55:14 -04:00
0d0c2b65f7 correct stan's email address 2017-03-20 16:32:16 -04:00
2218a9d704 emphasize that the online manual is following the latest development version 2017-03-20 16:32:04 -04:00
0a6b33cd78 remove duplicate paragraph in nose-hoover fix docs 2017-03-20 16:27:00 -04:00
ecf17621aa more permission fixes 2017-03-20 16:25:06 -04:00
f0c6ed004d remove xmovie 2017-03-20 16:24:38 -04:00
4ad1c82fcf Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_cps 2017-03-20 14:37:32 -04:00
ce94d7a4df Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks 2017-03-20 12:16:01 -06:00
2c93065786 Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos 2017-03-20 12:13:35 -06:00
554531a302 update permissions 2017-03-20 13:51:36 -04:00
d496c0fdfa Merge pull request #426 from dstelter92/master
fix for temper_grem exchange probability
2017-03-20 08:57:29 -06:00
5c39dfd740 re-ran example with fixed exchanges 2017-03-20 09:22:09 -04:00
5b842f0010 Teff and exchange bugfix, as per Greg Dignon to match python examples 2017-03-20 09:15:48 -04:00
20de98e898 Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in bugfix 2017-03-19 21:22:59 -04:00
a68f3a93e5 USER-DPD Kokkos: bugfix, add a misisng line of code in pair_exp6_rx_kokkos.cpp 2017-03-19 21:12:52 -04:00
52987a3615 Started writing pair_zhou.txt 2017-03-18 22:32:39 -04:00
b6ecfb91c4 deleted pair_zhou in main/src (moved to USER-MISC) 2017-03-18 21:22:02 -04:00
d04ea8653d add examples for pair_zhou 2017-03-18 21:21:25 -04:00
2ab77caa8b adapt to LAMMPS coding style 2017-03-18 21:01:40 -04:00
da81531906 move pair_zhou to USER-MISC and update USER-MISC/README 2017-03-18 20:54:12 -04:00
5be32f5d8d remove pair_zhou from Makefile.list 2017-03-18 20:48:49 -04:00
b3c46b7269 Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bugfix for bonds 2017-03-17 20:15:24 -04:00
fff43a4604 USER-DPD Kokkos: bugfix for npair_ssa_kokkos.cpp corresponding to 0cd3f0cd 2017-03-17 19:33:04 -04:00
0cd3f0cd63 USER-DPD: bugfix for npair_half_bin_newton_ssa when bonds are involved.
Only locals have valid special[] arrays, so when finding neighbors of
ghosts, we have to swap the arguments to find_special().
2017-03-17 19:22:02 -04:00
75670244bb Added ONE-TYPE template capability to vectorized_operator and cleaned up timers. 2017-03-17 17:02:47 -04:00
64fdb1f528 Kokkos/pair_exp6_rx_kokkos optimized for SIMD on the inner j-loop. 2017-03-17 15:52:40 -04:00
eb1a4d11dd Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, as of patch 17March17 2017-03-17 15:18:24 -04:00
1c749d5cf5 Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos 2017-03-17 12:09:25 -06:00
4a90bca7a3 patch 17Mar17 2017-03-17 11:29:23 -06:00
9f35b764f8 Merge pull request #424 from timattox/dpd_restart_fix
Remove unneeded restart_peratom flags in USER-DPD package
2017-03-17 11:19:04 -06:00
7ca5dce2f5 Merge pull request #423 from timattox/master_bugfix_irregular
bugfix for irregular::create_atom and create_data
2017-03-17 11:18:52 -06:00
fcc3b3bd36 Merge pull request #421 from akohlmey/memory-output
improve memory usage reporting in info and output class
2017-03-17 11:18:08 -06:00
53a3877c3d Merge pull request #420 from rbberger/doc_anchor_check
Add utility to detect duplicate anchors in docs
2017-03-17 11:17:28 -06:00
a936b7b2ab Merge pull request #419 from rbberger/python_fixes
Library interface fixes, Python example fixes and better Python 3 compatibility
2017-03-17 11:16:58 -06:00
a91b851f3d Merge pull request #416 from lukin17/filter_corotate
Added fix filter/corotate.
2017-03-17 11:14:59 -06:00
d31c591b60 Remove unneeded restart_peratom flags 2017-03-17 09:40:39 -06:00
ae5ebf6001 add support for MPI_Request_free() to MPI STUBS library 2017-03-17 11:40:09 -04:00
7fb741d53d Revert "In irregular.cpp use simpler and slightly faster MPI_Reduce_scatter_block()"
This reverts commit 8e75616c14.
2017-03-17 11:35:59 -04:00
a719f41426 Merge remote-tracking branch 'thunder/USER-DPD_kokkos_gb_test' into USER-DPD_GBhacks_cps 2017-03-17 10:26:44 -04:00
ba069fb755 Merge remote-tracking branch 'thunder/USER-DPD_GBhacks' into USER-DPD_GBhacks_cps 2017-03-17 10:11:00 -04:00
4a7bc115cb Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in MPI deadlock fix 2017-03-17 03:24:03 -04:00
5ea096d08c Merge branch 'master_bugfix_irregular' into USER-DPD_kokkos 2017-03-17 03:19:29 -04:00
8e75616c14 In irregular.cpp use simpler and slightly faster MPI_Reduce_scatter_block() 2017-03-17 03:02:42 -04:00
411c069ba6 BUGFIX: Prevent possible deadlock in Irregular::create_atom and create_data 2017-03-17 03:02:19 -04:00
ac82d041cc ignore package pair style 2017-03-16 23:12:49 -04:00
621d7d5ce0 Correct off-by-one error in line number reported 2017-03-16 23:05:03 -04:00
1bb9c7da42 Remove some duplicate anchors in documentation 2017-03-16 22:36:13 -04:00
ec192a95cb Cleaned up the non-kokkos part of KOKKOS/pair_exp6_rx_kokkos.cpp 2017-03-16 22:28:19 -04:00
f893104b18 Add anchor_check to doc Makefile 2017-03-16 22:21:55 -04:00
efb2a942e0 Add utility to detect duplicate anchors in documentation files 2017-03-16 22:21:12 -04:00
f5b7361ef6 Non-kokkos candidate of PairExp6rxKokkos::getMixingWeights to improve vectorization on the KNL.
- Moved the particle loop inside a replica of getMixingWeights, getMixingWeightsVect,
  and refactored to improve vectorization.
- Added OMP SIMD and OMP threading directly inside that function but will replace with
  kokkos parallel_for and parallel_reduce methods later.
2017-03-16 21:31:30 -04:00
070ce33a13 improve memory usage reporting in info and output class 2017-03-16 18:35:04 -04:00
f604f86cfc add fix filter/corotate to some administrative files 2017-03-16 15:08:17 -04:00
bed288339e simplify and shorten examples for fix filter/corotate and combine into a single folder 2017-03-16 15:02:50 -04:00
1995f434f3 fix some more code formatting issues, add newline at EOF 2017-03-16 14:24:28 -04:00
db0281b4df Merge branch 'filter_corotate' of https://github.com/lukin17/lammps into pull-416 2017-03-16 12:14:09 -04:00
acdb932c4e Fixing index issue in pair_exp6_rx_kokkos 2017-03-16 09:28:27 -06:00
8f37285b05 UPLOAD examples 2017-03-16 21:12:10 +09:00
ef72145540 Readme for examples 2017-03-16 21:10:41 +09:00
2f5e711acd Merge remote-tracking branch 'upstream/master' into filter_corotate 2017-03-16 10:00:12 +01:00
bdb7669e27 Fixed coding style. 2017-03-16 09:44:07 +01:00
cda8213892 Added Python matplotlib plot example 2017-03-16 01:41:28 -04:00
ef940d226c Improve Python 3 compatibility of pizza tools and simplify read_snapshot code 2017-03-16 01:38:05 -04:00
36da9223ec Fix dump cfg in vizplotgui_atomeye.py example 2017-03-15 22:55:51 -04:00
eb29ef32b1 Fix space/tab error in pizza/gl.py 2017-03-15 22:43:00 -04:00
29550d472d Fix dump cfg in viz_atomeye.py example 2017-03-15 22:31:14 -04:00
79cae51156 Document property 'uses_exceptions' of Python interface 2017-03-15 22:20:30 -04:00
a210867025 Fixes lammps_create_atoms library function and its Python interface variant
The interface of that function has changed and includes two additional
parameters, which haven't been added to the Python interface either.
This showed up by trying to run the simple.py example.
2017-03-15 22:13:06 -04:00
0262a54ecf Fix Python 3 compatibility by encoding strings passed as c_char_p 2017-03-15 22:00:43 -04:00
ce9b3f4fcb Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks 2017-03-15 18:17:39 -05:00
0d8f74f0c5 Merge branch 'filter_corotate' of https://github.com/lukin17/lammps into pull-416 2017-03-15 18:54:41 -04:00
7ebed717de Adding gb_test 2017-03-15 16:05:51 -06:00
bdee2fa234 Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos 2017-03-15 15:59:55 -06:00
3a2da51a82 Merge pull request #413 from ohenrich/user-cgdna
User cgdna
2017-03-15 13:12:43 -06:00
b1c59126f7 Merge pull request #415 from stanmoore1/kk_qeq
Add neigh/qeq option to Kokkos package
2017-03-15 13:12:08 -06:00
4c77838514 Merge pull request #414 from sstrong99/flow-gauss-doc-addition
flow/gauss documentation update
2017-03-15 13:11:26 -06:00
f9468f46f5 Merge pull request #412 from timattox/master_typofix
Correct a typo in the fix_halt.txt documentation.
2017-03-15 13:10:58 -06:00
bd7f4143e2 Merge pull request #18 from ibaned/pair-table-rx-kokkos-slow
pass Views by reference for pair_table_rx_kokkos
2017-03-15 09:47:42 -06:00
f4a08ba4fc pass Views by reference for pair_table_rx_kokkos
this greatly speeds up pair_table_rx_kokkos,
and should put it on par with pair_table_rx
in the Serial case
2017-03-15 09:25:16 -06:00
ec1778b586 add pair_zhou 2017-03-15 11:10:04 -04:00
c3ce3747e0 Added fix filter/corotate. 2017-03-15 11:34:01 +01:00
fdc390ad05 Tweaking docs for Kokkos package 2017-03-14 14:08:14 -06:00
5925460a27 Improve the performance of read_data of gzip'ed files using taskset.
Normally, the gzip process would be pinned to the same core as the
MPI rank 0 process, which makes the pipe stay in one core's cache,
but forces the two process to fight for that core, slowing things down.
2017-03-14 14:27:23 -05:00
580f6b567b Add neigh/qeq option to Kokkos 2017-03-14 10:44:31 -06:00
27b1c33a16 updated the NEMD discussion in the how-to documentation about flow/gauss 2017-03-14 10:39:06 -06:00
7a75cd111c Minor updates in documentation and setup tool, merge before upgrade to oxDNA2 2017-03-14 11:39:09 +00:00
23b8287933 Updated documentation and simple setup tool 2017-03-14 11:36:44 +00:00
d2cbfef13b Add CUDA support to atom_vec_hybrid_kokkos 2017-03-13 09:01:35 -06:00
d17d99b9dd UPLOAD Formulas for EES 2017-03-13 22:54:09 +09:00
68b2a454b5 UPLOAD fix_wall_ees_image 2017-03-13 22:53:10 +09:00
23c3f5622a DOC files for USER-EES
txt doc files for fix_wall_ees and fix_wall_region_ees added.
2017-03-13 22:51:15 +09:00
6311d33a5d UPLOAD source files
source files and install.sh added
2017-03-13 22:49:04 +09:00
e136a9db02 Create README 2017-03-13 22:48:12 +09:00
4b4bc7dc3b USER-DPD: specialize PairTableRXKokkos's compute_all_items() on NEWTON_PAIR
No noticable performance change, but it does eliminate a deep conditional.
2017-03-13 03:03:27 -04:00
d5eceebf32 USER-DPD Kokkos: add support for full neighbor lists.
Note: "newton on" still required if using non-kokkos pair styles or fixes.
Non-kokkos pairs/fixes don't expect their half lists with newton off,
which happens if newton is turned off globally by kokkos via commandline.
Note2: Regardless, fix_shardlow* will still use half lists and newton on.
2017-03-13 01:56:00 -04:00
b1b377cb59 USER-DPD: fix_shardlow's neighbor request needs "newton on" override.
Even if other stuff is doing newton off, SSA must have it turned on.
2017-03-12 17:48:51 -04:00
e908b8dbea USER-DPD Kokkos: correct some error messages 2017-03-12 16:20:09 -04:00
d6f6c6faf1 USER-DPD: Make newton-off warning in pair_dpd_fdt* be more selective.
If using fix_shardlow, the pair_dpd_fdt* styles are okay with newton off,
because the stocastic forces are thus only done in fix_shardlow.
2017-03-12 16:05:28 -04:00
17c8e695a4 Merge branch 'master' into USER-DPD_kokkos as of patch 10 Mar 2017 2017-03-10 21:37:52 -05:00
4cfe623bc1 Correct a typo in the fix_halt.txt documentation. 2017-03-10 21:30:03 -05:00
f871ecdc67 change to RCB cuts in load-balancing commands, also a new option for fix halt 2017-03-10 15:55:07 -07:00
470353e320 Merge pull request #408 from giacomofiorin/colvars-update-2017-03-10
Colvars update 2017-03-10
2017-03-10 14:51:16 -07:00
ffe02d20ca Merge pull request #406 from stanmoore1/kokkos_bugfix
Fix Kokkos issues
2017-03-10 14:51:04 -07:00
c7eadfdefd Merge branch 'master' into USER-DPD_kokkos 2017-03-10 16:29:09 -05:00
f70752c18f Include PDF of Colvars doc missing in previous commit 2017-03-10 15:58:35 -05:00
07fcfd6d54 Merge pull request #405 from stanmoore1/ev_setup_kk
Add alloc flag to ev_setup
2017-03-10 11:01:51 -07:00
c97feafca6 Merge pull request #407 from frobnitzem/master
Add error check to lammps_gather_atoms/lammps_scatter_atoms in library.cpp
2017-03-10 11:00:30 -07:00
b20d95d495 Merge pull request #402 from timattox/USER-DPD_spelling
Fix spelling "correction" from 3a054d1a: iterations not interactions and imd_writen not imd_written
2017-03-10 10:59:43 -07:00
0b4adaa9e6 Backport typo fixes that were not previously pushed to the Colvars repository 2017-03-10 09:24:46 -05:00
5fe6206638 Update Colvars module to version 2017-03-10 2017-03-10 09:16:58 -05:00
6f71275db3 Add Kokkos version of atom_vec_hybrid_kokkos, without CUDA support 2017-03-09 15:35:07 -07:00
65964f3b31 Add error check to lammps_gather_atoms/lammps_scatter_atoms in library.cpp 2017-03-09 16:49:07 -05:00
3298c37982 Makefile.lammps.gfortran for latte 2017-03-09 14:30:21 -07:00
b28b84d444 Fix half from full nlist issue with Kokkos 2017-03-09 14:00:27 -07:00
a001a5ceb0 Fixing memory overflow issue in comm_kokkos 2017-03-09 12:20:49 -07:00
35e1cf1d6e Fixing issue with ev_setup in pair_hybrid_kokkos 2017-03-08 20:02:02 -07:00
2ef713ea1b restore incorrect change due to spell checking in fix imd 2017-03-08 16:40:16 -05:00
fc23f9cfe8 Disable allocation of per-atom arrays in ev_setup for USER-DPD Kokkos styles 2017-03-08 13:07:52 -07:00
0ce5dc0234 Merge remote branch 'stanmoore1/ev_setup_kk' into USER-DPD_kokkos_ev_setup_bugfix 2017-03-08 13:05:15 -07:00
1f6c1942b3 Disable allocation of per-atom arrays in ev_setup for Kokkos styles 2017-03-08 12:42:44 -07:00
683023d820 Adding alloc flag to ev_setup 2017-03-08 12:36:23 -07:00
42d3a8f498 Fix spelling "correction" from 3a054d1a: iterations not interactions. :-) 2017-03-07 15:41:06 -05:00
d01f09dce2 Turn off use of OpenMP in MPIIO/dump_custom_mpiio.cpp if Kokkos is in use.
The convert_string_omp() method breaks when Kokkos is also using OpenMP.
2017-03-07 15:23:17 -05:00
de27305227 Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos 2017-03-07 11:47:18 -07:00
79b005dc3d patch 7Mar17 2017-03-07 11:40:07 -07:00
a2fa6ef452 Merge pull request #393 from akohlmey/small-bugfixes
Small bugfixes
2017-03-07 09:56:03 -07:00
920641bbff Merge pull request #399 from rbberger/docs_spelling_fixes
Correct spelling errors in documentation
2017-03-07 09:47:22 -07:00
c2aabdec22 Merge pull request #398 from stanmoore1/kokkos_changes
Kokkos changes
2017-03-07 09:46:54 -07:00
e4aa735a68 Merge pull request #395 from timattox/USER-DPD_bugfix
USER-DPD: a variety of small but important bugfixes
2017-03-07 09:46:40 -07:00
4af6557568 Merge pull request #394 from jaapkroe/kolmogorov-crespi
Added Kolmogorov-Crespi potential
2017-03-07 09:46:08 -07:00
0798885bdb Merge pull request #389 from akohlmey/update-agni-potential
update AGNI potential for Al, reference runs and output and citation
2017-03-07 09:35:31 -07:00
020e75e7ef Merge pull request #386 from akohlmey/doc-consistentcy
improve consistency of manual
2017-03-07 09:33:14 -07:00
d6866f1cfd Merge pull request #376 from v0i0/airebo-bondorderLJ-fixes
Fixes for PairAIREBO::bondorderLJ
2017-03-07 09:32:30 -07:00
efaa4c6710 new neigh_modify exclude option, other SNAP changes 2017-03-07 09:31:12 -07:00
08baaa9d8e Fix more typos in tools 2017-03-07 01:00:25 -05:00
359af419a7 Fix typo in python README 2017-03-07 00:58:35 -05:00
21be86c423 Fix typos in txt2html 2017-03-07 00:58:03 -05:00
d6800405a5 Fix more typos in examples 2017-03-07 00:57:23 -05:00
3a054d1a82 Fix more typos in src files 2017-03-07 00:55:01 -05:00
007f3c66a0 Third batch of spelling fixes in manual 2017-03-07 00:51:31 -05:00
32708860a9 Add remaining false positives 2017-03-07 00:27:35 -05:00
5b3101cb34 Merge pull request #16 from ibaned/cuda-runtime
Many CUDA runtime fixes
2017-03-06 16:02:52 -07:00
b8c72c7bdb don't query device variables from the host 2017-03-06 15:51:09 -07:00
527a573026 don't use device views to measure dimensions 2017-03-06 15:42:26 -07:00
3e3a24da48 consolidate sorting functions
two sort functions with different
names but identical functionality.
making them the same function
until we descide to use a different
algorithm for atoms and ghosts
2017-03-06 15:28:25 -07:00
a7d1b571be don't capture "this" in lambdas
CUDA lambdas can't capture the calling
object very well.
make local shallow copies of variables needed.
2017-03-06 15:07:07 -07:00
4a6f27935d fix lambda syntax for CUDA
KOKKOS_LAMBDA doesn't quite work on CUDA,
you have to use LAMMPS_LAMBDA.
Also, if you do use LAMMPS_LAMBDA, you need
to run on the default device type,
i.e. no using lambdas to run on OpenMP
when LAMMPS has been compiled for CUDA.
2017-03-06 14:58:40 -07:00
a2c80d2cca Merge remote-tracking branch 'fork/cuda-compile' into cuda-runtime 2017-03-06 14:50:43 -07:00
886cc69dfb Merge pull request #15 from ibaned/cuda-compile
add missing KOKKOS_INLINE_FUNCTION to fix_shardlow
2017-03-06 11:05:49 -07:00
3e8cfb8247 The wonders of git commit -a 2017-03-06 11:04:47 -07:00
c2c22fc2ed add missing KOKKOS_INLINE_FUNCTION to fix_shardlow 2017-03-06 10:57:19 -07:00
fc9eebb936 Added spellcheck utility to documentation build
Uses the sphinxcontrib-spelling extension and requires PyEnchant and
aspell-en to be installed.

Adds the optional make target 'spelling' which produces the file
spelling/output.txt. It contains all words it detects.

Due to the large number of false positives, words in
utils/sphinx-config/false_positives.txt are ignored.
2017-03-05 21:23:41 -05:00
dd76ac5010 Fix typos in tools folder 2017-03-05 21:18:01 -05:00
17486a9319 Convert USER/lb/polymer files to UNIX line endings and remove trailing whitespace 2017-03-05 21:16:21 -05:00
778a79b8ee Fix typos in examples folder 2017-03-05 21:10:33 -05:00
7dd60f9737 Fix typos in src files 2017-03-05 21:03:40 -05:00
084d831bce Second batch of spelling fixes in manual 2017-03-05 21:02:51 -05:00
e261bef7bb Spelling fixes in source files 2017-03-05 18:30:39 -05:00
fd78486086 First batch of spelling fixes in manual 2017-03-05 18:27:38 -05:00
b35895ca12 USER-DPD Kokkos: Remove the SSA's ALLOW_NON_DETERMINISTIC_DPD option.
There was no measurable performance benefit to turning it on.
2017-03-03 15:21:09 -05:00
635c448b61 USER-DPD: sort bins for deterministic SSA instead of using Kokkos::Serial 2017-03-03 14:57:35 -05:00
c1739cae97 Merge pull request #14 from timattox/USER-DPD_kokkos_ssa
USER-DPD Kokkos: work around CUDA not having max_hardware_threads()
2017-03-03 13:29:20 -05:00
0651ea7f69 USER-DPD Kokkos: work around CUDA not having max_hardware_threads() 2017-03-03 12:50:13 -05:00
c468727db0 Fixing issue in fix_wall_lj93_kokkos 2017-03-03 10:49:15 -07:00
6382d3c89a Improving memory access in comm_kokkos 2017-03-03 09:14:47 -07:00
a7e8550962 USER-DPD Kokkos: turn one_type optimization into a template specialization 2017-03-03 10:38:45 -05:00
7e78921c96 USER-DPD Kokkos: propagate 763a00e8 bugfix to pair_multi_lucy_rx_kokkos.cpp 2017-03-03 10:12:44 -05:00
27d6284ebe Merge branch 'USER-DPD_bugfix' into USER-DPD_kokkos, pair_multi_lucy_rx 2017-03-03 09:52:42 -05:00
763a00e8b0 USER-DPD: pair_multi_lucy_rx bugfix for systems with multiple atom types 2017-03-03 09:29:17 -05:00
ce1a3f25e1 Merge branch 'pair_write_fix' of https://github.com/andeplane/lammps into small-bugfixes 2017-03-03 08:11:55 -05:00
eaf7ed7707 Print error if pair_write does not get correct number of arguments 2017-03-02 21:25:27 -08:00
f11b83ecd2 Merge branch 'USER-DPD_kokkos_ssa' into USER-DPD_kokkos 2017-03-02 16:37:03 -05:00
3820c5881d Adding fix_wall_lj93_kokkos 2017-03-02 14:02:49 -07:00
27d2e9bf56 USER-DPD: add npair_halffull_newton_ssa to Purge.list
With the new SSA neighbor list, half from full can't work,
and will break compiles if the old files are in the src directory
2017-03-02 15:03:33 -05:00
d95fbf3a5e USER-DPD Kokkos: use Random_XorShift64() by default, but allow overrides 2017-03-02 15:01:41 -05:00
5c6b0cc85c removed fix_latte from src folder 2017-03-01 16:34:20 -07:00
03c05537fb Merge branch 'USER-DPD_kokkos' into USER-DPD_kokkos_ssa_debug 2017-03-01 15:49:12 -05:00
8210b25fb8 USER-DPD Kokkos: replicate 9a560b90 bugfix to atom_vec_dpd_kokkos.cpp 2017-03-01 15:34:24 -05:00
8c625a52de Merge branch 'USER-DPD_bugfix' into USER-DPD_kokkos, AtomVecDPD hybrid bugfix 2017-03-01 15:29:44 -05:00
9a560b9091 USER-DPD bugfix: make atom_vec_dpd work properly with atom_vec_hybrid.
We were sending too much data during pack_comm_hybrid/unpack_comm_hybrid.
2017-03-01 15:22:28 -05:00
ed089c34cf USER-DPD Kokkos: Now use the deterministic Random_XorShift64() for SSA 2017-03-01 14:18:14 -05:00
268e855a15 USER-DPD Kokkos: bugfix for the rare case were the SSA ghost
processing has more parallelism than for the locals.
2017-03-01 14:14:29 -05:00
48ed963fd2 latte in added 2017-03-01 12:05:00 -07:00
1025c25548 latte.in added 2017-03-01 09:55:33 -07:00
78a8f75a8f params added 2017-03-01 09:53:50 -07:00
641bf72f20 lib kokkos: Enable deterministic use of Random_XorShift*_Pool.
Add support for lock-free and deterministic use of Random_XorShift*_Pool
by giving state_idx selection and lock responsibility up to the
application.  Done by an overload of get_state() to take sate_idx as
an argument that the appplication guarantees is concurrently unique
and within the range of num_states that the application passed to init().
In other words, this allows the RNG state to be associated with some
application specific index, rather than a runtime arbitrary thread ID,
and thus the application can control which work is performed using
which RNG in a deterministic manner, regardless of which thread
performs the work.
2017-03-01 11:52:33 -05:00
6e26358ec3 lib kokkos bugfix: on a CUDA host, the random state wasn't preserved.
Random_XorShift*_Pool<Kokkos::Cuda>::free_state() has two purposes:
1) update the state value kept in the pool
2) unlock the state
For a CUDA host thread, ONLY skip step 2, not both.
2017-03-01 11:46:26 -05:00
bf1794f59a Merge branch 'USER-DPD_kokkos' into USER-DPD_kokkos_ssa_debug 2017-03-01 10:29:33 -05:00
8a0e44db83 updated documentation and ev_tally 2017-03-01 16:13:44 +01:00
0982331c71 USER-DPD Kokkos: replicate 7a593c2f bugfix to pair_table_rx_kokkos.cpp 2017-03-01 09:49:24 -05:00
3ae77e718a Merge branch 'USER-DPD_bugfix' into USER-DPD_kokkos 2017-03-01 09:45:50 -05:00
1dc78a7e58 USER-DPD: correct off-by-one errors in PairMultiLucyRX::coeff() 2017-02-28 17:45:21 -05:00
7a593c2fc8 USER-DPD: correct off-by-one errors in PairTableRX::coeff() 2017-02-28 14:25:03 -05:00
b26a434a50 USER-DPD Kokkos: Add "#ifdef ALLOW_NON_DETERMINISTIC_SSA" toggle
SSA atom binning algorithm was adjusted to do as much work in
parallel while preserving deterministic behavior.  The final
step is done serially to preserve deterministic behavior.
An alternative would be to sort the contents of the bins so
that they are always in the same order.
2017-02-28 12:53:56 -05:00
2b78ac2146 USER-DPD Kokkos: Add "#ifdef DPD_USE_RAN_MARS" toggle
Also, initialize the rand_pool with a seed in init_style()
2017-02-28 12:49:11 -05:00
9736fb3be8 added sucrose latte min example 2017-02-28 10:40:46 -07:00
3ac74a1d69 update lammps.book file for latest doc changes 2017-02-28 11:21:18 -05:00
3605208a45 add a few more missing details for integrating pair style kolmogorov/crespi/z 2017-02-28 11:16:27 -05:00
9b01949cac make the introduction of the command-by-category list less confusing 2017-02-28 11:05:40 -05:00
323570c920 added jpg for kolmogorov-crespi-z equations and fixed hybrid/overlay check in source 2017-02-28 15:39:01 +01:00
df13a7a003 email added 2017-02-28 15:12:35 +01:00
a1b40b902d Added Kolmogorov-Crespi potential 2017-02-28 14:59:13 +01:00
b921b69f47 implement bugfix from issue #388
this closes #388
2017-02-27 18:22:21 -05:00
c0cf50bce5 trigger recomputing ichunk between runs unless requested otherwise
this fixes #390
2017-02-27 18:19:59 -05:00
2708c86836 fix typos: moleclue -> molecule
this closes #386
2017-02-27 18:03:18 -05:00
a5507b291d USER-DPD Kokkos: give each workItem index a unique instance of RanMars
Makes fix_shardlow_kokkos deterministic across runs and thread count.
2017-02-26 18:00:20 -05:00
3eba3e5a1b USER-DPD Kokkos: for deterministic results, serialize bin_atoms() for now. 2017-02-26 17:57:13 -05:00
e4b544f934 Make pair_dpd_fdt_energy's random seed public so fix_shardlow can use it. 2017-02-26 17:53:45 -05:00
35ee24cfad use RandWrap in pair_dpd_fdt_energy_kokkos and fix_shardlow_kokkos 2017-02-26 14:50:58 -05:00
e4500859a3 USER-DPD: add "#ifdef DEBUG_PAIR_CT" debugging code to fix_shardlow* 2017-02-24 22:24:29 -05:00
fd1523c756 USER-DPD Kokkos: add missing () in STACKPARAMS check in ssa_update_* 2017-02-24 22:19:53 -05:00
21619b2976 USER-DPD Kokkos: correct the setup of the ghost SSA workplan 2017-02-24 22:16:33 -05:00
b053c367ea USER-DPD Kokkos: remove extranious debugging code 2017-02-24 19:09:07 -05:00
c2e3a76225 USER-DPD Kokkos: rand seed can't be zero, so add some salt. 2017-02-24 19:07:55 -05:00
6ea290a699 DEBUG: make FixShardlowKokkos have it's own rand_pool, plus debug code.
ssa_update_dpde() hangs on first use of rand_gen.normal()
Switching to not using a pointer to PairDPDfdtEnergyKokkos's rand_pool
had no noticble effect.
2017-02-24 17:41:57 -05:00
c56e0692b9 USER-DPD Kokkos: enable install of SSA Kokkos code 2017-02-24 17:38:46 -05:00
71379487ab USER-DPD: variety of fixes for new SSA Kokkos code. Still not functional. 2017-02-24 17:35:58 -05:00
9999f363a1 remove outdated log files, too. 2017-02-24 15:34:59 -05:00
a18b4ef4b0 update AGNI potential for Al, reference runs and output and citation 2017-02-24 15:33:13 -05:00
f7a48719ad USER-DPD: first attempt at fix_shardlow_kokkos... It compiles! 2017-02-24 13:35:48 -05:00
a341a6bca9 USER-DPD: make locals & ghosts use similar SSA work plan data structure
Kokkos SSA won't use AIRct_ssa[], but still used for non-Kokkos for now.
2017-02-24 13:27:27 -05:00
2f04e87d07 USER-DPD: make PairDPDfdtEnergyKokkos's rand_pool public so it can be reused 2017-02-24 13:24:18 -05:00
aecafecaa2 USER-DPD: fix missing host prefixes in AtomVecDPDKokkos::pack_comm 2017-02-24 13:21:26 -05:00
1db62a57b5 USER-DPD: pair_dpd_fdt_energy_kokkos: enable STACKPARAMS specialization 2017-02-24 13:17:49 -05:00
2dcbc805ba min latte partially fixed 2017-02-23 18:20:02 -07:00
b27cc8f474 USER-DPD: use LAMBDA instead of functor for ghost binning in nbin_ssa_kokkos 2017-02-22 15:08:24 -05:00
8065d96761 USER-DPD: first attempt at npair_ssa_kokkos... It compiles! 2017-02-22 15:08:24 -05:00
01d0a5c4a2 BUGFIX: use Kokkos::atomic_fetch_max() to avoid a race on new_maxneighs 2017-02-22 15:08:24 -05:00
5c6e7b12c6 BUGFIX: fix a copy-o in build_Item_Ghost(): xbin2, etc. should be an int
xbin2, ybin2, and zbin2 are temporary integer bin coordinates, not floats!
2017-02-22 15:08:24 -05:00
19ffe59315 USER-DPD: fix typo in NPairHalfBinNewtonSSA::build(): sz1 instead of sx1
Luckily, no real change, since sz1 and sx1 are normally identical.
2017-02-22 15:08:23 -05:00
37810bdc53 USER-DPD: move centroid bin of stencil_ssa to the first slot.
Eliminates a special case version of a loop just for Subphase 0.
NOTE: pair evaluation order changes, causing numerical differences!
This changed the order that close neighbors of ghosts are processed.
2017-02-22 15:08:23 -05:00
7feb6c2853 USER-DPD: fix a bug in AtomVecDPDKokkos::unpack_restart() 2017-02-22 15:08:23 -05:00
d1a0a3e1c3 USER-DPD: first attempt at nbin_ssa_kokkos... It compiles! 2017-02-22 15:08:22 -05:00
c2ee3285fc USER-DPD: change nstencil_ssa[] to eliminate a corner case
Saves a conditional inside an NPairHalfBinNewtonSSA::build() inner loop
2017-02-22 15:08:22 -05:00
5289ec0b39 cleanup: remove unused binatomsItem() declaration in npair_kokkos.h 2017-02-22 15:08:22 -05:00
e0bafa499d indentation fixes in npair_kokkos.cpp, plus a comment question 2017-02-22 15:08:22 -05:00
4b3197202b USER-DPD: Rework SSA to use a new neighbor list structure, ready for Kokkos
NOTE: pair evaluation order changes, causing numerical differences!
Atom pair processing order is fully planned out in npair_half_bin_newton_ssa
Makes the SSA neighbor list structure very different. Do not use by others!
Each local is in ilist, numneigh, and firstneigh four times instead of once.

Changes LAMMPS core code that had been previously changed for USER-DPD/SSA:
Removes ssaAIR[] from class Atom as it is now unused.
Removes ndxAIR_ssa[] from class NeighList as it is now unused.
Increases length of ilist[], numneigh[], and firstneigh[] if SSA flag set.
2017-02-22 15:08:21 -05:00
ab32d136b9 USER-DPD: SSA with Kokkos: make stencil's sx, sy, sz variables public 2017-02-22 15:08:21 -05:00
151b3f552b USER-DPD: Save pointer to the NPair used to create the NeighList
Gives a user of NeighList access to data stored in a custom NPair
2017-02-22 15:08:21 -05:00
52aaad907f USER-DPD: SSA with Kokkos: Reorder stencil subphases to make things easier. 2017-02-22 15:08:20 -05:00
be166cb5bf USER-DPD: Use subphases when processing AIR zero (locals) in SSA.
NOTE: pair ordering was NOT changed, but tiny differences could occur.
2017-02-22 15:08:20 -05:00
ee83b755ea USER-DPD: Split the SSA stencil and neighbor list into subphases.
NOTE: pair evaluation order changes, causing numerical differences!
This enables processing neighbors in subphase groups that enforce
a geometrical seperation of pairs, allowing greater parallelism
once fix_shardlow (SSA) is converted to Kokkos.
2017-02-22 15:08:20 -05:00
ce2da5068b USER-DPD: renumber AIRs back to 1-7 for ghosts, and just 0 for locals.
This removes the the distinction between pure and impure locals.
Pure and impure locals messed up the directionality of half neighbor lists,
which turns out is crucial to the approach for SSA with kokkos.
2017-02-22 15:08:19 -05:00
641bb4bb16 USER-DPD: remove use of ssaAIR[], move coord2ssaAIR() to nbin_ssa.cpp
Saves an int per atom and ghost, also simplifies and reduces code size.
2017-02-22 15:08:19 -05:00
f73c9a43ab USER-DPD: remove broken code for building SSA half neighbor list from full 2017-02-22 15:08:19 -05:00
3dddeef365 USER-DPD: remove unneeded gairct_ssa[] & anum vars, and some > 0 guards 2017-02-22 15:08:19 -05:00
fb279a87f5 USER-DPD: properly compute AIRct_ssa values, and use them in fix_shardlow.
Eliminates last use of per-atom ssaAIR values within initial_integrate()
2017-02-22 15:08:18 -05:00
e9d46f4e7a USER-DPD: Correct an error message typo. 2017-02-22 15:08:18 -05:00
e42678ed51 USER-DPD: track & use the extent of the local atoms in the bins 2017-02-22 15:08:18 -05:00
ff2786c86c USER-DPD: Make another version of coord2bin() for nbin_ssa 2017-02-22 15:08:17 -05:00
6384486764 USER-DPD: Copy inline coord2bin() functions from nbin_kokkos into nbin_ssa 2017-02-22 15:08:17 -05:00
0512e78860 USER-DPD: new neighbor list code for SSA that gives neighbors to ghosts.
This simplifies the processing of the neighbor list in fix_shardlow.
NOTE: pair evaluation order changes, causing numerical differences!
2017-02-22 15:08:17 -05:00
2db66e49b4 USER-DPD: make pair_dpd_fdt* check more generically for use of fix_shardlow
Allows easier experimentation of alternative shardlow implementations.
2017-02-22 15:08:17 -05:00
3626496c7c Corrected comment in 3' to 5' directionality check 2017-02-22 20:06:49 +00:00
458b6749e7 Corrected comment in 3' to 5' directionality check. 2017-02-22 20:03:41 +00:00
e76cad358b Merge branch 'FixRX_Kokkos_merge' into USER-DPD_kokkos 2017-02-22 14:25:41 -05:00
0a751c5901 KOKKOS: fix a compile-time error caused by merge of patch 21Feb17
Remove the unused PairHybridOverlayKokkos::modify_requests() method
The patch removed the parent PairHybridOverlay::modify_requests()
2017-02-22 11:52:20 -05:00
83988a1026 Merge branch 'master' into USER-DPD_kokkos as of patch 21Feb17 2017-02-22 11:29:01 -05:00
20a9ffe69d improve consistency and resolve dead links for USER-CGDNA related doc files 2017-02-21 21:27:34 -05:00
49e83b4348 patch 21Feb17 sync with GHub 2017-02-21 16:07:26 -07:00
6e89ccd522 Merge pull request #385 from akohlmey/collected-small-bugfixes
collected small bugfixes and updates
2017-02-21 15:59:06 -07:00
53f3df5bfc Merge pull request #384 from lammps/another_neigh_refactor
more neighbor list changes, some new options
2017-02-21 15:57:23 -07:00
3dbbea342a remove a debug print line 2017-02-21 15:57:03 -07:00
b70c670aac Merge pull request #383 from stanmoore1/rshan_class2_kk
Kokkos version of class2 bond, angle, dihedral, and improper from Ray Shan
2017-02-21 15:52:10 -07:00
1d17cae407 Merge pull request #382 from timattox/master_kokkos_neigh_bugfix
neighbor_kokkos.cpp: Don't call grow() on neighbor lists that are copies
2017-02-21 15:51:35 -07:00
429264a12b Merge pull request #380 from hheenen/core_shell_documentation
updated documentation and examples for coreshell
2017-02-21 15:50:53 -07:00
d001a09345 Merge pull request #379 from ndtrung81/pppm-gpu-compute-group-group
Fixed bugs with pppm/gpu when used with compute group/group
2017-02-21 15:50:28 -07:00
cb9d42da08 Merge pull request #378 from timattox/USER-DPD_ssa_update
USER-DPD: performance optimizations to ssa_update() in fix_shardlow
2017-02-21 15:50:07 -07:00
7185ec92b3 Merge pull request #377 from stanmoore1/kokkos_update
Kokkos library update
2017-02-21 15:49:50 -07:00
1cd4c48ccc new SNAP potential for W 2017-02-21 15:49:21 -07:00
a88136c3f5 correct a logic bug in fix wall/gran/region 2017-02-17 17:58:24 -05:00
ce20c7ffe9 remove debug code 2017-02-17 12:42:07 -05:00
4a80df3a99 more neighbor list changes, some new options 2017-02-15 16:45:33 -07:00
5f93fad012 Add copymode protection to class2 styles 2017-02-15 13:56:16 -07:00
ccaec315db Updating docs for Kokkos class2 2017-02-15 13:00:33 -07:00
c6c1852b3b Fix a few issues with Kokkos class2 files 2017-02-15 12:44:54 -07:00
69a8e19dc5 Add files from Ray Shan for Kokkos version of class2 angle, bond, etc. 2017-02-15 12:29:52 -07:00
928947dcea neighbor_kokkos.cpp: Don't call grow() on neighbor lists that are copies.
This corresponds to a bugfix from commit 9161bd98 on neighbor.cpp
2017-02-15 11:49:34 -05:00
904609a7a3 Fixed issue with switching function derivative in PairAIREBO::FLJ
Since we compute dvdw as d vdw / d rij, we have to also compute
dslw as d slw / d rij. Currently, we compute -1/r d slw/d rij,
which leads to incorrect results when the two are later combined.
Alternatively, one could also modify dvdw to be -1/r d vdw/d rij,
which would be a more standard way to do LJ calculations, but this
way seems more consistent.
2017-02-15 16:38:13 +01:00
fc3505fac4 Fixed a number of issues after verifying against the KIM version 2017-02-15 16:37:29 +01:00
48070011d9 update names in example, too 2017-02-14 07:42:36 -05:00
0fb8dacc00 one more Finchham to Fincham change 2017-02-14 07:41:05 -05:00
6b923476b9 updated documentation and examples for coreshell 2017-02-14 13:14:22 +01:00
20806dd86a Fixed bugs with pppm/gpu when used with compute group/group 2017-02-14 00:26:55 -06:00
acc5bde0fe Removed printf's from FixRXKokkos and FixRX.
- Commented out the printf's in FixRXKokkos and FixRX used for
  active debugging.
2017-02-13 16:36:30 -05:00
799d55e097 Switched to operator()'s and Tag's for the Kokkos launch objects.
- Switched from using lambda functions to operator()'s with type tags
  in FixRxKokkos. The lambda's were giving big problems in Cuda with
  the memory objects. This required that all referenced views be members
  of the FixRXKokkos class.
- Add copymode controls to solve_reactions() to avoid the destructor
  freeing pointers carried forward from the copy constructor. Added
  the same to FixRX since its called, too.
2017-02-13 16:33:21 -05:00
4e9c8f4962 Update FixRXKokkos for Cuda build. Added inline and other KOKKOS macros.
- Updated the function prototypes to include the necessary KOKKOS
macros for __host__ and __device__ functions and inlined functions.
- Changed several View definitions to match the disjoint memory spaces
that only come up with Cuda builds.
2017-02-13 16:33:21 -05:00
2f32c1a9af Switched to using Kokkos device data for ODE scratch data.
- Finished porting all scratch arrays to using the StridedArrayType
  template.
- Created a single, large Kokkos device array and using that for all
  scratch data passed into the StridedArrayType objects.
2017-02-13 16:33:20 -05:00
4ac7a5d1f2 Added Kokkos-like array datatype into RK4 and RHS in FixRXKokkos.
- Created an Array class that provides stride access for operator[]
  w/o needing Kokkos views. This was designed to avoid the performance
  issues encountered with Views and sub-views throughout the RHS and
  ODE solver functions.
2017-02-13 16:33:20 -05:00
93d99ec8d0 Added ODE diagnostics to FixRxKokkos using Kokkos managed data.
- Added the diagnostics performance analysis routine to FixRxKokkos
  using Kokkos views.
TODO:
  - Switch to using Kokkos data for the per-iteration scratch data.
    How to allocate only enouch for each work-unit and not all
    iterations? Can the shared-memory scratch memory work for this,
    even for large sizes?
2017-02-13 16:33:19 -05:00
4e8351d9c8 Code clean-up for FixRxKokkos.
- Removed dead code and old errors.
TODO:
  - Per-thread scratch data in kokkos.
  - ODE Diagnostics in kokkos.
2017-02-13 16:33:19 -05:00
f2d005fb8d Fixed errors in FixRxKokkos kokkos neighbor lists initialization and
usage and calls to computeLocalTemperature.

- Created request for kokkos neighbor list for fix and switched to
  that neighbor list datatype in computeLocalTemperature.
- Reconfigured pre_force and setup_pre_force to call a common
  solve_reactions() method to avoid duplicate code.
TODO:
  - Clean-up
  - Provide per-problem scratch data within kokkos framework (instead
    of C++ new/delete data).
2017-02-13 16:33:18 -05:00
0d57a1d831 Added setup_pre_force, pack/unpack methods to FixRxKokkos.
- Added a kokkos version of setup_pre_force that only sets dvector
  and then communicates that.
- Converted all for loops to parallel_for's in computeLocalTemperator()
  and setup_pre_force.
- Added pack/unpack forward/reverse methods with Kokkos host views.

TODO:
 - The Kokkos neighbor list is not working. Need to request a Kokkos
   neighbor list in ::init(). Then, replace objects like list->ilist[]
   with k_list->d_ilist().
2017-02-13 16:33:18 -05:00
acba25c383 Added kokkos datatypes to FixRxKokkos::computeLocalTemperature(...)
Added kokkos dual-view datatypes used in computeLocalTemperature and
pre_force (e.g., dpdThetaLocal) but still using the original host
pointers for the pack/unpack operations.

TODO:
- The Kokkos neighbor list is not working. Need to request a Kokkos
  neighbor list in ::init(). Then, replace objects like list->ilist[]
  with k_list->d_ilist().
- Add another template parameter for HALFTHREAD and create (automatic)
  atomic view of dpdThetaLocal and sumWeights.
- Add modify/sync comments and replace the host-only pointers in the
  pack/unpack methods.
2017-02-13 16:33:17 -05:00
843f3a9192 Updates to FixRxKokkos ...
- Added templated computeLocalTemp<>() to FixRxKokkos but still
  using the original host data pointers.
- Updated the copy-back to dvector operation to be the same with
  RK4 and RKF45 per discussion with J. Larentzos.
TODO:
  - Add kokkos data for computeLocalTemp and parallel_for loop.
2017-02-13 16:33:15 -05:00
2ea900df00 Updated FixRxKokkos to use kokkos-managed data objects.
- Switched to use kokkos dvector, mask, and dpdTheta views
  from atomKK.
2017-02-13 16:33:13 -05:00
70fa9189a8 Updated KOKKOS installer and updated USER-DPD FixRx to match KOKKOS version.
- Updated the KOKKOS installer to include the fix_rx_kokkos.[cpp,h].
- Updated the USER-DPD version of fix_rx.[cpp,h] to sync with the Kokkos
  version. Solves child->parent class dependencies.
2017-02-13 16:33:09 -05:00
41d3903f5a Added kokkos-managed parameters for FixRxKokkos.
- Added kokkos-managed parameter data for the kinetics equations.
- Removed dependencies in rhs() on atom and domain objects.

TODO:
  1. Switch to using KOKKOS data for dvector.
  2. Port ComputeLocalTemp(...) to Kokkos (needs pairing algorithm).
2017-02-13 16:33:05 -05:00
43d61f313f Initial bare-bones port of FixRX to Kokkos.
Initial port of USER-DPD/fix_rx.cpp to KOKKOS/fix_rx_kokkos.cpp.
Using parallel_reduce(...) but still using host-only data.
TODO:
  1. Switch to KOKKOS datatypes for sparse-kinetics data; dense
     is finished.
  2. Switch to using KOKKOS data for dvector.
  3. Remove dependencies in rhs(...) on atom. Store those consts
     in UserData{} or as member constants.
  4. Port ComputeLocalTemp(...) to Kokkos (needs pairing algorithm).
2017-02-13 16:33:02 -05:00
dc16228a60 Merge branch 'USER-DPD_ssa_update' into USER-DPD_kokkos 2017-02-13 15:03:14 -05:00
90e5ae965d Add missing flags to Kokkos Makefile 2017-02-13 11:19:46 -07:00
15008c9d18 USER-DPD: performance optimizations to ssa_update() in fix_shardlow
Overall improvements range from 2% to 18% on our benchmarks
1) Newton has to be turned on for SSA, so remove those conditionals
2) Rework the math in ssa_update() to eliminate many ops and temporaries
3) Split ssa_update() into two versions, based on DPD vs. DPDE
4) Reorder code in ssa_update_*() to reduce register pressure
2017-02-13 13:11:19 -05:00
33af7ab248 Remove merge line 2017-02-13 10:59:22 -07:00
8f9b2aca06 Removing unused files in Kokkos lib 2017-02-13 10:53:51 -07:00
383da816c2 Updating Kokkos lib 2017-02-13 10:50:34 -07:00
96a43e8ef1 Merge branch 'master' into USER-DPD_kokkos as of patch 13Feb17 2017-02-13 12:29:41 -05:00
a323ca1edd Moved variable declarations to front for consistency 2017-02-13 18:11:09 +01:00
de4af6f15d In PairAIREBO::bondorderLJ correct omega sum d/drij.
The code tries to make this distinction between the real distance (r23) and the facticious one (rij), but does not do so very well.
It is better if those two variables have the same value everywhere, and apply the correction where necessary.
The current way to use the values is incorrrect.

Remove those calculations that effectively are derivatives w.r.t. |rij| (the facticious distance), is constant and thus the chained derivative (d|rij|/dRij) is always zero.

Apply the corrections due to drij/dRij in the sum omega term.
2017-02-13 18:11:09 +01:00
0e16dc3ead In PairAIREBO::bondorderLJ: p^sigma pi account for d/drij derivatives.
The bonderorderLJ function operates on a facticious distance |rij|, i.e. everything gets calculated "as if" atoms i and j were a given distance alpha apart.
Mathematically, bondorderLJ is a function of rij (a vector), that is (in terms of the real distance Rij) rij = alpha * Rij/|Rij|.
When we calculate the forces in bondorderLJ, we have to make sure to chain in this derivative whenever we calculate derivatives w.r.t. rij.
The right correction, as it turns our, is Fij = alpha / |Rij| * (Identity(3,3) - Rij * Rij^T / |Rij|^2) * fij.
This commit only fixes this for the p_ij^sigma pi terms, which were modified to separate out the d/drij derivative in the cosine calculation.
Now, derivatives are taken w.r.t. the connecting edges instead of the edge points.
2017-02-13 18:11:01 +01:00
1b3f6e257a In PairAIREBO::bondorderLJ only compute torsion term once.
Since Etmp (representing sum_kijl omega_kijl * w_ik * w_jl) is not reset between the forward and reverse pass, the value used by later calculation will be twice the expected values.
One could instead reset Etmp between these passes, but there really is no reason to calculate it twice.
2017-02-13 17:14:52 +01:00
cb982f2f28 sync 13Feb17 patch back to GH 2017-02-13 09:05:03 -07:00
4843296d4e Merge pull request #372 from akohlmey/fft-cleanup
simplify FFT3d code by removing support for outdated FFT libraries
2017-02-13 08:53:13 -07:00
2bdda8f6c0 patch 12Feb17 - change int to tagint for compute group/group 2017-02-13 08:40:54 -07:00
0068ef5616 added molecule option to compute group/group command 2017-02-10 09:25:32 -07:00
02b0e6cc55 Merge pull request #375 from akohlmey/small-updates-and-fixes
Small updates and fixes
2017-02-10 09:23:51 -07:00
fbb24c2406 Merge pull request #374 from agiliopadua/master
Updated polarizer.py in USER-DRUDE to use coul/long/cs
2017-02-10 09:22:22 -07:00
0efd209480 Merge branch 'master' into user-cgdna 2017-02-09 11:50:03 +00:00
a5f830c40c fix typo
(cherry picked from commit 6410797697)
2017-02-08 14:33:45 -05:00
8c074a363a Merge branch 'master' into small-updates-and-fixes 2017-02-08 14:32:44 -05:00
dc9c2399b2 Merge branch 'master' into USER-DPD_kokkos
Fixed trivial merge conflict in src/KOKKOS/Install.sh
2017-02-06 15:45:26 -05:00
27aca14094 Updated polarizer.py to use coul/long/cs 2017-02-04 15:02:08 +01:00
191453e1c7 Merge branch 'master' into fft-cleanup 2017-02-03 16:53:10 -05:00
207adc3968 Merge pull request #373 from stanmoore1/kk_more_bugfixes
Fixing Kokkos per-atom energy/virial issues
2017-02-03 14:45:31 -07:00
84c517159d Merge pull request #368 from Pakketeretet2/kokkos_morse
Kokkos morse
2017-02-03 14:45:07 -07:00
6ca377436f Merge pull request #366 from rbberger/kokkos_lammps_bigbig_fix
Fix data type of molecule array in npair_kokkos.h
2017-02-03 14:43:33 -07:00
dc34a32602 Merge pull request #362 from ibaned/warnings2
fix Kokkos+kspace warnings
2017-02-03 14:43:12 -07:00
067119f6c6 Adding missing friend statement to pair_lj_class2_coul_cut_kokkos 2017-02-02 15:21:30 -07:00
1834a5e46c Fixing more Kokkos per-atom and fdotr issues 2017-02-02 15:21:21 -07:00
6a4918b39a Fixing typo in pair_buck_coul_cut_kokkos 2017-02-02 15:21:05 -07:00
5da0d39392 Fixing fdotr in pair_buck_coul_cut_kokkos 2017-02-02 13:35:51 -07:00
6f92429602 Fixing per-atom ev issue 2017-02-02 13:34:27 -07:00
38e0e4bb69 Add missing typedef in Kokkos pair styles 2017-02-02 13:24:05 -07:00
daf9f95381 Fixing Kokkos per-atom e/v issue 2017-02-02 13:09:52 -07:00
6595fde0a1 explain in more detail the handling of error checking for numerical inputs 2017-02-02 11:58:12 -05:00
6bcec9c61d Merge pull request #2 from stanmoore1/kk_tag_bugfixes
Fixing tagint and imageint issues in Kokkos package
2017-02-02 08:57:21 -05:00
9d1991bf84 remove support for obsolete legacy FFT libraries and point -DFFT_FFTW to FFTW3 2017-02-02 08:10:23 -05:00
0a87b7443a Updated contributing authors and docs 2017-02-02 13:42:47 +01:00
7ee45ec5f3 Fixing tagint and imageint issues in Kokkos package 2017-02-01 11:52:27 -07:00
d4c9e2500b Ported Morse to KOKKOS 2017-02-01 17:45:21 +01:00
6232073d3b Removed traces of pair morse/kk 2017-02-01 17:39:37 +01:00
ed59193d13 Removed traces of pair morse/kk 2017-02-01 17:39:06 +01:00
67bed8e853 Merge pull request #1 from akohlmey/tagint-issue
Fix additional tagint issue in fix qeq/reax/kk
2017-01-31 18:34:35 -05:00
bcb1d94b9a silence compiler warning about dead code 2017-01-31 18:28:04 -05:00
fbe30b5683 correct issue with compiling for -DLAMMPS_BIGBIG in fix qeq/reax/kk 2017-01-31 18:13:44 -05:00
9ef55fedf7 Merge branch 'kokkos_lammps_bigbig_fix' of https://github.com/rbberger/lammps into tagint-issue 2017-01-31 17:23:51 -05:00
b3e9006aef Merge branch 'master' into USER-DPD_kokkos 2017-01-30 12:04:30 -05:00
997142a4c1 Merge pull request #364 from stanmoore1/kk_triclinic_neighlist
Add triclinic neighbor list support to Kokkos
2017-01-30 07:27:02 -07:00
033b07fdb7 Merge pull request #363 from ibaned/obey-datamask
Fix GPU sync bugs
2017-01-30 07:26:49 -07:00
ed0a347fbf Merge branch 'master' into user-cgdna 2017-01-30 10:31:50 +00:00
51a0b6b445 Fix data type of molecule array in npair_kokkos.h
This showed up when trying to compile with -DLAMMPS_BIGBIG.
Fixes issue #365
2017-01-28 07:49:08 -05:00
59f4a77dd5 Whitespace change to npair_kokkos 2017-01-27 15:17:39 -07:00
579cc6d7aa More tweaks to npair_kokkos for triclinic 2017-01-27 15:13:37 -07:00
5afd3e995b Adding support to npair_kokkos for triclinic-newton-on neighborlists 2017-01-27 14:18:01 -07:00
a1f4551ac2 Adding missing sync/modified in atom_vec_dpd_kokkos 2017-01-27 10:18:41 -07:00
2a6f5e651c more preference of datamask over custom sync
see commit 09fc8b0 for details on why
2017-01-27 09:35:55 -07:00
09fc8b0bd7 kspace & dihedral can't do their own sync/modify
because the verlet_kokkos system has
a "clever" optimization which will
alter the datamasks before calling sync/modify,
so the datamask framework must be
strictly obeyed for GPU correctness.
(the optimization is to concurrently
compute forces on the host and GPU,
and add them up at the end of an iteration.
calling your own sync will overwrite
the partial GPU forces with the
partial host forces).
2017-01-27 08:39:55 -07:00
e5d0bde783 pppm_kokkos: remove useless statement 2017-01-27 08:35:37 -07:00
9daf7fb650 pppm_kokkos: don't shadow member variables 2017-01-27 08:35:37 -07:00
b5d622c6a3 pppm_kokkos: remove unused variables 2017-01-27 08:35:37 -07:00
2023fa28e0 consistent #ifdefs for fft3d variable (2)
this variable is only used when FFTW3
is enabled, so its declaration and
initialization should be protected
under the same conditions to avoid
compiler warnings
2017-01-27 08:35:37 -07:00
5b29515849 fft3d: use C++ loop declarations
the variable (offset) is only
used in a subset of numerous
scenarios with #ifdef, it seems
better just to have each loop
declare it as needed.
(avoids compiler warnings)
2017-01-27 08:35:37 -07:00
5b18421dd2 fft3d : remove unused variables 2017-01-27 08:35:37 -07:00
cf95ea0709 fft3d: only declare variables when used
avoids compiler warnings
2017-01-27 08:35:36 -07:00
6a74a81da0 consistent #ifdefs for fft3d variable
this variable is only used when FFTW3
is enabled, so its declaration and
initialization should be protected
under the same conditions to avoid
compiler warnings
2017-01-27 08:35:36 -07:00
f0a4ed615d add missing KOKKOS_INLINE_FUNCTION for params 2017-01-27 08:35:36 -07:00
cfe818a175 remove unused variables from fix_cmap 2017-01-27 08:35:36 -07:00
f3c5919606 Merge remote branch 'upstream/master' into USER-DPD_kokkos 2017-01-27 08:08:05 -07:00
f8506fee23 sync GHub with SVN 2017-01-26 14:06:43 -07:00
18e5584311 Merge pull request #354 from stanmoore1/kokkos_bugfixes
Kokkos bugfixes
2017-01-26 13:51:47 -07:00
851f80464f Merge pull request #361 from akohlmey/user-omp-fix-per-atom-data
fix USER-OMP bug on per-atom data with hybrid styles
2017-01-26 13:50:13 -07:00
5971d4c994 Merge pull request #358 from ibaned/warnings
warning fixes (Kokkos+CUDA)
2017-01-26 13:49:56 -07:00
868d95f0a5 Merge pull request #352 from akohlmey/fix-skip-with-ghost-issue
Fix skip with ghost issue
2017-01-26 13:47:12 -07:00
a5ff35435a Merge pull request #351 from timattox/USER-DPD_pair_exp6_bugfix
USER-DPD: Possible uninitialized variable in pair_exp6_rx.cpp bugfix.
2017-01-26 13:45:45 -07:00
8b7bd9d88e fix bug where per atom data for USER-OMP was reducing the wrong arrays with hybrid styles 2017-01-26 14:59:10 -05:00
149f37e764 Corrected reference to Fig.1 2017-01-26 19:08:59 +00:00
ebe27c65e1 Removing duplicate code in pair_exp6_rx_kokkos 2017-01-26 10:33:03 -07:00
85c8db5f86 Fixing warning in pair_dpd_fdt_energy_kokkos 2017-01-26 10:10:52 -07:00
be13ecfa17 Fixing Kokkos warnings 2017-01-26 10:10:42 -07:00
6cc969db92 Fixing warnings in Kokkos 2017-01-26 09:24:13 -07:00
8050eb3aa8 Another tweak to sync/modify in pair_multi_lucy_rx_kokkos 2017-01-26 09:17:59 -07:00
c617bc180a Adding sync/modify to pair_multi_lucy_rx_kokkos 2017-01-26 08:52:17 -07:00
672bbbe494 add more missing KOKKOS_INLINE_FUNCTION attributes 2017-01-25 16:03:11 -07:00
03c9c46533 add missing KOKKOS_INLINE_FUNCTION attributes 2017-01-25 15:49:05 -07:00
e992bfe510 remove unused variable 2017-01-25 15:40:52 -07:00
053ee54a27 remove unused variable 2017-01-25 15:38:41 -07:00
1074c6734b add missing return keywords 2017-01-25 15:37:27 -07:00
60b48c9d66 add missing KOKKOS_INLINE_FUNCTION attributes
this structure gets put inside a DualView,
so these members need to be able to execute
on the GPU
2017-01-25 15:36:24 -07:00
3d40b51708 remove unused variable 2017-01-25 15:24:52 -07:00
effbe18c46 fix domain boundary indexing
the compiler pointed out that
boundary[2][2] doesn't exist.
If I understand this correctly,
those checks should be against
boundary[*][0].
2017-01-25 15:24:01 -07:00
6328beb7d7 fix double-return warning
this #ifdef adds a return statement
for little endian machines, but leaves
the old one, which the compiler comlains
is unreachable. this commit combines
the conditionals so we can use #else
2017-01-25 15:22:42 -07:00
26c8d3d98f Fixing GPU memory issue in fix_langevin_kokkos 2017-01-25 12:53:55 -07:00
73177d650d Fixing GPU memory issue in domain_kokkos 2017-01-25 11:18:03 -07:00
8e808f6c6b Zeroing variables in pair_exp6_rx_kokkos to match pull request 2017-01-24 11:45:27 -07:00
5897955e2e Fixing GPU memory issue in fix_eos_table_rx_kokkos 2017-01-24 11:24:47 -07:00
b5cb74bd33 skip list build is compatible with NP_GHOST 2017-01-23 19:21:48 -05:00
31976d1dee skip list definition was missing NP_HALFFULL flag 2017-01-23 19:20:05 -05:00
c8260af37c Possible uninitialized variable in USER-DPD/pair_exp6_rx.cpp bugfix.
Added explicit initialization (to zero) for several variables inside the
inner j-loop to avoid using them uninitialized or from prior iterations
within rmOldij_12 == 0.
2017-01-23 13:34:51 -05:00
f9bc81b924 Merge branch 'master' into USER-DPD_kokkos as of patch 20 Jan 2017. 2017-01-20 16:43:13 -05:00
caea8973a3 add neighbor list kind output to screen 2017-01-20 13:24:09 -07:00
aa0ad9b483 Merge pull request #349 from akohlmey/collected-small-fixes
collected fixes and improvements
2017-01-20 13:19:43 -07:00
5d0e4e1ba9 Merge pull request #346 from stanmoore1/kokkos_fixes
Kokkos fixes
2017-01-20 13:15:16 -07:00
f8d3c4c740 Merge pull request #345 from timattox/USER-DPD_another_zero_compute
USER-DPD another zero compute optimization
2017-01-20 13:14:59 -07:00
e6996121d1 remove dead code 2017-01-20 14:30:46 -05:00
0887ff1273 Merge pull request #13 from timattox/master
simplified neighbor list copying, merge from Master branch, merged #13.
2017-01-20 09:37:07 -07:00
fbfb1df5eb fix typo causing wrong neighbor list copy selections 2017-01-19 20:47:10 -05:00
9a299875da simplified neighbor list copying to avoid possible same-timestep re-build issues 2017-01-19 17:01:15 -07:00
521f3df3d5 Initialize variables in pair_exp6_rx_kokkos 2017-01-19 16:54:50 -07:00
6d47cf350c Makefile for latte_dev 2017-01-19 15:42:09 -07:00
fc94f1bd18 Fixing GPU memory issues in Kokkos 2017-01-19 12:14:25 -07:00
5ce8e2fbae Fixing GPU memory issue in modify_kokkos, need to cherry pick back to Master 2017-01-19 12:13:48 -07:00
de6442d845 Fixing GPU memory issues in Kokkos 2017-01-19 11:55:22 -07:00
917ca19b34 Fixing GPU memory issue in modify_kokkos, need to cherry pick back to Master 2017-01-19 09:54:15 -07:00
cf83ce4543 Adding zero compute to pair_dpd_fdt_energy_kokkos 2017-01-19 08:44:30 -07:00
116ae9d0c4 Fixing copy bug in pair_exp6_rx_kokkos 2017-01-18 14:51:35 -07:00
e05b132289 Fixing error check in fix_eos_table_rx_kokkos 2017-01-18 14:18:35 -07:00
f6cd98636b USER-DPD: Also apply "check if a0 is zero" optimization to pair_dpd_fdt
This relates to commit 4eb08a5822 that was applied to pair_dpd_fdt_energy
2017-01-18 16:17:11 -05:00
05cafb716f USER-DPD: cleanup initialization of splitFDT_flag in pair_dpd_fdt.cpp 2017-01-18 15:51:50 -05:00
4f2fcee6df Merge branch 'master' into USER-DPD_kokkos as of 3af4b3c28 on 18 Jan. 2017
Includes a critical bugfix for using USER-DPD and MOLECULE together.
2017-01-18 15:08:32 -05:00
2d32fa8ccb Fixing GPU memory issues in atom_vec_dpd_kokkos 2017-01-18 12:53:40 -07:00
3af4b3c28c Merge pull request #337 from ohenrich/user-cgdna
Added source code and documentation for USER-CGDNA
2017-01-18 11:31:35 -07:00
7fc0970587 Merge pull request #344 from timattox/USER-DPD_zero_compute
USER-DPD: Skip a0*stuff computations, if a0 was set to zero in pair_coeff
2017-01-18 11:31:14 -07:00
93262b52b4 Merge pull request #343 from timattox/USER-DPD_bugfix_molecule
USER-DPD: bugfix for a segfault when using MOLECULE and DPD together.
2017-01-18 11:30:58 -07:00
b38733e5a2 Fixing GPU memory issue in pair_exp6_rx_kokkos 2017-01-18 10:15:06 -07:00
96636c7514 Fixing warnings in pair_exp6_rx_kokkos 2017-01-17 16:43:55 -07:00
5569c4c130 Fixing GPU memory issue with fix_property_atom_kokkos 2017-01-17 16:19:25 -07:00
4eb08a5822 USER-DPD: Skip a0*stuff computations, if a0 was set to zero in pair_coeff.
This saves around 10% of the runtime for many of our tests using SSA.
2017-01-17 15:55:39 -05:00
8b4130c0cb Fixing issue with pressure in pair_hybrid_kokkos 2017-01-17 13:28:55 -07:00
91d68e26ef Prevent overlapping host/device computation in pair_hybrid_kokkos 2017-01-17 12:26:00 -07:00
883385c8e4 Merge branch 'master' into USER-DPD_kokkos as of patch 17Jan17 2017-01-17 13:19:06 -05:00
01609f55e2 USER-DPD: bugfix for a segfault when using MOLECULE and DPD together. 2017-01-17 12:47:59 -05:00
d2fc88a626 patch 17Jan17 2017-01-17 10:14:53 -07:00
c52a26382f Merge pull request #339 from akohlmey/fixes-for-srp-example
Fixes for srp example
2017-01-17 09:36:28 -07:00
ad4d299975 Merge pull request #335 from stanmoore1/neighbor_fixes
Neighbor fixes
2017-01-17 09:33:25 -07:00
83408b195f Merge pull request #342 from epfl-cosmo/ipi-multiinit-bug
Bugfix in the fix_ipi initialization - prevents multiple open_socket calls
2017-01-17 09:14:03 -07:00
cd7bdf9251 Merge pull request #341 from stanmoore1/qeq_kk_neighlist
Make fix_qeq_reax_kokkos request its own neighbor list
2017-01-17 09:13:47 -07:00
8c5b108900 Merge pull request #340 from stanmoore1/fix_rx_neighborlist
Make fix_rx request its own neighbor list
2017-01-17 09:13:27 -07:00
c19d2011bb Merge pull request #334 from sstrong99/flow_gauss_changeRef
Updated the reference for the flow/gauss method
2017-01-17 09:12:22 -07:00
973bef4d45 Merge pull request #332 from akohlmey/coord-atom-orientorder-atom-enhancements
Coord atom orientorder atom enhancements
2017-01-17 09:11:45 -07:00
1b9e50c8cb Merge pull request #331 from timattox/USER-DPD_fix_example_typo
USER-DPD: fix a typo in the DPD-H example input; update reference output.
2017-01-17 09:08:14 -07:00
252e07e083 Merge pull request #330 from akohlmey/collected-small-bugfixes
Collected small bugfixes
2017-01-17 09:08:00 -07:00
74a661ae26 Merge pull request #328 from akohlmey/print-last-command-on-error
print the last input line, when error->all() is called
2017-01-17 09:05:19 -07:00
d8bc590aaf Merge pull request #327 from stanmoore1/kokkos_lib_update
Updating Kokkos lib
2017-01-17 09:04:12 -07:00
c9bea60710 Merge pull request #326 from Pakketeretet2/github-tutorial-update
Updated images of succesful merge.
2017-01-17 09:03:46 -07:00
5cd856c97f fix spring doc page update 2017-01-17 09:02:56 -07:00
2f13365cf5 avoid spurious error message, when no storage fix is active/used 2017-01-16 17:08:00 -05:00
0a2b78acb8 rather than adjusting the communication cutoff, we just print out the minimum value needed and error out
i suspect, this communication cutoff adjustment was included into the code before it was possible to separately set it via comm_modify. stopping with an error message printing the needed/current value is cleaner, in keeping with other modules in LAMMPS and much less problematic.
2017-01-16 15:47:02 -05:00
3f46b6d782 fix bugs from incorrect code synchronization 2017-01-16 11:15:54 -05:00
5abd6e5122 reordering operations in Pair::init_style() to avoid segfaults w/o a kspace style 2017-01-16 11:08:48 -05:00
f3a82f454e Included a flag to prevent multiple open_socket calls if run is included multiple times in the LAMMPS input 2017-01-16 08:42:23 +01:00
473a3ebeef fix for bug with compute rdf with pair reax/c. we must not copy a neighbor list, if newton settings are not compatible
an alternate route to address this issue would be to allow an "ANY" setting for neighbor list requests and then query the neighbor list for newton setting instead of the force class.
2017-01-15 12:05:19 -05:00
b220850377 Removing neighbor list hack in fix_qeq_reax_kokkos 2017-01-14 16:16:02 -07:00
fa00e0593f Make fix_rx request its own neighbor list 2017-01-14 15:39:37 -07:00
4a09399dc6 during setup, checking timestep doesn't seem to be sufficient. comparing bins and stencil point, too.
in addition, relevant pointers were not properly initialized to NULL
2017-01-14 17:13:22 -05:00
5821fe8dd5 correct out-of-bounds accesses 2017-01-14 17:06:23 -05:00
8360e70f4e update USER-CGDNA examples to follow LAMMPS style 2017-01-13 18:56:45 -05:00
b988b29413 remove dead code 2017-01-13 18:43:35 -05:00
5d48bfdcab USER-CGDNA whitespace cleanup: expand tabs and remove trailing whitespace 2017-01-13 18:40:34 -05:00
fe8caa8a56 apply some LAMMPS formatting style conventions for include files 2017-01-13 18:33:32 -05:00
afaacc6173 add USER-CGDNA package with dependencies into the build system 2017-01-13 18:32:32 -05:00
98ceb6feb1 add missing html files to lammps.book 2017-01-13 18:11:23 -05:00
374abea0f0 some minor documentation integration tweaks for USER-CGDNA package 2017-01-13 18:09:45 -05:00
e3153e0b30 Merge pull request #12 from ibaned/pair-table-rx-kokkos
fix CUDA type issues in pair_table_rx_kokkos
2017-01-13 14:43:48 -07:00
688df1c254 fix CUDA type issues in pair_table_rx_kokkos
stop using the global DAT, use the pair's
DeviceType for all the relevant types.
2017-01-13 14:40:36 -07:00
2b2998052c Fixing inheritance issue in pair_hybrid_overlay_kokkos 2017-01-13 13:50:21 -07:00
dc1b94cdd2 Merge pull request #11 from ibaned/pair-table-rx-kokkos
support for eatom and vatom in pair_table_rx_kokkos
2017-01-13 13:27:48 -07:00
a42a666142 support for eatom and vatom in pair_table_rx_kokkos 2017-01-13 13:23:26 -07:00
61cff85435 avoid not only division by zero, but also computing variance for short runs with insufficient resolution 2017-01-13 14:35:35 -05:00
aa0b327f7e Merge branch 'bugfix_dividebyzero' of https://github.com/timattox/lammps_USER-DPD into collected-small-bugfixes 2017-01-13 14:26:10 -05:00
04fe071968 Merge pull request #6 from ibaned/cuda-lj-ctor-warning
fix a CUDA constructor warning
2017-01-13 12:13:43 -07:00
78498715b4 Protect from divide by zero in mpi_timings() when printing results.
e.g. If neighbor list(s) are never rebuilt, the Neigh time will be zero.
2017-01-13 13:32:15 -05:00
f16f9393ef Merge branch 'master' into USER-DPD_kokkos 2017-01-13 10:51:28 -07:00
2a35fa7a4e Adding initial versions of pair_hybrid_kokkos and pair_hybrid_overlay_kokkos 2017-01-13 10:37:31 -07:00
c15d6580da Fixing issue in pair_multi_lucy_rx_kokkos found by ibaned 2017-01-13 10:01:22 -07:00
1ae53d59fa Merge pull request #9 from ibaned/pair-table-rx-kokkos
pair_table_rx_kokkos from @ibaned
2017-01-13 09:26:30 -07:00
96259ea2d2 Added source code and documentation for USER-CGDNA 2017-01-13 13:36:54 +00:00
b2f67fea30 Merge branch 'collected-small-bugfixes' of github.com:akohlmey/lammps into collected-small-bugfixes 2017-01-13 08:12:10 -05:00
c59bcf31d1 change $MKLROOT to $(MKLROOT) as reported by @WeiLiPenguin
This closes #336
2017-01-13 08:10:51 -05:00
2540fc281c Merge branch 'flow_gauss_changeRef' of github.com:sstrong99/lammps into pull-334 2017-01-12 23:54:52 -05:00
e8e03dd440 Updated the reference for the flow/gauss method, the new reference is much more comprehensive 2017-01-12 23:44:33 -05:00
aaa7dca21b Makefile.lammps.gfortran 2017-01-12 17:13:02 -07:00
6bd17be454 Makefile.lammps.gfortran 2017-01-12 16:58:27 -07:00
5b7ab135dd Fixing Kokkos neighbor bug 2017-01-12 16:36:27 -07:00
0635151e2d Fixing neighbor bug 2017-01-12 16:36:04 -07:00
daf766d4f8 Fixing Kokkos neighbor bug 2017-01-12 16:22:38 -07:00
630783c8e8 Fixing neighbor bug 2017-01-12 16:22:24 -07:00
cce10f6dff remove more leftover code 2017-01-12 14:19:10 -07:00
4dab6737ba remove leftover code 2017-01-12 14:15:42 -07:00
0c3b942686 cleanup changes to Install.sh 2017-01-12 13:50:30 -07:00
f51ddf8450 Makefile.lammps.gfortran 2017-01-12 13:50:02 -07:00
c94030d966 put pair_lj_coul in kokkos_type.h
also rename pair_lj_coul_gromacs
so it doesn't conflict with the
one now in kokkos_type.h
2017-01-12 13:37:53 -07:00
1229f6f60b Updated the reference for the flow/gauss method, the new reference is much more comprehensive 2017-01-12 10:15:18 -07:00
3580e5409d Fixing Kokkos CUDA compile error 2017-01-12 09:00:07 -07:00
b7d0dc8440 Merge branch 'debug' into pair-table-rx-kokkos 2017-01-12 08:32:51 -07:00
0b081b0086 whitespace cleanup 2017-01-11 21:05:32 -05:00
8e1cf6643c apply bugfix to fix wall/gran by eric_lyster@agilent.com on lammps-users 2017-01-11 20:59:40 -05:00
6950a99162 Revert "remove obsolete warning about fix rigid image flag restrictions"
This reverts commit 51e52b477a.
2017-01-11 19:49:58 -05:00
52761aee0d it compiles. 2017-01-11 13:18:13 -07:00
5dcbbba4ce lots of work towards compiling 2017-01-11 13:15:01 -07:00
fdb6b91e29 near trying to compile 2017-01-11 12:50:32 -07:00
41804ff524 progress converting compute_style 2017-01-11 12:42:05 -07:00
c2bb20e60f made compute_fpair a free function as well 2017-01-11 11:54:01 -07:00
cb9fdf7801 starting to separate compute_item from the class 2017-01-11 11:44:54 -07:00
b5ff41f5ef made MixingWeights code non-member
CUDA was simply giving too many
errors dealing with captures of
member variables.
2017-01-11 11:10:33 -07:00
6a9a0e8c33 tracking down some invalid reads... 2017-01-11 09:25:13 -07:00
9f4e5e0661 fix a CUDA constructor warning
The class params_lj_coul was copy-pasted
into many different pair styles, and only
one of them had the proper KOKKOS_INLINE_FUNCTION
annotations for CUDA.
created a header file for this class that
most of the pair styles now include.
One pair style did add extra members,
so it keeps a local copy of the class.
2017-01-11 09:11:35 -07:00
34cb4027df make formatting comment consistent 2017-01-11 07:46:07 -05:00
1d0e600ab7 formatting improvements and small corrections for timer settings and output discussions 2017-01-10 23:47:14 -05:00
d65676e981 make everything public to appease NVCC 2017-01-10 16:08:55 -07:00
55aa91be6b copy uCG and uCGnew correctly 2017-01-10 15:28:19 -07:00
5d5751be19 fix class name in PAIR_CLASS setup 2017-01-10 15:28:19 -07:00
e4673d7fa8 fix compilation 2017-01-10 15:28:19 -07:00
c877c07491 progress towards custom compute functor
which is needed to handle uCG contributions.
2017-01-10 15:28:19 -07:00
4d5abe64d5 draft compute_fpair for PairTableRXKokkos 2017-01-10 15:28:19 -07:00
afbc6fc628 added coeff, settings, single, fix compile 2017-01-10 15:28:19 -07:00
21cde6261a add member variables from PairTableRX 2017-01-10 15:28:19 -07:00
f995bb4335 starting to add getMixingWeights
some compile errors to work out
2017-01-10 15:28:19 -07:00
6abefe7ef9 restarting PairTableRXKokkos
as an exact copy of PairTableKokkos,
now that it derives from PairTable
2017-01-10 15:28:19 -07:00
98c66089a9 Merge pull request #8 from ibaned/pair-multi-lucy-rx-kokkos-rho
fix race condition on rho, thanks @ibaned
2017-01-10 15:25:21 -07:00
d26f1403cd fix race condition on rho
the main bug here is the use of a local
rho_i accumulator which later gets assigned
back to rho[i].
in parallel, atomic additions can happen to
rho[i] while the local accumulator is held;
those atomic additions are lost when
the accumulator is atomically assigned.
we instead initialize the accumulator to zero
and atomically add it back to rho[i].
2017-01-10 15:22:52 -07:00
7162cafdf5 Squelching output from Makefile 2017-01-10 14:46:30 -07:00
ee9e7cfbd5 Fixing Kokkos CUDA Makefile issue 2017-01-10 13:22:36 -07:00
7839c335da Fixing compile error with Kokkos CUDA Makefiles 2017-01-10 13:05:00 -07:00
622d926849 adapt example inputs for TAD and PRD to the change in compute coord/atom 2017-01-10 13:41:35 -05:00
1f6cfb1b31 Makefile.lammps.gfortran changed 2017-01-10 10:56:31 -07:00
92d15d4a89 replace string compare with enums, fix memory leak, formatting cleanup 2017-01-10 12:52:37 -05:00
95706ac846 import contributed code for computes coord/atom and orientorder/atom 2017-01-10 12:29:22 -05:00
d06688bb91 USER-DPD: fix a typo in the DPD-H example input; update reference output. 2017-01-10 12:11:20 -05:00
d014e00e53 ignore some newly added styles from packages. 2017-01-09 17:51:38 -05:00
0db2a07993 another workaround for duplicate labels (which sphinx does not like) 2017-01-09 17:51:19 -05:00
33412c76ed correct some formatting issues with USER-NC-DUMP 2017-01-09 17:50:49 -05:00
e5ac49d1de Merge branch 'master' into collected-small-bugfixes 2017-01-09 17:13:46 -05:00
1a81da0f73 print the last input line, when error->all() is called
this should help tracking down input file errors for many
common cases without having to repeat the run with -echo screen
and avoid having to explain how to use that feature all the time
2017-01-09 17:03:06 -05:00
c31f1e9f22 add fix mscg command, example, lib 2017-01-09 13:36:40 -07:00
ebd25cc078 Updating docs for Kokkos package 2017-01-09 12:40:33 -07:00
9250a55923 Adding enable_lambda to KOKKOS_CUDA_OPTIONS 2017-01-09 12:24:30 -07:00
001964ecd8 Merge branch 'ibaned-pair-table-rx-inherit' into USER-DPD_kokkos 2017-01-09 14:04:31 -05:00
9807062594 Merge branch 'pair-table-rx-inherit' of https://github.com/ibaned/lammps into ibaned-pair-table-rx-inherit 2017-01-09 13:39:44 -05:00
26d50853e9 Merge branch 'master' as of patch 6Jan17 into USER-DPD_kokkos 2017-01-09 13:12:02 -05:00
a9f0b7d523 Updating Kokkos lib 2017-01-09 10:39:46 -07:00
20f8a8c219 Merge branch 'master' into github-tutorial-update 2017-01-09 14:38:09 +01:00
09af780aa8 remove misleading comments 2017-01-06 21:31:39 -05:00
51e52b477a remove obsolete warning about fix rigid image flag restrictions 2017-01-06 21:30:33 -05:00
20a4e365b7 reduce warning when processing manual with sphinx 2017-01-06 21:30:13 -05:00
51fa33a407 patch 6Jan17 2017-01-06 11:14:48 -07:00
ccd09e3967 Updated images of succesful merge. 2017-01-06 19:04:26 +01:00
142770cb2a enable pppm/tip4p to work with triclinic 2017-01-06 10:38:32 -07:00
63f202501b Merge pull request #324 from ibaned/pair-table-kokkos-inherit
get PairTableKokkos to inherit from PairTable (also fix GPU)
2017-01-06 10:10:59 -07:00
83da5d3b5d Merge pull request #323 from akohlmey/pppm-cg-triclinic
synchronize pppm/cg with changes in pppm and remove block on triclinic
2017-01-06 10:10:09 -07:00
ebbf60b112 Merge pull request #319 from andeplane/domain_bug
Fixed bug in lamda_box_corners function
2017-01-06 10:03:32 -07:00
12c4fa25e8 Merge pull request #318 from andeplane/initialize_pointers
Initializing pointers in neighbor.cpp
2017-01-06 10:03:05 -07:00
3ac58452de Merge pull request #310 from EfremBraun/master
Fix nvk implemented
2017-01-06 10:02:22 -07:00
9b348d567b Merge pull request #315 from Pakketeretet2/github-tutorial-update
GitHub tutorial update
2017-01-06 10:01:57 -07:00
467377094a Merge pull request #314 from stanmoore1/fix-momentum-kokkos
Fix momentum kokkos
2017-01-06 10:01:17 -07:00
5656e90b78 Merge pull request #313 from stanmoore1/kokkos_bugfixes
Kokkos bugfixes
2017-01-06 10:00:33 -07:00
41a6a3076e Merge pull request #309 from giacomofiorin/colvars-2016-12-22
Update Colvars library to version 2016-12-22
2017-01-06 09:58:20 -07:00
d4e8d47387 Merge pull request #306 from timattox/USER-DPD_updates
USER-DPD updates
2017-01-06 09:58:01 -07:00
f6a819580c pair TIP4P bug fix for cutoffs >> box size 2017-01-06 09:57:27 -07:00
6af56e686d polish the introduction, some more clarifications, corrections and formatting improvements 2017-01-06 08:31:02 -05:00
eb1c6a225c typo fixed 2017-01-06 11:54:30 +01:00
4d0a6d83bd Merged Axel's suggestions and updated text 2017-01-06 11:51:42 +01:00
958722573f Merge branch 'github-tutorial-update' of https://github.com/Pakketeretet2/lammps into github-tutorial-update 2017-01-06 11:44:16 +01:00
9d46670972 Updated text and images on reverse pull requests 2017-01-06 11:44:14 +01:00
1a9f2df3d0 Updated text and images on reverse pull requests 2017-01-06 11:44:00 +01:00
1310438c8b Merge pull request #1 from akohlmey/pull-315
some formatting updates and text rewrites for your pull request
2017-01-06 11:40:32 +01:00
7201f003e5 move another enum back
see lammps/lammps#325
2017-01-05 21:00:39 -07:00
d8ddef37ed put enum back in .cpp file
see lammps/lammps#325
2017-01-05 20:56:37 -07:00
ad1402562d Revert "move enum to pair.h"
This reverts commit a1ac2ae9b7.
2017-01-05 20:54:24 -07:00
70927d08e7 remove duplicate enum 2017-01-05 20:53:45 -07:00
a1ac2ae9b7 move enum to pair.h
to avoid having it be replicated
in several different locations
2017-01-05 20:53:45 -07:00
3941fe9ab7 fix compilation 2017-01-05 20:53:45 -07:00
318ab9a185 trying PairTableRX : public PairTable
saves a lot of duplicate code
2017-01-05 20:53:45 -07:00
9bf771207d make PairTable::allocate() virtual
forgot to extract this change when
separating the commits for PairTableRX
and PairTableKokkos.
2017-01-05 20:46:05 -07:00
b9144d6332 Revert "move enum to pair.h"
This reverts commit aebc8ea826.
2017-01-05 20:22:15 -07:00
49d644ec3a Merge pull request #7 from ibaned/pair-dpd-energy-kokkos-warnings
fix many warnings in pair_dpd_fdt_energy_kokkos
2017-01-05 16:46:04 -07:00
267f05e5ca protect PairTable dtor with copymode 2017-01-05 15:38:45 -07:00
aebc8ea826 move enum to pair.h
to avoid having it be replicated
in several different locations
2017-01-05 15:38:45 -07:00
53a1de1d40 fix several GPU memory bugs in pair_table_kokkos 2017-01-05 15:38:45 -07:00
d059b5d334 fix crash in create_kokkos_tables
the code was crashing when trying to
deep_copy or assign views that had
not been allocated
2017-01-05 15:38:45 -07:00
7cff343680 fix allocation regressions in PairTableKokkos 2017-01-05 15:38:45 -07:00
a1ac861084 PairTableKokkos : public PairTable 2017-01-05 15:38:45 -07:00
17bdb57bb4 try PairTableKokkos : public PairTable
realize that there is a lot of copy-paste
in this codebase.
2017-01-05 15:38:45 -07:00
e5906dfba0 Merge branch 'exaalt' of gitlab.com:exaalt/lammps into exaalt 2017-01-05 15:37:21 -07:00
967cdd947e cleanup 2017-01-05 15:37:01 -07:00
19f2d2d1ec fix many warnings in pair_dpd_fdt_energy_kokkos
one Kokkos kernel was not annotated consistently,
STACKPARAMS was essentially uninitialized and
confused with a local variable,
plus lots of variables were unused in some
of the Kokkos kernels.
2017-01-05 15:34:05 -07:00
332372dec2 Renamed Makefile.afrl_thunder to Makefile.icex to be more general. 2017-01-05 14:03:16 -05:00
8503ac22a8 Fixed error->all instead of error->one bug in USER-DPD/fix_shardlow.cpp.
During dynamic load balancing, the subdomains will not be uniform so the
bbox size test in USER-DPD/fix_shardlow.cpp may only be called by one rank.
Using error->one allows any rank to stop the simulation in this scenario.
Added rcut and bbox information to help in diagnostics.
2017-01-05 13:58:11 -05:00
cc4040de10 Merge remote-tracking branch 'origin/USER-DPD_kokkos' into USER-DPD_kokkos 2017-01-05 12:25:45 -05:00
a4271ae8c5 Added a Makefile for AFRL Thunder. 2017-01-04 15:13:46 -05:00
fe14158c10 some formatting updates and text rewrites in the "do not use git add -a" section 2017-01-04 13:13:56 -05:00
0bcbcca140 Highlighted the assignee, maintainer changes, and mentioned LAMMPS collaborator 2017-01-04 17:28:22 +01:00
4cfe122ac6 fix warning about enum comparisons 2017-01-04 08:10:08 -07:00
b46629ee39 Merge pull request #5 from ibaned/kokkos-fixes
prevent implicit dereference of s_CTEMP
2017-01-04 08:06:55 -07:00
42bbeb3f16 NULLing pointers after delete 2017-01-04 16:04:05 +01:00
933b288ce9 Added explaination for assignee, changes pushed by others and collaborator. 2017-01-04 14:31:23 +01:00
a7c5905ca4 prevent implicit dereference of s_CTEMP 2017-01-03 15:17:33 -07:00
79ed1b5258 Merge branch 'USER-DPD_updates' into USER-DPD_kokkos, bring over history. 2017-01-03 17:04:12 -05:00
b5c7d44299 Merge branch 'USER-DPD_kokkos_updates' into USER-DPD_kokkos 2017-01-03 12:35:24 -07:00
fe3c98cdbb Merge pull request #4 from ibaned/dpd-fixes
some warning fixes
2017-01-03 14:29:11 -05:00
50df3da343 Merge pull request #3 from ibaned/fix-dpd-energy-kokkos-pr
Implement a Kokkos version of fix_dpd_energy
2017-01-03 14:27:49 -05:00
ae0e882cde Updating pair_multi_lucy_rx_kokkos to USER-DPD changes 2017-01-03 11:51:28 -07:00
6d7607a6ad member function containing lambdas must be public 2017-01-03 11:50:44 -07:00
e3ebd8e7f1 remove syncs that shouldn't be needed 2017-01-03 11:50:44 -07:00
dae132c770 place newline at end of file 2017-01-03 11:42:40 -07:00
e632f8597a fix warning about enum comparisons 2017-01-03 11:42:39 -07:00
89795b3653 got fix_dpd_energy_kokkos to compile 2017-01-03 11:41:40 -07:00
04e2f170a3 first draft fix_dpd_energy_kokkos
had to make k_duCond and k_duMech
in pair_dpd_fdt_energy_kokkos
public so they could be accessed
and sync'ed
2017-01-03 11:41:40 -07:00
53e07996c6 save draft of fix_dpd_energy_kokkos.cpp 2017-01-03 11:41:39 -07:00
66cdd3a708 draft fix_dpd_energy_kokkos.h 2017-01-03 11:41:39 -07:00
ccaa0506cb LAMMPS_LAMBDA from ibaned/lammps@7559bc9 2017-01-03 11:41:39 -07:00
f220b07625 Updating pair_exp6_rx_kokkos to USER-DPD changes 2017-01-03 10:36:55 -07:00
2af10cb8da Updating fix_eos_table_rx_kokkos to USER-DPD changes 2017-01-03 10:09:44 -07:00
37d5567f6d Fixed bug in lamda_box_corners function 2017-01-03 11:54:14 +01:00
b10d0c17ec Initializing pointers in neighbor.cpp 2017-01-03 11:24:48 +01:00
4f45d39ac7 Add warning formatting
Any paragraph starting with IMPORTANT NOTE: is transformed into a warning.
2017-01-03 02:34:11 +01:00
7d057d4c83 make it more explicit, that master needs to be updated and feature branches should be created from master 2017-01-02 13:02:48 -05:00
4f096dbad5 Updated some inconsistent text. 2017-01-02 18:53:28 +01:00
18b12efc9f Small changes to tutorial text. 2017-01-02 18:25:36 +01:00
2c7fea1e0d Second update round to text and images, a third will follow after succesful merge. 2017-01-02 18:15:08 +01:00
4d98bbdfa5 Almost done with the tutorial now 2017-01-02 18:08:14 +01:00
391ab761a4 Finally updated the github tutorial. 2017-01-02 17:55:02 +01:00
b0ebd3ef4e Merge pull request #1 from akohlmey/pull-310
add authorship attribution to lammps PR #310
2016-12-28 23:12:16 +01:00
94c4f8fe5f add authorship attribution 2016-12-28 17:03:37 -05:00
aa146e9b38 Moved fix_nvk to USER-MISC, updated documentation to reflect move 2016-12-28 19:06:35 +01:00
eca9539f84 Disallowing full neighborlist for pair_tersoff_kokkos styles until a bugfix is released 2016-12-28 10:59:53 -07:00
27172c4a55 Fixing Kokkos bug when many atom types 2016-12-28 10:59:42 -07:00
4f195254af Fixing bug with Kokkos and reading restart files 2016-12-28 10:59:30 -07:00
9a0007a13f rename region_block_kokkos inside()
this prevents compiler confusion with
the inside() function provided by
the normal region_block, as the two
should be completely separate.
2016-12-28 10:56:16 -07:00
994f36bc6f silence "implicit dereference" warning
see kokkos/kokkos#177 for detailed
discussion of the issue and fix
2016-12-28 10:56:06 -07:00
b3557bfbf5 add missing return in comm_tiled_kokkos 2016-12-28 10:55:51 -07:00
371df8ea72 repair sync bugs in fix_momentum_kokkos
Since the Group class is completely
unaware of Kokkos, the direct calls from
FixMomentumKokkos to Group methods
need to be preceded by atomKK->sync calls
for every atom variable that Group intends
to use.
fix_momentum_kokkos definitely does not
work on GPUs prior to this commit.
2016-12-28 10:51:59 -07:00
06ae2804f6 ensure velocity is marked as modified before syncing
it worked before, but this seems more reliable
2016-12-28 10:51:20 -07:00
68814d4fc8 Made documentation changes to fix nvk 2016-12-28 16:26:05 +01:00
616ca1de03 Fix nvk implemented. 2016-12-28 16:17:07 +01:00
b0263e87bb Fix missing force with extended-Lagrangian mass 2016-12-27 17:16:32 -05:00
925f42727f Fix typo 2016-12-27 14:26:43 -05:00
f553e230db Update Colvars library to version 2016-12-22
Significant code cleanup and several fixes (walls + extended Lagrangian)

New harmonicWalls bias to apply confining boundaries with time-dependent force
constant & integration
2016-12-27 13:17:34 -05:00
6ab716164b Fix seg fault for gyration collective variable 2016-12-27 13:17:02 -05:00
7a45c72b97 Allow extended Lagrangian on non-scalar collective variables 2016-12-27 12:35:30 -05:00
634eb357d2 synchronize pppm/cg with pppm and remove block on triclinic 2016-12-24 16:09:18 -05:00
cc1b55e031 Merging USER-DPD updates 2016-12-23 12:36:05 -07:00
a1036f2d74 USER-DPD: bugfix for new PairExp6rx::polynomialScaling() function. 2016-12-23 11:36:59 -05:00
c301d70333 USER-DPD: update example input and output (see commits 3faa57 and eff7238) 2016-12-22 17:32:41 -05:00
781daad2a0 USER-DPD: update documentation for changes in commit 3faa57 2016-12-22 17:31:17 -05:00
3faa57a413 USER-DPD: Several updates to *_rx files:
1) Added MY_EPSILON to handle machine precision checks
2) Removed error checks for DPD-RX; enabled use with DPD-E simulations
3) Expanded the EOS functional form to allow corrections
   in the thermo file or on the command line
4) Updated naming convention from fraction to mixWtSite*
5) Changed the name of getParams() method to getMixingWeights()
6) getMixingWeights() now handles fractional and molecular weighting
7) Added optional argument (fractional or molecular) to pair_style command
8) Added argument to specify the exp6 parameter scaling method
   NOTE: Requires additional arguments in the pair coefficients,
   thus command line areguments are NOT backward-compatible.
2016-12-22 17:15:09 -05:00
fa435fb514 USER-DPD: remove unused variable, and convert some constants to MY_EPSILON 2016-12-22 17:05:49 -05:00
a36e563aa5 Temporarily reverting change to pair_table_kokkos to allow runtime testing 2016-12-22 14:37:42 -07:00
ba96fcc15a USER-DPD: update reference output to reflect changes from commit eff7238 2016-12-22 16:21:05 -05:00
a4ab877c46 Change to allow pair_dpd_fdt_energy_kokkos 2016-12-22 13:16:57 -07:00
f6fe61196d CPU runtime tested version of pair_multi_lucy_rx_kokkos 2016-12-22 11:34:17 -07:00
163b61a32e Removing pair_table_rx_kokkos from Kokkos Install.sh since it isn't ready for runtime testing 2016-12-21 15:37:00 -07:00
26c21da45b Merge branch 'master' into USER-DPD_kokkos as of 21Dec16 patch 2016-12-21 16:50:42 -05:00
304f65b164 Merge pull request #2 from ibaned/fix-momentum-kokkos
Fix momentum kokkos from Dan Ibanez
2016-12-21 12:23:32 -07:00
4c33f31265 Merge branch 'debug-cuda' into fix-momentum-kokkos 2016-12-21 10:57:44 -07:00
ae8d882b03 need to sync new velocities back to host 2016-12-21 10:57:18 -07:00
807d9529da Fixing issues found during GPU runtime testing 2016-12-21 10:41:29 -07:00
7559bc9c5f workaround CUDA View::reference_type
it is not an lvalue reference in CUDA.
also, the previous code assumed contiguous
entries for one atom; now it should be
robust in the case of LayoutLeft.
2016-12-21 10:21:55 -07:00
62dea1bb63 21Dec16 patch 2016-12-21 09:53:32 -07:00
800ff43413 Merge pull request #304 from timattox/USER-DPD_whitespace
USER-DPD: Whitespace cleanup to pair_dpd_fdt_energy.cpp
2016-12-21 09:51:10 -07:00
9161bd98bf fixed bug with pair hybrid/overaly and manybody potentials finding the right skip neighbor method 2016-12-21 09:50:29 -07:00
f3327ca214 allow constructing Few from array on device 2016-12-21 09:21:11 -07:00
73326922d6 Fixing Kokkos issue in fix_eos_table_rx_kokkos 2016-12-21 08:56:48 -07:00
54963ba7da allow fix momentum angular with CUDA 2016-12-21 08:55:33 -07:00
ea76041803 CUDA-friendly fix_momentum_kokkos angular 2016-12-21 08:54:40 -07:00
7fb4faa439 draft CUDA-callable version of Domain::unmap 2016-12-21 08:53:57 -07:00
41c9357dde allow constructing Few from C array 2016-12-21 08:53:27 -07:00
d1a55ad2e0 add kokkos_few.h to .gitignore for /src 2016-12-21 08:07:19 -07:00
d9a0f575f6 get fix_momentum_kokkos to compile on White 2016-12-21 08:01:19 -07:00
01e3a31639 put Few in the global namespace... 2016-12-21 08:01:06 -07:00
992becc75f silence warning about partial x2lamda overload 2016-12-21 08:00:42 -07:00
35803c75c9 Fixing issues found during GPU runtime testing 2016-12-20 17:03:46 -07:00
8b5e15e979 add a Makefile for the White testbed 2016-12-20 16:30:50 -07:00
b2b33cca16 start working on fix_momentum Kokkos+CUDA
it doesn't compile anymore,
all in good time...
2016-12-20 16:30:21 -07:00
2ceee6b9be install kokkos_few, and remove Int 2016-12-20 16:19:17 -07:00
386c12c970 start porting my Few class into this code 2016-12-20 16:09:29 -07:00
590f317550 fix_momentum_kokkos: don't override init() 2016-12-20 11:03:16 -07:00
07bee39002 Merge branch 'USER-DPD_whitespace' into USER-DPD_kokkos 2016-12-20 12:23:02 -05:00
c4e02a5d2b USER-DPD: more whitespace fixes 2016-12-20 11:17:11 -05:00
889ee78f8b Change necessary for pair_exp6_rx_kokkos to compile on GPU 2016-12-19 17:15:02 -07:00
f62a6fe5a5 Renaming rand_pool_wrap to rand_pool_wrap_kokkos 2016-12-19 16:50:22 -07:00
6f51c3b75c Fixing issues in pair_multi_lucy_rx_kokkos 2016-12-19 16:25:31 -07:00
99910fc432 Adding CPU runtime tested version of pair_dpd_fdt_energy_kokkos 2016-12-19 15:27:16 -07:00
000df6e1cf Fixing what seems to be a Kokkos bug, I will submit to Kokkos lib developers too 2016-12-19 15:20:10 -07:00
3f1f51c1c7 Changes necessary for runtime testing of Kokkos styles 2016-12-19 13:31:09 -07:00
21bb603b93 Porting recent changes from USER-DPD package to KOKKOS package 2016-12-19 13:30:00 -07:00
c7ac9e79cb preemptive changes for Kokkos+CUDA
I haven't compiled in that mode yet
(don't know how), but these are some
changes I suspect the compiler
will require.
2016-12-19 13:17:22 -07:00
2ba424e1a3 USER-DPD: Whitespace cleanup to pair_dpd_fdt_energy.cpp 2016-12-19 15:11:52 -05:00
ca30c1ec88 got fix_momentum_kokkos to compile
there are likely still some compile
errors for Kokkos+CUDA...
2016-12-19 13:08:09 -07:00
a1b441a71f draft the parallel_* constructs based on lambdas
LAMMPS_LAMBDA was added to kokkos_type.h to
facilitate this.

some member variables will likely need local copies
in the fix_momentum code.
2016-12-19 12:02:12 -07:00
f6f2170369 first draft
copied fix_momentum, work on the Kokkos
View types for the arrays.
the next step is parallel_for and parallel_reduce
transformations.
2016-12-19 11:28:24 -07:00
ac57f4721c Small whitespace tweak to pair_dpd_fdt_energy 2016-12-16 17:14:27 -07:00
5cae3eca8c Whitespace cleanup to pair_dpd_fdt_energy, should be cherry-picked to Master 2016-12-16 17:09:19 -07:00
8474453efd Merge branch 'master' into USER-DPD_kokkos: as of 17Dec16 patch 2016-12-16 15:02:41 -05:00
cfa61b98ae Fixing runtime issues in fix_eos_table_rx_kokkos 2016-12-16 12:37:41 -07:00
81a2db8a0c 17Dec16 patch 2016-12-16 11:36:54 -07:00
0a176841e7 extra python_wrapper change needed for last patch 2016-12-16 11:35:42 -07:00
3027ac9250 patch 16Dec16 2016-12-16 10:30:57 -07:00
fc54ab5cea Merge pull request #301 from akohlmey/corrections-and-bugfixes
Collected corrections and bugfixes
2016-12-16 10:25:29 -07:00
e364b80724 added length keyword to python command 2016-12-16 10:24:25 -07:00
d93e3d1cee Fixing runtime issues with pair_exp6_rx_kokkos 2016-12-16 10:06:12 -07:00
f47a40b2e4 Fixing Kokkos memory deallocation issue 2016-12-16 10:02:01 -07:00
830c9e8661 Merge branch 'USER-DPD_internal_energy' of https://github.com/timattox/lammps_USER-DPD into corrections-and-bugfixes
This closes #303
2016-12-16 11:22:25 -05:00
4907b29ad2 Merge branch 'USER-DPD_bugfixes' of https://github.com/timattox/lammps_USER-DPD into corrections-and-bugfixes
This closes #302
2016-12-16 11:21:15 -05:00
eff7238ff2 USER-DPD: fix_eos*: partition all internal energy into the uMech term only
This makes our results more closely match a vetted serial implementation.
NOTE: This does make the output different from any previous versions.
Patch by Jim Larentzos.  Applied by Tim Mattox.
2016-12-16 10:25:12 -05:00
126fb22e93 USER-DPD: Fix #define typo in pair_multi_lucy.h and pair_multi_lucy_rx.h 2016-12-16 10:08:30 -05:00
a3c1d385e8 Adding Kokkos version of fix_property_atom 2016-12-15 15:50:30 -07:00
d5f8f36442 Change to fix_property_atom to allow virtual override of grow_arrays() function 2016-12-15 15:48:09 -07:00
0a90492c44 USER-DPD: Update the header files to properly document all error statements
Patch by Jim Larentzos.  Applied by Tim Mattox.
2016-12-15 17:39:15 -05:00
fed629c23e USER-DPD: Bugfix for fix_rx and fix_eos_table_rx to handle restart files.
Patch by Jim Larentzos.  Applied by Tim Mattox.
2016-12-15 17:10:13 -05:00
925481c3f4 USER-DPD: Fix hard-wall force interaction bug, and ensure fraction is >= 0
pair_exp6_rx.cpp patch by Jim Larentzos.  Applied by Tim Mattox.
2016-12-15 16:46:25 -05:00
c0d6cbbdd3 Updates to Kokkos files 2016-12-15 11:18:50 -07:00
a58f7631c0 fix_latte unpdated 2016-12-15 10:57:02 -07:00
da2ad5b6e0 update FixIntel code for new neighbor list code 2016-12-14 15:51:12 -05:00
bfcab72268 restore change to make -DLAMMPS_MEMALIGN=64 default when USER-INTEL package is installed (which requires it) 2016-12-14 15:24:55 -05:00
a9d26b3f4a Updates to Kokkos files 2016-12-14 12:58:02 -07:00
cf4010474d Merge branch 'exaalt' of gitlab.com:exaalt/lammps into exaalt 2016-12-14 12:50:52 -07:00
766b3fa457 Merge branch 'exaalt' of gitlab.com:exaalt/lammps into exaalt
Sync all changes made in lammps master branch with exaalt branch
2016-12-14 11:49:49 -07:00
ee4d1b340b test push 2016-12-14 11:48:06 -07:00
07d9f9d66e updated version of fix latte from SJP 2016-12-14 11:48:06 -07:00
f209c8c129 changes in fix_latte 2016-12-14 11:48:06 -07:00
ef8d507338 changes in latte makefile for lattelib and README 2016-12-14 11:48:06 -07:00
e59552c2ec changes for lattelib 2016-12-14 11:48:06 -07:00
7eb05b33fb initial dummy version of fix_latte.cpp 2016-12-14 11:48:06 -07:00
3e2cd6d265 Merging from master to 13Dec16 version 2016-12-14 11:46:04 -07:00
544e23f971 test push 2016-12-14 11:38:39 -07:00
16b15a636c updated version of fix latte from SJP 2016-12-14 11:38:39 -07:00
d43bd57a40 changes in fix_latte 2016-12-14 11:38:39 -07:00
b912db5c73 changes in latte makefile for lattelib and README 2016-12-14 11:38:39 -07:00
765fe3cdfe changes for lattelib 2016-12-14 11:38:39 -07:00
031d4acde8 initial dummy version of fix_latte.cpp 2016-12-14 11:38:39 -07:00
d47c6b2761 Merge branch 'master' into USER-DPD_kokkos 2016-12-14 11:25:11 -07:00
f509f133af patch 13Dec16: neighbor refactor, Stan pppm/disp bug fix, M Brown INTEL package updates 2016-12-13 17:14:28 -07:00
f93c62d3e2 Reverting accidental change 2016-12-13 16:54:00 -07:00
1dbf6d443f Adding Kokkos files 2016-12-13 16:43:40 -07:00
624c57e9da Merge pull request #185 from akohlmey/new-neighbor
New neighbor list code with updates for USER-OMP and USER-DPD
2016-12-13 16:24:41 -07:00
f3b355bcbe Merge pull request #298 from akohlmey/collected-small-fixes
Collected small fixes
2016-12-13 16:23:23 -07:00
ae5764beac added functionity to lib interface 2016-12-13 16:22:17 -07:00
fda43c00fd add deleted file in package to purge list 2016-12-12 13:22:54 -05:00
b34be30be6 Merge pull request #53 from stanmoore1/new-neighbor
New neighbor Kokkos
2016-12-12 13:18:03 -05:00
13b6196b82 Fixing Kokkos compile error 2016-12-12 10:47:39 -07:00
baf55c90f4 Whitespace change 2016-12-12 09:25:41 -07:00
770f5d0bf7 Whitespace change 2016-12-12 09:24:37 -07:00
a31b00965a Updating to master 2016-12-12 09:18:20 -07:00
a5e46e3e6a Merging 2016-12-09 16:20:42 -07:00
31be0da590 Merging pull request 2016-12-09 16:17:35 -07:00
0f3b2544a1 Merge pull request #1 from timattox/new-neighbor
USER-DPD workaround for neighbor list issues
2016-12-09 16:08:31 -07:00
586514e05c Merge branch 'new-neighbor' into new-neighbor 2016-12-09 16:08:08 -07:00
43c459ba56 More changes for Kokkos neighbor 2016-12-09 15:56:55 -07:00
b5c3d2f66c Merge pull request #52 from timattox/new-neighbor
USER-DPD workaround for neighbor list issues
2016-12-09 17:51:35 -05:00
5187cb97e5 USER-DPD: Make fix_shardlow request its own SSA-specific neighbor list,
instead of having pair_dpd_fdt* make the SSA-neighbor list request for it.
Forces an "extra" list to be built, but now skip lists work properly.
Maybe we can detect if skip lists won't be used, and squash the extra list.
2016-12-09 15:42:27 -06:00
eff503e56c Prevent neighbor list copies between SSA and non-SSA neighbor list requests. 2016-12-09 15:39:46 -06:00
cdcebab3bd make the output of the %CPU/OpenMP threads line consistent with compiling in OpenMP support, not having USER-OMP installed 2016-12-09 14:43:56 -05:00
ddf678da51 make fix gcmc command overview consistent
this closes #296
2016-12-09 14:30:27 -05:00
435421301b Small tweaks to Kokkos neighbor 2016-12-09 08:37:01 -07:00
9b48c49f83 Removing used Kokkos file 2016-12-08 09:18:55 -07:00
d3d5ac17bf Fixed small typos in doc 2016-12-07 19:37:51 -08:00
8318c67816 Kokkos neighbor refactor 2016-12-07 13:00:27 -07:00
7c61dbf5e2 Merge branch 'new-neighbor' of github.com:akohlmey/lammps into new-neighbor 2016-12-07 13:43:04 -05:00
39a12b15d7 Merge branch 'master' into new-neighbor
Resolved Conflicts:
	src/Purge.list
	src/neigh_derive.cpp
2016-12-07 13:40:14 -05:00
5f78c2b6a5 test push 2016-12-01 15:14:47 -07:00
45b85b1686 updated version of fix latte from SJP 2016-12-01 14:50:11 -07:00
3f68d370b5 Merge branch 'master' into USER-DPD_kokkos: up to date to 30Nov16 patch 2016-11-30 16:57:48 -05:00
6e6776f396 Finish moving/integrating atom_vec_dpd_kokkos into the Kokkos package 2016-11-30 16:25:07 -05:00
fb3f597f41 30Nov16 patch 2016-11-30 14:04:41 -07:00
d14814ae2e Merge pull request #289 from akohlmey/collected-updates-and-bugfixes
Collected updates and bugfixes
2016-11-30 14:02:41 -07:00
beb5a30f67 new compute global/atom command, also bug fix for descending dump sorts 2016-11-30 14:01:27 -07:00
7ddb6670c0 fix typo 2016-11-30 00:12:35 -05:00
789e62388f simplify code 2016-11-29 09:03:53 -05:00
7d098bff90 update format
(cherry picked from commit 2597185afb)
2016-11-29 09:01:36 -05:00
1d970d3cdf dihedral_nharmonic: added writing coefficient by write_data
(cherry picked from commit 618f5c6aa5)
2016-11-29 09:01:36 -05:00
42d430168b fix typo in compute cluster/atom docs
this closes #292
2016-11-29 07:24:09 -05:00
5ff5bc2a6c avoid issues detected by coverity scan 2016-11-28 21:34:35 -05:00
fe99fc287d changes in fix_latte 2016-11-28 15:29:37 -07:00
6d94439cfe Integrating pair_dpd_fdt_energy_kokkos files 2016-11-28 14:42:47 -07:00
91e38720d5 Adding pair_exp6_rx_kokkos files 2016-11-28 14:25:02 -07:00
02ae2d218a correct broken link to USER-SMD docs PDF 2016-11-28 11:34:22 -05:00
470908fc93 explicitly disallow dynamic groups with compute rdf 2016-11-24 05:46:15 -05:00
6759630c16 bug fix for dump sort in descending order 2016-11-23 17:08:36 -07:00
87781771ba fix typo and USER-OMP support omission 2016-11-23 09:02:32 -05:00
df46b9aa38 rename compute pressure/grem to compute PRESSURE/GREM 2016-11-22 15:25:59 -05:00
647c6f00ce Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into collected-updates-and-bugfixes 2016-11-22 14:51:19 -05:00
237307eda2 small typo and changes 2016-11-22 12:16:00 -05:00
d58dd4f159 bugfix when parsing mpirun 2016-11-22 12:13:20 -05:00
ae70f1090f added readme for grem examples 2016-11-22 12:05:14 -05:00
59d100ab57 final prep for 22Nov patch 2016-11-22 09:23:02 -07:00
61e71d23ed Merge pull request #288 from akohlmey/moltemplate-1.40
update bundled version of moltemplate to v1.40
2016-11-22 08:51:11 -07:00
b6f2f0e6e9 Merge pull request #287 from rbberger/pylammps/docs
Created PyLammps documentation
2016-11-22 08:50:29 -07:00
ff0441ac16 Merge pull request #286 from akohlmey/small-fixes-and-updates
Collected small fixes and updates
2016-11-22 08:49:46 -07:00
41907d3110 Merge pull request #285 from akohlmey/fix-ipi-update
update for fix ipi from michele ceriotti
2016-11-22 08:48:27 -07:00
b95f255af4 small changes to temper/grem commands 2016-11-22 08:47:44 -07:00
d7b542101a Merge pull request #283 from akohlmey/grem-feature
gREM generalized replica exchange feature for USER-MISC
2016-11-22 08:15:35 -07:00
0ffa50f8e8 tweaked author syntax 2016-11-22 08:15:13 -07:00
7590791604 Integrating atom_vec_dpd into the Kokkos package 2016-11-21 13:54:14 -07:00
7893215964 small comment/whitespace tweak 2016-11-21 12:46:43 -05:00
8f78157202 USER-DPD: aplly unpack_comm_hybrid bugfix d31121b to atom_vec_dpd_kokkos.cpp 2016-11-21 12:32:48 -05:00
1d939231a4 USER-DPD: initial Kokkos port, first steps from Aug 24th ARL Kokkos hackathon
atom_vec_dpd_kokkos
pair_dpd_fdt_energy_kokkos without the Oct 7th VV support from e27ed6c
2016-11-21 12:21:01 -05:00
3dff9f2018 removed extra file 2016-11-21 12:05:30 -05:00
dab232c542 modified temper_grem name to fit conventions, re-ran example to match 2016-11-21 12:02:17 -05:00
9e9d9d5aa5 update bundled version of moltemplate to v1.40 2016-11-21 11:34:42 -05:00
c982b174a2 Merge pull request #49 from epfl-cosmo/fix-ipi
i-PI interface fix
2016-11-19 19:36:13 -05:00
87a5a35bad A tiny bugfix for the reset flag, and a brief explanation of the changes 2016-11-20 00:44:23 +01:00
fd174ce2b1 Merge branch 'fix-ipi-update' of https://github.com/akohlmey/lammps into fix-ipi 2016-11-20 00:04:56 +01:00
b11f376a4f Merge branch 'master' of github.com:lammps/lammps 2016-11-19 23:25:51 +01:00
230b29eae6 correct accelerator flags for dpd styles in pair style overview 2016-11-19 11:47:12 -05:00
2383c31f15 Created PyLammps documentation
Based on material presented during MD Workshop at Temple University in
August 2016.
2016-11-18 23:58:57 -07:00
e175a18bdb be more thorough in initializing optional data in pair style dpd/fdt/energy 2016-11-18 16:18:47 -05:00
a5bde82e37 update .gitignore for recent addition 2016-11-18 15:38:11 -05:00
d787afcca9 also remove generated html files with 'make clean' in docs folder 2016-11-18 15:37:49 -05:00
176cde8ed3 minor cleanups 2016-11-18 15:36:38 -05:00
2862c20815 Merge branch 'master' into grem-feature 2016-11-18 14:51:46 -05:00
78e018829f Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem-feature 2016-11-18 14:48:47 -05:00
c78914e7b3 update for fix ipi from michele ceriotti 2016-11-18 09:21:50 -05:00
635f3ce128 synchronize USER-SMD examples with code 2016-11-18 08:09:24 -05:00
81f68e06fd Merge branch 'master' into doc-updates 2016-11-17 20:44:07 -05:00
4b51719e67 new 17Nov16 patch and stable 2016-11-17 16:51:35 -07:00
25d7be5f3d compute pressure doc change 2016-11-17 16:11:30 -07:00
2a026c9ad8 revised temper_grem example, better file management 2016-11-17 12:53:25 -05:00
4a3091f844 modified temper_grem example with more exchanges 2016-11-17 11:24:29 -05:00
74c0e4dd5c Merge pull request #278 from akohlmey/pair-agni
Implementation of the AGNI manybody potential
2016-11-17 09:04:31 -07:00
073e8a0524 Merge pull request #276 from akohlmey/doc-updates
Small bugfixes and updates
2016-11-17 09:02:27 -07:00
5320bbf585 Merge pull request #275 from andeplane/IP_VORONOI
Initializing pointers in VORONOI
2016-11-17 09:01:46 -07:00
4448819824 Merge pull request #274 from andeplane/IP_POEMS
Initialize pointers in POEMS
2016-11-17 09:01:37 -07:00
300ac30332 Merge pull request #273 from akohlmey/auto-memalign
turn on -DLAMMPS_MEMALIGN=64 automatically when USER-INTEL is installed
2016-11-17 09:01:27 -07:00
2535e44991 Merge pull request #271 from akohlmey/tersoff-modc
pair style tersoff/mod/c
2016-11-17 09:00:52 -07:00
747c95c525 revised documentation, added temper_grem ref to fix_grem 2016-11-17 11:00:49 -05:00
cdae794383 Merge pull request #242 from andeplane/vashishta_kokkos
Added KOKKOS vashishta
2016-11-17 09:00:03 -07:00
8756a1017d Kokkos updates by Stan 2016-11-17 08:58:22 -07:00
5c64934bc8 added documention, re-ran temper_grem example 2016-11-17 10:40:10 -05:00
4e62e58d29 Merge pull request #47 from dstelter92/grem-feature
added internal tempering in grem with example
2016-11-17 10:04:43 -05:00
5ac2d9532e Re-run example with debug off 2016-11-17 09:43:44 -05:00
19ac9d2959 turned off dev mode by default in temper_grem 2016-11-17 09:31:07 -05:00
9f313aac75 shorter example 2016-11-16 20:43:41 -05:00
0102c5dadc file cleanup 2016-11-16 20:38:53 -05:00
07e46b797a added internal tempering in grem with example 2016-11-16 20:27:14 -05:00
b45d1e37ef integrate fix grem docs and update to match current conventions 2016-11-16 16:46:00 -05:00
2e7fd513d4 provide fix grem example input for nvt and npt 2016-11-16 16:42:01 -05:00
82364d10e3 Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem-feature
Resolved merge conflicts and adapted logic to most recent changes in feature branch

Closes #46
2016-11-16 16:11:53 -05:00
16c8a307e5 removed leftover tex files 2016-11-16 15:39:02 -05:00
94f14ab051 spell check, minor typos 2016-11-16 15:34:32 -05:00
22d93fe8fb add restrict to CCFLAGS for makefiles intended for intel compilers 2016-11-16 14:31:10 -05:00
683f514fac simplify multi-replica run by passing per-replica parameters as variables on the command line 2016-11-16 14:22:20 -05:00
f617993944 need to apply fix_modify already in fix grem constructor 2016-11-16 13:52:27 -05:00
4641c9e568 Added basic documentation for grem fix 2016-11-16 13:36:13 -05:00
705f66aaee remove superfluous code 2016-11-16 13:24:41 -05:00
e57ae1ce3f compute scaled kinetic energy tensor without destroying the original data 2016-11-16 12:45:13 -05:00
950442b8b1 added check for nvt vs npt, enabled nvt simulation with fix_grem 2016-11-15 21:53:28 -05:00
f040f15218 changes in latte makefile for lattelib and README 2016-11-14 16:11:12 -07:00
1c68e42ecc fix_modify is not longer needed 2016-11-14 13:43:28 -05:00
5f94b31806 add multi-replica example for gREM 2016-11-14 10:12:48 -05:00
f3d6ecf07b changes for lattelib 2016-11-14 07:58:47 -07:00
fdf5d68f9f allow to extract properties in NH integrator only when they are active 2016-11-14 09:27:33 -05:00
0c25f3b1d6 whitespace cleanup 2016-11-13 23:20:09 -05:00
14c7cf4197 retrieve target temperature and pressure from fix npt. add sanity checks. 2016-11-13 23:18:59 -05:00
26870f223d add example for gREM 2016-11-13 23:18:14 -05:00
09544d0698 bugfix for compute pressure/grem: must make a copy of argument strings 2016-11-13 19:19:52 -05:00
b5130a3b35 avoid NaN for variance from average output 2016-11-13 18:46:55 -05:00
20daf82463 initial import of adapted gREM code by David Stelter and Edyta Malolepsza
The following changes were made:
- the modifications to compute pressure were transferred to a derived class compute pressure/grem
- fix scaleforce was renamed to fix grem
- identifying the grem fix was simplified as fix grem passes an additional argument to compute pressure/grem
- dead code was removed in both files
- checking of arguments was tightened
2016-11-13 18:44:10 -05:00
57124b9b25 update documentation metadata files for recent changes 2016-11-12 09:18:21 -05:00
03b3834fe3 add documentation for pair style agni 2016-11-12 09:07:42 -05:00
d0124eac95 optimized data access and using approximate exponential for USER-OMP version 2016-11-12 08:36:27 -05:00
5685131fe2 add USER-OMP version of pair style agni 2016-11-11 19:08:01 -05:00
22fc92f9d8 use special ev_tally() function suitable for this kind of force compute 2016-11-11 18:32:55 -05:00
b9770766a8 add adatom and vacancy examples for AGNI pair style 2016-11-11 18:19:29 -05:00
9cc0c8badd error exit when requested element is not in potential file 2016-11-11 18:10:57 -05:00
6e1492a86c add potential file for pair style AGNI 2016-11-11 18:10:26 -05:00
9b0987d8c4 first complete implementation of AGNI pair style 2016-11-11 17:32:47 -05:00
e453adaf81 implemented parser for 1 element potential files 2016-11-11 15:53:37 -05:00
8e0fd88697 add example demonstrating the use of fix addtorque 2016-11-11 10:52:50 -05:00
fdcabd7d1d fix addtorque is compatible with dynamic groups 2016-11-11 09:01:18 -05:00
c5c8c50e97 initialize 'nper' 2016-11-11 07:47:42 -05:00
72b0841b28 Merge branch 'doc-updates' of github.com:akohlmey/lammps into doc-updates 2016-11-11 07:44:44 -05:00
801111a7ab dummy framework implementation for AGNI pair style 2016-11-10 15:00:36 -05:00
bfc478c320 simpler variant of the segfault workaround, that does not offend Clang c++. 2016-11-10 14:12:02 -05:00
2b75ee761d avoid segmentation fault, when creating a LAMMPS instance from the library interface. arg[] may be NULL. 2016-11-10 13:28:32 -05:00
352e177fcd Merge branch 'master' into small-fixes-and-updates 2016-11-10 13:26:00 -05:00
c20ee34c7b Initializing pointers in VORONOI 2016-11-10 09:30:07 +01:00
95a7f7160e Initialize pointers in POEMS 2016-11-10 09:26:52 +01:00
1f38e1a771 Merge branch 'master' into doc-updates 2016-11-09 18:18:05 -05:00
9806da69f3 Stan bug fixes for fix reaxc/bonds/kk 2016-11-09 15:47:50 -07:00
fec87c070d simplify compiling USER-INTEL package, by defaulting to -DLAMMPS_MEMALIGN=64 in case it is not set 2016-11-09 16:53:39 -05:00
3d3a99c082 added missing potential for tersoff/mod/c 2016-11-09 16:50:34 -05:00
3e36ec3754 remove unused class member 2016-11-09 16:17:46 -05:00
6f23f6535c initial dummy version of fix_latte.cpp 2016-11-09 13:48:11 -07:00
9ed5c4f0fa Merge branch 'master' into kokkos-vashishta 2016-11-09 15:15:10 -05:00
c55fd502e0 correct typo in formula 2016-11-09 15:04:24 -05:00
71ee2ecaa1 integrate pair style tersoff/mod/c contributed by Ganga P Purja Pun (GMU)
This includes docs, added testing and inclusion of USER-OMP support.
2016-11-09 14:52:39 -05:00
bfea3dce7d Merge pull request #268 from arielzn/born_dsf
pair styles born/coul/dsf and born/coul/dsf/cs added
2016-11-09 11:57:09 -07:00
eef862ee1c Merge pull request #267 from akohlmey/pager-help
use pager for help message, if connected to stdout
2016-11-09 11:53:43 -07:00
0cc2fbf1d6 Merge pull request #266 from andeplane/IP_USER_OMP
Initializing pointers in USER-OMP
2016-11-09 11:52:05 -07:00
ae00666994 Merge pull request #265 from andeplane/IP_DIFF_DPD
Initializing pointers in USER-DIFFRACTION and USER-DPD
2016-11-09 11:51:53 -07:00
51b3b5fb35 Merge pull request #264 from andeplane/IP_SNAP_SRD
Initialize pointers in SNAP and SRD
2016-11-09 11:51:44 -07:00
176f2c3aa1 Merge pull request #263 from andeplane/IP_RIGID_SHOCK
Initialize pointers in RIGID and SHOCK
2016-11-09 11:51:36 -07:00
3f71bfb185 Merge pull request #262 from andeplane/IP_PERI_QEQ_REPLICA
Initializing pointers in PERI, QEQ and REPLICA
2016-11-09 11:51:25 -07:00
cf3ab51679 Merge pull request #261 from andeplane/IP_MISC_MOLECULE
Initialized pointers in MISC and MOLECULE
2016-11-09 11:51:09 -07:00
59922f894b Merge pull request #260 from andeplane/IP_MANYBODY_MC
Initialize pointers in MANYBODY and MC
2016-11-09 11:51:01 -07:00
5e2b9d8bf3 Merge pull request #259 from andeplane/IP_KSPACE
Initialize pointers in KSPACE
2016-11-09 11:50:50 -07:00
2d132cad6b Merge pull request #258 from andeplane/IP_GRANULAR
Initialize pointers in GRANULAR
2016-11-09 11:50:41 -07:00
ef6801f8bf Merge pull request #257 from andeplane/IP_CORESHELL
Initialize pointers in CORESHELL
2016-11-09 11:50:31 -07:00
c81a723642 Merge pull request #256 from andeplane/IP_BODY
Initialized pointers in BODY
2016-11-09 11:50:23 -07:00
f9eb2a99ce Merge pull request #255 from andeplane/IP_ASPHERE
Initialize pointers in ASPHERE
2016-11-09 11:50:11 -07:00
16a02ef27d Merge pull request #254 from andeplane/IP_root
Initialized pointers in src folder
2016-11-09 11:47:21 -07:00
2c801320c2 fixed links in Section_intro.txt 2016-11-09 11:46:10 -07:00
d20b32092e Building correct shortlists and removed rsq test in force loops 2016-11-08 18:57:27 +01:00
9de1a2a08f added input using born/coul/dsf/cs to examples/coreshell 2016-11-08 18:27:44 +01:00
cdb5d47e9f add FLERR argument to force->bounds() in born/coul/dsf 2016-11-08 18:24:54 +01:00
a23b287a7a sync with SVN for creation of stable release 2016-11-08 09:05:50 -07:00
31204aab6a sync with SVN 2016-11-08 08:57:51 -07:00
25e7d074cf documentation added for born/coul/dsf and born/coul/dsf/cs styles 2016-11-08 16:51:54 +01:00
667f4dfe28 pair style born/coul/dsf added with its coreshell version 2016-11-08 11:32:38 +01:00
21694ca3a8 improve help and it through a pager, when screen == stdout 2016-11-07 17:10:12 -05:00
9b910d5511 make name of the actual executable (i.e. arg[0]) accessible 2016-11-07 17:07:40 -05:00
054ab6bff3 Initializing pointers in USER-OMP 2016-11-07 21:07:10 +01:00
616420cda8 Initializing pointers in USER-DIFFRACTION and USER-DPD 2016-11-07 20:51:36 +01:00
fb3ac9afba Initialize pointers in SNAP and SRD 2016-11-07 20:30:38 +01:00
7cd7cda2d4 Initialize pointers in RIGID and SHOCK 2016-11-07 20:22:04 +01:00
db0524278a Initializing pointers in PERI, QEQ and REPLICA 2016-11-07 19:58:27 +01:00
1ff75eaba2 Initialized pointers in MISC and MOLECULE 2016-11-07 17:15:48 +01:00
30dede867a Initialize pointers in MANYBODY and MC 2016-11-07 17:02:32 +01:00
a5c6104d64 Initialize pointers in KSPACE 2016-11-07 16:54:59 +01:00
c5869bdee2 Initialize pointers in GRANULAR 2016-11-07 16:33:50 +01:00
e7a2c6b5d1 Initialize pointers in CORESHELL 2016-11-07 16:26:16 +01:00
06959a9c59 Initialized pointers in BODY 2016-11-07 16:21:08 +01:00
cd65d44d95 Initialize pointers in ASPHERE 2016-11-07 16:15:39 +01:00
45f2e86dd6 NULLed ptrs in files 2016-11-07 16:07:37 +01:00
f8226e8ae5 NULL ptrs in dump_custom and dump_image 2016-11-07 15:56:47 +01:00
b221b15d24 NULLing ptrs in comm_brick and dump*.cpp 2016-11-07 15:50:18 +01:00
3a3d96b877 info styles also prints out pair styles 2016-11-04 18:18:40 -04:00
77bbf03f0f Merge pull request #252 from akohlmey/preinstalled-vs-scm
remove the misleading "(which it is by default)" from several doc files
2016-11-04 10:59:06 -06:00
7cff08ca0a Merge pull request #249 from lammps/unstable
Incorporate merge commits from "unstable" into "master"
2016-11-04 10:58:55 -06:00
f0131393e0 Merge pull request #248 from akohlmey/collected-small-fixes
collected small bugfixes and updates
2016-11-04 10:58:42 -06:00
32e0a58343 Merge pull request #247 from akohlmey/bounds-error-with-code-line
Propagate error error locations for a few more utility functions
2016-11-04 10:58:14 -06:00
60908eeab4 Merge pull request #246 from akohlmey/manybody-short-neighbor-list
Manybody short neighbor list
2016-11-04 10:57:43 -06:00
8214555b29 Merge pull request #244 from ketankhare/patch-2
Enable write_data for dihedral style fourier
2016-11-04 10:57:20 -06:00
f48b71f46b added examples/threebody, fix reaxc/speceies/kk 2016-11-04 10:56:04 -06:00
6cc4eb19af remove the misleading "(which it is by default)" from several doc files 2016-11-04 12:20:17 -04:00
7d23a0737e add thorough checking for valid arguments to -partition or -p 2016-11-04 00:42:23 -04:00
02510ec321 add temporary force accumulation to local variables for vashishta styles 2016-11-02 22:32:30 -04:00
33140e5004 accumulate forces in temporary local variables for tersoff 2016-11-02 22:16:53 -04:00
639fb6f444 use local variables for more efficient force accumulation 2016-11-02 17:20:56 -04:00
b156771721 build short neighbor list for sw on based on ij parameters only 2016-11-02 17:09:32 -04:00
5d787f7f16 avoid tiny memory leak, when the restart command is specified multiple times 2016-11-01 21:39:12 -04:00
c8f4b55588 avoid uninitialized data for using ewald/disp with lj only 2016-11-01 16:48:30 -04:00
e13e4031cf avoid memory leak in pppm/disp/omp 2016-11-01 16:48:00 -04:00
782a328080 avoid memory leaks when using kspace solvers for lennard-jones 2016-11-01 14:55:13 -04:00
e81ae21dbd do not access uninitialized data for ewald/disp and pppm/disp 2016-11-01 14:54:16 -04:00
7fdd6e2807 remove work repetitions for 'the' 2016-11-01 11:40:07 -04:00
2e0d304c7e remove word repetitions for 'a' 2016-11-01 11:36:11 -04:00
f333d659c2 Using short neighborlists in neigh full 2016-10-29 22:54:43 +02:00
51e2313fac Using short neighbor lists 2016-10-29 22:35:29 +02:00
e37d2b5c94 Calculating short neighbor lists 2016-10-29 22:20:37 +02:00
c4b86a25a7 Merge branch 'master' into manybody-short-neighbor-list 2016-10-28 11:12:21 -04:00
218e121b41 Merge branch 'master' into bounds-error-with-code-line 2016-10-28 11:11:28 -04:00
93d393aa69 permission cleanup in tools folder 2016-10-28 10:48:35 -04:00
4216be49f3 Merge branch 'master' into collected-small-fixes 2016-10-28 10:46:33 -04:00
3870780894 Merge branch 'master' into kokkos-vashishta 2016-10-28 10:43:05 -04:00
c3a1e72183 Version 27 Oct 2016 2016-10-27 11:40:36 -04:00
d9891abdf4 new library functions 2016-10-27 09:34:04 -06:00
f9a9e27f5a add error location propagation to atom->set_mass() and atom->check_mass() 2016-10-26 16:01:40 -04:00
35753b8f08 add error location propagation to force->bounds() and force->boundsbig() 2016-10-26 15:53:02 -04:00
f028a9a967 region cylinder is compatible with open_faces[2], so do not disallow it. 2016-10-26 15:04:18 -04:00
ef9f7c818e fix off-by-one bug in buffer re-allocator 2016-10-26 10:14:08 -04:00
8e61bed2d8 add USER-OMP variant of manybody short neighbor list 2016-10-26 09:51:52 -04:00
3267b34590 simplify short neighbor list implementation. remove unneeded class member 2016-10-26 09:29:27 -04:00
0a417b4016 add short neighbor list support to pair style tersoff 2016-10-26 07:06:38 -04:00
399c0af150 consistent short neighbor list for vashishta and vashishta/table 2016-10-25 23:46:25 -04:00
e8b3f79690 fully tested multi-element compatible short neighbor list for Stillinger-Weber 2016-10-25 23:18:14 -04:00
21619f6a2f Recommitting reverted change
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15794 f3b2605a-c512-4ea7-a41b-209d697bcdaa
(cherry picked from commit c0b98f5299)
2016-10-25 15:25:39 -04:00
039bda9b61 Added updated vashishta for KOKKOS support
(cherry picked from commit 96089a42547f625e70aa2ac3933d248d2731b731)
2016-10-25 15:07:10 -04:00
6929603eef Added KOKKOS vashishta
(cherry picked from commit 5edc474bf0be574ddba96d00bb63894edf400ddb)
2016-10-25 15:07:10 -04:00
7f3f5e8c38 Clean whitespace 2016-10-25 14:46:44 -04:00
f350500e69 Enable write_data 2016-10-25 14:43:12 -04:00
d7c77a419d Enable write_data for dihedral_fourier 2016-10-25 14:36:18 -04:00
efaa8feab5 Merge pull request #239 from akohlmey/static-analysis-fixes
Static analysis fixes
2016-10-25 10:32:55 -06:00
ad5f7c4581 Merge pull request #238 from giacomofiorin/colvars-2016-10-24
Colvars fixes and small changes
2016-10-25 10:32:41 -06:00
6b33499135 Merge pull request #231 from akohlmey/collected-doc-fixes
Collected doc fixes
2016-10-25 10:30:34 -06:00
63eada2425 fix issue with docs for orientorder/atom compute reported by @andeplane
this closes #243
2016-10-25 12:12:48 -04:00
1a436bd7a9 Merge branch 'collected-doc-fixes' of github.com:akohlmey/lammps into collected-doc-fixes 2016-10-25 11:58:42 -04:00
52dd9aee5f Merge branch 'master' into collected-doc-fixes 2016-10-25 11:55:09 -04:00
eca96e21ef Merge branch 'doc' 2016-10-25 09:46:07 -06:00
9c81ad1ab6 doc page changes 2016-10-25 09:45:55 -06:00
f8367e3d0f update documentation pdf for updated colvars lib 2016-10-24 17:49:53 -04:00
ba6d1528bb Merge branch 'colvars-2016-10-24' of https://github.com/giacomofiorin/lammps into colvars-update 2016-10-24 17:34:28 -04:00
182141b850 Make SMP parallelism for Colvars optional 2016-10-24 17:13:34 -04:00
512c413b7e whitespace cleanup 2016-10-24 17:13:21 -04:00
7b89e47a38 apply corrections to issues reported by static code analysis 2016-10-24 17:12:28 -04:00
e02505c8cc Add ensemble-biased metadynamics (Fabrizio Marinelli, NIH) 2016-10-24 17:11:09 -04:00
be2d155cef Minor changes and fixes not relevant to LAMMPS 2016-10-24 17:10:52 -04:00
c243093980 Fix wall forces and subtractAppliedForce for extended-Lagrangian ABF 2016-10-24 17:05:47 -04:00
ad57a17f48 Add C-linkage wrapper for colvarscript (useful with ctypes) 2016-10-24 16:48:20 -04:00
477ddaf112 Merge pull request #232 from akohlmey/small-bugfixes
Small bugfixes
2016-10-24 08:15:08 -06:00
4f69d91a99 Merge pull request #230 from akohlmey/manual-in-ebook-format
generate LAMMPS manual in ebook format
2016-10-24 08:12:08 -06:00
bc44988003 correct typo in write_dump docs
this closes #233
2016-10-23 15:18:25 -04:00
db36c8bcc3 stop with error, if molecule command requires special bond auto-generation before box is defined 2016-10-21 14:51:09 -04:00
991034b632 have bond style table exit when bond length is outside table range 2016-10-21 14:01:06 -04:00
607246f923 ignore mobi file as well 2016-10-21 13:25:53 -04:00
6742fb634a remove mobi file format creation from makefile and explain it in README instead 2016-10-21 12:05:21 -04:00
ed3f02f249 ignore generated PDF and ePUB files 2016-10-21 12:04:48 -04:00
a2e34aab0a make certain, that atom->maxspecial is incremented with extra special space 2016-10-21 11:55:36 -04:00
6cd6c106ef Merge branch 'collected-small-changes' into collected-doc-fixes 2016-10-20 19:27:18 -04:00
a9572275ee Revert "support generation of manual in ePUB format"
This reverts commit 8c3f5cb307.
2016-10-20 16:27:00 -04:00
2cf77ff778 Add support for ebook generation in ePUB and mobi format 2016-10-20 16:16:17 -04:00
f022f6d88a fix various formatting and broken link issues identified by ebook-convert 2016-10-20 14:40:18 -04:00
8c3f5cb307 support generation of manual in ePUB format 2016-10-20 09:27:26 -04:00
e8359923f1 update packages section in manual with information about USER-NC-DUMP 2016-10-19 15:58:50 -04:00
d2da0fabb4 Version 20 Oct 2016 2016-10-19 15:29:13 -04:00
13ce1037f2 Version 18 Oct 2016 2016-10-18 15:46:56 -04:00
fa984b2c3b Version 13 Oct 2016 2016-10-13 19:56:33 -04:00
8540a9f038 Version 11 Oct 2016 2016-10-11 17:10:24 -04:00
13b6eb1bae Version 6 Oct 2016 2016-10-06 19:12:58 -04:00
d80a9def17 Version 5 Oct 2016 2016-10-05 18:49:08 -04:00
114926a488 Merge branch 'master' into new-neighbor 2016-10-02 00:26:56 -04:00
be4734bdce Version 30 Sep 2016 2016-09-30 11:57:15 -04:00
5eb9dd0c5d Merge branch 'master' into new-neighbor 2016-09-29 23:14:28 -04:00
2551619b07 Version 29 Sep 2016 2016-09-29 10:55:26 -04:00
d8bf149edc Version 28 Sep 2016 2016-09-29 10:55:18 -04:00
473b12ded4 Version 26 Sep 2016 2016-09-29 10:55:10 -04:00
27c3149590 Version 21 Sep 2016 2016-09-29 10:54:59 -04:00
3b408d71fe Version 20 Sep 2016 2016-09-29 10:53:40 -04:00
ebabc8f0bc Merge remote-tracking branch 'lammps-rw/integration' into update-neighbor 2016-09-09 15:46:20 -04:00
232abf8534 restore locale and enforce grep option squashing 2016-09-09 15:42:14 -04:00
d22caf2658 Merge pull request #29 from timattox/new-neighbor
USER-DPD: remove several files from src that came from src/USER-DPD/
2016-09-09 15:28:56 -04:00
3842aa6095 forward skip lists /omp neighbor list builds to non-omp implementations 2016-09-09 15:23:40 -04:00
32c240978a USER-DPD: remove several files from src that came from src/USER-DPD/
These were accidentally added to git in c9c2ae6.
2016-09-09 15:17:42 -04:00
212c2617f6 delete a couple more files, that don't belong into src/ 2016-09-09 14:56:23 -04:00
40f85c93ba corrected mismatched free() vs. delete[] 2016-09-09 14:10:42 -04:00
2f02d98469 remove USER-DPD files that should not be where they are 2016-09-09 13:53:07 -04:00
4553881fc2 Merge pull request #28 from timattox/new-neighbor
New neighbor, USER-DPD updates
2016-09-09 13:11:55 -04:00
81fcbcd99c USER-DPD: move nstencil_ssa out of core LAMMPS into USER-DPD 2016-09-09 12:19:54 -04:00
82c6eb4675 USER-DPD: Set missing NP_HALF flag in npair_half_bin_newton_ssa.h 2016-09-09 12:19:36 -04:00
8ed3f4226e USER-DPD: move custom binning stuff to a NBinSSA child class.
Removes most SSA specific fields from class NeighList.
2016-09-09 12:19:06 -04:00
9b7a0d7e1c Update gitignore for the new USER-DPD source files. 2016-09-09 12:18:51 -04:00
c9c2ae6c61 new neighbor list changes 2016-09-07 13:42:58 -06:00
0229556b03 Merge branch 'master' of github.com:lammps/lammps 2015-07-03 15:43:29 +02:00
357d4517e8 Merge branch 'master' of github.com:lammps/lammps 2015-04-08 10:46:50 +02:00
a4a97de84f A few GLE fixes 2015-04-08 10:45:49 +02:00
5540 changed files with 955055 additions and 258176 deletions

21
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1,21 @@
# This file contains file patterns that triggers automatic
# code review requests from users that are owners of these files
# Order matters, the last match has the highest precedence
# library folders
lib/colvars/* @giacomofiorin
lib/compress/* @akohlmey
lib/kokkos/* @stanmoore1
lib/molfile/* @akohlmey
lib/qmmm/* @akohlmey
lib/vtk/* @rbberger
# packages
src/KOKKOS @stanmoore1
src/USER-CGSDK @akohlmey
src/USER-COLVARS @giacomofiorin
src/USER-OMP @akohlmey
src/USER-QMMM @akohlmey
# tools
tools/msi2lmp/* @akohlmey

112
.github/CONTRIBUTING.md vendored Normal file
View File

@ -0,0 +1,112 @@
# Contributing to LAMMPS via GitHub
Thank your for considering to contribute to the LAMMPS software project.
The following is a set of guidelines as well as explanations of policies and workflows for contributing to the LAMMPS molecular dynamics software project. These guidelines focus on submitting issues or pull requests on the LAMMPS GitHub project.
Thus please also have a look at:
* [The Section on submitting new features for inclusion in LAMMPS of the Manual](http://lammps.sandia.gov/doc/Section_modify.html#mod-15)
* [The LAMMPS GitHub Tutorial in the Manual](http://lammps.sandia.gov/doc/tutorial_github.html)
## Table of Contents
[I don't want to read this whole thing, I just have a question!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question)
[How Can I Contribute?](#how-can-i-contribute)
* [Discussing How To Use LAMMPS](#discussing-how-to-use-lammps)
* [Reporting Bugs](#reporting-bugs)
* [Suggesting Enhancements](#suggesting-enhancements)
* [Contributing Code](#contributing-code)
[GitHub Workflows](#github-workflows)
* [Issues](#issues)
* [Pull Requests](#pull-requests)
__
## I don't want to read this whole thing I just have a question!
> **Note:** Please do not file an issue to ask a general question about LAMMPS, its features, how to use specific commands, or how perform simulations or analysis in LAMMPS. Instead post your question to the ['lammps-users' mailing list](http://lammps.sandia.gov/mail.html). You do not need to be subscribed to post to the list (but a mailing list subscription avoids having your post delayed until it is approved by a mailing list moderator). Most posts to the mailing list receive a response within less than 24 hours. Before posting to the mailing list, please read the [mailing list guidelines](http://lammps.sandia.gov/guidelines.html). Following those guidelines will help greatly to get a helpful response. Always mention which LAMMPS version you are using.
## How Can I Contribute?
There are several ways how you can actively contribute to the LAMMPS project: you can discuss compiling and using LAMMPS, and solving LAMMPS related problems with other LAMMPS users on the lammps-users mailing list, you can report bugs or suggest enhancements by creating issues on GitHub (or posting them to the lammps-users mailing list), and you can contribute by submitting pull requests on GitHub or e-mail your code
to one of the [LAMMPS core developers](http://lammps.sandia.gov/authors.html). As you may see from the aforementioned developer page, the LAMMPS software package includes the efforts of a very large number of contributors beyond the principal authors and maintainers.
### Discussing How To Use LAMMPS
The LAMMPS mailing list is hosted at SourceForge. The mailing list began in 2005, and now includes tens of thousands of messages in thousands of threads. LAMMPS developers try to respond to posted questions in a timely manner, but there are no guarantees. Please consider that people live in different timezone and may not have time to answer e-mails outside of their work hours.
You can post to list by sending your email to lammps-users at lists.sourceforge.net (no subscription required), but before posting, please read the [mailing list guidelines](http://lammps.sandia.gov/guidelines.html) to maximize your chances to receive a helpful response.
Anyone can browse/search previous questions/answers in the archives. You do not have to subscribe to the list to post questions, receive answers (to your questions), or browse/search the archives. You **do** need to subscribe to the list if you want emails for **all** the posts (as individual messages or in digest form), or to answer questions yourself. Feel free to sign up and help us out! Answering questions from fellow LAMMPS users is a great way to pay back the community for providing you a useful tool for free, and to pass on the advice you have received yourself to others. It improves your karma and helps you understand your own research better.
If you post a message and you are a subscriber, your message will appear immediately. If you are not a subscriber, your message will be moderated, which typically takes one business day. Either way, when someone replies the reply will usually be sent to both, your personal email address and the mailing list. When replying to people, that responded to your post to the list, please always included the mailing list in your replies (i.e. use "Reply All" and **not** "Reply"). Responses will appear on the list in a few minutes, but it can take a few hours for postings and replies to show up in the SourceForge archive. Sending replies also to the mailing list is important, so that responses are archived and people with a similar issue can search for possible solutions in the mailing list archive.
### Reporting Bugs
While developers writing code for LAMMPS are careful to test their code, LAMMPS is such a large and complex software, that it is impossible to test for all combinations of features under all normal and not so normal circumstances. Thus bugs do happen, and if you suspect, that you have encountered one, please try to document it and report it as an [Issue](https://github.com/lammps/lammps/issues) on the LAMMPS GitHub project web page. However, before reporting a bug, you need to check whether this is something that may have already been corrected. The [Latest Features and Bug Fixes in LAMMPS](http://lammps.sandia.gov/bug.html) web page lists all significant changes to LAMMPS over the years. It also tells you what the current latest development version of LAMMPS is, and you should test whether your issue still applies to that version.
When you click on the green "New Issue" button, you will be provided with a text field, where you can enter your message. That text field with contain a template with several headlines and some descriptions. Keep the headlines that are relevant to your reported potential bug and replace the descriptions with the information as suggested by the descriptions.
You can also attach small text files (please add the file name extension `.txt` or it will be rejected), images, or small compressed text files (using gzip, do not use RAR or 7-ZIP or similar tools that are uncommon outside of Windows machines). In many cases, bugs are best illustrated by providing a small input deck (do **not** attach your entire production input, but remove everything that is not required to reproduce the issue, and scale down your system size, that the resulting calculation runs fast and can be run on small desktop quickly).
To be able to submit an issue on GitHub, you have to register for an account (for GitHub in general). If you do not want to do that, or have other reservations against submitting an issue there, you can - as an alternative and in decreasing preference - either send an e-mail to the lammps-users mailing list, the original authors of the feature that you suspect to be affected, or one or more of the core LAMMPS developers.
### Suggesting Enhancements
The LAMMPS developers welcome suggestions for enhancements or new features. These should be submitted using the [GitHub Issue Tracker](https://github.com/lammps/lammps/issues) of the LAMMPS project. This is particularly recommended, when you plan to implement the feature or enhancement yourself, as this allows to coordinate in case there are other similar or conflicting ongoing developments.
The LAMMPS developers will review your submission and consider implementing it. Whether this will actually happen depends on many factors: how difficult it would be, how much effort it would take, how many users would benefit from it, how well the individual developer would understand the underlying physics of the feature, and whether this is a feature that would fit into a software like LAMMPS, or would be better implemented as a separate tool. Because of these factors, it matters how well the suggested enhancement is formulated and the overall benefit is argued convincingly.
To be able to submit an issue on GitHub, you have to register for an account (for GitHub in general). If you do not want to do that, or have other reservations against submitting an issue there, you can - as an alternative - send an e-mail to the lammps-users mailing list.
### Contributing Code
We encourage users to submit new features or modifications for LAMMPS to the core developers so they can be added to the LAMMPS distribution. The preferred way to manage and coordinate this is by submitting a pull request at the LAMMPS project on GitHub. For any larger modifications or programming project, you are encouraged to contact the LAMMPS developers ahead of time, in order to discuss implementation strategies and coding guidelines, that will make it easier to integrate your contribution and result in less work for everybody involved. You are also encouraged to search through the list of open issues on GitHub and submit a new issue for a planned feature, so you would not duplicate the work of others (and possibly get scooped by them) or have your work duplicated by others.
How quickly your contribution will be integrated depends largely on how much effort it will cause to integrate and test it, how much it requires changes to the core code base, and of how much interest it is to the larger LAMMPS community. Please see below for a checklist of typical requirements. Once you have prepared everything, see [this tutorial](http://lammps.sandia.gov/doc/tutorial_github.html)
for instructions on how to submit your changes or new files through a GitHub pull request
Here is a checklist of steps you need to follow to submit a single file or user package for our consideration. Following these steps will save both you and us time. See existing files in packages in the source directory for examples. If you are uncertain, please ask on the lammps-users mailing list.
* 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, class header files should not import any system headers outside <stdio.h>, 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. Header files must not import namespaces with using. 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.
* If you want your contribution to be added as a user-contributed feature, and it is a single file (actually a `<name>.cpp` and `<name>.h` file) it can be rapidly added to the USER-MISC directory. Include the one-line entry to add to the USER-MISC/README file in that directory, along with the 2 source files. You can do this multiple times if you wish to contribute several individual features.
* If you want your contribution to be added as a user-contribution and it is several related features, it is probably best to make it a user package directory with a name like USER-FOO. In addition to your new files, the directory should contain a README text file. The README should contain your name and contact information and a brief description of what your new package does. If your files depend on other LAMMPS style files also being installed (e.g. because your file is a derived class from the other LAMMPS class), then an Install.sh file is also needed to check for those dependencies. See other README and Install.sh files in other USER directories as examples. Send us a tarball of this USER-FOO directory.
* Your new source files need to have the LAMMPS copyright, GPL notice, and your name and email address at the top, like other user-contributed LAMMPS source files. They need to create a class that is inside the LAMMPS namespace. If the file is for one of the USER packages, including USER-MISC, then we are not as picky about the coding style (see above). I.e. the files do not need to be in the same stylistic format and syntax as other LAMMPS files, though that would be nice for developers as well as users who try to read your code.
* You **must** also create or extend a documentation file for each new command or style you are adding to LAMMPS. For simplicity and convenience, the documentation of groups of closely related commands or styles may be combined into a single file. This will be one file for a single-file feature. For a package, it might be several files. These are simple text files with a specific markup language, that are then auto-converted to HTML and PDF. The tools for this conversion are included in the source distribution, and the translation can be as simple as doing "make html pdf" in the doc folder. Thus the documentation source files must be in the same format and style as other `<name>.txt` files in the lammps/doc/src directory for similar commands and styles; use one or more of them as a starting point. A description of the markup can also be found in `lammps/doc/utils/txt2html/README.html` As appropriate, the text files can include links to equations (see doc/Eqs/*.tex for examples, we auto-create the associated JPG files), or figures (see doc/JPG for examples), or even additional PDF files with further details (see doc/PDF for examples). The doc page should also include literature citations as appropriate; see the bottom of doc/fix_nh.txt for examples and the earlier part of the same file for how to format the cite itself. The "Restrictions" section of the doc page should indicate that your command is only available if LAMMPS is built with the appropriate USER-MISC or USER-FOO package. See other user package doc files for examples of how to do this. The prerequisite for building the HTML format files are Python 3.x and virtualenv, the requirement for generating the PDF format manual is the htmldoc software. Please run at least "make html" and carefully inspect and proofread the resulting HTML format doc page before submitting your code.
* For a new package (or even a single command) you should include one or more example scripts demonstrating its use. These should run in no more than a couple minutes, even on a single processor, and not require large data files as input. See directories under examples/USER for examples of input scripts other users provided for their packages. These example inputs are also required for validating memory accesses and testing for memory leaks with valgrind
* If there is a paper of yours describing your feature (either the algorithm/science behind the feature itself, or its initial usage, or its implementation in LAMMPS), you can add the citation to the *.cpp source file. See src/USER-EFF/atom_vec_electron.cpp for an example. A LaTeX citation is stored in a variable at the top of the file and a single line of code that references the variable is added to the constructor of the class. Whenever a user invokes your feature from their input script, this will cause LAMMPS to output the citation to a log.cite file and prompt the user to examine the file. Note that you should only use this for a paper you or your group authored. E.g. adding a cite in the code for a paper by Nose and Hoover if you write a fix that implements their integrator is not the intended usage. That kind of citation should just be in the doc page you provide.
Finally, as a general rule-of-thumb, the more clear and self-explanatory you make your documentation and README files, and the easier you make it for people to get started, e.g. by providing example scripts, the more likely it is that users will try out your new feature.
If the new features/files are broadly useful we may add them as core files to LAMMPS or as part of a standard package. Else we will add them as a user-contributed file or package. Examples of user packages are in src sub-directories that start with USER. The USER-MISC package is simply a collection of (mostly) unrelated single files, which is the simplest way to have your contribution quickly added to the LAMMPS distribution. You can see a list of the both standard and user packages by typing "make package" in the LAMMPS src directory.
Note that by providing us files to release, you are agreeing to make them open-source, i.e. we can release them under the terms of the GPL, used as a license for the rest of LAMMPS. See Section 1.4 for details.
With user packages and files, all we are really providing (aside from the fame and fortune that accompanies having your name in the source code and on the Authors page of the LAMMPS WWW site), is a means for you to distribute your work to the LAMMPS user community, and a mechanism for others to easily try out your new feature. This may help you find bugs or make contact with new collaborators. Note that you are also implicitly agreeing to support your code which means answer questions, fix bugs, and maintain it if LAMMPS changes in some way that breaks it (an unusual event).
To be able to submit an issue on GitHub, you have to register for an account (for GitHub in general). If you do not want to do that, or have other reservations or difficulties to submit a pull request, you can - as an alternative - contact one or more of the core LAMMPS developers and ask if one of them would be interested in manually merging your code into LAMMPS and send them your source code. Since the effort to merge a pull request is a small fraction of the effort of integrating source code manually (which would usually be done by converting the contribution into a pull request), your chances to have your new code included quickly are the best with a pull request.
If you prefer to submit patches or full files, you should first make certain, that your code works correctly with the latest patch-level version of LAMMPS and contains all bug fixes from it. Then create a gzipped tar file of all changed or added files or a corresponding patch file using 'diff -u' or 'diff -c' and compress it with gzip. Please only use gzip compression, as this works well on all platforms.
## GitHub Workflows
This section briefly summarizes the steps that will happen **after** you have submitted either an issue or a pull request on the LAMMPS GitHub project page.
### Issues
After submitting an issue, one or more of the LAMMPS developers will review it and categorize it by assigning labels. Confirmed bug reports will be labeled `bug`; if the bug report also contains a suggestion for how to fix it, it will be labeled `bugfix`; if the issue is a feature request, it will be labeled `enhancement`. Other labels may be attached as well, depending on which parts of the LAMMPS code are affected. If the assessment is, that the issue does not warrant any changes, the `wontfix` label will be applied and if the submission is incorrect or something that should not be submitted as an issue, the `invalid` label will be applied. In both of the last two cases, the issue will then be closed without further action.
For feature requests, what happens next is that developers may comment on the viability or relevance of the request, discuss and make suggestions for how to implement it. If a LAMMPS developer or user is planning to implement the feature, the issue will be assigned to that developer. For developers, that are not yet listed as LAMMPS project collaborators, they will receive an invitation to be added to the LAMMPS project as a collaborator so they can get assigned. If the requested feature or enhancement is implemented, it will usually be submitted as a pull request, which will contain a reference to the issue number. And once the pull request is reviewed and accepted for inclusion into LAMMPS, the issue will be closed. For details on how pull requests are processed, please see below.
For bug reports, the next step is that one of the core LAMMPS developers will self-assign to the issue and try to confirm the bug. If confirmed, the `bug` label and potentially other labels are added to classify the issue and its impact to LAMMPS. Before confirming, further questions may be asked or requests for providing additional input files or details about the steps required to reproduce the issue. Any bugfix is likely to be submitted as a pull request (more about that below) and since most bugs require only local changes, the bugfix may be included in a pull request specifically set up to collect such local bugfixes or small enhancements. Once the bugfix is included in the master branch, the issue will be closed.
### Pull Requests
For submitting pull requests, there is a [detailed tutorial](http://lammps.sandia.gov/doc/tutorial_github.html) in the LAMMPS manual. Thus only a brief breakdown of the steps is presented here.
Immediately after the submission, the LAMMPS continuing integration server at ci.lammps.org will download your submitted branch and perform a simple compilation test, i.e. will test whether your submitted code can be compiled under various conditions. It will also do a check on whether your included documentation translates cleanly. Whether these tests are successful or fail will be recorded. If a test fails, please inspect the corresponding output on the CI server and take the necessary steps, if needed, so that the code can compile cleanly again. The test will be re-run each the pull request is updated with a push to the remote branch on GitHub.
Next a LAMMPS core developer will self-assign and do an overall technical assessment of the submission. If you are not yet registered as a LAMMPS collaborator, you will receive an invitation for that.
You may also receive comments and suggestions on the overall submission or specific details. If permitted, additional changes may be pushed into your pull request branch or a pull request may be filed in your LAMMPS fork on GitHub to include those changes.
The LAMMPS developer may then decide to assign the pull request to another developer (e.g. when that developer is more knowledgeable about the submitted feature or enhancement or has written the modified code). It may also happen, that additional developers are requested to provide a review and approve the changes. For submissions, that may change the general behavior of LAMMPS, or where a possibility of unwanted side effects exists, additional tests may be requested by the assigned developer.
If the assigned developer is satisfied and considers the submission ready for inclusion into LAMMPS, the pull request will be assigned to the LAMMPS lead developer, Steve Plimpton (@sjplimp), who will then have the final decision on whether the submission will be included, additional changes are required or it will be ultimately rejected. After the pull request is merged, you may delete the pull request branch in your personal LAMMPS fork.
Since the learning curve for git is quite steep for efficiently managing remote repositories, local and remote branches, pull requests and more, do not hesitate to ask questions, if you are not sure about how to do certain steps that are asked of you. Even if the changes asked of you do not make sense to you, they may be important for the LAMMPS developers. Please also note, that these all are guidelines and not set in stone.

31
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,31 @@
## Summary
_Please provide a brief description of the issue_
## Type of Issue
_Is this a 'Bug Report' or a 'Suggestion for an Enhancement'?_
## Detailed Description (Enhancement Suggestion)
_Explain how you would like to see LAMMPS enhanced, what feature(s) you are looking for, provide references to relevant background information, and whether you are willing to implement the enhancement yourself or would like to participate in the implementation_
## LAMMPS Version (Bug Report)
_Please specify which LAMMPS version this issue was detected with. If this is not the latest development version, please stop and test that version, too, and report it here if the bug persists_
## Expected Behavior (Bug Report)
_Describe the expected behavior. Quote from the LAMMPS manual where needed or explain why the expected behavior is meaningful, especially when it differs from the manual_
## Actual Behavior (Bug Report)
_Describe the actual behavior, how it differs from the expected behavior, and how this can be observed. Try to be specific and do **not* use vague terms like "doesn't work" or "wrong result". Do not assume that the person reading this has any experience with or knowledge of your specific research._
## Steps to Reproduce (Bug Report)
_Describe the steps required to quickly reproduce the issue. You can attach (small) files to the section below or add URLs where to download an archive with all necessary files. Please try to create input that are as small as possible and run as fast as possible. NOTE: the less effort and time it takes to reproduce your issue, the more likely, that somebody will look into it._
## Further Information, Files, and Links
_Put any additional information here, attach relevant text or image files and URLs to external sites, e.g. relevant publications_

29
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,29 @@
## Purpose
_Briefly describe the new feature(s), enhancement(s), or bugfix(es) included in this pull request. If this addresses an open GitHub Issue, mention the issue number, e.g. with `fixes #221` or `closes #135`, so that issue will be automatically closed when the pull request is merged_
## Author(s)
_Please state name and affiliation of the author or authors that should be credited with the changes in this pull request_
## Backward Compatibility
_Please state whether any changes in the pull request break backward compatibility for inputs, and - if yes - explain what has been changed and why_
## Implementation Notes
_Provide any relevant details about how the changes are implemented, how correctness was verified, how other features - if any - in LAMMPS are affected_
## Post Submission Checklist
_Please check the fields below as they are completed_
- [ ] The feature or features in this pull request is complete
- [ ] Suitable new documentation files and/or updates to the existing docs are included
- [ ] One or more example input decks are included
- [ ] The source code follows the LAMMPS formatting guidelines
## Further Information, Files, and Links
_Put any additional information here, attach relevant text or image files, and URLs to external sites (e.g. DOIs or webpages)_

8
.gitignore vendored
View File

@ -32,3 +32,11 @@ log.cite
.Trashes
ehthumbs.db
Thumbs.db
#cmake
/build*
/CMakeCache.txt
/CMakeFiles/
/Makefile
/cmake_install.cmake
/lmp

View File

@ -3,7 +3,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

View File

@ -1,55 +1,21 @@
These are input scripts used to run versions of several of the
benchmarks in the top-level bench directory using the GPU and
USER-CUDA accelerator packages. The results of running these scripts
on two different machines (a desktop with 2 Tesla GPUs and the ORNL
Titan supercomputer) are shown on the "GPU (Fermi)" section of the
Benchmark page of the LAMMPS WWW site: lammps.sandia.gov/bench.
benchmarks in the top-level bench directory using the GPU accelerator
package. The results of running these scripts on two different machines
(a desktop with 2 Tesla GPUs and the ORNL Titan supercomputer) are shown
on the "GPU (Fermi)" section of the Benchmark page of the LAMMPS WWW
site: lammps.sandia.gov/bench.
Examples are shown below of how to run these scripts. This assumes
you have built 3 executables with both the GPU and USER-CUDA packages
you have built 3 executables with the GPU package
installed, e.g.
lmp_linux_single
lmp_linux_mixed
lmp_linux_double
The precision (single, mixed, double) refers to the GPU and USER-CUDA
pacakge precision. See the README files in the lib/gpu and lib/cuda
directories for instructions on how to build the packages with
different precisions. The GPU and USER-CUDA sub-sections of the
doc/Section_accelerate.html file also describes this process.
Make.py -d ~/lammps -j 16 -p #all orig -m linux -o cpu -a exe
Make.py -d ~/lammps -j 16 -p #all opt orig -m linux -o opt -a exe
Make.py -d ~/lammps -j 16 -p #all omp orig -m linux -o omp -a exe
Make.py -d ~/lammps -j 16 -p #all gpu orig -m linux \
-gpu mode=double arch=20 -o gpu_double -a libs exe
Make.py -d ~/lammps -j 16 -p #all gpu orig -m linux \
-gpu mode=mixed arch=20 -o gpu_mixed -a libs exe
Make.py -d ~/lammps -j 16 -p #all gpu orig -m linux \
-gpu mode=single arch=20 -o gpu_single -a libs exe
Make.py -d ~/lammps -j 16 -p #all cuda orig -m linux \
-cuda mode=double arch=20 -o cuda_double -a libs exe
Make.py -d ~/lammps -j 16 -p #all cuda orig -m linux \
-cuda mode=mixed arch=20 -o cuda_mixed -a libs exe
Make.py -d ~/lammps -j 16 -p #all cuda orig -m linux \
-cuda mode=single arch=20 -o cuda_single -a libs exe
Make.py -d ~/lammps -j 16 -p #all intel orig -m linux -o intel_cpu -a exe
Make.py -d ~/lammps -j 16 -p #all kokkos orig -m linux -o kokkos_omp -a exe
Make.py -d ~/lammps -j 16 -p #all kokkos orig -kokkos cuda arch=20 \
-m cuda -o kokkos_cuda -a exe
Make.py -d ~/lammps -j 16 -p #all opt omp gpu cuda intel kokkos orig \
-gpu mode=double arch=20 -cuda mode=double arch=20 -m linux \
-o all -a libs exe
Make.py -d ~/lammps -j 16 -p #all opt omp gpu cuda intel kokkos orig \
-kokkos cuda arch=20 -gpu mode=double arch=20 \
-cuda mode=double arch=20 -m cuda -o all_cuda -a libs exe
------------------------------------------------------------------------
To run on just CPUs (without using the GPU or USER-CUDA styles),
To run on just CPUs (without using the GPU styles),
do something like the following:
mpirun -np 1 lmp_linux_double -v x 8 -v y 8 -v z 8 -v t 100 < in.lj
@ -81,23 +47,5 @@ node via a "-ppn" setting.
------------------------------------------------------------------------
To run with the USER-CUDA package, do something like the following:
mpirun -np 1 lmp_linux_single -c on -sf cuda -v x 16 -v y 16 -v z 16 -v t 100 < in.lj
mpirun -np 2 lmp_linux_double -c on -sf cuda -pk cuda 2 -v x 32 -v y 64 -v z 64 -v t 100 < in.eam
The "xyz" settings determine the problem size. The "t" setting
determines the number of timesteps. The "np" setting determines how
many MPI tasks (per node) the problem will run on. The numeric
argument to the "-pk" setting is the number of GPUs (per node); 1 GPU
is the default. Note that the number of MPI tasks must equal the
number of GPUs (both per node) with the USER-CUDA package.
These mpirun commands run on a single node. To run on multiple nodes,
scale up the "-np" setting, and control the number of MPI tasks per
node via a "-ppn" setting.
------------------------------------------------------------------------
If the script has "titan" in its name, it was run on the Titan
supercomputer at ORNL.

View File

@ -71,49 +71,33 @@ integration
----------------------------------------------------------------------
Here is a src/Make.py command which will perform a parallel build of a
LAMMPS executable "lmp_mpi" with all the packages needed by all the
examples. This assumes you have an MPI installed on your machine so
that "mpicxx" can be used as the wrapper compiler. It also assumes
you have an Intel compiler to use as the base compiler. You can leave
off the "-cc mpi wrap=icc" switch if that is not the case. You can
also leave off the "-fft fftw3" switch if you do not have the FFTW
(v3) installed as an FFT package, in which case the default KISS FFT
library will be used.
cd src
Make.py -j 16 -p none molecule manybody kspace granular rigid orig \
-cc mpi wrap=icc -fft fftw3 -a file mpi
----------------------------------------------------------------------
Here is how to run each problem, assuming the LAMMPS executable is
named lmp_mpi, and you are using the mpirun command to launch parallel
runs:
Serial (one processor runs):
lmp_mpi < in.lj
lmp_mpi < in.chain
lmp_mpi < in.eam
lmp_mpi < in.chute
lmp_mpi < in.rhodo
lmp_mpi -in in.lj
lmp_mpi -in in.chain
lmp_mpi -in in.eam
lmp_mpi -in in.chute
lmp_mpi -in in.rhodo
Parallel fixed-size runs (on 8 procs in this case):
mpirun -np 8 lmp_mpi < in.lj
mpirun -np 8 lmp_mpi < in.chain
mpirun -np 8 lmp_mpi < in.eam
mpirun -np 8 lmp_mpi < in.chute
mpirun -np 8 lmp_mpi < in.rhodo
mpirun -np 8 lmp_mpi -in in.lj
mpirun -np 8 lmp_mpi -in in.chain
mpirun -np 8 lmp_mpi -in in.eam
mpirun -np 8 lmp_mpi -in in.chute
mpirun -np 8 lmp_mpi -in in.rhodo
Parallel scaled-size runs (on 16 procs in this case):
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 < in.lj
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 < in.chain.scaled
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 < in.eam
mpirun -np 16 lmp_mpi -var x 4 -var y 4 < in.chute.scaled
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 < in.rhodo.scaled
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 -in in.lj
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 -in in.chain.scaled
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 -in in.eam
mpirun -np 16 lmp_mpi -var x 4 -var y 4 -in in.chute.scaled
mpirun -np 16 lmp_mpi -var x 2 -var y 2 -var z 4 -in in.rhodo.scaled
For each of the scaled-size runs you must set 3 variables as -var
command line switches. The variables x,y,z are used in the input

732
cmake/CMakeLists.txt Normal file
View File

@ -0,0 +1,732 @@
########################################
# CMake build system
# This file is part of LAMMPS
# Created by Christoph Junghans and Richard Berger
cmake_minimum_required(VERSION 3.1)
project(lammps)
set(SOVERSION 0)
set(LAMMPS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src)
set(LAMMPS_LIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
set(LAMMPS_LIB_BINARY_DIR ${CMAKE_BINARY_DIR}/lib)
#To not conflict with old Makefile build system, we build everything here
file(GLOB LIB_SOURCES ${LAMMPS_SOURCE_DIR}/*.cpp)
file(GLOB LMP_SOURCES ${LAMMPS_SOURCE_DIR}/main.cpp)
list(REMOVE_ITEM LIB_SOURCES ${LMP_SOURCES})
# Cmake modules/macros are in a subdirectory to keep this file cleaner
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
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)
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
# remove any style headers in the src dir
file(GLOB SRC_STYLE_FILES ${LAMMPS_SOURCE_DIR}/style_*.h)
if(SRC_STYLE_FILES)
file(REMOVE ${SRC_STYLE_FILES})
endif()
enable_language(CXX)
######################################################################
# compiler tests
# these need ot be done early (before further tests).
#####################################################################
include(CheckCCompilerFlag)
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")
endif()
########################################################################
# User input options #
########################################################################
option(BUILD_SHARED_LIBS "Build shared libs" OFF)
if(BUILD_SHARED_LIBS) # for all pkg libs, mpi_stubs and linalg
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
include(GNUInstallDirs)
set(LAMMPS_LINK_LIBS)
set(LAMMPS_DEPS)
set(LAMMPS_API_DEFINES)
option(ENABLE_MPI "Build MPI version" OFF)
if(ENABLE_MPI)
find_package(MPI REQUIRED)
include_directories(${MPI_C_INCLUDE_PATH})
list(APPEND LAMMPS_LINK_LIBS ${MPI_CXX_LIBRARIES})
option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
if(LAMMPS_LONGLONG_TO_LONG)
add_definitions(-DLAMMPS_LONGLONG_TO_LONG)
endif()
else()
file(GLOB MPI_SOURCES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.c)
add_library(mpi_stubs STATIC ${MPI_SOURCES})
include_directories(${LAMMPS_SOURCE_DIR}/STUBS)
list(APPEND LAMMPS_LINK_LIBS mpi_stubs)
endif()
set(LAMMPS_SIZE_LIMIT "LAMMPS_SMALLBIG" CACHE STRING "Lammps size limit")
set_property(CACHE LAMMPS_SIZE_LIMIT PROPERTY STRINGS LAMMPS_SMALLBIG LAMMPS_BIGBIG LAMMPS_SMALLSMALL)
add_definitions(-D${LAMMPS_SIZE_LIMIT})
set(LAMMPS_API_DEFINES "${LAMMPS_API_DEFINES} -D${LAMMPS_SIZE_LIMIT}")
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")
add_definitions(-DLAMMPS_MEMALIGN=${LAMMPS_MEMALIGN})
option(LAMMPS_EXCEPTIONS "enable the use of C++ exceptions for error messages (useful for library interface)" OFF)
if(LAMMPS_EXCEPTIONS)
add_definitions(-DLAMMPS_EXCEPTIONS)
set(LAMMPS_API_DEFINES "${LAMMPS_API_DEFINES} -DLAMMPS_EXCEPTIONS")
endif()
set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary and liblammps (WON'T enable any features automatically")
mark_as_advanced(LAMMPS_MACHINE)
if(LAMMPS_MACHINE)
set(LAMMPS_MACHINE "_${LAMMPS_MACHINE}")
endif()
option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF)
option(ENABLE_TESTING "Enable testing" OFF)
if(ENABLE_TESTING)
enable_testing()
endif(ENABLE_TESTING)
option(ENABLE_ALL "Build all default packages" OFF)
set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GRANULAR
KSPACE MANYBODY MC MEAM MISC MOLECULE PERI QEQ
REAX REPLICA RIGID SHOCK SNAP SRD)
set(OTHER_PACKAGES KIM PYTHON MSCG MPIIO VORONOI POEMS LATTE
USER-ATC USER-AWPMD USER-CGDNA USER-MESO
USER-CGSDK USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF
USER-FEP USER-H5MD USER-LB USER-MANIFOLD USER-MEAMC USER-MGPT USER-MISC
USER-MOFFF USER-MOLFILE USER-NETCDF USER-PHONON USER-QTB USER-REAXC USER-SMD
USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-VTK USER-QUIP USER-QMMM)
set(ACCEL_PACKAGES USER-OMP KOKKOS OPT USER-INTEL GPU)
foreach(PKG ${DEFAULT_PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL})
endforeach()
foreach(PKG ${ACCEL_PACKAGES} ${OTHER_PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" OFF)
endforeach()
macro(pkg_depends PKG1 PKG2)
if(ENABLE_${PKG1} AND NOT ENABLE_${PKG2})
message(FATAL_ERROR "${PKG1} package needs LAMMPS to be build with ${PKG2}")
endif()
endmacro()
pkg_depends(MPIIO MPI)
pkg_depends(QEQ MANYBODY)
pkg_depends(USER-ATC MANYBODY)
pkg_depends(USER-H5MD MPI)
pkg_depends(USER-LB MPI)
pkg_depends(USER-MISC MANYBODY)
pkg_depends(USER-PHONON KSPACE)
if(ENABLE_BODY AND ENABLE_POEMS)
message(FATAL_ERROR "BODY and POEMS cannot be enabled at the same time")
endif()
######################################################
# packages with special compiler needs or external libs
######################################################
if(ENABLE_REAX OR ENABLE_MEAM OR ENABLE_USER-QUIP OR ENABLE_USER-QMMM OR ENABLE_LATTE)
enable_language(Fortran)
include(CheckFortranCompilerFlag)
check_Fortran_compiler_flag("-fno-second-underscore" FC_HAS_NO_SECOND_UNDERSCORE)
endif()
if(ENABLE_KOKKOS OR ENABLE_MSCG)
# starting with CMake 3.1 this is all you have to do to enforce C++11
set(CMAKE_CXX_STANDARD 11) # C++11...
set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
endif()
if(ENABLE_USER-OMP OR ENABLE_KOKKOS OR ENABLE_USER-INTEL)
find_package(OpenMP REQUIRED)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
endif()
if(ENABLE_KSPACE)
set(FFT "KISSFFT" CACHE STRING "FFT library for KSPACE package")
set_property(CACHE FFT PROPERTY STRINGS KISSFFT FFTW3 MKL FFTW2)
if(NOT FFT STREQUAL "KISSFFT")
find_package(${FFT} REQUIRED)
add_definitions(-DFFT_${FFT})
include_directories(${${FFT}_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${${FFT}_LIBRARIES})
endif()
set(PACK_OPTIMIZATION "PACK_ARRAY" CACHE STRING "Optimization for FFT")
set_property(CACHE PACK_OPTIMIZATION PROPERTY STRINGS PACK_ARRAY PACK_POINTER PACK_MEMCPY)
if(NOT PACK_OPTIMIZATION STREQUAL "PACK_ARRAY")
add_definitions(-D${PACK_OPTIMIZATION})
endif()
endif()
if(ENABLE_MSCG OR ENABLE_USER-ATC OR ENABLE_USER-AWPMD OR ENABLE_USER-QUIP OR ENABLE_LATTE)
find_package(LAPACK)
if(NOT LAPACK_FOUND)
enable_language(Fortran)
file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/*.f)
add_library(linalg STATIC ${LAPACK_SOURCES})
include(CheckFortranCompilerFlag)
check_Fortran_compiler_flag("-fno-second-underscore" FC_HAS_NO_SECOND_UNDERSCORE)
if(FC_HAS_NO_SECOND_UNDERSCORE)
target_compile_options(linalg PRIVATE -fno-second-underscore)
endif()
set(LAPACK_LIBRARIES linalg)
endif()
endif()
if(ENABLE_PYTHON)
find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED)
add_definitions(-DLMP_PYTHON)
include_directories(${PYTHON_INCLUDE_DIR})
list(APPEND LAMMPS_LINK_LIBS ${PYTHON_LIBRARY})
if(BUILD_SHARED_LIBS)
if(NOT PYTHON_INSTDIR)
execute_process(COMMAND ${PYTHON_EXECUTABLE}
-c "import distutils.sysconfig as cg; print(cg.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
OUTPUT_VARIABLE PYTHON_INSTDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../python/lammps.py DESTINATION ${PYTHON_INSTDIR})
endif()
endif()
find_package(JPEG)
if(JPEG_FOUND)
add_definitions(-DLAMMPS_JPEG)
include_directories(${JPEG_INCLUDE_DIR})
list(APPEND LAMMPS_LINK_LIBS ${JPEG_LIBRARIES})
endif()
find_package(PNG)
find_package(ZLIB)
if(PNG_FOUND AND ZLIB_FOUND)
include_directories(${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
add_definitions(-DLAMMPS_PNG)
endif()
find_program(GZIP_EXECUTABLE gzip)
find_package_handle_standard_args(GZIP REQUIRED_VARS GZIP_EXECUTABLE)
if(GZIP_FOUND)
add_definitions(-DLAMMPS_GZIP)
endif()
find_program(FFMPEG_EXECUTABLE ffmpeg)
find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_EXECUTABLE)
if(FFMPEG_FOUND)
add_definitions(-DLAMMPS_FFMPEG)
endif()
if(ENABLE_VORONOI)
find_package(VORO REQUIRED) #some distros
include_directories(${VORO_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${VORO_LIBRARIES})
endif()
if(ENABLE_LATTE)
find_package(LATTE QUIET)
if(NOT LATTE_FOUND)
message(STATUS "LATTE not found - we will build our own")
include(ExternalProject)
ExternalProject_Add(latte_build
URL https://github.com/lanl/LATTE/archive/v1.0.1.tar.gz
URL_MD5 5137e28cb1a64444bd571c98c98a6eee
SOURCE_SUBDIR cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
)
ExternalProject_get_property(latte_build INSTALL_DIR)
set(LATTE_LIBRARIES ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/liblatte.a)
list(APPEND LAMMPS_DEPS latte_build)
endif()
list(APPEND LAMMPS_LINK_LIBS ${LATTE_LIBRARIES} ${LAPACK_LIBRARIES} ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
endif()
if(ENABLE_USER-MOLFILE)
add_library(molfile INTERFACE)
target_include_directories(molfile INTERFACE ${LAMMPS_LIB_SOURCE_DIR}/molfile)
target_link_libraries(molfile INTERFACE ${CMAKE_DL_LIBS})
list(APPEND LAMMPS_LINK_LIBS molfile)
endif()
if(ENABLE_USER-NETCDF)
find_package(NetCDF REQUIRED)
include_directories(NETCDF_INCLUDE_DIR)
list(APPEND LAMMPS_LINK_LIBS ${NETCDF_LIBRARY})
add_definitions(-DLMP_HAS_NETCDF -DNC_64BIT_DATA=0x0020)
endif()
if(ENABLE_USER-SMD)
find_package(Eigen3 REQUIRED)
include_directories(${EIGEN3_INCLUDE_DIR})
endif()
if(ENABLE_USER-QUIP)
find_package(QUIP REQUIRED)
list(APPEND LAMMPS_LINK_LIBS ${QUIP_LIBRARIES} ${LAPACK_LIBRARIES} ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
endif()
if(ENABLE_USER-QMMM)
find_package(QE REQUIRED)
include_directories(${QE_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${QE_LIBRARIES} ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
endif()
if(ENABLE_USER-VTK)
find_package(VTK REQUIRED NO_MODULE)
include(${VTK_USE_FILE})
add_definitions(-DLAMMPS_VTK)
list(APPEND LAMMPS_LINK_LIBS ${VTK_LIBRARIES})
endif()
if(ENABLE_KIM)
find_package(KIM REQUIRED)
list(APPEND LAMMPS_LINK_LIBS ${KIM_LIBRARIES})
include_directories(${KIM_INCLUDE_DIRS})
endif()
if(ENABLE_MSCG)
find_package(GSL REQUIRED)
set(LAMMPS_LIB_MSCG_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/mscg)
set(MSCG_TARBALL ${LAMMPS_LIB_MSCG_BIN_DIR}/MS-CG-master.zip)
set(LAMMPS_LIB_MSCG_BIN_DIR ${LAMMPS_LIB_MSCG_BIN_DIR}/MSCG-release-master/src)
if(NOT EXISTS ${LAMMPS_LIB_MSCG_BIN_DIR})
if(NOT EXISTS ${MSCG_TARBALL})
message(STATUS "Downloading ${MSCG_TARBALL}")
file(DOWNLOAD
https://github.com/uchicago-voth/MSCG-release/archive/master.zip
${MSCG_TARBALL} SHOW_PROGRESS) #EXPECTED_MD5 cannot be due due to master
endif()
message(STATUS "Unpacking ${MSCG_TARBALL}")
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ${MSCG_TARBALL}
WORKING_DIRECTORY ${LAMMPS_LIB_BINARY_DIR}/mscg)
endif()
file(GLOB MSCG_SOURCES ${LAMMPS_LIB_MSCG_BIN_DIR}/*.cpp)
add_library(mscg STATIC ${MSCG_SOURCES})
list(APPEND LAMMPS_LINK_LIBS mscg)
target_compile_options(mscg PRIVATE -DDIMENSION=3 -D_exclude_gromacs=1)
target_include_directories(mscg PUBLIC ${LAMMPS_LIB_MSCG_BIN_DIR})
target_link_libraries(mscg ${GSL_LIBRARIES} ${LAPACK_LIBRARIES})
endif()
########################################################################
# Basic system tests (standard libraries, headers, functions, types) #
########################################################################
include(CheckIncludeFile)
foreach(HEADER math.h)
check_include_file(${HEADER} FOUND_${HEADER})
if(NOT FOUND_${HEADER})
message(FATAL_ERROR "Could not find needed header - ${HEADER}")
endif(NOT FOUND_${HEADER})
endforeach(HEADER)
set(MATH_LIBRARIES "m" CACHE STRING "math library")
mark_as_advanced( MATH_LIBRARIES )
include(CheckLibraryExists)
foreach(FUNC sin cos)
check_library_exists(${MATH_LIBRARIES} ${FUNC} "" FOUND_${FUNC}_${MATH_LIBRARIES})
if(NOT FOUND_${FUNC}_${MATH_LIBRARIES})
message(FATAL_ERROR "Could not find needed math function - ${FUNC}")
endif(NOT FOUND_${FUNC}_${MATH_LIBRARIES})
endforeach(FUNC)
list(APPEND LAMMPS_LINK_LIBS ${MATH_LIBRARIES})
######################################
# Generate Basic Style files
######################################
include(StyleHeaderUtils)
RegisterStyles(${LAMMPS_SOURCE_DIR})
##############################################
# add sources of enabled packages
############################################
foreach(PKG ${DEFAULT_PACKAGES} ${OTHER_PACKAGES})
set(${PKG}_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/${PKG})
# ignore PKG files which were manually installed in src folder
# headers are ignored during RegisterStyles
file(GLOB ${PKG}_SOURCES ${${PKG}_SOURCES_DIR}/*.cpp)
file(GLOB ${PKG}_HEADERS ${${PKG}_SOURCES_DIR}/*.h)
foreach(PKG_FILE in ${${PKG}_SOURCES})
get_filename_component(FNAME ${PKG_FILE} NAME)
list(REMOVE_ITEM LIB_SOURCES ${LAMMPS_SOURCE_DIR}/${FNAME})
endforeach()
foreach(PKG_FILE in ${${PKG}_HEADERS})
get_filename_component(FNAME ${PKG_FILE} NAME)
DetectAndRemovePackageHeader(${LAMMPS_SOURCE_DIR}/${FNAME})
endforeach()
if(ENABLE_${PKG})
# detects styles in package and adds them to global list
RegisterStyles(${${PKG}_SOURCES_DIR})
list(APPEND LIB_SOURCES ${${PKG}_SOURCES})
include_directories(${${PKG}_SOURCES_DIR})
endif()
endforeach()
##############################################
# add lib sources of (simple) enabled packages
############################################
foreach(SIMPLE_LIB REAX MEAM POEMS USER-ATC USER-AWPMD USER-COLVARS USER-H5MD
USER-QMMM)
if(ENABLE_${SIMPLE_LIB})
string(REGEX REPLACE "^USER-" "" PKG_LIB "${SIMPLE_LIB}")
string(TOLOWER "${PKG_LIB}" PKG_LIB)
file(GLOB_RECURSE ${PKG_LIB}_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/*.F
${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/*.c ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/*.cpp)
add_library(${PKG_LIB} STATIC ${${PKG_LIB}_SOURCES})
list(APPEND LAMMPS_LINK_LIBS ${PKG_LIB})
if(PKG_LIB STREQUAL awpmd)
target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
elseif(PKG_LIB STREQUAL h5md)
target_include_directories(h5md PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/h5md/include)
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()
endif()
endforeach()
if(ENABLE_USER-AWPMD)
target_link_libraries(awpmd ${LAPACK_LIBRARIES})
endif()
if(ENABLE_USER-ATC)
target_link_libraries(atc ${LAPACK_LIBRARIES})
endif()
if(ENABLE_USER-H5MD)
find_package(HDF5 REQUIRED)
target_link_libraries(h5md ${HDF5_LIBRARIES})
target_include_directories(h5md PRIVATE ${HDF5_INCLUDE_DIRS})
endif()
if(ENABLE_MEAM AND FC_HAS_NO_SECOND_UNDERSCORE)
foreach(FSRC ${meam_SOURCES})
string(REGEX REPLACE "^.*\\." "" FEXT "${FSRC}")
list(FIND CMAKE_Fortran_SOURCE_FILE_EXTENSIONS "${FEXT}" FINDEX)
if(FINDEX GREATER -1)
set_property(SOURCE ${FSRC} APPEND PROPERTY COMPILE_FLAGS "-fno-second-underscore")
endif()
endforeach()
endif()
if(ENABLE_REAX AND FC_HAS_NO_SECOND_UNDERSCORE)
target_compile_options(reax PRIVATE -fno-second-underscore)
endif()
######################################################################
# packages which selectively include variants based on enabled styles
# e.g. accelerator packages
######################################################################
if(ENABLE_USER-OMP)
set(USER-OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP)
set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp
${USER-OMP_SOURCES_DIR}/thr_omp.cpp
${USER-OMP_SOURCES_DIR}/fix_nh_omp.cpp
${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp)
set_property(GLOBAL PROPERTY "OMP_SOURCES" "${USER-OMP_SOURCES}")
# detects styles which have USER-OMP version
RegisterStylesExt(${USER-OMP_SOURCES_DIR} omp OMP_SOURCES)
get_property(USER-OMP_SOURCES GLOBAL PROPERTY OMP_SOURCES)
list(APPEND LIB_SOURCES ${USER-OMP_SOURCES})
include_directories(${USER-OMP_SOURCES_DIR})
endif()
if(ENABLE_KOKKOS)
set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
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
${KOKKOS_PKG_SOURCES_DIR}/atom_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/atom_vec_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/comm_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/comm_tiled_kokkos.cpp
${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}/domain_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/modify_kokkos.cpp)
set_property(GLOBAL PROPERTY "KOKKOS_PKG_SOURCES" "${KOKKOS_PKG_SOURCES}")
# detects styles which have KOKKOS version
RegisterStylesExt(${KOKKOS_PKG_SOURCES_DIR} kokkos KOKKOS_PKG_SOURCES)
# register kokkos-only styles
RegisterNBinStyle(${KOKKOS_PKG_SOURCES_DIR}/nbin_kokkos.h)
RegisterNPairStyle(${KOKKOS_PKG_SOURCES_DIR}/npair_kokkos.h)
if(ENABLE_USER-DPD)
get_property(KOKKOS_PKG_SOURCES GLOBAL PROPERTY KOKKOS_PKG_SOURCES)
list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/npair_ssa_kokkos.cpp)
RegisterNPairStyle(${KOKKOS_PKG_SOURCES_DIR}/npair_ssa_kokkos.h)
set_property(GLOBAL PROPERTY "KOKKOS_PKG_SOURCES" "${KOKKOS_PKG_SOURCES}")
endif()
get_property(KOKKOS_PKG_SOURCES GLOBAL PROPERTY KOKKOS_PKG_SOURCES)
list(APPEND LIB_SOURCES ${KOKKOS_PKG_SOURCES})
include_directories(${KOKKOS_PKG_SOURCES_DIR})
endif()
if(ENABLE_OPT)
set(OPT_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/OPT)
set(OPT_SOURCES)
set_property(GLOBAL PROPERTY "OPT_SOURCES" "${OPT_SOURCES}")
# detects styles which have OPT version
RegisterStylesExt(${OPT_SOURCES_DIR} opt OPT_SOURCES)
get_property(OPT_SOURCES GLOBAL PROPERTY OPT_SOURCES)
list(APPEND LIB_SOURCES ${OPT_SOURCES})
include_directories(${OPT_SOURCES_DIR})
endif()
if(ENABLE_USER-INTEL)
set(USER-INTEL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-INTEL)
set(USER-INTEL_SOURCES ${USER-INTEL_SOURCES_DIR}/intel_preprocess.h
${USER-INTEL_SOURCES_DIR}/intel_buffers.h
${USER-INTEL_SOURCES_DIR}/intel_buffers.cpp
${USER-INTEL_SOURCES_DIR}/math_extra_intel.h
${USER-INTEL_SOURCES_DIR}/nbin_intel.h
${USER-INTEL_SOURCES_DIR}/nbin_intel.cpp
${USER-INTEL_SOURCES_DIR}/npair_intel.h
${USER-INTEL_SOURCES_DIR}/npair_intel.cpp
${USER-INTEL_SOURCES_DIR}/intel_simd.h
${USER-INTEL_SOURCES_DIR}/intel_intrinsics.h)
set_property(GLOBAL PROPERTY "USER-INTEL_SOURCES" "${USER-INTEL_SOURCES}")
# detects styles which have USER-INTEL version
RegisterStylesExt(${USER-INTEL_SOURCES_DIR} opt USER-INTEL_SOURCES)
get_property(USER-INTEL_SOURCES GLOBAL PROPERTY USER-INTEL_SOURCES)
list(APPEND LIB_SOURCES ${USER-INTEL_SOURCES})
include_directories(${USER-INTEL_SOURCES_DIR})
endif()
if(ENABLE_GPU)
set(GPU_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/GPU)
set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h
${GPU_SOURCES_DIR}/fix_gpu.h
${GPU_SOURCES_DIR}/fix_gpu.cpp)
set(GPU_API "OpenCL" CACHE STRING "API used by GPU package")
set_property(CACHE GPU_API PROPERTY STRINGS OpenCL CUDA)
set(GPU_PREC "SINGLE_DOUBLE" CACHE STRING "LAMMPS GPU precision size")
set_property(CACHE GPU_PREC PROPERTY STRINGS SINGLE_DOUBLE SINGLE_SINGLE DOUBLE_DOUBLE)
file(GLOB GPU_LIB_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cpp)
file(MAKE_DIRECTORY ${LAMMPS_LIB_BINARY_DIR}/gpu)
if(GPU_API STREQUAL "CUDA")
find_package(CUDA REQUIRED)
find_program(BIN2C bin2c)
if(NOT BIN2C)
message(FATAL_ERROR "Couldn't find bin2c, use -DBIN2C helping cmake to find it.")
endif()
option(CUDPP_OPT "Enable CUDPP_OPT" ON)
set(GPU_ARCH "sm_30" CACHE STRING "LAMMPS GPU CUDA SM architecture")
set_property(CACHE GPU_ARCH PROPERTY STRINGS sm_10 sm_20 sm_30 sm_60)
file(GLOB GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/gpu/*.cu)
list(REMOVE_ITEM GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_pppm.cu)
cuda_include_directories(${LAMMPS_LIB_SOURCE_DIR}/gpu ${LAMMPS_LIB_BINARY_DIR}/gpu)
if(CUDPP_OPT)
cuda_include_directories(${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini)
file(GLOB GPU_LIB_CUDPP_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini/*.cpp)
file(GLOB GPU_LIB_CUDPP_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini/*.cu)
endif()
cuda_compile_cubin(GPU_GEN_OBJS ${GPU_LIB_CU} OPTIONS
-DUNIX -O3 -Xptxas -v --use_fast_math -DNV_KERNEL -DUCL_CUDADR -arch=${GPU_ARCH} -D_${GPU_PREC})
cuda_compile(GPU_OBJS ${GPU_LIB_CUDPP_CU} OPTIONS $<$<BOOL:${BUILD_SHARED_LIBS}>:-Xcompiler=-fPIC>
-DUNIX -O3 -Xptxas -v --use_fast_math -DUCL_CUDADR -arch=${GPU_ARCH} -D_${GPU_PREC})
foreach(CU_OBJ ${GPU_GEN_OBJS})
get_filename_component(CU_NAME ${CU_OBJ} NAME_WE)
string(REGEX REPLACE "^.*_lal_" "" CU_NAME "${CU_NAME}")
add_custom_command(OUTPUT ${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}_cubin.h
COMMAND ${BIN2C} -c -n ${CU_NAME} ${CU_OBJ} > ${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}_cubin.h
DEPENDS ${CU_OBJ}
COMMENT "Generating ${CU_NAME}_cubin.h")
list(APPEND GPU_LIB_SOURCES ${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}_cubin.h)
endforeach()
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LAMMPS_LIB_BINARY_DIR}/gpu/*_cubin.h")
add_library(gpu STATIC ${GPU_LIB_SOURCES} ${GPU_LIB_CUDPP_SOURCES} ${GPU_OBJS})
target_link_libraries(gpu ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu ${CUDA_INCLUDE_DIRS})
target_compile_definitions(gpu PRIVATE -D_${GPU_PREC} -DMPI_GERYON -DUCL_NO_EXIT)
if(CUDPP_OPT)
target_include_directories(gpu PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini)
target_compile_definitions(gpu PRIVATE -DUSE_CUDPP)
endif()
list(APPEND LAMMPS_LINK_LIBS gpu)
add_executable(nvc_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
target_compile_definitions(nvc_get_devices PRIVATE -DUCL_CUDADR)
target_link_libraries(nvc_get_devices PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
target_include_directories(nvc_get_devices PRIVATE ${CUDA_INCLUDE_DIRS})
elseif(GPU_API STREQUAL "OpenCL")
find_package(OpenCL REQUIRED)
set(OCL_TUNE "GENERIC" CACHE STRING "OpenCL Device Tuning")
set_property(CACHE OCL_TUNE PROPERTY STRINGS INTEL FERMI KEPLER CYPRESS GENERIC)
include(OpenCLUtils)
set(OCL_COMMON_HEADERS ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_preprocessor.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_aux_fun1.h)
file(GLOB GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu)
list(REMOVE_ITEM GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_gayberne.cu ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_gayberne_lj.cu)
foreach(GPU_KERNEL ${GPU_LIB_CU})
get_filename_component(basename ${GPU_KERNEL} NAME_WE)
string(SUBSTRING ${basename} 4 -1 KERNEL_NAME)
GenerateOpenCLHeader(${KERNEL_NAME} ${CMAKE_CURRENT_BINARY_DIR}/gpu/${KERNEL_NAME}_cl.h ${OCL_COMMON_HEADERS} ${GPU_KERNEL})
list(APPEND GPU_LIB_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/gpu/${KERNEL_NAME}_cl.h)
endforeach()
GenerateOpenCLHeader(gayberne ${CMAKE_CURRENT_BINARY_DIR}/gpu/gayberne_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_ellipsoid_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_gayberne.cu)
GenerateOpenCLHeader(gayberne_lj ${CMAKE_CURRENT_BINARY_DIR}/gpu/gayberne_lj_cl.h ${OCL_COMMON_HEADERS} ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_ellipsoid_extra.h ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_gayberne_lj.cu)
list(APPEND GPU_LIB_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/gpu/gayberne_cl.h ${CMAKE_CURRENT_BINARY_DIR}/gpu/gayberne_lj_cl.h)
add_library(gpu STATIC ${GPU_LIB_SOURCES})
target_link_libraries(gpu ${OpenCL_LIBRARIES})
target_include_directories(gpu PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gpu ${OpenCL_INCLUDE_DIRS})
target_compile_definitions(gpu PRIVATE -D_${GPU_PREC} -DMPI_GERYON -DUCL_NO_EXIT)
target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)
list(APPEND LAMMPS_LINK_LIBS gpu)
add_executable(ocl_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
target_compile_definitions(ocl_get_devices PRIVATE -DUCL_OPENCL)
target_link_libraries(ocl_get_devices PRIVATE ${OpenCL_LIBRARIES})
target_include_directories(ocl_get_devices PRIVATE ${OpenCL_INCLUDE_DIRS})
endif()
# GPU package
FindStyleHeaders(${GPU_SOURCES_DIR} FIX_CLASS fix_ FIX)
set_property(GLOBAL PROPERTY "GPU_SOURCES" "${GPU_SOURCES}")
# detects styles which have GPU version
RegisterStylesExt(${GPU_SOURCES_DIR} gpu GPU_SOURCES)
get_property(GPU_SOURCES GLOBAL PROPERTY GPU_SOURCES)
list(APPEND LIB_SOURCES ${GPU_SOURCES})
include_directories(${GPU_SOURCES_DIR})
endif()
######################################################
# Generate style headers based on global list of
# styles registered during package selection
######################################################
set(LAMMPS_STYLE_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/styles)
GenerateStyleHeaders(${LAMMPS_STYLE_HEADERS_DIR})
include_directories(${LAMMPS_SOURCE_DIR})
include_directories(${LAMMPS_STYLE_HEADERS_DIR})
###########################################
# Actually add executable and lib to build
############################################
add_library(lammps ${LIB_SOURCES})
target_link_libraries(lammps ${LAMMPS_LINK_LIBS})
if(LAMMPS_DEPS)
add_dependencies(lammps ${LAMMPS_DEPS})
endif()
set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_MACHINE})
if(BUILD_SHARED_LIBS)
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)
configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
add_executable(lmp ${LMP_SOURCES})
target_link_libraries(lmp lammps)
set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${LAMMPS_MACHINE})
install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
if(ENABLE_TESTING)
add_test(ShowHelp lmp${LAMMPS_MACHINE} -help)
endif()
##################################
# Print package summary
##################################
foreach(PKG ${DEFAULT_PACKAGES} ${OTHER_PACKAGES} ${ACCEL_PACKAGES})
if(ENABLE_${PKG})
message(STATUS "Building package: ${PKG}")
endif()
endforeach()
string(TOUPPER "${CMAKE_BUILD_TYPE}" BTYPE)
message(STATUS "<<< Build configuration >>>
Build type ${CMAKE_BUILD_TYPE}
Install path ${CMAKE_INSTALL_PREFIX}
Compilers and Flags:
C++ Compiler ${CMAKE_CXX_COMPILER}
Type ${CMAKE_CXX_COMPILER_ID}
C++ Flags ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
if(LANGUAGES MATCHES ".*Fortran.*")
message(STATUS "Fortran Compiler ${CMAKE_Fortran_COMPILER}
Type ${CMAKE_Fortran_COMPILER_ID}
Fortran Flags ${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${BTYPE}}")
endif()
message(STATUS "Linker flags:
Executable ${CMAKE_EXE_LINKER_FLAGS}")
if(BUILD_SHARED_LIBS)
message(STATUS "Shared libries ${CMAKE_SHARED_LINKER_FLAGS}")
else()
message(STATUS "Static libries ${CMAKE_STATIC_LINKER_FLAGS}")
endif()
message(STATUS "Link libraries: ${LAMMPS_LINK_LIBS}")

View File

@ -0,0 +1,22 @@
# - Find fftw2
# Find the native FFTW2 headers and libraries.
#
# FFTW2_INCLUDE_DIRS - where to find fftw2.h, etc.
# FFTW2_LIBRARIES - List of libraries when using fftw2.
# FFTW2_FOUND - True if fftw2 found.
#
find_path(FFTW2_INCLUDE_DIR fftw.h)
find_library(FFTW2_LIBRARY NAMES fftw)
set(FFTW2_LIBRARIES ${FFTW2_LIBRARY})
set(FFTW2_INCLUDE_DIRS ${FFTW2_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set FFTW2_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(FFTW2 DEFAULT_MSG FFTW2_LIBRARY FFTW2_INCLUDE_DIR)
mark_as_advanced(FFTW2_INCLUDE_DIR FFTW2_LIBRARY )

View File

@ -0,0 +1,25 @@
# - Find fftw3
# Find the native FFTW3 headers and libraries.
#
# FFTW3_INCLUDE_DIRS - where to find fftw3.h, etc.
# FFTW3_LIBRARIES - List of libraries when using fftw3.
# FFTW3_FOUND - True if fftw3 found.
#
find_package(PkgConfig)
pkg_check_modules(PC_FFTW3 fftw3)
find_path(FFTW3_INCLUDE_DIR fftw3.h HINTS ${PC_FFTW3_INCLUDE_DIRS})
find_library(FFTW3_LIBRARY NAMES fftw3 HINTS ${PC_FFTW3_LIBRARY_DIRS})
set(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(FFTW3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
mark_as_advanced(FFTW3_INCLUDE_DIR FFTW3_LIBRARY )

View File

@ -0,0 +1,22 @@
# - Find kim
# Find the native KIM headers and libraries.
#
# KIM_INCLUDE_DIRS - where to find kim.h, etc.
# KIM_LIBRARIES - List of libraries when using kim.
# KIM_FOUND - True if kim found.
#
find_path(KIM_INCLUDE_DIR KIM_API.h PATH_SUFFIXES kim-api-v1)
find_library(KIM_LIBRARY NAMES kim-api-v1)
set(KIM_LIBRARIES ${KIM_LIBRARY})
set(KIM_INCLUDE_DIRS ${KIM_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set KIM_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(KIM DEFAULT_MSG KIM_LIBRARY KIM_INCLUDE_DIR)
mark_as_advanced(KIM_INCLUDE_DIR KIM_LIBRARY )

View File

@ -0,0 +1,18 @@
# - Find latte
# Find the native LATTE libraries.
#
# LATTE_LIBRARIES - List of libraries when using latte.
# LATTE_FOUND - True if latte found.
#
find_library(LATTE_LIBRARY NAMES latte)
set(LATTE_LIBRARIES ${LATTE_LIBRARY})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LATTE_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(LATTE DEFAULT_MSG LATTE_LIBRARY)
mark_as_advanced(LATTE_LIBRARY)

View File

@ -0,0 +1,22 @@
# - Find mkl
# Find the native MKL headers and libraries.
#
# MKL_INCLUDE_DIRS - where to find mkl.h, etc.
# MKL_LIBRARIES - List of libraries when using mkl.
# MKL_FOUND - True if mkl found.
#
find_path(MKL_INCLUDE_DIR mkl_dfti.h HINTS $ENV{MKLROOT}/include)
find_library(MKL_LIBRARY NAMES mkl_rt HINTS $ENV{MKLROOT}/lib $ENV{MKLROOT}/lib/intel64)
set(MKL_LIBRARIES ${MKL_LIBRARY})
set(MKL_INCLUDE_DIRS ${MKL_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set MKL_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(MKL DEFAULT_MSG MKL_LIBRARY MKL_INCLUDE_DIR)
mark_as_advanced(MKL_INCLUDE_DIR MKL_LIBRARY )

View File

@ -0,0 +1,118 @@
# - Find NetCDF
# Find the native NetCDF includes and library
#
# NETCDF_INCLUDE_DIR - user modifiable choice of where netcdf headers are
# NETCDF_LIBRARY - user modifiable choice of where netcdf libraries are
#
# Your package can require certain interfaces to be FOUND by setting these
#
# NETCDF_CXX - require the C++ interface and link the C++ library
# NETCDF_F77 - require the F77 interface and link the fortran library
# NETCDF_F90 - require the F90 interface and link the fortran library
#
# Or equivalently by calling FindNetCDF with a COMPONENTS argument containing one or
# more of "CXX;F77;F90".
#
# When interfaces are requested the user has access to interface specific hints:
#
# NETCDF_${LANG}_INCLUDE_DIR - where to search for interface header files
# NETCDF_${LANG}_LIBRARY - where to search for interface libraries
#
# This module returns these variables for the rest of the project to use.
#
# NETCDF_FOUND - True if NetCDF found including required interfaces (see below)
# NETCDF_LIBRARIES - All netcdf related libraries.
# NETCDF_INCLUDE_DIRS - All directories to include.
# NETCDF_HAS_INTERFACES - Whether requested interfaces were found or not.
# NETCDF_${LANG}_INCLUDE_DIRS/NETCDF_${LANG}_LIBRARIES - C/C++/F70/F90 only interface
#
# Normal usage would be:
# set (NETCDF_F90 "YES")
# find_package (NetCDF REQUIRED)
# target_link_libraries (uses_everthing ${NETCDF_LIBRARIES})
# target_link_libraries (only_uses_f90 ${NETCDF_F90_LIBRARIES})
#search starting from user editable cache var
if (NETCDF_INCLUDE_DIR AND NETCDF_LIBRARY)
# Already in cache, be silent
set (NETCDF_FIND_QUIETLY TRUE)
endif ()
set(USE_DEFAULT_PATHS "NO_DEFAULT_PATH")
if(NETCDF_USE_DEFAULT_PATHS)
set(USE_DEFAULT_PATHS "")
endif()
find_path (NETCDF_INCLUDE_DIR netcdf.h
HINTS "${NETCDF_DIR}/include")
mark_as_advanced (NETCDF_INCLUDE_DIR)
set (NETCDF_C_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR})
find_library (NETCDF_LIBRARY NAMES netcdf
HINTS "${NETCDF_DIR}/lib")
mark_as_advanced (NETCDF_LIBRARY)
set (NETCDF_C_LIBRARIES ${NETCDF_LIBRARY})
#start finding requested language components
set (NetCDF_libs "")
set (NetCDF_includes "${NETCDF_INCLUDE_DIR}")
get_filename_component (NetCDF_lib_dirs "${NETCDF_LIBRARY}" PATH)
set (NETCDF_HAS_INTERFACES "YES") # will be set to NO if we're missing any interfaces
macro (NetCDF_check_interface lang header libs)
if (NETCDF_${lang})
#search starting from user modifiable cache var
find_path (NETCDF_${lang}_INCLUDE_DIR NAMES ${header}
HINTS "${NETCDF_INCLUDE_DIR}"
HINTS "${NETCDF_${lang}_ROOT}/include"
${USE_DEFAULT_PATHS})
find_library (NETCDF_${lang}_LIBRARY NAMES ${libs}
HINTS "${NetCDF_lib_dirs}"
HINTS "${NETCDF_${lang}_ROOT}/lib"
${USE_DEFAULT_PATHS})
mark_as_advanced (NETCDF_${lang}_INCLUDE_DIR NETCDF_${lang}_LIBRARY)
#export to internal varS that rest of project can use directly
set (NETCDF_${lang}_LIBRARIES ${NETCDF_${lang}_LIBRARY})
set (NETCDF_${lang}_INCLUDE_DIRS ${NETCDF_${lang}_INCLUDE_DIR})
if (NETCDF_${lang}_INCLUDE_DIR AND NETCDF_${lang}_LIBRARY)
list (APPEND NetCDF_libs ${NETCDF_${lang}_LIBRARY})
list (APPEND NetCDF_includes ${NETCDF_${lang}_INCLUDE_DIR})
else ()
set (NETCDF_HAS_INTERFACES "NO")
message (STATUS "Failed to find NetCDF interface for ${lang}")
endif ()
endif ()
endmacro ()
list (FIND NetCDF_FIND_COMPONENTS "CXX" _nextcomp)
if (_nextcomp GREATER -1)
set (NETCDF_CXX 1)
endif ()
list (FIND NetCDF_FIND_COMPONENTS "F77" _nextcomp)
if (_nextcomp GREATER -1)
set (NETCDF_F77 1)
endif ()
list (FIND NetCDF_FIND_COMPONENTS "F90" _nextcomp)
if (_nextcomp GREATER -1)
set (NETCDF_F90 1)
endif ()
NetCDF_check_interface (CXX netcdfcpp.h netcdf_c++)
NetCDF_check_interface (F77 netcdf.inc netcdff)
NetCDF_check_interface (F90 netcdf.mod netcdff)
#export accumulated results to internal varS that rest of project can depend on
list (APPEND NetCDF_libs "${NETCDF_C_LIBRARIES}")
set (NETCDF_LIBRARIES ${NetCDF_libs})
set (NETCDF_INCLUDE_DIRS ${NetCDF_includes})
# handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE if
# all listed variables are TRUE
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (NetCDF
DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS NETCDF_HAS_INTERFACES)

View File

@ -0,0 +1,29 @@
# - Find quantum-espresso
# Find the native QE headers and libraries.
#
# QE_INCLUDE_DIRS - where to find quantum-espresso.h, etc.
# QE_LIBRARIES - List of libraries when using quantum-espresso.
# QE_FOUND - True if quantum-espresso found.
#
find_path(QE_INCLUDE_DIR libqecouple.h PATH_SUFFIXES COUPLE/include)
find_library(QECOUPLE_LIBRARY NAMES qecouple)
find_library(PW_LIBRARY NAMES pw)
find_library(QEMOD_LIBRARY NAMES qemod)
find_library(QEFFT_LIBRARY NAMES qefft)
find_library(QELA_LIBRARY NAMES qela)
find_library(CLIB_LIBRARY NAMES clib)
find_library(IOTK_LIBRARY NAMES iotk)
set(QE_LIBRARIES ${QECOUPLE_LIBRARY} ${PW_LIBRARY} ${QEMOD_LIBRARY} ${QEFFT_LIBRARY} ${QELA_LIBRARY} ${CLIB_LIBRARY} ${IOTK_LIBRARY})
set(QE_INCLUDE_DIRS ${QE_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set QE_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(QE DEFAULT_MSG QECOUPLE_LIBRARY PW_LIBRARY QEMOD_LIBRARY QEFFT_LIBRARY QELA_LIBRARY CLIB_LIBRARY IOTK_LIBRARY QE_INCLUDE_DIR)
mark_as_advanced(QE_INCLUDE_DIR QECOUPLE_LIBRARY PW_LIBRARY QEMOD_LIBRARY QEFFT_LIBRARY QELA_LIBRARY CLIB_LIBRARY IOTK_LIBRARY)

View File

@ -0,0 +1,18 @@
# - Find quip
# Find the native QUIP libraries.
#
# QUIP_LIBRARIES - List of libraries when using fftw3.
# QUIP_FOUND - True if fftw3 found.
#
find_library(QUIP_LIBRARY NAMES quip)
set(QUIP_LIBRARIES ${QUIP_LIBRARY})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set QUIP_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(QUIP DEFAULT_MSG QUIP_LIBRARY)
mark_as_advanced(QUIP_LIBRARY)

View File

@ -0,0 +1,22 @@
# - Find voro++
# Find the native VORO headers and libraries.
#
# VORO_INCLUDE_DIRS - where to find voro++.hh, etc.
# VORO_LIBRARIES - List of libraries when using voro++.
# VORO_FOUND - True if voro++ found.
#
find_path(VORO_INCLUDE_DIR voro++.hh PATH_SUFFIXES voro++)
find_library(VORO_LIBRARY NAMES voro++)
set(VORO_LIBRARIES ${VORO_LIBRARY})
set(VORO_INCLUDE_DIRS ${VORO_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set VORO_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(VORO DEFAULT_MSG VORO_LIBRARY VORO_INCLUDE_DIR)
mark_as_advanced(VORO_INCLUDE_DIR VORO_LIBRARY )

View File

@ -0,0 +1,18 @@
function(GenerateOpenCLHeader varname outfile files)
message("Creating ${outfile}...")
file(WRITE ${outfile} "const char * ${varname} = \n")
math(EXPR ARG_END "${ARGC}-1")
foreach(IDX RANGE 2 ${ARG_END})
list(GET ARGV ${IDX} filename)
file(READ ${filename} content)
string(REGEX REPLACE "\\s*//[^\n]*\n" "" content "${content}")
string(REGEX REPLACE "\\\\" "\\\\\\\\" content "${content}")
string(REGEX REPLACE "\"" "\\\\\"" content "${content}")
string(REGEX REPLACE "([^\n]+)\n" "\"\\1\\\\n\"\n" content "${content}")
string(REGEX REPLACE "\n+" "\n" content "${content}")
file(APPEND ${outfile} "${content}")
endforeach()
file(APPEND ${outfile} ";\n")
endfunction(GenerateOpenCLHeader)

View File

@ -0,0 +1,183 @@
function(FindStyleHeaders path style_class file_pattern headers)
file(GLOB files "${path}/${file_pattern}*.h")
get_property(hlist GLOBAL PROPERTY ${headers})
foreach(file_name ${files})
file(STRINGS ${file_name} is_style LIMIT_COUNT 1 REGEX ${style_class})
if(is_style)
list(APPEND hlist ${file_name})
endif()
endforeach()
set_property(GLOBAL PROPERTY ${headers} "${hlist}")
endfunction(FindStyleHeaders)
function(AddStyleHeader path headers)
get_property(hlist GLOBAL PROPERTY ${headers})
list(APPEND hlist ${path})
set_property(GLOBAL PROPERTY ${headers} "${hlist}")
endfunction(AddStyleHeader)
function(FindStyleHeadersExt path style_class extension headers sources)
get_property(hlist GLOBAL PROPERTY ${headers})
get_property(slist GLOBAL PROPERTY ${sources})
set(ext_list)
get_filename_component(abs_path "${path}" ABSOLUTE)
foreach(file_name ${hlist})
get_filename_component(basename ${file_name} NAME_WE)
set(ext_file_name "${abs_path}/${basename}_${extension}.h")
if(EXISTS "${ext_file_name}")
file(STRINGS ${ext_file_name} is_style LIMIT_COUNT 1 REGEX ${style_class})
if(is_style)
list(APPEND ext_list ${ext_file_name})
set(source_file_name "${abs_path}/${basename}_${extension}.cpp")
if(EXISTS "${source_file_name}")
list(APPEND slist ${source_file_name})
endif()
endif()
endif()
endforeach()
list(APPEND hlist ${ext_list})
set_property(GLOBAL PROPERTY ${headers} "${hlist}")
set_property(GLOBAL PROPERTY ${sources} "${slist}")
endfunction(FindStyleHeadersExt)
function(CreateStyleHeader path filename)
math(EXPR N "${ARGC}-2")
set(temp "")
if(N GREATER 0)
math(EXPR ARG_END "${ARGC}-1")
foreach(IDX RANGE 2 ${ARG_END})
list(GET ARGV ${IDX} FNAME)
get_filename_component(FNAME ${FNAME} NAME)
set(temp "${temp}#include \"${FNAME}\"\n")
endforeach()
endif()
message(STATUS "Generating ${filename}...")
file(WRITE "${path}/${filename}.tmp" "${temp}" )
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${path}/${filename}.tmp" "${path}/${filename}")
endfunction(CreateStyleHeader)
function(GenerateStyleHeader path property style)
get_property(files GLOBAL PROPERTY ${property})
#message("${property} = ${files}")
CreateStyleHeader("${path}" "style_${style}.h" ${files})
endfunction(GenerateStyleHeader)
function(RegisterNBinStyles search_path)
FindStyleHeaders(${search_path} NBIN_CLASS nbin_ NBIN ) # nbin ) # neighbor
endfunction(RegisterNBinStyles)
function(RegisterNPairStyles search_path)
FindStyleHeaders(${search_path} NPAIR_CLASS npair_ NPAIR ) # npair ) # neighbor
endfunction(RegisterNPairStyles)
function(RegisterNBinStyle path)
AddStyleHeader(${path} NBIN)
endfunction(RegisterNBinStyle)
function(RegisterNPairStyle path)
AddStyleHeader(${path} NPAIR)
endfunction(RegisterNPairStyle)
function(RegisterStyles search_path)
FindStyleHeaders(${search_path} ANGLE_CLASS angle_ ANGLE ) # angle ) # force
FindStyleHeaders(${search_path} ATOM_CLASS atom_vec_ ATOM_VEC ) # atom ) # atom atom_vec_hybrid
FindStyleHeaders(${search_path} BODY_CLASS body_ BODY ) # body ) # atom_vec_body
FindStyleHeaders(${search_path} BOND_CLASS bond_ BOND ) # bond ) # force
FindStyleHeaders(${search_path} COMMAND_CLASS "" COMMAND ) # command ) # input
FindStyleHeaders(${search_path} COMPUTE_CLASS compute_ COMPUTE ) # compute ) # modify
FindStyleHeaders(${search_path} DIHEDRAL_CLASS dihedral_ DIHEDRAL ) # dihedral ) # force
FindStyleHeaders(${search_path} DUMP_CLASS dump_ DUMP ) # dump ) # output write_dump
FindStyleHeaders(${search_path} FIX_CLASS fix_ FIX ) # fix ) # modify
FindStyleHeaders(${search_path} IMPROPER_CLASS improper_ IMPROPER ) # improper ) # force
FindStyleHeaders(${search_path} INTEGRATE_CLASS "" INTEGRATE ) # integrate ) # update
FindStyleHeaders(${search_path} KSPACE_CLASS "" KSPACE ) # kspace ) # force
FindStyleHeaders(${search_path} MINIMIZE_CLASS min_ MINIMIZE ) # minimize ) # update
FindStyleHeaders(${search_path} NBIN_CLASS nbin_ NBIN ) # nbin ) # neighbor
FindStyleHeaders(${search_path} NPAIR_CLASS npair_ NPAIR ) # npair ) # neighbor
FindStyleHeaders(${search_path} NSTENCIL_CLASS nstencil_ NSTENCIL ) # nstencil ) # neighbor
FindStyleHeaders(${search_path} NTOPO_CLASS ntopo_ NTOPO ) # ntopo ) # neighbor
FindStyleHeaders(${search_path} PAIR_CLASS pair_ PAIR ) # pair ) # force
FindStyleHeaders(${search_path} READER_CLASS reader_ READER ) # reader ) # read_dump
FindStyleHeaders(${search_path} REGION_CLASS region_ REGION ) # region ) # domain
endfunction(RegisterStyles)
function(RemovePackageHeader headers pkg_header)
get_property(hlist GLOBAL PROPERTY ${headers})
list(REMOVE_ITEM hlist ${pkg_header})
set_property(GLOBAL PROPERTY ${headers} "${hlist}")
endfunction(RemovePackageHeader)
function(DetectAndRemovePackageHeader fname)
RemovePackageHeader(ANGLE ${fname})
RemovePackageHeader(ATOM_VEC ${fname})
RemovePackageHeader(BODY ${fname})
RemovePackageHeader(BOND ${fname})
RemovePackageHeader(COMMAND ${fname})
RemovePackageHeader(COMPUTE ${fname})
RemovePackageHeader(DIHEDRAL ${fname})
RemovePackageHeader(DUMP ${fname})
RemovePackageHeader(FIX ${fname})
RemovePackageHeader(IMPROPER ${fname})
RemovePackageHeader(INTEGRATE ${fname})
RemovePackageHeader(KSPACE ${fname})
RemovePackageHeader(MINIMIZE ${fname})
RemovePackageHeader(NBIN ${fname})
RemovePackageHeader(NPAIR ${fname})
RemovePackageHeader(NSTENCIL ${fname})
RemovePackageHeader(NTOPO ${fname})
RemovePackageHeader(PAIR ${fname})
RemovePackageHeader(READER ${fname})
RemovePackageHeader(REGION ${fname})
endfunction(DetectAndRemovePackageHeader)
function(RegisterStylesExt search_path extension sources)
FindStyleHeadersExt(${search_path} ANGLE_CLASS ${extension} ANGLE ${sources})
FindStyleHeadersExt(${search_path} ATOM_CLASS ${extension} ATOM_VEC ${sources})
FindStyleHeadersExt(${search_path} BODY_CLASS ${extension} BODY ${sources})
FindStyleHeadersExt(${search_path} BOND_CLASS ${extension} BOND ${sources})
FindStyleHeadersExt(${search_path} COMMAND_CLASS ${extension} COMMAND ${sources})
FindStyleHeadersExt(${search_path} COMPUTE_CLASS ${extension} COMPUTE ${sources})
FindStyleHeadersExt(${search_path} DIHEDRAL_CLASS ${extension} DIHEDRAL ${sources})
FindStyleHeadersExt(${search_path} DUMP_CLASS ${extension} DUMP ${sources})
FindStyleHeadersExt(${search_path} FIX_CLASS ${extension} FIX ${sources})
FindStyleHeadersExt(${search_path} IMPROPER_CLASS ${extension} IMPROPER ${sources})
FindStyleHeadersExt(${search_path} INTEGRATE_CLASS ${extension} INTEGRATE ${sources})
FindStyleHeadersExt(${search_path} KSPACE_CLASS ${extension} KSPACE ${sources})
FindStyleHeadersExt(${search_path} MINIMIZE_CLASS ${extension} MINIMIZE ${sources})
FindStyleHeadersExt(${search_path} NBIN_CLASS ${extension} NBIN ${sources})
FindStyleHeadersExt(${search_path} NPAIR_CLASS ${extension} NPAIR ${sources})
FindStyleHeadersExt(${search_path} NSTENCIL_CLASS ${extension} NSTENCIL ${sources})
FindStyleHeadersExt(${search_path} NTOPO_CLASS ${extension} NTOPO ${sources})
FindStyleHeadersExt(${search_path} PAIR_CLASS ${extension} PAIR ${sources})
FindStyleHeadersExt(${search_path} READER_CLASS ${extension} READER ${sources})
FindStyleHeadersExt(${search_path} REGION_CLASS ${extension} REGION ${sources})
endfunction(RegisterStylesExt)
function(GenerateStyleHeaders output_path)
GenerateStyleHeader(${output_path} ANGLE angle ) # force
GenerateStyleHeader(${output_path} ATOM_VEC atom ) # atom atom_vec_hybrid
GenerateStyleHeader(${output_path} BODY body ) # atom_vec_body
GenerateStyleHeader(${output_path} BOND bond ) # force
GenerateStyleHeader(${output_path} COMMAND command ) # input
GenerateStyleHeader(${output_path} COMPUTE compute ) # modify
GenerateStyleHeader(${output_path} DIHEDRAL dihedral ) # force
GenerateStyleHeader(${output_path} DUMP dump ) # output write_dump
GenerateStyleHeader(${output_path} FIX fix ) # modify
GenerateStyleHeader(${output_path} IMPROPER improper ) # force
GenerateStyleHeader(${output_path} INTEGRATE integrate ) # update
GenerateStyleHeader(${output_path} KSPACE kspace ) # force
GenerateStyleHeader(${output_path} MINIMIZE minimize ) # update
GenerateStyleHeader(${output_path} NBIN nbin ) # neighbor
GenerateStyleHeader(${output_path} NPAIR npair ) # neighbor
GenerateStyleHeader(${output_path} NSTENCIL nstencil ) # neighbor
GenerateStyleHeader(${output_path} NTOPO ntopo ) # neighbor
GenerateStyleHeader(${output_path} PAIR pair ) # force
GenerateStyleHeader(${output_path} READER reader ) # read_dump
GenerateStyleHeader(${output_path} REGION region ) # domain
endfunction(GenerateStyleHeaders)

19
cmake/README.md Normal file
View File

@ -0,0 +1,19 @@
cmake-buildsystem
-----------------
To use the cmake build system instead of the make-driven one, do:
```
cmake /path/to/lammps/source/cmake
```
(please note the cmake directory as the very end)
To enable package, e.g. GPU do
```
cmake /path/to/lammps/source/cmake -DENABLE_GPU=ON
```
cmake has many many options, do get an overview use the curses-based cmake interface, ccmake:
```
ccmake /path/to/lammps/source/cmake
```
(Don't forget to press "g" for generate once you are done with configuring)

4
cmake/gpu/lal_pppm_d.cu Normal file
View File

@ -0,0 +1,4 @@
#define grdtyp double
#define grdtyp4 double4
#include "lal_pppm.cu"

4
cmake/gpu/lal_pppm_f.cu Normal file
View File

@ -0,0 +1,4 @@
#define grdtyp float
#define grdtyp4 float4
#include "lal_pppm.cu"

View File

@ -0,0 +1,18 @@
# pkg-config file for lammps
# https://people.freedesktop.org/~dbn/pkg-config-guide.html
# Usage: cc `pkg-config --cflags --libs liblammps` -o myapp myapp.c
# after you added @CMAKE_INSTALL_FULL_LIBDIR@/pkg-config to PKG_CONFIG_PATH,
# e.g. export PKG_CONFIG_PATH=@CMAKE_INSTALL_FULL_LIBDIR@/pkgconfig
prefix=@CMAKE_INSTALL_FULL_PREFIX@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: liblammps@LAMMPS_MACHINE@
Description: Large-scale Atomic/Molecular Massively Parallel Simulator Library
URL: http://lammps.sandia.gov
Version:
Requires:
Libs: -L${libdir} -llammps@LAMMPS_MACHINE@
Libs.private: -lm
Cflags: -I${includedir} @LAMMPS_API_DEFINES@

5
doc/.gitignore vendored
View File

@ -1 +1,6 @@
/html
/spelling
/LAMMPS.epub
/LAMMPS.mobi
/Manual.pdf
/Developer.pdf

View File

@ -6,6 +6,7 @@ BUILDDIR = /tmp/lammps-docs-$(SHA1)
RSTDIR = $(BUILDDIR)/rst
VENV = $(BUILDDIR)/docenv
TXT2RST = $(VENV)/bin/txt2rst
ANCHORCHECK = $(VENV)/bin/doc_anchor_check
PYTHON = $(shell which python3)
HAS_PYTHON3 = NO
@ -19,10 +20,11 @@ ifeq ($(shell which virtualenv >/dev/null 2>&1; echo $$?), 0)
HAS_VIRTUALENV = YES
endif
SOURCES=$(wildcard src/*.txt)
SPHINXEXTRA = -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiprocessing.cpu_count())')
SOURCES=$(filter-out src/lammps_commands.txt src/lammps_tutorials.txt,$(wildcard src/*.txt))
OBJECTS=$(SOURCES:src/%.txt=$(RSTDIR)/%.rst)
.PHONY: help clean-all clean html pdf old venv
.PHONY: help clean-all clean epub html pdf old venv spelling anchor_check
# ------------------------------------------
@ -32,9 +34,11 @@ help:
@echo " pdf create Manual.pdf and Developer.pdf in this dir"
@echo " old create old-style HTML doc pages in old dir"
@echo " fetch fetch HTML and PDF files from LAMMPS web site"
@echo " epub create ePUB format manual for e-book readers"
@echo " clean remove all intermediate RST files"
@echo " clean-all reset the entire build environment"
@echo " txt2html build txt2html tool"
@echo " anchor_check scan for duplicate anchor labels"
# ------------------------------------------
@ -42,13 +46,20 @@ clean-all:
rm -rf $(BUILDDIR)/* utils/txt2html/txt2html.exe
clean:
rm -rf $(RSTDIR)
rm -rf $(RSTDIR) html
rm -rf spelling
html: $(OBJECTS)
clean-spelling:
rm -rf spelling
html: $(OBJECTS) $(ANCHORCHECK)
@(\
. $(VENV)/bin/activate ;\
cp -r src/* $(RSTDIR)/ ;\
sphinx-build -j 8 -b html -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
sphinx-build $(SPHINXEXTRA) -b html -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
echo "############################################" ;\
doc_anchor_check src/*.txt ;\
echo "############################################" ;\
deactivate ;\
)
-rm html/searchindex.js
@ -63,8 +74,34 @@ html: $(OBJECTS)
@rm -rf html/USER/*/*.[sg]*
@echo "Build finished. The HTML pages are in doc/html."
spelling: $(OBJECTS) utils/sphinx-config/false_positives.txt
@(\
. $(VENV)/bin/activate ;\
pip install sphinxcontrib-spelling ;\
cp -r src/* $(RSTDIR)/ ;\
cp utils/sphinx-config/false_positives.txt $(RSTDIR)/ ;\
sphinx-build -b spelling -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) spelling ;\
deactivate ;\
)
@echo "Spell check finished."
epub: $(OBJECTS)
@mkdir -p epub
@rm -f LAMMPS.epub
@cp src/JPG/lammps-logo.png epub/
@(\
. $(VENV)/bin/activate ;\
cp -r src/* $(RSTDIR)/ ;\
sphinx-build $(SPHINXEXTRA) -b epub -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) epub ;\
deactivate ;\
)
@mv epub/LAMMPS.epub .
@rm -rf epub
@echo "Build finished. The ePUB manual file is created."
pdf: utils/txt2html/txt2html.exe
@(\
set -e; \
cd src; \
../utils/txt2html/txt2html.exe -b *.txt; \
htmldoc --batch lammps.book; \
@ -97,6 +134,13 @@ fetch:
txt2html: utils/txt2html/txt2html.exe
anchor_check : $(ANCHORCHECK)
@(\
. $(VENV)/bin/activate ;\
doc_anchor_check src/*.txt ;\
deactivate ;\
)
# ------------------------------------------
utils/txt2html/txt2html.exe: utils/txt2html/txt2html.cpp
@ -121,7 +165,7 @@ $(VENV):
deactivate;\
)
$(TXT2RST): $(VENV)
$(TXT2RST) $(ANCHORCHECK): $(VENV)
@( \
. $(VENV)/bin/activate; \
(cd utils/converters;\

View File

@ -1,13 +1,14 @@
LAMMPS Documentation
Depending on how you obtained LAMMPS, this directory has 2 or 3
sub-directories and optionally 2 PDF files:
sub-directories and optionally 2 PDF files and an ePUB file:
src content files for LAMMPS documentation
html HTML version of the LAMMPS manual (see html/Manual.html)
tools tools and settings for building the documentation
Manual.pdf large PDF version of entire manual
Developer.pdf small PDF with info about how LAMMPS is structured
LAMMPS.epub Manual in ePUB format
If you downloaded LAMMPS as a tarball from the web site, all these
directories and files should be included.
@ -49,6 +50,7 @@ make pdf # generate 2 PDF files (Manual.pdf,Developer.pdf)
make old # generate old-style HTML pages in old dir via txt2html
make fetch # fetch HTML doc pages and 2 PDF files from web site
# as a tarball and unpack into html dir and 2 PDFs
make epub # generate LAMMPS.epub in ePUB format using Sphinx
make clean # remove intermediate RST files created by HTML build
make clean-all # remove entire build folder and any cached data
@ -91,3 +93,23 @@ This will install virtualenv from the Python Package Index.
----------------
Installing prerequisites for PDF build
[TBA]
----------------
Installing prerequisites for epub build
## ePUB
Same as for HTML. This uses the same tools and configuration
files as the HTML tree.
For converting the generated ePUB file to a mobi format file
(for e-book readers like Kindle, that cannot read ePUB), you
also need to have the 'ebook-convert' tool from the "calibre"
software installed. http://calibre-ebook.com/
You first create the ePUB file with 'make epub' and then do:
ebook-convert LAMMPS.epub LAMMPS.mobi

View File

@ -464,7 +464,7 @@ the angletype option can only be assigned to a "fix style" of "shake",
entirely rigid (e.g. water)
the angletype option enables an additional check when SHAKE constraints
are computed: if a cluster is of size 3 and both bonds in
the cluster are of a bondtype specified by the 2nd paramter of
the cluster are of a bondtype specified by the 2nd parameter of
angletype, then the cluster is SHAKEn with an additional angle
constraint that makes it rigid, using the equilibrium angle appropriate
to the specified angletype
@ -476,7 +476,7 @@ IMPORTANT NOTE: the angletype option has one additional affect, namely
since they will not be SHAKEn but neither will the angle force by computed
for style region, a coeff of INF means + or - infinity (all the way
to the boundary)
an atom can be assigned to multiple constraints, the contraints will be
an atom can be assigned to multiple constraints, the constraints will be
applied in the reverse order they are assigned to that atom
(e.g. each timestep, the last fix assigned to an atom will be applied
to it first, then the next-to-last applied second, etc)
@ -689,7 +689,7 @@ coeffs: types
remainder
no other parameters required
used with &quot;create temp&quot; commmand to initialize velocities of atoms
used with &quot;create temp&quot; command to initialize velocities of atoms
by default, the &quot;create temp&quot; command initializes the velocities of all atoms,
this command limits the initialization to a group of atoms
this command is only in force for the next &quot;create temp&quot; command, any
@ -1263,7 +1263,7 @@ when using constraints with the minimizer, fixes are
applied when atoms move except for the following
fixes associated with temperature control are not allowed
(rescale, hoover/drag, langevin)
the minimizer does not invoke the &quot;fix style shake&quot; contraints on
the minimizer does not invoke the &quot;fix style shake&quot; constraints on
bond lengths
the minimizer does not invoke pressure control or volume control settings
for good convergence, should specify use of smooth nonbond force fields
@ -1566,7 +1566,7 @@ mesh dimensions that are power-of-two are fastest for FFTs, but any sizes
can be used that are supported by native machine libraries
this command is optional - if not used, a default
mesh size will be chosen to satisfy accuracy criterion - if used, the
specifed mesh size will override the default
specified mesh size will override the default
</PRE>
<HR>
<H3>
@ -1788,7 +1788,7 @@ if the style is 2, restart information will be written alternately to files
when the minimizer is invoked this command means create a restart file
at the end of the minimization with the filename filename.timestep.min
a restart file stores atom and force-field information in binary form
allows program to restart from where it left off (see &quot;read restart&quot; commmand)
allows program to restart from where it left off (see &quot;read restart&quot; command)
Default = 0
</PRE>

View File

@ -167,7 +167,7 @@ tool on the small-system data file.</P>
<P>
(6) flow</P>
<P>
2-d flow of Lennard-Jones atoms in a channel using various contraint
2-d flow of Lennard-Jones atoms in a channel using various constraint
options.</P>
<P>
(7) polymer</P>
@ -201,7 +201,7 @@ The tools directory also has a F77 program called setup_chain.f
(compile and link with print.c) which can be used to generate random
initial polymer configurations for bead-spring models like those used
in examples/polymer. It uses an input polymer definition file (see
examples/polymer for two sample def files) that specfies how many
examples/polymer for two sample def files) that specifies how many
chains of what length, a random number seed, etc.</P>
</BODY>
</HTML>

View File

@ -40,7 +40,7 @@ Note: this file is somewhat out-of-date for LAMMPS 99.</P>
<LI>
maxtype = max # of atom types
<LI>
maxbond = max # of bonds to compute on one procesor
maxbond = max # of bonds to compute on one processor
<LI>
maxangle = max # of angles to compute on one processor
<LI>

View File

@ -294,7 +294,7 @@ assign a group of atoms to a particular constraint
use appropriate number of coeffs for a particular style
the constraint itself is defined by the &quot;fix style&quot; command
multiple groups of atoms can be assigned to the same constraint
an atom can be assigned to multiple constraints, the contraints will be
an atom can be assigned to multiple constraints, the constraints will be
applied in the reverse order they are assigned to that atom
(e.g. each timestep, the last fix assigned to an atom will be applied
to it first, then the next-to-last applied second, etc)
@ -477,7 +477,7 @@ coeffs: types
remainder
no other parameters required
used with &quot;create temp&quot; commmand to initialize velocities of atoms
used with &quot;create temp&quot; command to initialize velocities of atoms
by default, the &quot;create temp&quot; command initializes the velocities of all atoms,
this command limits the initialization to a group of atoms
this command is only in force for the next &quot;create temp&quot; command, any
@ -1124,7 +1124,7 @@ mesh dimensions that are power-of-two are fastest for FFTs, but any size
can be used that are supported by native machine libraries
this command is optional - if not used, a default
mesh size will be chosen to satisfy accuracy criterion - if used, the
specifed mesh size will override the default
specified mesh size will override the default
Default = none
</PRE>
@ -1343,7 +1343,7 @@ value of 0 means never create one
program will toggle between 2 filenames as the run progresses
so always have at least one good file even if the program dies in mid-write
restart file stores atom positions and velocities in binary form
allows program to restart from where it left off (see &quot;read restart&quot; commmand)
allows program to restart from where it left off (see &quot;read restart&quot; command)
Default = 0
</PRE>

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
doc/src/Eqs/bond_gromos.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1,10 @@
\documentclass[12pt]{article}
\pagestyle{empty}
\begin{document}
$$
E = K (r^2 - r_0^2)^2
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,10 @@
\documentclass[12pt]{article}
\pagestyle{empty}
\begin{document}
$$
E = - \frac{\epsilon}{2} \ln \left[ 1 - \left(\frac{r-r0}{\Delta}\right)^2\right]
$$
\end{document}

BIN
doc/src/Eqs/cnp_cutoff.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -0,0 +1,14 @@
\documentclass[12pt,article]{article}
\usepackage{indentfirst}
\usepackage{amsmath}
\begin{document}
\begin{eqnarray*}
r_{c}^{fcc} & = & \frac{1}{2} \left(\frac{\sqrt{2}}{2} + 1\right) \mathrm{a} \simeq 0.8536 \:\mathrm{a} \\
r_{c}^{bcc} & = & \frac{1}{2}(\sqrt{2} + 1) \mathrm{a} \simeq 1.207 \:\mathrm{a} \\
r_{c}^{hcp} & = & \frac{1}{2}\left(1+\sqrt{\frac{4+2x^{2}}{3}}\right) \mathrm{a}
\end{eqnarray*}
\end{document}

BIN
doc/src/Eqs/cnp_cutoff2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -0,0 +1,12 @@
\documentclass[12pt,article]{article}
\usepackage{indentfirst}
\usepackage{amsmath}
\begin{document}
$$
Rc + Rs > 2*{\rm cutoff}
$$
\end{document}

BIN
doc/src/Eqs/cnp_eq.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

9
doc/src/Eqs/cnp_eq.tex Normal file
View File

@ -0,0 +1,9 @@
\documentclass[12pt]{article}
\begin{document}
$$
Q_{i} = \frac{1}{n_i}\sum_{j = 1}^{n_i} | \sum_{k = 1}^{n_{ij}} \vec{R}_{ik} + \vec{R}_{jk} |^2
$$
\end{document}

BIN
doc/src/Eqs/fix_gcmc1.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

@ -0,0 +1,9 @@
\documentclass[12pt]{article}
\begin{document}
\begin{eqnarray*}
\mu &=&\mu^{id} + \mu^{ex}
\end{eqnarray*}
\end{document}

BIN
doc/src/Eqs/fix_gcmc2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

10
doc/src/Eqs/fix_gcmc2.tex Normal file
View File

@ -0,0 +1,10 @@
\documentclass[12pt]{article}
\begin{document}
\begin{eqnarray*}
\mu^{id} &=& k T \ln{\rho \Lambda^3} \\
&=& k T \ln{\frac{\phi P \Lambda^3}{k T}}
\end{eqnarray*}
\end{document}

BIN
doc/src/Eqs/fix_gcmc3.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -0,0 +1,9 @@
\documentclass[12pt]{article}
\begin{document}
\begin{eqnarray*}
\Lambda &=& \sqrt{ \frac{h^2}{2 \pi m k T}}
\end{eqnarray*}
\end{document}

BIN
doc/src/Eqs/fix_grem.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

9
doc/src/Eqs/fix_grem.tex Normal file
View File

@ -0,0 +1,9 @@
\documentclass[12pt]{article}
\begin{document}
$$
T_{eff} = \lambda + \eta (H - H_0)
$$
\end{document}

BIN
doc/src/Eqs/fix_mvv_dpd.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,21 @@
\documentclass[12pt]{article}
\begin{document}
$$
v(t+\frac{\Delta t}{2}) = v(t) + \frac{\Delta t}{2}\cdot a(t),
$$
$$
r(t+\Delta t) = r(t) + \Delta t\cdot v(t+\frac{\Delta t}{2}),
$$
$$
a(t+\Delta t) = \frac{1}{m}\cdot F\left[ r(t+\Delta t), v(t) +\lambda \cdot \Delta t\cdot a(t)\right],
$$
$$
v(t+\Delta t) = v(t+\frac{\Delta t}{2}) + \frac{\Delta t}{2}\cdot a(t+\Delta t)
$$
\end{document}

BIN
doc/src/Eqs/fix_rhok.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

11
doc/src/Eqs/fix_rhok.tex Normal file
View File

@ -0,0 +1,11 @@
\documentclass[12pt]{article}
\begin{document}
\begin{eqnarray*}
U &=& \frac{1}{2} K (|\rho_{\vec{k}}| - a)^2 \\
\rho_{\vec{k}} &=& \sum_j^N \exp(-i\vec{k} \cdot \vec{r}_j )/\sqrt{N} \\
\vec{k} &=& (2\pi n_x /L_x , 2\pi n_y /L_y , 2\pi n_z/L_z )
\end{eqnarray*}
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

View File

@ -0,0 +1,10 @@
\documentclass[12pt]{article}
\begin{document}
$$
E = \epsilon \left[ \frac{2 \sigma_{LJ}^{12} \left(7 r^5+14 r^3 \sigma_{n}^2+3 r \sigma_{n}^4\right) }{945 \left(r^2-\sigma_{n}^2\right)^7} -\frac{ \sigma_{LJ}^6 \left(2 r \sigma_{n}^3+\sigma_{n}^2 \left(r^2-\sigma_{n}^2\right)\log{ \left[\frac{r-\sigma_{n}}{r+\sigma_{n}}\right]}\right) }{12 \sigma_{n}^5 \left(r^2-\sigma_{n}^2\right)} \right]\qquad \sigma_n < r < r_c
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
doc/src/Eqs/pair_agni.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
doc/src/Eqs/pair_buck6d.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,33 @@
\documentclass[12pt]{article}
\begin{document}
$$
\mathbf{F}_{ij}^{C} = \alpha_{ij}{\omega_{C}}(r_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
$$
$$
\omega_{C}(r) = 1 - r/r_c,
$$
$$
\alpha_{ij} = A\cdot k_B(T_i + T_j)/2,
$$
$$
\omega_{D}(r) = \omega^2_{R}(r) = (1-r/r_c)^s,
$$
$$
\sigma_{ij}^2 = 4\gamma k_B T_i T_j/(T_i + T_j),
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,15 @@
\documentclass[12pt]{article}
\begin{document}
$$
\frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2}=
\frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}
=\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}),
$$
$$
C_v\frac{\mathrm{d} T_i}{\mathrm{d} t}= q_{i} = \sum_{i\neq j}(q_{ij}^{C}+q_{ij}^{V}+q_{ij}^{R}),
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

View File

@ -0,0 +1,29 @@
\documentclass[12pt]{article}
\begin{document}
$$
q_i^C = \sum_{j \ne i} k_{ij} \omega_{CT}(r_{ij}) \left( \frac{1}{T_i} - \frac{1}{T_j} \right),
$$
$$
q_i^V = \frac{1}{2 C_v}\sum_{j \ne i}{ \left\{ \omega_D(r_{ij})\left[\gamma_{ij} \left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right)^2 - \frac{\left( \sigma _{ij} \right)^2}{m}\right] - \sigma _{ij} \omega_R(r_{ij})\left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right){\xi_{ij}} \right\} },
$$
$$
q_i^R = \sum_{j \ne i} \beta _{ij} \omega_{RT}(r_{ij}) d {t^{ - 1/2}} \xi_{ij}^e,
$$
$$
\omega_{CT}(r)=\omega_{RT}^2(r)=\left(1-r/r_{ct}\right)^{s_T},
$$
$$
k_{ij}=C_v^2\kappa(T_i + T_j)^2/4k_B,
$$
$$
\beta_{ij}^2=2k_Bk_{ij},
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

@ -0,0 +1,9 @@
\documentclass[12pt]{article}
\begin{document}
$$
\kappa = \frac{315k_B\upsilon }{2\pi \rho C_v r_{ct}^5}\frac{1}{Pr},
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -0,0 +1,13 @@
\documentclass[12pt]{article}
\thispagestyle{empty}
\begin{document}
\begin{eqnarray*}
E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
V_{ij} & = & e^{-\lambda(r_{ij} -z_0}) \left[ C + f(\rho_{ij}) + f(\rho_{ji}) \right] - A \left( \frac{r_{ij}}{z_0}\right)^{-6} + A \left( \frac{\textrm{cutoff}}{z_0}\right)^{-6} \\
\rho_{ij}^2 = \rho_{ji}^2 & = & x_{ij}^2 + y_{ij}^2 ~\hspace{2cm} (\mathbf{n_i}\equiv\hat \mathbf{z})\\
f(\rho) & = & e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} \left( \rho/\delta \right) ^{2n}
\end{eqnarray*}
\end{document}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@ -1,11 +0,0 @@
\documentclass[12pt]{article}
\begin{document}
\begin{eqnarray*}
F & = & F_{\mathrm{LJ}}(r) - F_{\mathrm{LJ}}(r_{\mathrm{c}}) \qquad r < r_{\mathrm{c}} \\
E & = & E_{\mathrm{LJ}}(r) - E_{\mathrm{LJ}}(r_{\mathrm{c}}) + (r - r_{\mathrm{c}}) F_{\mathrm{LJ}}(r_{\mathrm{c}}) \qquad r < r_{\mathrm{c}} \\
\mathrm{with} \qquad E_{\mathrm{LJ}}(r) & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - \left(\frac{\sigma}{r}\right)^6 \right] \qquad \mathrm{and} \qquad F_{\mathrm{LJ}}(r) = - E^\prime_{\mathrm{LJ}}(r)
\end{eqnarray*}
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,17 @@
\documentclass[12pt]{article}
\begin{document}
$$
\mathbf{F}_{ij}^C = Aw_c(r_{ij})\mathbf{e}_{ij} + B(\rho_i+\rho_j)w_d(r_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
$$
\end{document}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -1,13 +1,14 @@
\documentclass[12pt]{article}
\usepackage{amsmath}
\begin{document}
$$
E=\sum_{ij}\phi(r_{ij})+\sum_{i}U(\rho_{i}),
E=\sum_{i<j}\phi(r_{ij})+\sum_{i}U(n_{i}),
$$
$$
\rho_{i}=\sum_{j}\rho(r_{ij})+\sum_{jk}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
n_{i}=\sum_{j}\rho(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,14 @@
\documentclass[12pt]{article}
\usepackage{amsmath}
\begin{document}
$$
E=\sum_{i<j}\phi_{ij}(r_{ij})+\sum_{i}U_i(n_{i}),
$$
$$
n_{i}=\sum_{j\ne i}\rho_j(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f_{j}(r_{ij})f_{k}(r_{ik})g_{jk}[\cos(\theta_{jik})]
$$
\end{document}

BIN
doc/src/Eqs/pair_momb.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

13
doc/src/Eqs/pair_momb.tex Normal file
View File

@ -0,0 +1,13 @@
\documentclass[12pt,fleqn]{article}
\usepackage{amsmath}
\thispagestyle{empty}
\begin{document}
\setlength{\jot}{2ex}
\begin{gather*}
E = D_0 [\exp^{-2 \alpha (r-r_0)} - 2\exp^{-\alpha (r-r_0)}] - s_6 \frac{C_6}{r^6} f_{damp}(r,R_r) \\
f_{damp}(r,R_r) = \frac{1}{1 + \exp^{-d(r/R_r - 1)}}
\end{gather*}
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,21 @@
\documentclass[12pt]{article}
\begin{document}
$$
Q_{ij}^D = -\kappa_{ij} w_{DC}(r_{ij}) \left( C_i - C_j \right),
$$
$$
Q_{ij}^R = \epsilon_{ij}\left( C_i + C_j \right) w_{RC}(r_{ij}) \xi_{ij},
$$
$$
w_{DC}(r_{ij})=w^2_{RC}(r_{ij}) = (1 - r/r_{cc})^{\rm power\_{cc}},
$$
$$
\epsilon_{ij}^2 = m_s^2\kappa_{ij}\rho,
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,29 @@
\documentclass[12pt]{article}
\begin{document}
$$
\mathbf{F}_{ij}^{C} = A{\omega_{C}}(r_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
$$
$$
\mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
$$
$$
\omega_{C}(r) = 1 - r/r_c,
$$
$$
\omega_{D}(r) = \omega^2_{R}(r) = (1-r/r_c)^{\rm power\_f},
$$
$$
\sigma^2 = 2\gamma k_B T,
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -0,0 +1,13 @@
\documentclass[12pt]{article}
\begin{document}
$$
\frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2} = \frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}=\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}),
$$
$$
\frac{\mathrm{d} C_{i}}{\mathrm{d} t}= Q_{i} = \sum_{i\neq j}(Q_{ij}^{D}+Q_{ij}^{R}) + Q_{i}^{S},
$$
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -0,0 +1,10 @@
\documentclass[12pt]{article}
\pagestyle{empty}
\begin{document}
\begin{eqnarray*}
V_{ij} & = & f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) + c_0 \right]
\end{eqnarray*}
\end{document}

BIN
doc/src/Eqs/pair_ufm.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

14
doc/src/Eqs/pair_ufm.tex Normal file
View File

@ -0,0 +1,14 @@
\documentclass[12pt]{article}
\begin{document}
$$
E = -\varepsilon\, \ln{\left[1-\exp{\left(-r^{2}/\sigma^{2}\right)}\right]} \qquad r < r_c
$$
$$
\varepsilon = p\,k_B\,T
$$
\end{document}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -3,7 +3,7 @@
\begin{document}
$$
P = \frac{N k_B T}{V} + \frac{\sum_{i}^{N} r_i \bullet f_i}{dV}
P = \frac{N k_B T}{V} + \frac{\sum_{i}^{N'} r_i \bullet f_i}{dV}
$$
\end{document}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -4,7 +4,7 @@
$$
P_{IJ} = \frac{\sum_{k}^{N} m_k v_{k_I} v_{k_J}}{V} +
\frac{\sum_{k}^{N} r_{k_I} f_{k_J}}{V}
\frac{\sum_{k}^{N'} r_{k_I} f_{k_J}}{V}
$$
\end{document}

BIN
doc/src/JPG/bow_tutorial_01.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
doc/src/JPG/bow_tutorial_02.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Some files were not shown because too many files have changed in this diff Show More