Diffusion lammps 00a18085eb15

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
00a18085eb15
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 20 2014, 16:51.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 20 2014, 16:51

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSf51b6d103b77: Restoring qeq files
rLAMMPSa88834698ea7: collected USER-CUDA and KOKKOS updates to address compiler warnings

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS00a18085eb15: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 20 2014, 16:51

Merged Changes

Commit	Author	Details	Committed
f51b6d103b77	stamoor	Restoring qeq files	Nov 19 2014
72a1dc1552f1	stamoor	Fixing bug in qeq	Nov 19 2014
7eca5edcae58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12743 f3b2605a-c512-4ea7…	Nov 19 2014
2d840c556ba0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12742 f3b2605a-c512-4ea7…	Nov 19 2014
59c9f7af480c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12741 f3b2605a-c512-4ea7…	Nov 19 2014
65030577a92f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12740 f3b2605a-c512-4ea7…	Nov 19 2014
e835f4b6f1c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12738 f3b2605a-c512-4ea7…	Nov 19 2014
edb95fc5cd25	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12737 f3b2605a-c512-4ea7…	Nov 19 2014
b6e72407abc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12736 f3b2605a-c512-4ea7…	Nov 19 2014
23a756c86e7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12735 f3b2605a-c512-4ea7…	Nov 19 2014
a7c5a1661d25	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12734 f3b2605a-c512-4ea7…	Nov 19 2014
0617d8704797	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12732 f3b2605a-c512-4ea7…	Nov 19 2014
526b81b955c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12731 f3b2605a-c512-4ea7…	Nov 19 2014
aaa76b5649ae	stamoor	Fixing bug	Nov 19 2014
74adae232eb4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12729 f3b2605a-c512-4ea7…	Nov 19 2014
1591ed8379a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12728 f3b2605a-c512-4ea7…	Nov 19 2014
fcaaf75764f7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12727 f3b2605a-c512-4ea7…	Nov 19 2014

Changes (23)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	A			doc/compute_force_molecule.html
	A			doc/compute_force_molecule.txt
	A			doc/compute_vcm_molecule.html
	A			doc/compute_vcm_molecule.txt
	M			doc/lattice.html
	M			doc/lattice.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/QEQ/fix_qeq.h
	M			src/QEQ/fix_qeq_dynamic.cpp
	M			src/QEQ/fix_qeq_point.cpp
	M			src/QEQ/fix_qeq_shielded.cpp
	A			src/compute_force_molecule.cpp
	P			src/compute_force_molecule.h Copied from src/compute_com_molecule.h
	P			src/compute_vcm_molecule.cpp Copied from src/compute_com_molecule.cpp
	P			src/compute_vcm_molecule.h Copied from src/compute_com_molecule.h
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h