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

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

Description

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

Resolved Conflicts:
src/fix_temp_csvr.cpp
src/fix_temp_csvr.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 24 2015, 19:15

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS421724aadc99: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13281 f3b2605a-c512-4ea7…
rLAMMPS30e442ea2b43: fix temp/csvr does not have a problem with fix shake (or rattle)

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
421724aadc99	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13281 f3b2605a-c512-4ea7…	Mar 24 2015
ac0b1d1ac371	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13280 f3b2605a-c512-4ea7…	Mar 24 2015
db30c74d438b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13279 f3b2605a-c512-4ea7…	Mar 24 2015
84a5ec39ec21	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13278 f3b2605a-c512-4ea7…	Mar 24 2015
94d653c282ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13277 f3b2605a-c512-4ea7…	Mar 24 2015
a71d94841a89	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13276 f3b2605a-c512-4ea7…	Mar 23 2015
ccda7e01096d	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13275 f3b2605a-c512-4ea7…	Mar 23 2015
d744af1de71e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13274 f3b2605a-c512-4ea7…	Mar 23 2015
e4fd7af5abb1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13272 f3b2605a-c512-4ea7…	Mar 23 2015

Changes (186)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			src/CORESHELL/compute_temp_cs.cpp
	M			src/CORESHELL/compute_temp_cs.h
	M			src/DIPOLE/pair_lj_long_dipole_long.cpp
	M			src/DIPOLE/pair_lj_long_dipole_long.h
	M			src/GPU/fix_gpu.h
	M			src/GPU/pair_born_coul_long_gpu.cpp
	M			src/GPU/pair_born_coul_long_gpu.h
	M			src/GPU/pair_buck_coul_long_gpu.cpp
	M			src/GPU/pair_buck_coul_long_gpu.h
	M			src/GPU/pair_coul_cut_gpu.h
	M			src/GPU/pair_coul_debye_gpu.h
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_coul_long_gpu.h
	M			src/GPU/pair_dpd_gpu.h
	M			src/GPU/pair_dpd_tstat_gpu.h
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.h
	M			src/GPU/pair_lj_class2_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_coul_long_gpu.h
	M			src/GPU/pair_lj_cut_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_gpu.h
	M			src/GRANULAR/fix_pour.h
	M			src/KOKKOS/atom_kokkos.cpp
	M			src/KOKKOS/atom_vec_angle_kokkos.h
	M			src/KOKKOS/atom_vec_atomic_kokkos.h
	M			src/KOKKOS/atom_vec_bond_kokkos.h
	M			src/KOKKOS/atom_vec_charge_kokkos.h
	M			src/KOKKOS/atom_vec_full_kokkos.h
	M			src/KOKKOS/atom_vec_molecular_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	M			src/KOKKOS/comm_kokkos.h
	M			src/KOKKOS/fix_langevin_kokkos.h
	M			src/KOKKOS/kokkos.h
	M			src/KOKKOS/pair_buck_kokkos.h
	M			src/KOKKOS/pair_coul_cut_kokkos.h
	M			src/KOKKOS/pair_coul_dsf_kokkos.h
	M			src/KOKKOS/pair_coul_wolf_kokkos.h
	M			src/KOKKOS/pair_eam_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h
	M			src/KOKKOS/pair_lj_cut_kokkos.h
	M			src/KOKKOS/pair_table_kokkos.h
	M			src/KSPACE/ewald.h
	M			src/KSPACE/ewald_disp.h
	M			src/KSPACE/msm.h
	M			src/KSPACE/msm_cg.h
	M			src/KSPACE/pair_born_coul_msm.h
	M			src/KSPACE/pair_buck_coul_msm.h
	M			src/KSPACE/pair_coul_msm.h
	M			src/KSPACE/pair_lj_charmm_coul_msm.h
	M			src/KSPACE/pair_lj_cut_coul_msm.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_cg.h
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_disp_tip4p.h
	M			src/KSPACE/pppm_stagger.h
	M			src/KSPACE/pppm_tip4p.h
	M			src/MANYBODY/pair_comb.h
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MANYBODY/pair_comb3.h
	M			src/MANYBODY/pair_nb3b_harmonic.h
	M			src/MANYBODY/pair_sw.h
	M			src/MANYBODY/pair_tersoff.h
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/MC/fix_atom_swap.cpp
	M			src/MC/fix_atom_swap.h
	M			src/MC/fix_bond_break.h
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_create.h
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/MC/fix_tfmc.h
	M			src/MISC/fix_deposit.h
	M			src/MISC/fix_oneway.cpp
	M			src/MISC/fix_oneway.h
	M			src/MPIIO/dump_atom_mpiio.h
	M			src/MPIIO/dump_cfg_mpiio.h
	M			src/MPIIO/dump_custom_mpiio.h
	M			src/MPIIO/dump_xyz_mpiio.h
	M			src/PERI/compute_dilatation_atom.h
	M			src/PERI/compute_plasticity_atom.h
	M			src/PERI/pair_peri_eps.h
	M			src/PYTHON/python.cpp
	M			src/PYTHON/python.h
	M			src/QEQ/fix_qeq.h
	M			src/QEQ/fix_qeq_dynamic.h
	M			src/QEQ/fix_qeq_point.h
	M			src/QEQ/fix_qeq_shielded.cpp
	M			src/QEQ/fix_qeq_shielded.h
	M			src/QEQ/fix_qeq_slater.h
	M			src/REAX/pair_reax.h
	M			src/REPLICA/verlet_split.h
	M			src/RIGID/fix_rattle.cpp
	M			src/RIGID/fix_rattle.h
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh.h
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_nh_small.h
	M			src/RIGID/fix_rigid_nph_small.cpp
	M			src/RIGID/fix_rigid_nph_small.h
	M			src/RIGID/fix_rigid_npt_small.cpp
	M			src/RIGID/fix_rigid_npt_small.h
	M			src/RIGID/fix_rigid_nvt_small.h
	M			src/RIGID/fix_rigid_small.h
	M			src/SNAP/compute_sna_atom.h
	M			src/SNAP/compute_snad_atom.h
	M			src/SNAP/compute_snav_atom.h
	M			src/SNAP/pair_snap.cpp
	M			src/SNAP/pair_snap.h
	M			src/SNAP/sna.cpp
	M			src/SNAP/sna.h
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_srd.h
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/VORONOI/compute_voronoi_atom.h
	M			src/XTC/dump_xtc.cpp
	M			src/XTC/dump_xtc.h
	M			src/accelerator_kokkos.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/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.cpp
	M			src/compute_pressure.h
	M			src/compute_property_chunk.h
	M			src/compute_reduce.cpp
	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/domain.h
	M			src/dump_custom.h
	M			src/dump_local.h
	M			src/fix_adapt.h
	M			src/fix_ave_atom.h
	M			src/fix_ave_chunk.h
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.h
	M			src/fix_balance.h
	M			src/fix_group.h
	M			src/fix_store_state.cpp
	M			src/fix_store_state.h
	M			src/fix_vector.h
	M			src/force.h
	M			src/group.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.h
	M			src/pair_coul_streitz.cpp
	M			src/pair_coul_streitz.h
	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