jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,401 Commits 9 Branches 198 Tags 1.1 GiB
Commit Graph

17401 Commits

Author SHA1 Message Date
Mingjian Wen 16bb8a1439 Clean up comments 2019-04-17 16:58:18 -05:00
Mingjian Wen d6f3a95599 Remove unused variables and methods 2019-04-17 10:53:45 -05:00
Mingjian Wen cb30414820 Add contribution to virial and atom virial 2019-04-17 10:05:05 -05:00
Dan S. Bolintineanu ebee2b588c Merge branch 'gran_mods' of github.com:dsbolin/lammps into gran_mods 2019-04-16 17:00:10 -06:00
Dan S. Bolintineanu 4b2388339e Fixes bug in calculation of relative tangential velocity for granular wall particle interactions. 
Thanks to Andrew Santos for providing a test case that reveals this.
 2019-04-16 16:59:21 -06:00
Dan S. Bolintineanu 1d4372c24d Fixes bug in calculation of relative tangential velocity for granular wall particle interactions 2019-04-16 16:40:41 -06:00
Mingjian Wen 82a87322ed Get the same forces as KIM implementation 2019-04-16 16:54:17 -05:00
Mingjian Wen 5fb164d586 Get total energy correct 2019-04-16 15:04:16 -05:00
Steven Strong 4c565db9af update contrib authors 2019-04-16 11:50:33 -05:00
Steven Strong 0eebb31903 update contact info 2019-04-16 11:48:45 -05:00
Steven Strong 69e7a2a237 add e3b water model 2019-04-16 11:32:47 -05:00
Mingjian Wen 835fce7a5e Copy all function from KIM implementation to PairDRIP 2019-04-16 10:51:20 -05:00
Mingjian Wen fdaa3f48e9 Modify all methods other than compute 2019-04-15 22:38:51 -05:00
Mingjian Wen 2bdd9b7544 Remove single 2019-04-15 20:14:10 -05:00
Mingjian Wen 100f17077c Create pair_drip by copying KC files 2019-04-15 19:27:41 -05:00
Dan S. Bolintineanu 0b24a3d830 Added a 'mass_velocity' damping option to the new granular pair styles and granular wall interaction. 
This is to more closely match the old style pair gran/hooke/* damping behavior.
Updated doc page accordingly, as well as adding some examples on how to match old pair gran/* styles.
 2019-04-15 16:14:02 -06:00
Eisuke Kawashima 2e9404acdf
Fix typo [skip ci] 2019-04-15 16:06:36 +09:00
Jacob Gissinger 80431612c7
Merge pull request #47 from lammps/master 
rebase
 2019-04-14 20:11:37 -06:00
Dan S. Bolintineanu d0826f2838 Added granular example input scripts 2019-04-13 23:52:30 -06:00
Dan S. Bolintineanu d33a30806a Minor code clean up in pair_granular.cpp 2019-04-13 23:37:46 -06:00
Dan S. Bolintineanu 14d3d09de3 Fixed several errors in granular doc pages, particularly coefficients in examples 2019-04-13 23:36:40 -06:00
julient31 5e3929de56 Commit2 JT 041019 
- correct spelling in Howto_spin.txt
 2019-04-10 13:35:58 -06:00
julient31 70c816aa02 Commit JT 041019 
- corrected setforce/spin
- added an example
- added the documentation (in setforce)
- updated the Howto_spin documentation
 2019-04-10 13:18:33 -06:00
Stan Moore e4e2249b63 Fix issue in comm_kokkos 2019-04-10 10:17:14 -06:00
julient31 3d7b387786 Commit JT 040919 
- first working version of setforce
- modified fix nve/spin to account for it
 2019-04-09 16:57:27 -06:00
Dan S. Bolintineanu 4af22a723d Fixes several bugs in fix wall/gran, wall/gran/region: 
1. Radius of curvature for curved regions was incorrectly used to compute wall-particle overlaps
2. Uninitialized values of rolling and twisting history could produce crashes in
cases that don't initialize these to 0 by default. These are now initialized to 0.
3. Fixed a bug with the use of 'NULL' for specification of the tangential stiffness for
wall/gran and wall/gran/region
 2019-04-09 16:40:49 -06:00
Stan Moore cf35ebe5fa Revert optimization that is causing regression tests to fail 2019-04-09 16:17:37 -06:00
Stan Moore 073f003470 Doc tweak 2019-04-09 15:17:40 -06:00
Stan Moore 618547b72e Reduce DELTA and revert subview change 2019-04-09 14:40:39 -06:00
Stan Moore a01bce46bb Reduce GPU/CPU data transfer 2019-04-09 10:23:37 -06:00
Stan Moore 82be3ee32c Only use team with full neigh list 2019-04-09 09:17:07 -06:00
Stan Moore 16b17f812c Update docs 2019-04-09 08:51:24 -06:00
Axel Kohlmeyer 915c3a6001
step version number for next patch release 2019-04-09 03:06:04 -04:00
julient31 8ec231a8e5 Commit JT 040819 
- corrected bug in fix nve/spin (init tables with grow)
- start work for fix setforce/spin
 2019-04-08 16:54:25 -06:00
Stan Moore 22b7e12baf Merge branch 'kk_binsize' into team_opt 2019-04-08 16:40:20 -06:00
Stan Moore c11b1edc1f Avoid spell checker error 2019-04-08 16:35:36 -06:00
Stan Moore b8d3c9e01b Rename team option to neigh/thread 2019-04-08 16:02:18 -06:00
Stan Moore 149a57f3ae Add threshold for using Kokkos teams 2019-04-08 15:21:42 -06:00
Axel Kohlmeyer db74f14f33
Merge branch 'master' into report-uninstalled-pkg-style 
# Conflicts:
#	cmake/CMakeLists.txt
 2019-04-08 17:16:30 -04:00
Axel Kohlmeyer 69c1a7954a
correct test for leftovers from conventional builds 2019-04-08 17:14:59 -04:00
Stan Moore 7f2c81657b Merge from upstream 2019-04-08 14:14:52 -06:00
julient31 b8ae466999 Commit4 JT 040819 
- added unknown names/acronyms in doc/utils/sphinx-config/false_positives.txt
 2019-04-08 14:00:49 -06:00
Stan Moore fbda72891c Fix spelling error 2019-04-08 13:41:33 -06:00
Stan Moore ece46dbfa5 Small tweak to Kokkos docs 2019-04-08 13:12:21 -06:00
Stan Moore 2bb69773d3 Update Kokkos docs 2019-04-08 13:07:29 -06:00
Stan Moore 77d80c84c9 Change defaults for KOKKOS package 2019-04-08 12:37:49 -06:00
Stan Moore aa336c2bb4 Merge branch 'master' into kk_binsize 2019-04-08 12:07:58 -06:00
julient31 814b9b9378 Merge branch 'clean-master2' of github.com:julient31/lammps into gneb_spin 2019-04-08 11:26:48 -06:00
julient31 1501e9ba8a Commit3 JT 040819 
- README and interpolate.c for in examples/SPIN/gneb/interpolate/
 2019-04-08 11:22:02 -06:00
julient31 57247142d2 Commit2 JT 040819 
- finished doc (compiled and spell check)
- compiled with -Wall -Wextra, unused var. removed
 2019-04-08 11:08:06 -06:00