Diffusion lammps 987d6789ac6c

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 8 2014, 17:28.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 8 2014, 17:28

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS4acacd8e3b18: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
rLAMMPSde6d21a1b5e8: import FeC tersoff potential provided by Peter Klaver on lammps-users

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS987d6789ac6c: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 8 2014, 17:28

Merged Changes

Commit	Author	Details	Committed
4acacd8e3b18	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	May 8 2014
cf0cd2e912ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11945 f3b2605a-c512-4ea7…	May 7 2014
4d9cdc874670	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11944 f3b2605a-c512-4ea7…	May 7 2014
8c0de891d7fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11943 f3b2605a-c512-4ea7…	May 7 2014
919d293a147f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11941 f3b2605a-c512-4ea7…	May 7 2014
c3a29a758563	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11940 f3b2605a-c512-4ea7…	May 7 2014
320d269f42b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11939 f3b2605a-c512-4ea7…	May 7 2014
59971d161674	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11938 f3b2605a-c512-4ea7…	May 7 2014
4c9bba90f109	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11937 f3b2605a-c512-4ea7…	May 7 2014
4ab16d538868	athomps	Added viscosity estimate from diagonal shear stress	May 7 2014
53db68362ec1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11935 f3b2605a-c512-4ea7…	May 7 2014
fc62bdc5cb96	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	May 7 2014
71699d5d893e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11933 f3b2605a-c512-4ea7…	May 7 2014
4d097d288da0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11932 f3b2605a-c512-4ea7…	May 7 2014
1a29057dafdb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11930 f3b2605a-c512-4ea7…	May 7 2014
9a9fd0f4011f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11929 f3b2605a-c512-4ea7…	May 7 2014
ee16e52c9cd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11928 f3b2605a-c512-4ea7…	May 7 2014
f351d8316ad1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11927 f3b2605a-c512-4ea7…	May 7 2014
8bfceea16b5c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11926 f3b2605a-c512-4ea7…	May 6 2014
ed0c839effb7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11923 f3b2605a-c512-4ea7…	May 6 2014
f314f75d2d6a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11922 f3b2605a-c512-4ea7…	May 6 2014
650f5ef4f87e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11921 f3b2605a-c512-4ea7…	May 6 2014
aa6458d35cbc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11920 f3b2605a-c512-4ea7…	May 6 2014
eaab9700db0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11919 f3b2605a-c512-4ea7…	May 6 2014
7785c987035d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11918 f3b2605a-c512-4ea7…	May 6 2014
7cdef3fd61f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11917 f3b2605a-c512-4ea7…	May 6 2014
91ad77986ee7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11916 f3b2605a-c512-4ea7…	May 6 2014
4a1807d39739	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11915 f3b2605a-c512-4ea7…	May 6 2014
acae56ce8245	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11914 f3b2605a-c512-4ea7…	May 6 2014
55a23e57daf2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11913 f3b2605a-c512-4ea7…	May 6 2014
d353f8b729e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11912 f3b2605a-c512-4ea7…	May 6 2014

Changes (89)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/create_atoms.html
	M			doc/create_atoms.txt
	M			doc/fix_deposit.html
	M			doc/fix_deposit.txt
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			examples/VISCOSITY/in.gk.2d
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/ASPHERE/compute_temp_asphere.h
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/MISC/fix_deposit.cpp
	M			src/MISC/fix_deposit.h
	M			src/MISC/fix_efield.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/atom_vec_template.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/Purge.list
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/RIGID/fix_shake.cpp
	M			src/RIGID/fix_shake.h
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-CUDA/atom_vec_angle_cuda.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/atom_vec_charge_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.cpp
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-REAXC/reaxc_hydrogen_bonds.cpp
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_body.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_line.cpp
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_tri.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_temp.cpp
	M			src/compute_temp.h
	M			src/compute_temp_com.cpp
	M			src/compute_temp_com.h
	M			src/compute_temp_deform.cpp
	M			src/compute_temp_deform.h
	M			src/compute_temp_partial.cpp
	M			src/compute_temp_partial.h
	M			src/compute_temp_profile.cpp
	M			src/compute_temp_profile.h
	M			src/compute_temp_ramp.cpp
	M			src/compute_temp_ramp.h
	M			src/compute_temp_region.cpp
	M			src/compute_temp_sphere.cpp
	M			src/compute_temp_sphere.h
	M			src/create_box.cpp
	M			src/fix.h
	M			src/fix_adapt.cpp
	M			src/fix_addforce.cpp
	M			src/fix_move.cpp
	M			src/fix_setforce.cpp
	M			src/fix_store_state.cpp
	M			src/modify.cpp
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/version.h
	M			tools/moltemplate/common/oplsaa/oplsaa_moltemplate.py
	M			tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/oplsaa_moltemplate.py
	M			tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/oplsaa_moltemplate.py
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/README.sh
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/graphene.lt
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/graphene_walls.lt
	A			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/graphite.lt
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/nanotube.lt
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/spce.lt
	M			tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/system.lt
	M			tools/moltemplate/src/moltemplate.sh