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.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 10 2016, 19:26

Pushed

junge

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

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

Merged Changes

Commit	Author	Details	Committed
9806da69f3f9	Steve Plimpton	Stan bug fixes for fix reaxc/bonds/kk	Nov 9 2016
bfea3dce7dab	sjplimp/GitHub	Merge pull request #268 from arielzn/born_dsf	Nov 9 2016
eef862ee1c47	sjplimp/GitHub	Merge pull request #267 from akohlmey/pager-help	Nov 9 2016
0cc2fbf1d6db	sjplimp/GitHub	Merge pull request #266 from andeplane/IP_USER_OMP	Nov 9 2016
ae006669941e	sjplimp/GitHub	Merge pull request #265 from andeplane/IP_DIFF_DPD	Nov 9 2016
51b3b5fb359c	sjplimp/GitHub	Merge pull request #264 from andeplane/IP_SNAP_SRD	Nov 9 2016
176f2c3aa197	sjplimp/GitHub	Merge pull request #263 from andeplane/IP_RIGID_SHOCK	Nov 9 2016
3f71bfb18570	sjplimp/GitHub	Merge pull request #262 from andeplane/IP_PERI_QEQ_REPLICA	Nov 9 2016
cf3ab5167915	sjplimp/GitHub	Merge pull request #261 from andeplane/IP_MISC_MOLECULE	Nov 9 2016
59922f894b18	sjplimp/GitHub	Merge pull request #260 from andeplane/IP_MANYBODY_MC	Nov 9 2016
5e2b9d8bf32d	sjplimp/GitHub	Merge pull request #259 from andeplane/IP_KSPACE	Nov 9 2016
2d132cad6b77	sjplimp/GitHub	Merge pull request #258 from andeplane/IP_GRANULAR	Nov 9 2016
ef6801f8bfa3	sjplimp/GitHub	Merge pull request #257 from andeplane/IP_CORESHELL	Nov 9 2016
c81a72364268	sjplimp/GitHub	Merge pull request #256 from andeplane/IP_BODY	Nov 9 2016
f9eb2a99ce8b	sjplimp/GitHub	Merge pull request #255 from andeplane/IP_ASPHERE	Nov 9 2016
16a02ef27d4f	sjplimp/GitHub	Merge pull request #254 from andeplane/IP_root	Nov 9 2016
2c801320c26a	Steve Plimpton	fixed links in Section_intro.txt	Nov 9 2016
9de1a2a08fab	arielzn	added input using born/coul/dsf/cs to examples/coreshell	Nov 8 2016
cdb5d47e9f9d	arielzn	add FLERR argument to force->bounds() in born/coul/dsf	Nov 8 2016
a23b287a7aac	Steve Plimpton	sync with SVN for creation of stable release	Nov 8 2016
31204aab6a1b	Steve Plimpton	sync with SVN	Nov 8 2016
25e7d074cfa4	arielzn	documentation added for born/coul/dsf and born/coul/dsf/cs styles	Nov 8 2016
667f4dfe28b9	arielzn	pair style born/coul/dsf added with its coreshell version	Nov 8 2016
21694ca3a843	Axel Kohlmeyer	improve help and it through a pager, when screen == stdout	Nov 7 2016
9b910d5511b1	Axel Kohlmeyer	make name of the actual executable (i.e. arg[0]) accessible	Nov 7 2016
054ab6bff32f	Anders Hafreager	Initializing pointers in USER-OMP	Nov 7 2016
616420cda841	Anders Hafreager	Initializing pointers in USER-DIFFRACTION and USER-DPD	Nov 7 2016
fb3ac9afba39	Anders Hafreager	Initialize pointers in SNAP and SRD	Nov 7 2016
7cd7cda2d4b7	Anders Hafreager	Initialize pointers in RIGID and SHOCK	Nov 7 2016
db0524278a69	Anders Hafreager	Initializing pointers in PERI, QEQ and REPLICA	Nov 7 2016
1ff75eaba2bf	Anders Hafreager	Initialized pointers in MISC and MOLECULE	Nov 7 2016
30dede867af9	Anders Hafreager	Initialize pointers in MANYBODY and MC	Nov 7 2016
a5c6104d6403	Anders Hafreager	Initialize pointers in KSPACE	Nov 7 2016
c5869bdee209	Anders Hafreager	Initialize pointers in GRANULAR	Nov 7 2016
e7a2c6b5d1f3	Anders Hafreager	Initialize pointers in CORESHELL	Nov 7 2016
06959a9c597c	Anders Hafreager	Initialized pointers in BODY	Nov 7 2016
cd65d44d9507	Anders Hafreager	Initialize pointers in ASPHERE	Nov 7 2016
45f2e86dd63e	Anders Hafreager	NULLed ptrs in files	Nov 7 2016
f8226e8ae5c8	Anders Hafreager	NULL ptrs in dump_custom and dump_image	Nov 7 2016
b221b15d24ec	Anders Hafreager	NULLing ptrs in comm_brick and dump*.cpp	Nov 7 2016

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