Diffusion lammps 7037e4fabba6

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
7037e4fabba6
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 3 2014, 10:50.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 3 2014, 10:50

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSde59c30e05ab: correct warning about not returning from function with return value.
rLAMMPSfede63c7e341: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS7037e4fabba6: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 3 2014, 10:50

Merged Changes

Commit	Author	Details	Committed
de59c30e05ab	Axel Kohlmeyer	correct warning about not returning from function with return value.	Oct 2 2014
5578d988b0f7	Axel Kohlmeyer	update colvars module to the latest version from the git repo	Oct 2 2014
b3b99122affa	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Oct 2 2014
4d473aa47358	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12581 f3b2605a-c512-4ea7…	Oct 1 2014
4f0b35ceeea7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12580 f3b2605a-c512-4ea7…	Oct 1 2014
251660040393	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12579 f3b2605a-c512-4ea7…	Oct 1 2014
8a517e353c67	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12578 f3b2605a-c512-4ea7…	Oct 1 2014
60b877f75f84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12577 f3b2605a-c512-4ea7…	Oct 1 2014
1ae9826e6203	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12576 f3b2605a-c512-4ea7…	Oct 1 2014
7266c83c2669	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12575 f3b2605a-c512-4ea7…	Oct 1 2014
9705739cd016	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12574 f3b2605a-c512-4ea7…	Oct 1 2014
036d813c7d71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12573 f3b2605a-c512-4ea7…	Oct 1 2014
3a5d4208f3d5	Axel Kohlmeyer	safer call to generation of occasional neighbor lists. cleaner implementation…	Sep 30 2014
495c49dbe26c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12572 f3b2605a-c512-4ea7…	Sep 30 2014
7da99d44d84a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12571 f3b2605a-c512-4ea7…	Sep 30 2014
bfd158da1b7b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12570 f3b2605a-c512-4ea7…	Sep 30 2014
18d0508c5860	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12569 f3b2605a-c512-4ea7…	Sep 30 2014

Changes (77)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/PDF/colvars-refman-lammps.pdf
	M			lib/colvars/Makefile.32-bit
	M			lib/colvars/Makefile.fermi
	M			lib/colvars/Makefile.g++
	M			lib/colvars/Makefile.mingw32-cross
	M			lib/colvars/Makefile.mingw64-cross
	M			lib/colvars/colvar.cpp
	M			lib/colvars/colvar.h
	M			lib/colvars/colvaratoms.cpp
	M			lib/colvars/colvaratoms.h
	V			lib/colvars/{colvarbias.cpp → colvarbias_restraint.cpp}
	V			lib/colvars/{colvarbias.h → colvarbias_restraint.h}
	M			lib/colvars/colvarbias_abf.cpp
	M			lib/colvars/colvarbias_abf.h
	M			lib/colvars/colvarbias_alb.cpp
	M			lib/colvars/colvarbias_alb.h
	M			lib/colvars/colvarbias_meta.cpp
	M			lib/colvars/colvarbias_meta.h
	V			lib/colvars/{colvarbias_restraint.cpp ← colvarbias.cpp}
	V			lib/colvars/{colvarbias_restraint.h ← colvarbias.h}
	M			lib/colvars/colvarcomp.cpp
	M			lib/colvars/colvarcomp.h
	M			lib/colvars/colvarcomp_angles.cpp
	M			lib/colvars/colvarcomp_coordnums.cpp
	M			lib/colvars/colvarcomp_distances.cpp
	M			lib/colvars/colvarcomp_protein.cpp
	M			lib/colvars/colvarcomp_rotations.cpp
	M			lib/colvars/colvargrid.cpp
	M			lib/colvars/colvargrid.h
	M			lib/colvars/colvarmodule.cpp
	M			lib/colvars/colvarmodule.h
	M			lib/colvars/colvarparse.cpp
	M			lib/colvars/colvarparse.h
	M			lib/colvars/colvarproxy.h
	A			lib/colvars/colvarscript.cpp
	A			lib/colvars/colvarscript.h
	A			lib/colvars/colvartypes.cpp
	M			lib/colvars/colvartypes.h
	M			lib/colvars/colvarvalue.cpp
	M			lib/colvars/colvarvalue.h
	P			src/MAKE/OPTIONS/Makefile.intel_cpu Copied to multiple locations: src/MAKE/OPTIONS/Makefile.omp src/MAKE/OPTIONS/Makefile.opt
	M			src/MAKE/OPTIONS/Makefile.intel_phi
	P			src/MAKE/OPTIONS/Makefile.omp Copied from src/MAKE/OPTIONS/Makefile.intel_cpu
	P			src/MAKE/OPTIONS/Makefile.opt Copied from src/MAKE/OPTIONS/Makefile.intel_cpu
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/Make.py
	M			src/PERI/fix_peri_neigh.cpp
	M			src/QEQ/fix_qeq.cpp
	M			src/SNAP/compute_sna_atom.cpp
	M			src/SNAP/compute_snad_atom.cpp
	M			src/SNAP/compute_snav_atom.cpp
	M			src/USER-COLVARS/colvarproxy_lammps.cpp
	M			src/USER-COLVARS/colvarproxy_lammps.h
	M			src/USER-CUDA/Install.sh
	M			src/USER-MISC/compute_ackland_atom.cpp
	M			src/USER-MISC/compute_basal_atom.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/compute.cpp
	M			src/compute_centro_atom.cpp
	M			src/compute_cluster_atom.cpp
	M			src/compute_cna_atom.cpp
	M			src/compute_contact_atom.cpp
	M			src/compute_coord_atom.cpp
	M			src/compute_group_group.cpp
	M			src/compute_pair_local.cpp
	M			src/compute_property_local.cpp
	M			src/compute_rdf.cpp
	M			src/delete_atoms.cpp
	M			src/dump_custom.cpp
	M			src/dump_local.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/version.h
	M			src/write_dump.cpp