Commit Graph

9534 Commits

Author SHA1 Message Date
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
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
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
568b67eee9 include citation for reference paper into pair style momb 2017-03-23 12:00:53 -04:00
b88a749680 rename a couple more references to pair style zhou into momb 2017-03-23 11:38:33 -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
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
dc1d93a491 some more whitespace cleanup 2017-03-22 15:08:09 -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
7435084375 Verified oxDNA with modified nucleotide layout 2017-03-22 15:59:10 +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
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
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
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
b6ecfb91c4 deleted pair_zhou in main/src (moved to USER-MISC) 2017-03-18 21:22:02 -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