Homec4science

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

Authored by Richard Berger <richard.berger@temple.edu> on Jun 28 2016, 18:08.

Description

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

Event Timeline

Richard Berger <richard.berger@temple.edu> committed rLAMMPS7d1c34b5098d: Merge remote-tracking branch 'upstream/lammps-icms' into… (authored by Richard Berger <richard.berger@temple.edu>).Jun 28 2016, 18:08

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
d8670ba7e328Axel Kohlmeyer
Merge branch 'merge-gpu-patch' into lammps-icms 
Jun 24 2016
1bfe3a3ff5baAxel Kohlmeyer
Merge branch 'merge-pull-100' into lammps-icms 
Jun 24 2016
9a31a5469319Axel Kohlmeyer
fix a few small issues on USER-HADRESS docs. still much more work to do. 
Jun 24 2016
317dcdf1783bAxel Kohlmeyer
Cleanup of USER-HADRESS documentation to match the current state. regenerate… 
Jun 24 2016
6ba8906ce2feAxel Kohlmeyer
Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… 
Jun 24 2016
7c016aee735eAxel Kohlmeyer
remove trailing whitespace and replace tabs with spaces in gpu library and… 
Jun 24 2016
b56bdd2d7bf3Axel Kohlmeyer
remove trailing whitespace in gpu library 
Jun 24 2016
bc8c50615c6dAxel Kohlmeyer
include patch from trung that addresses issues when using manybody potentials… 
Jun 24 2016
b69f79ca1b98MaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
3424786a4779MaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
1ed74de9a87fMaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
7e4cd4643459MaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
1f7f7bf12b45MaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
2e4fdec2869bMaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
824c0a359638MaziarHeidari
HADRESS_Version_24_Jun_2016 
Jun 24 2016
95ec7a3c0e70Axel Kohlmeyer
fixup CR-LF mess 
Jun 24 2016
52f73246b731Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jun 24 2016
ffc252e7843cstamoor
Adding Kokkos ReaxFF files 
Jun 23 2016
0434eb168973stamoor
Adding Kokkos ReaxFF files 
Jun 23 2016
8a8758f32161Axel Kohlmeyer
Merge branch 'merge-pull-105' into lammps-icms 
Jun 23 2016
84b7bce41cf6Axel Kohlmeyer
Merge branch 'USER-DPD_restore_atom_style_support' of https://github. 
Jun 23 2016
fb69d36b3eabAxel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jun 23 2016
1647a54020fbTim Mattox
Fix missing newlines in a few USER-DPD example input files. 
Jun 23 2016
84d79d769f16Tim Mattox
Update the documentation for atom_style restrictions for USER-DPD. 
Jun 23 2016
297f31387fcfTim Mattox
Restore use of "atom_style atomic" in two of the USER-DPD examples. 
Jun 23 2016
0ccd6c6ed96dTim Mattox
Move ssaAIR calculation code from atom_vec_dpd into fix_shardlow. Re-enables… 
Jun 23 2016
a0cadae11ebdAxel Kohlmeyer
Merge branch 'merge-pull-104' into lammps-icms 
Jun 23 2016
6fa216d96cbeAxel Kohlmeyer
add missing newline characters 
Jun 23 2016
67c60a3ac725Axel Kohlmeyer
Merge branch 'update-user-manifold' of https://github.com/Pakketeretet2/lammps… 
Jun 23 2016
eaa3e82aff1aStefan Paquay
Forgot closing quotes. 
Jun 23 2016
20681bac1a63Stefan Paquay
Fixed bibtex entry to be proper bibtex. 
Jun 23 2016
987f7f19c80cStefan Paquay
removed morse soft from wrong branch. 
Jun 23 2016
fa7c2cea4d38stamoor
Adding Kokkos mpi-only Makefile 
Jun 22 2016
a1239e65607aTim Mattox
Fix the SSA AIR number for ghosts that fall exactly on the upper boundary. Bug… 
Jun 21 2016
396523a0daacAxel Kohlmeyer
Merge branch 'add-gw' into lammps-icms 
Jun 21 2016
19e4cc0f101fAxel Kohlmeyer
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… 
Jun 21 2016
ca443e0b6da8Axel Kohlmeyer
Merge branch 'USER-DPD_restartfix' of https://github.com/timattox/lammps into… 
Jun 21 2016
7e65f67f2ba2Tim Mattox
Fixes a bug when attempting to restart a reaction DPD calculation. 
Jun 21 2016
b01d83f17801Axel Kohlmeyer
force initialization of some member variables in compute rigid/local 
Jun 21 2016
455c123191c4Stefan Paquay
Fixed the citation to be a valid bibtex format. 
Jun 21 2016
881dd7608c13Axel Kohlmeyer
undo commit enabling a known to be broken feature 
Jun 20 2016
9cab25d42c8bAxel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jun 20 2016
2f5827189b3cAxel Kohlmeyer
Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… 
Jun 20 2016
d40eaf99429aMaziarHeidari
HADRESS_NEW_REVISION 
Jun 20 2016
4e62aa6510fcAxel Kohlmeyer
Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… 
Jun 20 2016
10435ca8dcc7MaziarHeidari
HADRESS_NEW_REVISION 
Jun 20 2016
e707236bf733MaziarHeidari
HADRESS_NEW_REVISION 
Jun 20 2016
38c80e129fe8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15210 f3b2605a-c512-4ea7… 
Jun 18 2016
3ea4562a598aStefan Paquay
removed ramp again. 
Jun 10 2016
d853ac5fd85fStefan Paquay
Updated pair_morse_soft to have a smoother ramp for lf < l < 1. 
Jun 10 2016