Homec4science

Merge remote-tracking branch 'origin/master' into cmake_improvements

Authored by Christoph Junghans <junghans@votca.org> on Sep 9 2017, 16:22.

Description

Merge remote-tracking branch 'origin/master' into cmake_improvements

Event Timeline

Christoph Junghans <junghans@votca.org> committed rLAMMPS4738fedca32f: Merge remote-tracking branch 'origin/master' into cmake_improvements (authored by Christoph Junghans <junghans@votca.org>).Sep 9 2017, 16:22

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
c80203cb0115Steve Plimpton/GitHub
Merge pull request #641 from lammps/doc-tweak 
Sep 6 2017
4161868bcf69Steve Plimpton/GitHub
Merge pull request #640 from ohenrich/user-cgdna 
Sep 6 2017
9ca39c89a6a3Steve Plimpton/GitHub
Merge pull request #639 from rbberger/python_interface_improvements 
Sep 6 2017
99791ce01c09Steve Plimpton/GitHub
Merge pull request #632 from timattox/USER-DPD_kokkos_merge 
Sep 6 2017
0248a7b98e9eTim Mattox
remove duplicate listing of deleted USER-DPD files from Purge.list 
Sep 6 2017
d886cc91f3b3Axel Kohlmeyer
fix syntax error in fix saed/vtk docs example 
Sep 5 2017
4c5d901e2b04Axel Kohlmeyer
fix stupid typo (too much compiling of fortran codes...) 
Sep 5 2017
c8f92c1a617aAxel Kohlmeyer
add a couple deleted files from USER-DPD to Purge.list 
Sep 5 2017
dec1d7b2dc48Axel Kohlmeyer
re-indent so that gcc no longer complains about inconsistent indentation 
Sep 5 2017
45602e58f99aAxel Kohlmeyer/GitHub
fix another couple of typos 
Sep 5 2017
cd72532fb934Axel Kohlmeyer/GitHub
fix typo 
Sep 5 2017
b1706060529bSteve Plimpton/GitHub
Merge pull request #620 from amilumas/master 
Sep 5 2017
65b295e826aaSteve Plimpton/GitHub
Merge pull request #638 from jdevemy/master 
Sep 5 2017
89a0bc947f01Steve Plimpton
small update to docs for new commands 
Sep 5 2017
c8967a335f26Oliver Henrich
Included hyperlink to package 
Sep 5 2017
2105145f55e6Oliver Henrich
More minor changes 
Sep 5 2017
f7715ab6ce3cOliver Henrich
Added comment about optimised damping coefficient for BD 
Sep 5 2017
12fe614ddf58Oliver Henrich
Added sequence-dependent stacking and base-pairing strength 
Sep 5 2017
0b5a2e199ddbRichard Berger
Add way of getting correct ctypes integer type for bigint, tagint, and imageint 
Sep 5 2017
09bb687918e6Richard Berger
Correct indentation 
Sep 5 2017
bb3ee752e5e9Richard Berger
Added optional numpy access to atom data 
Sep 5 2017
6b2d321d1899Richard Berger
Add missing globals in library interface 
Sep 5 2017
2b9646097c86Steve Plimpton
Merge branch 'master' of github.com:lammps/lammps 
Sep 1 2017
f58088ae619dSteve Plimpton
patch 1Sep17 
Sep 1 2017
397bc225b27cAxel Kohlmeyer
add temper/npt to src/USER-MISC/README 
Aug 31 2017
d9d9ba824474Axel Kohlmeyer
update .gitignore 
Aug 31 2017
eba4be18c29aAxel Kohlmeyer
adapt formatting and naming conventions to fully match LAMMPS style. allow… 
Aug 31 2017
4d2ed30b3526Axel Kohlmeyer
add reference outputs to temper/npt example 
Aug 31 2017
f3dda30f8ef3Axel Kohlmeyer
fully integrate temper/npt command into manual 
Aug 31 2017
d95a5f219e69Stan Moore
Remove all thread fences except one in verlet_kokkos 
Aug 31 2017
a5b65c1af48cJulien Devemy
Mods for extra/special/per/atom and add toluene 
Aug 31 2017
3e6cdd140011Tim Mattox
USER-DPD: finish renaming #ifdef DEBUG_PAIR_CT to DEBUG_SSA_PAIR_CT 
Aug 30 2017
dc7f1281b832Tim Mattox
USER-DPD: Kokkos version of Const Temperature DPD isn't implemented yet 
Aug 30 2017
2dd202cc761dTim Mattox
USER-DPD: remove some out-of-date FIXME comments in fix_shardlow_kokkos.cpp 
Aug 30 2017
f2d8c37f27b1Tim Mattox
Rename SSA specific debug #ifdef to DEBUG_SSA_PAIR_CT 
Aug 30 2017
a4a45f1d9cfbStan Moore
Remove unnecessary check in npair_kokkos 
Aug 30 2017
f57d19492051Amulya/GitHub
Add files via upload 
Aug 29 2017
736e063971bcTim Mattox
Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge 
Aug 28 2017
6a4bbddb3b7aAmulya/GitHub
Add files via upload 
Aug 28 2017
2add18e013ddAmulya/GitHub
Create in.temper_npt 
Aug 28 2017
d0efd3a422abAmulya/GitHub
Add files via upload 
Aug 28 2017
21893539cbcaSteve Plimpton/GitHub
Merge pull request #633 from lammps/doc-user-meso 
Aug 26 2017
dd101db79cedSteve Plimpton/GitHub
Merge pull request #582 from stanmoore1/kk_changes 
Aug 26 2017
81ba181349d7Steve Plimpton
tweak an eq in USER-MESO, also allow neigh to be built w/out styles 
Aug 26 2017
e52a28f8afafStan Moore
Update docs for Kokkos version of USER-DPD package 
Aug 26 2017
01dd0e173e51Stan Moore
Merge branch 'master' into USER-DPD_kokkos_merge 
Aug 26 2017
1f8c4f2c62dfStan Moore
Remove hardcoded map variables and debug output 
Aug 25 2017
b73999ef215cStan Moore
Revert change to read_data.cpp 
Aug 25 2017
1e16fed9ab94Stan Moore
Error out if using pair hybrid with Kokkos, but not pair hybrid/overlay 
Aug 25 2017
a062944de95eStan Moore
Fix execution space issues 
Aug 25 2017

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.