Merge branch 'master' into openmp-master
2b97a34844b2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 9 2011, 15:40.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/temper.cpp
src/min.cpp
src/minimize.cpp
src/run.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 9 2011, 15:40

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa978a15c6481: fix link
rLAMMPScb224643d789: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7328 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2b97a34844b2: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 9 2011, 15:40

Merged Changes

Commit	Author	Details	Committed
cb224643d789	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7328 f3b2605a-c512-4ea7…	Dec 9 2011
e354f748479e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7327 f3b2605a-c512-4ea7…	Dec 9 2011
c92047aeb5ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7326 f3b2605a-c512-4ea7…	Dec 9 2011
5fa4f2eb2651	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7325 f3b2605a-c512-4ea7…	Dec 9 2011
62b27e591539	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7324 f3b2605a-c512-4ea7…	Dec 9 2011
650607a38bc0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7323 f3b2605a-c512-4ea7…	Dec 9 2011
1f81fcf5e450	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7322 f3b2605a-c512-4ea7…	Dec 9 2011
bca92d41bdb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7321 f3b2605a-c512-4ea7…	Dec 9 2011
f56f6a1a9dd4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7320 f3b2605a-c512-4ea7…	Dec 9 2011
91388f635f9a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7319 f3b2605a-c512-4ea7…	Dec 9 2011
501eb48d5b90	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7318 f3b2605a-c512-4ea7…	Dec 9 2011
4a2feb25b2ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7317 f3b2605a-c512-4ea7…	Dec 9 2011
96e9210c160f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7316 f3b2605a-c512-4ea7…	Dec 8 2011
6b4fd6d47c6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7315 f3b2605a-c512-4ea7…	Dec 8 2011
e1f70c3a98c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7314 f3b2605a-c512-4ea7…	Dec 8 2011
e08627bdc8f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7312 f3b2605a-c512-4ea7…	Dec 8 2011
b1334c1314be	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7311 f3b2605a-c512-4ea7…	Dec 8 2011
16a2afc64205	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7310 f3b2605a-c512-4ea7…	Dec 8 2011

Changes (52)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/Section_history.html
	M			doc/Section_history.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_modify.html
	M			doc/Section_modify.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_python.html
	M			doc/Section_python.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/pair_coul_diel.html
	M			doc/pair_tersoff.html
	M			doc/partition.html
	M			doc/partition.txt
	M			doc/processors.html
	M			doc/processors.txt
	P			lib/gpu/Makefile.serial Copied from lib/gpu/Makefile.linux
	A			lib/gpu/Makefile.serial_opencl
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_tip4p.cpp
	M			src/KSPACE/pppm_tip4p.h
	M			src/MANYBODY/pair_airebo.h
	M			src/REPLICA/neb.cpp
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/REPLICA/temper.cpp
	M			src/STUBS/mpi.cpp
	M			src/STUBS/mpi.h
	M			src/USER-CUDA/pppm_cuda.h
	A			src/USER-OMP/hack_openmp_for_pgi.sh
	M			src/comm.cpp
	M			src/comm.h
	M			src/error.cpp
	M			src/error.h
	M			src/finish.cpp
	M			src/lammps.cpp
	M			src/math_extra.h
	M			src/min.cpp
	M			src/verlet_split.cpp
	M			src/version.h