Diffusion lammps 352e177fcd83

Merge branch 'master' into small-fixes-and-updates
352e177fcd83
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 10 2016, 19:26.

Tags

None

Subscribers

None

Description

Merge branch 'master' into small-fixes-and-updates

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 10 2016, 19:26

Pushed

Oct 19 2017, 09:53

Parents

rLAMMPS3a3d96b8770b: info styles also prints out pair styles
rLAMMPS9806da69f3f9: Stan bug fixes for fix reaxc/bonds/kk

Branches

Unknown

Tags

Unknown

[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS352e177fcd83: Merge branch 'master' into small-fixes-and-updates (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 10 2016, 19:26

Changes (112)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/src/Manual.txt
	M			doc/src/Section_commands.txt
	M			doc/src/Section_intro.txt
	M			doc/src/pair_born.txt
	M			doc/src/pair_cs.txt
	M			doc/src/pair_snap.txt
	A			examples/coreshell/in.coreshell.dsf
	A			examples/coreshell/log.9Nov16.coreshell.dsf.1
	M			src/.gitignore
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/BODY/body_nparticle.cpp
	M			src/BODY/compute_body_local.cpp
	M			src/BODY/compute_temp_body.cpp
	M			src/CORESHELL/Install.sh
	M			src/CORESHELL/compute_temp_cs.cpp
	A			src/CORESHELL/pair_born_coul_dsf_cs.cpp
	A			src/CORESHELL/pair_born_coul_dsf_cs.h
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/GRANULAR/fix_wall_gran_region.cpp
	M			src/KOKKOS/Install.sh
	M			src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
	M			src/KOKKOS/fix_reaxc_bonds_kokkos.h
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_stagger.cpp
	M			src/MAKE/OPTIONS/Makefile.kokkos_phi
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MC/fix_atom_swap.cpp
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/MC/fix_tfmc.cpp
	M			src/MISC/compute_ti.cpp
	M			src/MISC/dump_xtc.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/MISC/fix_efield.cpp
	M			src/MISC/fix_evaporate.cpp
	M			src/MISC/fix_gld.cpp
	M			src/MISC/fix_orient_bcc.cpp
	M			src/MISC/fix_orient_fcc.cpp
	M			src/MISC/fix_thermal_conductivity.cpp
	M			src/MISC/fix_ttm.cpp
	M			src/MISC/fix_viscosity.cpp
	M			src/MOLECULE/fix_cmap.cpp
	M			src/PERI/compute_damage_atom.cpp
	M			src/QEQ/fix_qeq.cpp
	M			src/REPLICA/compute_event_displace.cpp
	M			src/REPLICA/fix_event.cpp
	M			src/REPLICA/fix_neb.cpp
	M			src/REPLICA/verlet_split.cpp
	M			src/RIGID/compute_erotate_rigid.cpp
	M			src/RIGID/compute_ke_rigid.cpp
	M			src/RIGID/compute_rigid_local.cpp
	M			src/RIGID/fix_ehex.cpp
	M			src/RIGID/fix_ehex.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_shake.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_msst.cpp
	M			src/SHOCK/fix_nphug.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/SNAP/compute_sna_atom.cpp
	M			src/SNAP/compute_snad_atom.cpp
	M			src/SNAP/compute_snav_atom.cpp
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_wall_srd.cpp
	M			src/USER-DIFFRACTION/compute_saed.cpp
	M			src/USER-DIFFRACTION/compute_xrd.cpp
	M			src/USER-DIFFRACTION/fix_saed_vtk.cpp
	M			src/USER-DPD/compute_dpd_atom.cpp
	M			src/USER-DPD/fix_eos_table.cpp
	M			src/USER-DPD/fix_eos_table_rx.cpp
	M			src/USER-DPD/fix_rx.cpp
	M			src/USER-DPD/fix_shardlow.cpp
	M			src/USER-DPD/pair_multi_lucy.cpp
	M			src/USER-DPD/pair_multi_lucy_rx.cpp
	M			src/USER-OMP/fix_nphug_omp.cpp
	M			src/USER-OMP/msm_cg_omp.cpp
	M			src/accelerator_kokkos.h
	M			src/comm_brick.cpp
	M			src/dump_cfg.cpp
	M			src/dump_custom.cpp
	M			src/dump_dcd.cpp
	M			src/dump_image.cpp
	M			src/dump_local.cpp
	M			src/dump_xyz.cpp
	M			src/fix.cpp
	M			src/input.cpp
	M			src/kspace.cpp
	M			src/lammps.cpp
	M			src/lammps.h
	M			src/math_special.cpp
	M			src/molecule.cpp
	A			src/pair_born_coul_dsf.cpp
	A			src/pair_born_coul_dsf.h
	M			src/pair_hybrid.cpp
	M			src/random_mars.cpp
	M			src/region.cpp
	M			src/region_cylinder.cpp
	M			src/region_intersect.cpp
	M			src/region_union.cpp
	M			src/respa.cpp
	M			src/version.h

rLAMMPS352e177fcd83

doc/src/Manual.txt

doc/src/Section_commands.txt

doc/src/Section_intro.txt

doc/src/pair_born.txt

doc/src/pair_cs.txt

doc/src/pair_snap.txt

examples/coreshell/in.coreshell.dsf

examples/coreshell/log.9Nov16.coreshell.dsf.1

src/.gitignore

src/ASPHERE/compute_temp_asphere.cpp

src/BODY/body_nparticle.cpp

src/BODY/compute_body_local.cpp

src/BODY/compute_temp_body.cpp

src/CORESHELL/Install.sh

src/CORESHELL/compute_temp_cs.cpp

src/CORESHELL/pair_born_coul_dsf_cs.cpp

src/CORESHELL/pair_born_coul_dsf_cs.h

src/GRANULAR/fix_pour.cpp

src/GRANULAR/fix_wall_gran.cpp

src/GRANULAR/fix_wall_gran_region.cpp

src/KOKKOS/Install.sh

src/KOKKOS/fix_reaxc_bonds_kokkos.cpp

src/KOKKOS/fix_reaxc_bonds_kokkos.h

src/KSPACE/ewald.cpp

src/KSPACE/ewald_disp.cpp

src/KSPACE/msm.cpp

src/KSPACE/msm_cg.cpp

src/KSPACE/pppm.cpp

src/KSPACE/pppm_cg.cpp

src/KSPACE/pppm_disp.cpp

src/KSPACE/pppm_stagger.cpp

src/MAKE/OPTIONS/Makefile.kokkos_phi

src/MANYBODY/fix_qeq_comb.cpp

src/MC/fix_atom_swap.cpp

src/MC/fix_bond_break.cpp

src/MC/fix_bond_create.cpp

src/MC/fix_bond_swap.cpp

src/MC/fix_tfmc.cpp

src/MISC/compute_ti.cpp

src/MISC/dump_xtc.cpp

src/MISC/fix_deposit.cpp

src/MISC/fix_efield.cpp

src/MISC/fix_evaporate.cpp

src/MISC/fix_gld.cpp

src/MISC/fix_orient_bcc.cpp

src/MISC/fix_orient_fcc.cpp

src/MISC/fix_thermal_conductivity.cpp

src/MISC/fix_ttm.cpp

src/MISC/fix_viscosity.cpp

src/MOLECULE/fix_cmap.cpp

src/PERI/compute_damage_atom.cpp

src/QEQ/fix_qeq.cpp

src/REPLICA/compute_event_displace.cpp

src/REPLICA/fix_event.cpp

src/REPLICA/fix_neb.cpp

src/REPLICA/verlet_split.cpp

src/RIGID/compute_erotate_rigid.cpp

src/RIGID/compute_ke_rigid.cpp

src/RIGID/compute_rigid_local.cpp

src/RIGID/fix_ehex.cpp

src/RIGID/fix_ehex.h

src/RIGID/fix_rigid.cpp

src/RIGID/fix_rigid_nh.cpp

src/RIGID/fix_rigid_nh_small.cpp

src/RIGID/fix_rigid_small.cpp

src/RIGID/fix_shake.cpp

src/SHOCK/fix_append_atoms.cpp

src/SHOCK/fix_msst.cpp

src/SHOCK/fix_nphug.cpp

src/SHOCK/fix_wall_piston.cpp

src/SNAP/compute_sna_atom.cpp

src/SNAP/compute_snad_atom.cpp

src/SNAP/compute_snav_atom.cpp

src/SRD/fix_srd.cpp

src/SRD/fix_wall_srd.cpp

src/USER-DIFFRACTION/compute_saed.cpp

src/USER-DIFFRACTION/compute_xrd.cpp

src/USER-DIFFRACTION/fix_saed_vtk.cpp

src/USER-DPD/compute_dpd_atom.cpp

src/USER-DPD/fix_eos_table.cpp

src/USER-DPD/fix_eos_table_rx.cpp

src/USER-DPD/fix_rx.cpp

src/USER-DPD/fix_shardlow.cpp

src/USER-DPD/pair_multi_lucy.cpp

src/USER-DPD/pair_multi_lucy_rx.cpp

src/USER-OMP/fix_nphug_omp.cpp

src/USER-OMP/msm_cg_omp.cpp

src/accelerator_kokkos.h

src/comm_brick.cpp

src/dump_cfg.cpp

src/dump_custom.cpp

src/dump_dcd.cpp

src/dump_image.cpp

src/dump_local.cpp

src/dump_xyz.cpp

src/fix.cpp

src/input.cpp

src/kspace.cpp

src/lammps.cpp

src/lammps.h

src/math_special.cpp

src/molecule.cpp

src/pair_born_coul_dsf.cpp

src/pair_born_coul_dsf.h

src/pair_hybrid.cpp

src/random_mars.cpp

src/region.cpp

src/region_cylinder.cpp

src/region_intersect.cpp

src/region_union.cpp

src/respa.cpp

src/version.h