Diffusion lammps 3b06646a184a

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 21 2013, 05:10.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 21 2013, 05:10

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS12f76c19633b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10604 f3b2605a-c512-4ea7…
rLAMMPS3687d46f8b4d: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3b06646a184a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 21 2013, 05:10

Merged Changes

Commit	Author	Details	Committed
12f76c19633b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10604 f3b2605a-c512-4ea7…	Aug 19 2013
408e853bc607	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10603 f3b2605a-c512-4ea7…	Aug 19 2013
569407544c08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10602 f3b2605a-c512-4ea7…	Aug 19 2013
3293a669c11c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10601 f3b2605a-c512-4ea7…	Aug 19 2013
c45e80022424	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10600 f3b2605a-c512-4ea7…	Aug 19 2013
9af873dddb70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10599 f3b2605a-c512-4ea7…	Aug 19 2013
b67c1506c794	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10598 f3b2605a-c512-4ea7…	Aug 19 2013
897b4aa7bf3b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10595 f3b2605a-c512-4ea7…	Aug 19 2013
6224328ab978	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10594 f3b2605a-c512-4ea7…	Aug 19 2013
e5cc3c02e8f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10593 f3b2605a-c512-4ea7…	Aug 19 2013
62df2d920e40	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10592 f3b2605a-c512-4ea7…	Aug 19 2013
cebda1c402f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10591 f3b2605a-c512-4ea7…	Aug 19 2013
417d9c57567b	athomps	Changed broken dimension command	Aug 15 2013
ba33c832713e	athomps	Added file support to print command	Aug 15 2013
9dc10e8118ce	athomps	Added file support to print command	Aug 15 2013
299e38ca0b01	jzimmer	Deleting stdout file from src/USER-ATC.	Aug 14 2013
546d3c4e6196	rjones	remove log file	Aug 14 2013
5687649fa0b2	athomps	Added density keyword	Aug 14 2013
8e61b4c5c056	athomps	Added density keyword	Aug 14 2013
e7518d494c95	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10577 f3b2605a-c512-4ea7…	Aug 13 2013
905724e5fa7b	athomps	Fixed error in switching function force	Aug 13 2013

Changes (25)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/print.html
	M			doc/print.txt
	M			doc/thermo_style.html
	M			doc/thermo_style.txt
	M			examples/nemd/in.nemd
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald.h
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_old.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp
	M			src/USER-COLVARS/README
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/compute_group_group.cpp
	M			src/input.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h