Merge remote branch 'lammps-ro/master' into lammps-icms
ce2b853e4a11
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 1 2013, 13:53.

Description

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

Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
doc/Manual.txt
doc/pair_list.html
doc/pair_list.txt
lib/atc/Makefile.lammps.linalg
lib/awpmd/Makefile.lammps.linalg
lib/gpu/Makefile.lincoln
lib/linalg/Makefile.gfortran
lib/linalg/Makefile.mingw_cross
lib/linalg/README
lib/reax/Makefile.lammps
src/USER-CG-CMM/Install.sh
src/USER-COLVARS/Install.sh
src/USER-CUDA/Install.sh
src/USER-MISC/Install.sh
src/USER-MISC/pair_list.cpp
src/USER-OMP/Install.sh
src/USER-PHONON/Install.sh

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 1 2013, 13:53

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd56c38d62d9c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10008 f3b2605a-c512-4ea7…
rLAMMPS1554dac23315: bugfix for SSAO rendering

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSce2b853e4a11: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 1 2013, 13:53

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
d56c38d62d9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10008 f3b2605a-c512-4ea7…	Jun 1 2013
ebfa383c9a22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10007 f3b2605a-c512-4ea7…	May 31 2013
d193e024f2d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10006 f3b2605a-c512-4ea7…	May 31 2013
8d0a4ee15d66	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10004 f3b2605a-c512-4ea7…	May 31 2013
84da54d77dcc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10003 f3b2605a-c512-4ea7…	May 31 2013
0df45b9e75ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10002 f3b2605a-c512-4ea7…	May 31 2013
4205e9c9d375	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10001 f3b2605a-c512-4ea7…	May 31 2013
4065c191029c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10000 f3b2605a-c512-4ea7…	May 31 2013
0aa1b410fee6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9999 f3b2605a-c512-4ea7…	May 31 2013
822d0936b5ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9998 f3b2605a-c512-4ea7…	May 31 2013
5c37a4510e12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9997 f3b2605a-c512-4ea7…	May 31 2013
1b85fa692fd8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9996 f3b2605a-c512-4ea7…	May 31 2013
ab271789f78b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9995 f3b2605a-c512-4ea7…	May 31 2013
0e032e078503	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9994 f3b2605a-c512-4ea7…	May 31 2013
6732c9bbc01b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9993 f3b2605a-c512-4ea7…	May 31 2013
52b3a24e2a12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9992 f3b2605a-c512-4ea7…	May 31 2013
bc5c1ace49d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9991 f3b2605a-c512-4ea7…	May 31 2013
4c5ae335d43d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9990 f3b2605a-c512-4ea7…	May 31 2013
2a704420358c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9989 f3b2605a-c512-4ea7…	May 31 2013
b1430e190ff5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9988 f3b2605a-c512-4ea7…	May 31 2013
a5da3aa1ce77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9987 f3b2605a-c512-4ea7…	May 31 2013
0e9dc078892c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9985 f3b2605a-c512-4ea7…	May 30 2013
ba2cfa1d2645	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9984 f3b2605a-c512-4ea7…	May 30 2013
6b0299ef8b29	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9983 f3b2605a-c512-4ea7…	May 30 2013
2ab555de25f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9982 f3b2605a-c512-4ea7…	May 30 2013
e56c4a1358a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9981 f3b2605a-c512-4ea7…	May 30 2013
7644b9955f9b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9980 f3b2605a-c512-4ea7…	May 30 2013
a4930c44c39a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9979 f3b2605a-c512-4ea7…	May 30 2013
5c541cb43a4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9978 f3b2605a-c512-4ea7…	May 30 2013
c95b44619cc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9977 f3b2605a-c512-4ea7…	May 30 2013
5da43fc24a0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9976 f3b2605a-c512-4ea7…	May 30 2013
d3bcb185062d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9975 f3b2605a-c512-4ea7…	May 30 2013
73075ec5fe1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9974 f3b2605a-c512-4ea7…	May 30 2013
b9f8522d50bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9973 f3b2605a-c512-4ea7…	May 30 2013
a60b4a249ee3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9972 f3b2605a-c512-4ea7…	May 30 2013
c5bdb0c98991	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9971 f3b2605a-c512-4ea7…	May 30 2013
2abcef360345	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9970 f3b2605a-c512-4ea7…	May 30 2013
cf370d0ae73f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9969 f3b2605a-c512-4ea7…	May 30 2013
52a814dff13a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9968 f3b2605a-c512-4ea7…	May 30 2013
c50f626457b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9967 f3b2605a-c512-4ea7…	May 30 2013
41d194f8be84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9966 f3b2605a-c512-4ea7…	May 30 2013
0977af1299aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9965 f3b2605a-c512-4ea7…	May 30 2013
ac4229fe16f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9964 f3b2605a-c512-4ea7…	May 30 2013
10d82d2d84dc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9963 f3b2605a-c512-4ea7…	May 30 2013
26f3ce4266de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9962 f3b2605a-c512-4ea7…	May 30 2013
c18dd6bbc5d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9961 f3b2605a-c512-4ea7…	May 30 2013
d3ae4be6effb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9960 f3b2605a-c512-4ea7…	May 30 2013
2c34287e2f0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9959 f3b2605a-c512-4ea7…	May 30 2013
4a3ea642c724	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9958 f3b2605a-c512-4ea7…	May 30 2013
42954a55b7eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9957 f3b2605a-c512-4ea7…	May 30 2013

Changes (134)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			doc/Eqs/compute_msd_nongauss.jpg
	A			doc/Eqs/compute_msd_nongauss.tex
	M			doc/Eqs/pair_gauss.jpg
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/compute_displace_atom.html
	M			doc/compute_displace_atom.txt
	M			doc/compute_msd.html
	M			doc/compute_msd.txt
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			doc/pair_gauss.html
	M			doc/pair_list.html
	M			doc/pair_list.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			lib/atc/Makefile.g++
	M			lib/atc/Makefile.icc
	P			lib/atc/Makefile.lammps Deleted after being copied to multiple locations: lib/atc/Makefile.lammps.empty lib/atc/Makefile.lammps.linalg
	P			lib/atc/Makefile.lammps.empty Copied from lib/atc/Makefile.lammps
	V			lib/{atc/Makefile.lammps.installed ← colvars/Makefile.lammps}
	V			lib/atc/{Makefile.lammps.linalg ← Makefile.lammps}
	M			lib/atc/Makefile.serial
	M			lib/atc/README
	P			lib/awpmd/Makefile.lammps Deleted after being copied to multiple locations: lib/awpmd/Makefile.lammps.empty lib/awpmd/Makefile.lammps.linalg
	P			lib/awpmd/Makefile.lammps.empty Copied from lib/awpmd/Makefile.lammps
	V			lib/{awpmd/Makefile.lammps.installed ← meam/Makefile.lammps}
	V			lib/awpmd/{Makefile.lammps.linalg ← Makefile.lammps}
	M			lib/awpmd/Makefile.openmpi
	M			lib/awpmd/README
	M			lib/colvars/Makefile.fermi
	M			lib/colvars/Makefile.g++
	V			lib/{colvars/Makefile.lammps → atc/Makefile.lammps.installed}
	M			lib/colvars/Makefile.mingw32-cross
	M			lib/colvars/README
	M			lib/cuda/README
	V			lib/gpu/{Makefile.lammps → Makefile.lammps.standard}
	V			lib/gpu/{Makefile.lammps.standard ← Makefile.lammps}
	M			lib/gpu/Makefile.lens
	M			lib/gpu/Makefile.lincoln
	P			lib/gpu/Makefile.linux Copied to multiple locations: lib/gpu/Makefile.linux.double lib/gpu/Makefile.linux.mixed
	P			lib/gpu/Makefile.linux.double Copied from lib/gpu/Makefile.linux
	P			lib/gpu/Makefile.linux.mixed Copied from lib/gpu/Makefile.linux
	M			lib/gpu/Makefile.linux_opencl
	M			lib/gpu/Makefile.longhorn
	M			lib/gpu/Makefile.mac
	M			lib/gpu/Makefile.mac_opencl
	M			lib/gpu/Makefile.serial
	M			lib/gpu/Makefile.serial_opencl
	M			lib/gpu/Makefile.xk7
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/README
	M			lib/linalg/Makefile.gfortran
	M			lib/linalg/README
	M			lib/meam/Makefile.g95
	M			lib/meam/Makefile.gfortran
	M			lib/meam/Makefile.ifort
	V			lib/{meam/Makefile.lammps → awpmd/Makefile.lammps.installed}
	M			lib/meam/Makefile.pgf90
	M			lib/meam/Makefile.tbird
	M			lib/meam/README
	M			lib/poems/Makefile.g++
	M			lib/poems/Makefile.icc
	V			lib/poems/{Makefile.lammps → Makefile.lammps.empty}
	V			lib/poems/{Makefile.lammps.empty ← Makefile.lammps}
	D			lib/poems/Makefile.storm
	M			lib/poems/README
	D			lib/reax/Makefile.g77
	M			lib/reax/Makefile.g95
	M			lib/reax/Makefile.gfortran
	M			lib/reax/Makefile.ifort
	D			lib/reax/Makefile.lammps
	M			lib/reax/Makefile.pgf90
	M			lib/reax/Makefile.redsky
	M			lib/reax/Makefile.tbird
	M			lib/reax/README
	D			src/ASPHERE/Install.sh
	D			src/BODY/Install.sh
	D			src/CLASS2/Install.sh
	D			src/COLLOID/Install.sh
	D			src/DIPOLE/Install.sh
	M			src/Depend.sh
	D			src/FLD/Install.sh
	M			src/GPU/Install.sh
	D			src/GRANULAR/Install.sh
	A			src/Install.sh
	M			src/KIM/Install.sh
	D			src/KSPACE/Install.sh
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_tip4p.cpp
	D			src/MANYBODY/Install.sh
	D			src/MC/Install.sh
	M			src/MEAM/Install.sh
	D			src/MOLECULE/Install.sh
	M			src/Makefile
	M			src/OPT/Install.sh
	D			src/PERI/Install.sh
	M			src/POEMS/Install.sh
	M			src/Package.sh
	M			src/REAX/Install.sh
	D			src/REPLICA/Install.sh
	D			src/RIGID/Install.sh
	D			src/SHOCK/Install.sh
	D			src/SRD/Install.sh
	M			src/USER-ATC/Install.sh
	M			src/USER-AWPMD/Install.sh
	M			src/USER-CG-CMM/Install.sh
	M			src/USER-COLVARS/Install.sh
	M			src/USER-CUDA/Install.sh
	D			src/USER-EFF/Install.sh
	M			src/USER-MISC/Install.sh
	M			src/USER-MOLFILE/Install.sh
	M			src/USER-OMP/Install.sh
	D			src/USER-OMP/Package.sh
	M			src/USER-PHONON/Install.sh
	M			src/USER-PHONON/fix_phonon.cpp
	D			src/USER-REAXC/Install.sh
	D			src/USER-SPH/Install.sh
	M			src/VORONOI/Install.sh
	D			src/XTC/Install.sh
	M			src/compute_msd.cpp
	P			src/compute_msd.h Copied to src/compute_msd_nongauss.h
	A			src/compute_msd_nongauss.cpp
	P			src/compute_msd_nongauss.h Copied from src/compute_msd.h
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h

Merge remote branch 'lammps-ro/master' into lammps-icmsce2b853e4a11Actions

Description

Details

Event Timeline

Merged Changes

Changes (134)Show All Changes

Very Large Commit

rLAMMPSce2b853e4a11

doc/Eqs/compute_msd_nongauss.jpg

doc/Eqs/compute_msd_nongauss.tex

doc/Eqs/pair_gauss.jpg

doc/Manual.html

doc/Manual.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_packages.html

doc/Section_packages.txt

doc/Section_start.html

doc/Section_start.txt

doc/compute_displace_atom.html

doc/compute_displace_atom.txt

doc/compute_msd.html

doc/compute_msd.txt

doc/fix_pour.html

doc/fix_pour.txt

doc/pair_gauss.html

doc/pair_list.html

doc/pair_list.txt

doc/pair_lubricate.html

doc/pair_lubricate.txt

lib/atc/Makefile.g++

lib/atc/Makefile.icc

lib/atc/Makefile.lammps

lib/atc/Makefile.lammps.empty

lib/atc/Makefile.lammps.installed

lib/atc/Makefile.lammps.linalg

lib/atc/Makefile.serial

lib/atc/README

lib/awpmd/Makefile.lammps

lib/awpmd/Makefile.lammps.empty

lib/awpmd/Makefile.lammps.installed

lib/awpmd/Makefile.lammps.linalg

lib/awpmd/Makefile.openmpi

lib/awpmd/README

lib/colvars/Makefile.fermi

lib/colvars/Makefile.g++

lib/colvars/Makefile.lammps

lib/colvars/Makefile.mingw32-cross

lib/colvars/README

lib/cuda/README

lib/gpu/Makefile.lammps

lib/gpu/Makefile.lammps.standard

lib/gpu/Makefile.lens

lib/gpu/Makefile.lincoln

lib/gpu/Makefile.linux

lib/gpu/Makefile.linux.double

lib/gpu/Makefile.linux.mixed

lib/gpu/Makefile.linux_opencl

lib/gpu/Makefile.longhorn

lib/gpu/Makefile.mac

lib/gpu/Makefile.mac_opencl

lib/gpu/Makefile.serial

lib/gpu/Makefile.serial_opencl

lib/gpu/Makefile.xk7

lib/gpu/Nvidia.makefile

lib/gpu/Opencl.makefile

lib/gpu/README

lib/linalg/Makefile.gfortran

lib/linalg/README

lib/meam/Makefile.g95

lib/meam/Makefile.gfortran

lib/meam/Makefile.ifort

lib/meam/Makefile.lammps

lib/meam/Makefile.pgf90

lib/meam/Makefile.tbird

lib/meam/README

lib/poems/Makefile.g++

lib/poems/Makefile.icc

lib/poems/Makefile.lammps

lib/poems/Makefile.lammps.empty

Merge remote branch 'lammps-ro/master' into lammps-icms
ce2b853e4a11
Actions

Changes (134)
Show All Changes