Diffusion lammps 6ed1f1df2f87

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 9 2016, 13:56.

Description

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

Conflicts:
src/REAX/pair_reax.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 9 2016, 13:56

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9e20448834a5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14582 f3b2605a-c512-4ea7…
rLAMMPS5fa36ebf0052: integrate USER-VTK into make process

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6ed1f1df2f87: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 9 2016, 13:56

Merged Changes

	Commit			Author	Details	Committed
	9e20448834a5			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14582 f3b2605a-c512-4ea7…	Feb 8 2016

Changes (100)

				Path
	M			src/ASPHERE/compute_temp_asphere.h
	M			src/ASPHERE/pair_line_lj.h
	M			src/BODY/body_nparticle.h
	M			src/COMPRESS/dump_atom_gz.h
	M			src/COMPRESS/dump_cfg_gz.h
	M			src/COMPRESS/dump_custom_gz.h
	M			src/COMPRESS/dump_xyz_gz.h
	M			src/CORESHELL/compute_temp_cs.h
	M			src/GPU/pair_eam_alloy_gpu.h
	M			src/GPU/pair_eam_fs_gpu.h
	M			src/GPU/pair_lj_cubic_gpu.h
	M			src/GPU/pair_tersoff_gpu.h
	M			src/GPU/pair_zbl_gpu.h
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/KOKKOS/atom_kokkos.h
	M			src/KOKKOS/compute_temp_kokkos.h
	M			src/KOKKOS/domain_kokkos.h
	M			src/KOKKOS/fix_deform_kokkos.h
	M			src/KOKKOS/fix_nh_kokkos.h
	M			src/KOKKOS/fix_nph_kokkos.h
	P			src/KOKKOS/fix_npt_kokkos.h Copied to src/neigh_shardlow.h
	M			src/KOKKOS/fix_nvt_kokkos.h
	M			src/KOKKOS/kokkos.h
	M			src/KOKKOS/neighbor_kokkos.h
	M			src/KOKKOS/pair_buck_coul_cut_kokkos.h
	M			src/KOKKOS/pair_buck_coul_long_kokkos.h
	M			src/KOKKOS/pair_coul_debye_kokkos.h
	M			src/KOKKOS/pair_coul_long_kokkos.h
	M			src/KOKKOS/pair_eam_alloy_kokkos.h
	M			src/KOKKOS/pair_eam_fs_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h
	M			src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h
	M			src/KOKKOS/pair_lj_class2_coul_long_kokkos.h
	M			src/KOKKOS/pair_lj_class2_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_debye_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h
	M			src/KOKKOS/pair_lj_expand_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_kokkos.h
	M			src/KOKKOS/pair_sw_kokkos.h
	M			src/KOKKOS/pair_tersoff_kokkos.h
	M			src/KOKKOS/pair_tersoff_mod_kokkos.h
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.h
	M			src/KSPACE/ewald_disp.h
	M			src/MANYBODY/pair_bop.h
	M			src/MANYBODY/pair_polymorphic.h
	M			src/MANYBODY/pair_vashishta.h
	M			src/MC/fix_atom_swap.h
	M			src/MC/fix_gcmc.h
	M			src/MISC/fix_deposit.h
	M			src/RIGID/fix_rigid_small.h
	M			src/atom.h
	M			src/atom_vec_body.h
	M			src/comm.h
	M			src/compute_chunk_atom.h
	M			src/compute_hexorder_atom.h
	M			src/compute_msd_chunk.h
	M			src/compute_orientorder_atom.h
	M			src/compute_temp.h
	M			src/compute_temp_chunk.h
	M			src/compute_temp_com.h
	M			src/compute_temp_deform.h
	M			src/compute_temp_partial.h
	M			src/compute_temp_profile.h
	M			src/compute_temp_ramp.h
	M			src/compute_temp_region.h
	M			src/compute_temp_sphere.h
	M			src/delete_atoms.h
	M			src/displace_atoms.h
	M			src/dump_image.h
	M			src/fix_ave_chunk.h
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.h
	M			src/fix_ave_histo_weight.h
	M			src/fix_ave_time.h
	M			src/fix_move.h
	M			src/fix_nh.h
	M			src/fix_nve_limit.h
	M			src/fix_nve_sphere.h
	M			src/fix_property_atom.h
	M			src/fix_store.h
	M			src/fix_temp_csvr.h
	M			src/fix_wall_region.h
	M			src/group.h
	M			src/info.h
	M			src/input.h
	M			src/molecule.h
	P			src/neigh_shardlow.h Copied from src/KOKKOS/fix_npt_kokkos.h
	M			src/pair.h
	M			src/pair_hybrid.h
	M			src/read_data.h
	M			src/read_restart.h
	M			src/region.h
	M			src/respa.h
	M			src/set.h
	M			src/timer.h
	M			src/update.h
	M			src/variable.h