Merge branch 'master' into lammps-icms
4ae1ca521cd4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 7 2012, 18:04.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
lib/linalg/Makefile.gfortran
lib/linalg/Makefile.mingw_cross
src/GPU/pppm_gpu.cpp
src/USER-REAXC/pair_reax_c.h
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 7 2012, 18:04

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7638f8ea7c61: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7464 f3b2605a-c512-4ea7…
rLAMMPS4f1bc1a2da1c: documentation updates

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4ae1ca521cd4: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 7 2012, 18:04

Merged Changes

Commit	Author	Details	Committed
7638f8ea7c61	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7464 f3b2605a-c512-4ea7…	Jan 7 2012
bff244e206de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7463 f3b2605a-c512-4ea7…	Jan 7 2012
64be81e57153	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7459 f3b2605a-c512-4ea7…	Jan 6 2012
5e7a75160a7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7458 f3b2605a-c512-4ea7…	Jan 6 2012
6e8418d36f98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7456 f3b2605a-c512-4ea7…	Jan 6 2012
2b742fac28d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7455 f3b2605a-c512-4ea7…	Jan 6 2012
cf4145cfe583	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7454 f3b2605a-c512-4ea7…	Jan 6 2012
aee60101d160	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7453 f3b2605a-c512-4ea7…	Jan 6 2012
5b62a1cb926a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7452 f3b2605a-c512-4ea7…	Jan 6 2012
7cbf5d0dc785	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7450 f3b2605a-c512-4ea7…	Jan 6 2012
1081c8062b1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7449 f3b2605a-c512-4ea7…	Jan 6 2012
43b81297d7b2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7448 f3b2605a-c512-4ea7…	Jan 6 2012
78385ca341ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7446 f3b2605a-c512-4ea7…	Jan 6 2012
062409ad340e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7445 f3b2605a-c512-4ea7…	Jan 6 2012
63de8e36128f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7443 f3b2605a-c512-4ea7…	Jan 6 2012
c5ae5bdb1b97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7441 f3b2605a-c512-4ea7…	Jan 6 2012
02532720cd78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7440 f3b2605a-c512-4ea7…	Jan 6 2012
4c698a05e565	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7439 f3b2605a-c512-4ea7…	Jan 6 2012
a10a77764004	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7437 f3b2605a-c512-4ea7…	Jan 6 2012
bc9971341fd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7436 f3b2605a-c512-4ea7…	Jan 6 2012
1215b8acccfc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7435 f3b2605a-c512-4ea7…	Jan 6 2012
033d0e654680	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7434 f3b2605a-c512-4ea7…	Jan 6 2012
edcd54b2eb10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7433 f3b2605a-c512-4ea7…	Jan 6 2012
0af770b923af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7432 f3b2605a-c512-4ea7…	Jan 6 2012
45d04dc45a9a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7429 f3b2605a-c512-4ea7…	Jan 6 2012
725929a727e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7427 f3b2605a-c512-4ea7…	Jan 6 2012
aac0e5699f0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7426 f3b2605a-c512-4ea7…	Jan 6 2012
bbdb30077879	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7424 f3b2605a-c512-4ea7…	Jan 6 2012
8c63a6ef5366	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7423 f3b2605a-c512-4ea7…	Jan 6 2012
a242911efdfa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7422 f3b2605a-c512-4ea7…	Jan 6 2012
19ee529faf1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7421 f3b2605a-c512-4ea7…	Jan 6 2012
2a3b7a830512	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7420 f3b2605a-c512-4ea7…	Jan 6 2012

Changes (70)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/fix_langevin_eff.html
	M			doc/fix_langevin_eff.txt
	M			doc/fix_reax_bonds.html
	M			doc/fix_reax_bonds.txt
	M			doc/pair_reax_c.html
	M			doc/pair_reax_c.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			lib/README
	M			lib/atc/README
	M			lib/gpu/lal_pppm.cpp
	M			lib/gpu/lal_pppm.h
	M			lib/gpu/lal_pppm_ext.cpp
	M			lib/linalg/Makefile.gfortran
	M			lib/linalg/Makefile.mingw_cross
	A			lib/linalg/README
	P			potentials/ffield.reax.Al_Al0_AlN Copied from potentials/ffield.reax.budzien
	A			potentials/ffield.reax.lg
	M			src/GPU/pppm_gpu.cpp
	M			src/GPU/pppm_gpu.h
	M			src/MANYBODY/pair_eam.h
	M			src/USER-EFF/README
	M			src/USER-EFF/compute_ke_atom_eff.cpp
	M			src/USER-EFF/compute_ke_eff.cpp
	M			src/USER-EFF/compute_temp_deform_eff.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-EFF/compute_temp_region_eff.cpp
	M			src/USER-EFF/fix_langevin_eff.cpp
	M			src/USER-EFF/fix_nh_eff.cpp
	M			src/USER-EFF/fix_nve_eff.cpp
	M			src/USER-EFF/pair_eff_cut.cpp
	M			src/USER-REAXC/Install.sh
	P			src/USER-REAXC/fix_reaxc_bonds.cpp Copied from src/REAX/fix_reax_bonds.cpp
	P			src/USER-REAXC/fix_reaxc_bonds.h Copied from src/USER-SPH/fix_meso.h
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/pair_reax_c.h
	M			src/USER-REAXC/reaxc_allocate.cpp
	M			src/USER-REAXC/reaxc_bond_orders.cpp
	M			src/USER-REAXC/reaxc_bonds.cpp
	M			src/USER-REAXC/reaxc_defs.h
	M			src/USER-REAXC/reaxc_ffield.cpp
	M			src/USER-REAXC/reaxc_hydrogen_bonds.cpp
	M			src/USER-REAXC/reaxc_io_tools.cpp
	M			src/USER-REAXC/reaxc_io_tools.h
	M			src/USER-REAXC/reaxc_lookup.cpp
	M			src/USER-REAXC/reaxc_multi_body.cpp
	M			src/USER-REAXC/reaxc_nonbonded.cpp
	M			src/USER-REAXC/reaxc_nonbonded.h
	M			src/USER-REAXC/reaxc_torsion_angles.cpp
	M			src/USER-REAXC/reaxc_traj.cpp
	M			src/USER-REAXC/reaxc_types.h
	M			src/USER-REAXC/reaxc_valence_angles.cpp
	M			src/neigh_derive.cpp
	M			src/neigh_full.cpp
	M			src/neigh_gran.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_multi.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neigh_respa.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/variable.cpp
	M			src/version.h
	M			tools/restart2data.cpp