Diffusion lammps 05eacff252db

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
05eacff252db
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 19 2015, 14:13.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/Make.py

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 19 2015, 14:13

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS1fc75b8638ed: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13270 f3b2605a-c512-4ea7…
rLAMMPS69aacfb4515c: update scripts and information for building pre-compiled packages

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS05eacff252db: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 19 2015, 14:13

Merged Changes

Commit	Author	Details	Committed
1fc75b8638ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13270 f3b2605a-c512-4ea7…	Mar 19 2015
698e3ac8812f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13267 f3b2605a-c512-4ea7…	Mar 19 2015
d6ee32aa7f02	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13266 f3b2605a-c512-4ea7…	Mar 19 2015
254e0da8225b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13264 f3b2605a-c512-4ea7…	Mar 19 2015
884e76555b1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13263 f3b2605a-c512-4ea7…	Mar 19 2015
acfc16d41aa0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13262 f3b2605a-c512-4ea7…	Mar 19 2015
996a18cb83e3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13261 f3b2605a-c512-4ea7…	Mar 19 2015
fe59993ac8fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13260 f3b2605a-c512-4ea7…	Mar 19 2015
7b820ec67776	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13259 f3b2605a-c512-4ea7…	Mar 19 2015
7056c8bf11f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13258 f3b2605a-c512-4ea7…	Mar 19 2015
c3e7b8587a3a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13257 f3b2605a-c512-4ea7…	Mar 19 2015
448f69a4d4ee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13256 f3b2605a-c512-4ea7…	Mar 19 2015
ea303bbf9acd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13255 f3b2605a-c512-4ea7…	Mar 18 2015
85b07ef0d428	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13254 f3b2605a-c512-4ea7…	Mar 18 2015
4c2103f69528	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13253 f3b2605a-c512-4ea7…	Mar 18 2015
4825579470c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13252 f3b2605a-c512-4ea7…	Mar 18 2015
636ef51ae4bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13251 f3b2605a-c512-4ea7…	Mar 18 2015
12db3762ea5e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13250 f3b2605a-c512-4ea7…	Mar 18 2015
1b78441c5e85	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13249 f3b2605a-c512-4ea7…	Mar 18 2015

Changes (146)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.pdf
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/angle_charmm.html
	M			doc/angle_charmm.txt
	M			doc/angle_harmonic.html
	M			doc/angle_harmonic.txt
	M			doc/bond_fene.html
	M			doc/bond_fene.txt
	M			doc/bond_harmonic.html
	M			doc/bond_harmonic.txt
	M			doc/dihedral_charmm.html
	M			doc/dihedral_charmm.txt
	M			doc/dihedral_opls.html
	M			doc/dihedral_opls.txt
	M			doc/improper_harmonic.html
	M			doc/improper_harmonic.txt
	A			lib/python/Makefile.lammps.python2
	M			src/Depend.sh
	M			src/KOKKOS/Install.sh
	A			src/KOKKOS/angle_charmm_kokkos.cpp
	A			src/KOKKOS/angle_charmm_kokkos.h
	A			src/KOKKOS/angle_harmonic_kokkos.cpp
	A			src/KOKKOS/angle_harmonic_kokkos.h
	M			src/KOKKOS/atom_vec_angle_kokkos.cpp
	M			src/KOKKOS/atom_vec_bond_kokkos.cpp
	M			src/KOKKOS/atom_vec_full_kokkos.cpp
	M			src/KOKKOS/atom_vec_molecular_kokkos.cpp
	A			src/KOKKOS/bond_fene_kokkos.cpp
	A			src/KOKKOS/bond_fene_kokkos.h
	A			src/KOKKOS/bond_harmonic_kokkos.cpp
	A			src/KOKKOS/bond_harmonic_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	A			src/KOKKOS/dihedral_charmm_kokkos.cpp
	A			src/KOKKOS/dihedral_charmm_kokkos.h
	A			src/KOKKOS/dihedral_opls_kokkos.cpp
	A			src/KOKKOS/dihedral_opls_kokkos.h
	A			src/KOKKOS/improper_harmonic_kokkos.cpp
	A			src/KOKKOS/improper_harmonic_kokkos.h
	M			src/KOKKOS/kokkos_type.h
	A			src/KOKKOS/neigh_bond_kokkos.cpp
	A			src/KOKKOS/neigh_bond_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/neighbor_kokkos.h
	M			src/MANYBODY/pair_eam.cpp
	M			src/MOLECULE/angle_charmm.cpp
	M			src/MOLECULE/angle_charmm.h
	M			src/MOLECULE/angle_harmonic.cpp
	M			src/MOLECULE/angle_harmonic.h
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_harmonic.cpp
	M			src/MOLECULE/bond_harmonic.h
	M			src/MOLECULE/dihedral_charmm.cpp
	M			src/MOLECULE/dihedral_charmm.h
	M			src/MOLECULE/dihedral_opls.cpp
	M			src/MOLECULE/dihedral_opls.h
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/MOLECULE/improper_harmonic.h
	M			src/Make.py
	M			src/angle.cpp
	M			src/angle.h
	M			src/angle_hybrid.h
	M			src/atom.h
	M			src/atom_vec.h
	M			src/atom_vec_body.h
	M			src/balance.h
	M			src/bond.cpp
	M			src/bond.h
	M			src/comm.h
	M			src/comm_brick.h
	M			src/comm_tiled.h
	M			src/compute.h
	M			src/compute_chunk_atom.cpp
	M			src/compute_chunk_atom.h
	M			src/compute_com_chunk.h
	M			src/compute_gyration_chunk.h
	M			src/compute_inertia_chunk.h
	M			src/compute_msd_chunk.h
	M			src/compute_pressure.h
	M			src/compute_property_atom.h
	M			src/compute_property_chunk.h
	M			src/compute_reduce.h
	M			src/compute_stress_atom.h
	M			src/compute_temp_chunk.h
	M			src/compute_torque_chunk.h
	M			src/compute_vcm_chunk.h
	M			src/create_atoms.h
	M			src/create_bonds.h
	M			src/delete_atoms.h
	M			src/dihedral.cpp
	M			src/dihedral.h
	M			src/domain.h
	M			src/dump_custom.h
	M			src/dump_local.h
	M			src/fix.cpp
	M			src/fix_adapt.h
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_atom.h
	M			src/fix_ave_chunk.cpp
	M			src/fix_ave_chunk.h
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.cpp
	M			src/fix_ave_time.h
	M			src/fix_balance.h
	M			src/fix_group.h
	M			src/fix_store_state.h
	M			src/fix_temp_csvr.h
	M			src/fix_vector.h
	M			src/force.h
	M			src/group.h
	M			src/improper.cpp
	M			src/improper.h
	M			src/input.h
	M			src/kspace.h
	M			src/lammps.h
	M			src/memory.h
	M			src/modify.h
	M			src/molecule.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/output.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_buck.cpp
	M			src/pair_coul_dsf.cpp
	M			src/pair_coul_streitz.h
	M			src/pair_coul_wolf.cpp
	M			src/pair_hybrid.h
	M			src/read_data.h
	M			src/read_dump.h
	M			src/read_restart.h
	M			src/rerun.h
	M			src/special.cpp
	M			src/thermo.h
	M			src/variable.h
	M			src/velocity.h
	M			src/version.h
	M			src/write_dump.h