Merge branch 'lammps-icms' into lammps-colvars
4131334df16b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 8 2012, 17:48.

Description

Merge branch 'lammps-icms' into lammps-colvars

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 8 2012, 17:48

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4131334df16b: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 8 2012, 17:48

Commit	Author	Details	Committed
8da82c59e2a1	Axel Kohlmeyer	adjust for enhanced times in LAMMPS-ICMS	Jun 8 2012
047c922f40d2	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jun 8 2012
1a2e242f71ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8240 f3b2605a-c512-4ea7…	Jun 8 2012
c7090834b6dd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8239 f3b2605a-c512-4ea7…	Jun 8 2012
90273afa6e86	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8238 f3b2605a-c512-4ea7…	Jun 8 2012
441c71f36702	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8237 f3b2605a-c512-4ea7…	Jun 8 2012
78f8f6989523	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8236 f3b2605a-c512-4ea7…	Jun 7 2012
2bc8b55c7903	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8233 f3b2605a-c512-4ea7…	Jun 7 2012
946ba5223d84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8232 f3b2605a-c512-4ea7…	Jun 7 2012
278c5e859f28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8231 f3b2605a-c512-4ea7…	Jun 7 2012

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/read_dump.html
	M			doc/read_dump.txt
	A			doc/rerun.html
	A			doc/rerun.txt
	M			doc/reset_timestep.html
	M			doc/reset_timestep.txt
	M			src/comm.cpp
	M			src/comm.h
	M			src/fix.h
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_atom.h
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.cpp
	M			src/fix_ave_time.h
	M			src/output.cpp
	M			src/output.h
	M			src/read_dump.cpp
	M			src/read_dump.h
	A			src/rerun.cpp
	P			src/rerun.h Copied from src/ASPHERE-POINT/fix_nvt_asphere.h
	M			src/update.cpp