Diffusion lammps 68ac4a3356fe

Merge branch 'master' into openmp-master
68ac4a3356fe
Actions

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

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
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, 17:57

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSdad8ad747126: Merge branch 'master' into openmp-master
rLAMMPS7638f8ea7c61: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7464 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS68ac4a3356fe: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 7 2012, 17:57

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 (127)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		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_deposit.html
M		doc/fix_deposit.txt
M		doc/fix_langevin_eff.html
M		doc/fix_langevin_eff.txt
M		doc/fix_qeq_reax.html
M		doc/fix_reax_bonds.html
M		doc/fix_reax_bonds.txt
M		doc/fix_spring_self.html
M		doc/pair_born.html
M		doc/pair_brownian.html
M		doc/pair_class2.html
M		doc/pair_coul.html
M		doc/pair_lubricate.html
M		doc/pair_reax_c.html
M		doc/pair_reax_c.txt
M		doc/variable.html
M		doc/variable.txt
M		examples/USER/cg-cmm/peg-verlet/in.pegc12e8
M		examples/USER/cg-cmm/peg-verlet/in.pegc12e8-angle
M		examples/USER/cg-cmm/peg-verlet/log.pegc12e8
M		examples/USER/cg-cmm/peg-verlet/log.pegc12e8-angle
M		examples/USER/cg-cmm/peg-verlet/parm.pegc12e8
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
A	(dir)	lib/linalg/
A		lib/linalg/Makefile.gfortran
A		lib/linalg/Makefile.mingw_cross
A		lib/linalg/README
A		lib/linalg/dasum.f
A		lib/linalg/daxpy.f
A		lib/linalg/dcopy.f
A		lib/linalg/ddot.f
A		lib/linalg/dgecon.f
A		lib/linalg/dgemm.f
A		lib/linalg/dgemv.f
A		lib/linalg/dger.f
A		lib/linalg/dgetf2.f
A		lib/linalg/dgetrf.f
A		lib/linalg/dgetri.f
A		lib/linalg/dlabad.f
A		lib/linalg/dlacn2.f
A		lib/linalg/dlamch.f
A		lib/linalg/dlange.f
A		lib/linalg/dlassq.f
A		lib/linalg/dlaswp.f
A		lib/linalg/dlatrs.f
A		lib/linalg/drscl.f
A		lib/linalg/dscal.f
A		lib/linalg/dswap.f
A		lib/linalg/dtrmm.f
A		lib/linalg/dtrmv.f
A		lib/linalg/dtrsm.f
A		lib/linalg/dtrsv.f
A		lib/linalg/dtrti2.f
A		lib/linalg/dtrtri.f
A		lib/linalg/idamax.f
A		lib/linalg/ieeeck.f
A		lib/linalg/ilaenv.f
A		lib/linalg/iparmq.f
A		lib/linalg/lsame.f
A		lib/linalg/xerbla.f
A		potentials/ffield.reax.Al_Al0_AlN
A		potentials/ffield.reax.lg
M		src/GPU/pppm_gpu.cpp
M		src/GPU/pppm_gpu.h
M		src/MANYBODY/pair_comb.cpp
M		src/MANYBODY/pair_eam.h
M		src/POEMS/fix_poems.cpp
M		src/USER-CG-CMM/Package.sh
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
A		src/USER-REAXC/fix_reaxc_bonds.cpp
A		src/USER-REAXC/fix_reaxc_bonds.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/fix_deposit.cpp
M		src/fix_deposit.h
M		src/lmptype.h
M		src/lmpwindows.h
M		src/memory.h
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/region_cone.cpp
M		src/variable.cpp
M		src/version.h
M		tools/restart2data.cpp