Diffusion lammps 934347e56584

Merge branch 'lammps-icms' into cle-orig
934347e56584
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 2 2014, 17:59.

Description

Merge branch 'lammps-icms' into cle-orig

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 2 2014, 17:59

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa44e538ac67f: transfer changes from upstream to USER-OMP version
rLAMMPS0688046e698a: Merge branch 'lammps-icms' into cle-orig

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS934347e56584: Merge branch 'lammps-icms' into cle-orig (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 2 2014, 17:59

Merged Changes

Commit	Author	Details	Committed
a44e538ac67f	Axel Kohlmeyer	transfer changes from upstream to USER-OMP version	Jul 1 2014
29ae4bd8dc3d	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 1 2014
74d63800abb6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12164 f3b2605a-c512-4ea7…	Jun 28 2014
dae378a3681b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12163 f3b2605a-c512-4ea7…	Jun 28 2014
a5856e9d3e65	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12162 f3b2605a-c512-4ea7…	Jun 28 2014
5b6c04fd5f32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12161 f3b2605a-c512-4ea7…	Jun 28 2014
0c68c7f32817	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12160 f3b2605a-c512-4ea7…	Jun 28 2014
c8bbcb34de08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12159 f3b2605a-c512-4ea7…	Jun 28 2014
f939beaf31cb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12158 f3b2605a-c512-4ea7…	Jun 28 2014
7872ffe797b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12157 f3b2605a-c512-4ea7…	Jun 28 2014
a2dfb8421ef0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12155 f3b2605a-c512-4ea7…	Jun 27 2014
588985586146	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12154 f3b2605a-c512-4ea7…	Jun 27 2014
18e1a56f6ff8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12153 f3b2605a-c512-4ea7…	Jun 27 2014
635d42c51fe6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12152 f3b2605a-c512-4ea7…	Jun 27 2014
3b1a73c3bd83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12151 f3b2605a-c512-4ea7…	Jun 27 2014
f9e246d0cccd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12150 f3b2605a-c512-4ea7…	Jun 27 2014
ae2d215b8c58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12149 f3b2605a-c512-4ea7…	Jun 27 2014
b9531f508f4e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12148 f3b2605a-c512-4ea7…	Jun 27 2014
8a9e1676ebd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12147 f3b2605a-c512-4ea7…	Jun 27 2014
67ae64329e18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12146 f3b2605a-c512-4ea7…	Jun 27 2014
f745f24bcd1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12145 f3b2605a-c512-4ea7…	Jun 27 2014
026ff1f6dd4f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12144 f3b2605a-c512-4ea7…	Jun 27 2014
5f768359a740	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12143 f3b2605a-c512-4ea7…	Jun 23 2014
cc1f20727039	athomps	Added OpenMP to red Sky Makefile	Jun 20 2014
8dddba111213	athomps	Pruned unnecessary libraries	Jun 20 2014
0654220deea8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12138 f3b2605a-c512-4ea7…	Jun 14 2014
94be87cf7da7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12137 f3b2605a-c512-4ea7…	Jun 14 2014
bbcb4b200950	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12136 f3b2605a-c512-4ea7…	Jun 14 2014
1ad73fec90e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12134 f3b2605a-c512-4ea7…	Jun 14 2014
75a456247d6d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12133 f3b2605a-c512-4ea7…	Jun 14 2014
2ec1442e977b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12132 f3b2605a-c512-4ea7…	Jun 14 2014
7b5846a38615	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12131 f3b2605a-c512-4ea7…	Jun 14 2014
a3d049f1425f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12130 f3b2605a-c512-4ea7…	Jun 14 2014
319356d89285	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12129 f3b2605a-c512-4ea7…	Jun 14 2014
b8f6904ce368	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12128 f3b2605a-c512-4ea7…	Jun 14 2014
3f98c4d07662	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12127 f3b2605a-c512-4ea7…	Jun 14 2014
a4b442271285	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12126 f3b2605a-c512-4ea7…	Jun 12 2014

Changes (39)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/delete_atoms.html
	M			doc/delete_atoms.txt
	M			doc/dihedral_quadratic.html
	M			doc/dihedral_quadratic.txt
	M			doc/fix_gcmc.html
	M			doc/fix_gcmc.txt
	M			doc/group.html
	M			doc/group.txt
	M			doc/molecule.html
	M			doc/molecule.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			doc/pair_kim.html
	M			doc/pair_kim.txt
	A			examples/kim/log.kim.lj.23Jun14.ubuntu.1
	A			examples/kim/log.kim.lj.23Jun14.ubuntu.4
	A			examples/kim/log.kim.lj.lmp.23Jun14.ubuntu.1
	A			examples/kim/log.kim.lj.lmp.23Jun14.ubuntu.4
	P			lib/gpu/Makefile.linux.single Copied from lib/gpu/Makefile.linux.double
	M			lib/reax/Makefile.lammps.ifort
	M			src/KIM/pair_kim.cpp
	M			src/MAKE/Makefile.redsky
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/USER-MISC/dihedral_quadratic.cpp
	M			src/USER-OMP/dihedral_quadratic_omp.cpp
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/comm_tiled.cpp
	M			src/delete_atoms.cpp
	M			src/fix_move.cpp
	M			src/fix_move.h
	M			src/group.cpp
	M			src/group.h
	M			src/pair_coul_debye.cpp
	M			src/version.h