Homec4science

Merge remote-tracking branch 'upstream/lammps-icms' into…

Authored by Richard Berger <richard.berger@temple.edu> on Jul 14 2016, 17:58.

Description

Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface

Event Timeline

Richard Berger <richard.berger@temple.edu> committed rLAMMPS81879899299d: Merge remote-tracking branch 'upstream/lammps-icms' into… (authored by Richard Berger <richard.berger@temple.edu>).Jul 14 2016, 17:58

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
cca89b7cb2ddAxel Kohlmeyer
make fix wall/gran/omp compile again 
Jul 14 2016
8213a5d6e8e5Axel Kohlmeyer
port changes to fix wall/gran to fix wall/gran/omp 
Jul 14 2016
5d0a755ef7a0Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jul 14 2016
202057838606sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15307 f3b2605a-c512-4ea7… 
Jul 14 2016
35bc617478edsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15306 f3b2605a-c512-4ea7… 
Jul 14 2016
53fbe4558aaeAxel Kohlmeyer
add proper bugfix for uninitialized data issue 
Jul 14 2016
4b186656067asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15305 f3b2605a-c512-4ea7… 
Jul 14 2016
5881c6da6f6csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15304 f3b2605a-c512-4ea7… 
Jul 14 2016
320a6214f511Axel Kohlmeyer
whitespace cleanup 
Jul 14 2016
f538bd5fc85aAxel Kohlmeyer
fix serious bug in molecule command, where flags were used uninitialized 
Jul 14 2016
c1fb6c967e3dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15303 f3b2605a-c512-4ea7… 
Jul 14 2016
6367c3700bd4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15302 f3b2605a-c512-4ea7… 
Jul 14 2016
d7032bd8e992Axel Kohlmeyer
Merge branch 'merge-pull-115' into lammps-icms 
Jul 13 2016
6171c774aa49sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15301 f3b2605a-c512-4ea7… 
Jul 13 2016
b3aeb43a93c4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15300 f3b2605a-c512-4ea7… 
Jul 13 2016
020484f2547bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15299 f3b2605a-c512-4ea7… 
Jul 13 2016
71fe537ebcdfTim Mattox
USER-DPD: move SSA data structures from Neighbor class to NeighList class This… 
Jul 13 2016
1e59f6f1182dAxel Kohlmeyer
update README file for QM/MM library 
Jul 13 2016
f3047583bf19Axel Kohlmeyer
include QM/MM lib folder makefile for intel compilers and MPI 
Jul 13 2016
92e5aae7bb0esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15298 f3b2605a-c512-4ea7… 
Jul 13 2016
53ebd8cfeb5aAxel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jul 13 2016
e58791e29d4bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15296 f3b2605a-c512-4ea7… 
Jul 13 2016
e3e7d0280d06sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15295 f3b2605a-c512-4ea7… 
Jul 13 2016
f9047919e8f2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15294 f3b2605a-c512-4ea7… 
Jul 13 2016
070ca2614844sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15293 f3b2605a-c512-4ea7… 
Jul 13 2016
5783c78f4462sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15292 f3b2605a-c512-4ea7… 
Jul 13 2016
eec4d961c0c9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15291 f3b2605a-c512-4ea7… 
Jul 13 2016
6ec2346ca0f0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15290 f3b2605a-c512-4ea7… 
Jul 13 2016
c5aece5b435fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15289 f3b2605a-c512-4ea7… 
Jul 13 2016
0ff512a6da4esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15288 f3b2605a-c512-4ea7… 
Jul 13 2016
568c530bfe28sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15287 f3b2605a-c512-4ea7… 
Jul 13 2016
3f802d97c9a2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15286 f3b2605a-c512-4ea7… 
Jul 13 2016
1df9db5091dasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15285 f3b2605a-c512-4ea7… 
Jul 13 2016
c7e4cf7d332bAxel Kohlmeyer
Merge branch 'merge-qe-qmmm' into lammps-icms 
Jul 12 2016
8067fedbdf95Axel Kohlmeyer
update figures for dihedral spherical and general dihedrals. move the latter to… 
Jul 12 2016
bbb642bfb724Axel Kohlmeyer
more cleanup and bugifxes for fix qmmm. use proper indexing by atom tag. 
Jul 12 2016
69194a748d14Axel Kohlmeyer
fix bug in assigning covalent radii for qm/mm. cleanups. more message tags 
Jul 12 2016
bf9e82105508sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15284 f3b2605a-c512-4ea7… 
Jul 12 2016
afe07ccca651Axel Kohlmeyer
Merge branch 'merge-dihedral-spherical' into lammps-icms 
Jul 12 2016
9998d7f66dc8Axel Kohlmeyer
integrate dihedral style spherical provided by andrew jewett 
Jul 12 2016
dfbecf047fddsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15283 f3b2605a-c512-4ea7… 
Jul 12 2016
cd2fe6f99765Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jul 12 2016
2812b100322bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15282 f3b2605a-c512-4ea7… 
Jul 11 2016
c4529dc00a4dAxel Kohlmeyer
Merge branch 'lammps-icms' into merge-qe-qmmm 
Jul 10 2016
8363441a2804Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jul 10 2016
5ea854de2eaesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15280 f3b2605a-c512-4ea7… 
Jul 9 2016
4484686077fasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15279 f3b2605a-c512-4ea7… 
Jul 9 2016
a33753ae6f46sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15278 f3b2605a-c512-4ea7… 
Jul 9 2016
80b6719d686fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15277 f3b2605a-c512-4ea7… 
Jul 9 2016
ee6f9b96211asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15276 f3b2605a-c512-4ea7… 
Jul 9 2016