|
|
da3605120c
|
Merge branch '2sep-patch' into lammps-icms
# Conflicts:
# src/read_restart.cpp
# src/universe.cpp
|
2015-09-03 06:22:28 -04:00 |
|
|
|
0c517447cf
|
anticipate 3 Sep 2015 patch
|
2015-09-02 17:11:05 -04:00 |
|
|
|
42c0a76c66
|
fix bugs in version string parser and output
|
2015-08-31 18:03:14 -04:00 |
|
|
|
b6c07bddc6
|
add code to compute and provide a "comparable" numeric version id in Universe
|
2015-08-31 17:42:51 -04:00 |
|
|
|
bf608bb71a
|
enforce that Universe::version is readonly
|
2015-08-31 16:10:17 -04:00 |
|
|
|
573db9e2f7
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_oneway.txt
doc/fix_temp_csvr.txt
src/fix_move.cpp
src/fix_nh.cpp
src/fix_temp_csvr.cpp
src/neigh_stencil.cpp
src/pair.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/msi2lmp/src/msi2lmp.c
tools/msi2lmp/src/msi2lmp.h
Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
|
2014-03-12 17:43:22 -04:00 |
|
|
|
3d6ac732ad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:45:25 +00:00 |
|
|
|
b0007d45b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10199 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-29 21:27:42 +00:00 |
|
|
|
0e04550043
|
massive patch to flag non-numeric input
|
2013-06-23 14:34:38 +02:00 |
|
|
|
48aa45f7f0
|
Merge branch 'master' into lammps-icms
Resolved Conflicts (i hope):
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/verlet_split.cpp
src/USER-CUDA/atom_vec_angle_cuda.h
src/USER-CUDA/atom_vec_atomic_cuda.h
src/USER-CUDA/atom_vec_charge_cuda.h
src/USER-CUDA/atom_vec_full_cuda.h
src/USER-CUDA/compute_pe_cuda.h
src/USER-CUDA/compute_pressure_cuda.h
src/USER-CUDA/compute_temp_cuda.h
src/USER-CUDA/compute_temp_partial_cuda.h
src/USER-CUDA/cuda.cpp
src/USER-CUDA/cuda.h
src/USER-CUDA/cuda_data.h
src/USER-CUDA/cuda_neigh_list.h
src/USER-CUDA/fft3d_cuda.h
src/USER-CUDA/fft3d_wrap_cuda.h
src/USER-CUDA/fix_addforce_cuda.h
src/USER-CUDA/fix_aveforce_cuda.h
src/USER-CUDA/fix_enforce2d_cuda.h
src/USER-CUDA/fix_freeze_cuda.h
src/USER-CUDA/fix_gravity_cuda.h
src/USER-CUDA/fix_nve_cuda.h
src/USER-CUDA/fix_set_force_cuda.h
src/USER-CUDA/fix_temp_berendsen_cuda.h
src/USER-CUDA/fix_temp_rescale_cuda.h
src/USER-CUDA/fix_temp_rescale_limit_cuda.h
src/USER-CUDA/fix_viscous_cuda.h
src/USER-CUDA/pair_born_coul_long_cuda.h
src/USER-CUDA/pair_buck_coul_cut_cuda.h
src/USER-CUDA/pair_buck_coul_long_cuda.h
src/USER-CUDA/pair_buck_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
src/USER-CUDA/pair_cg_cmm_cuda.cpp
src/USER-CUDA/pair_cg_cmm_cuda.h
src/USER-CUDA/pair_eam_cuda.h
src/USER-CUDA/pair_gran_hooke_cuda.h
src/USER-CUDA/pair_lj96_cut_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_coul_cut_cuda.h
src/USER-CUDA/pair_lj_class2_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_cuda.h
src/USER-CUDA/pair_lj_cut_coul_cut_cuda.h
src/USER-CUDA/pair_lj_cut_coul_debye_cuda.h
src/USER-CUDA/pair_lj_cut_coul_long_cuda.h
src/USER-CUDA/pair_lj_cut_cuda.h
src/USER-CUDA/pair_lj_cut_experimental_cuda.h
src/USER-CUDA/pair_lj_expand_cuda.h
src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.h
src/USER-CUDA/pair_lj_gromacs_cuda.h
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
src/USER-CUDA/pair_lj_sdk_cuda.h
src/USER-CUDA/pair_lj_smooth_cuda.h
src/USER-CUDA/pair_morse_cuda.h
src/USER-CUDA/pair_sw_cuda.h
src/USER-CUDA/pair_tersoff_cuda.h
src/USER-CUDA/pair_tersoff_zbl_cuda.h
src/USER-CUDA/pppm_cuda.h
src/USER-CUDA/verlet_cuda.cpp
src/USER-CUDA/verlet_cuda.h
src/comm.cpp
src/finish.cpp
src/fix_rigid_nvt.h
src/respa.cpp
src/run.cpp
|
2012-06-07 16:42:38 -04:00 |
|
|
|
ef9e700545
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-06 22:47:51 +00:00 |
|
|
|
9bdacec22f
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/GPU/pppm_gpu.h
|
2012-02-14 09:42:03 -05:00 |
|
|
|
1217612ab6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7761 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-13 15:33:29 +00:00 |
|
|
|
006d63d78a
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Eqs/pair_gauss.jpg
doc/Eqs/pair_tersoff_1.jpg
src/KSPACE/fft3d.h
src/comm.cpp
src/comm.h
|
2011-12-31 19:37:59 -05:00 |
|
|
|
9259ae8699
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Section_commands.html
doc/Section_commands.txt
doc/pair_coul_diel.html
doc/pair_coul_diel.txt
doc/processors.html
doc/processors.txt
examples/USER/imd/bucky_cnt_imd.vmd
examples/USER/imd/in.bucky-plus-cnt
examples/USER/imd/in.deca-ala-solv_imd
examples/USER/imd/in.deca-ala_imd
lib/gpu/Makefile.fermi
lib/gpu/Makefile.lincoln
lib/gpu/Makefile.longhorn
lib/gpu/Makefile.serial
lib/gpu/geryon/VERSION.txt
lib/gpu/pair_gpu_device.cpp
src/ASPHERE/atom_vec_ellipsoid.cpp
src/CLASS2/Install.sh
src/COLLOID/atom_vec_colloid.cpp
src/DIPOLE/atom_vec_dipole.cpp
src/GPU/fix_gpu.cpp
src/GRANULAR/atom_vec_granular.cpp
src/GRANULAR/fix_pour.h
src/KSPACE/Install.sh
src/KSPACE/fft3d.cpp
src/KSPACE/fft3d.h
src/KSPACE/kissfft.h
src/KSPACE/pppm.cpp
src/KSPACE/pppm.h
src/KSPACE/pppm_tip4p.cpp
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_eam.cpp
src/MANYBODY/pair_eim.cpp
src/MANYBODY/pair_sw.cpp
src/MANYBODY/pair_tersoff.cpp
src/MANYBODY/pair_tersoff_zbl.cpp
src/MOLECULE/atom_vec_angle.cpp
src/MOLECULE/atom_vec_bond.cpp
src/MOLECULE/atom_vec_full.cpp
src/MOLECULE/atom_vec_molecular.cpp
src/Makefile
src/Makefile.lib
src/PERI/atom_vec_peri.cpp
src/USER-CG-CMM/Install.sh
src/USER-IMD/README
src/USER-IMD/fix_imd.cpp
src/USER-IMD/fix_imd.h
src/USER-SMD/Install.sh
src/atom_vec_atomic.cpp
src/atom_vec_charge.cpp
src/comm.cpp
src/finish.cpp
src/fix_box_relax.cpp
src/fix_deposit.cpp
src/fix_spring_self.cpp
src/fix_store_state.cpp
src/fix_wall.cpp
src/fix_wall_reflect.cpp
src/input.cpp
src/input.h
src/memory.cpp
src/memory.h
src/pair_lj_cut.cpp
tools/restart2data.cpp
|
2011-12-31 19:07:46 -05:00 |
|
|
|
86347b81e3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7340 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-13 15:57:18 +00:00 |
|
|
|
43a79f1a56
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7335 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 22:45:19 +00:00 |
|
|
|
5baa07d3af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7333 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:46:31 +00:00 |
|
|
|
1f2a7add78
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-26 00:50:29 +00:00 |
|
|
|
9d3abefcc2
|
simpler version of the modified version string.
|
2010-05-09 11:18:03 -04:00 |
|
|
|
b5fe65db11
|
append -ICMS to the version string so that one can
tell where the LAMMPS version is coming from.
|
2010-05-08 22:27:16 -04:00 |
|
|
|
d423a9f7ef
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3818 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-02-19 23:47:12 +00:00 |
|
|
|
9cecf81520
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3682 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-14 19:44:09 +00:00 |
|
|
|
b16daa15d8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3113 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-08-18 18:43:28 +00:00 |
|
|
|
1467441a91
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2959 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-07-02 18:03:11 +00:00 |
|
|
|
8ae32d6ae4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2359 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-09 14:45:28 +00:00 |
|
|
|
7aef31a5cb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1837 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-05-16 20:40:00 +00:00 |
|
|
|
8cbf38c2ba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1397 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-18 21:58:29 +00:00 |
|
|
|
f213705e7f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@964 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-05 17:22:29 +00:00 |
|
|
|
9be7620ace
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-03 16:22:30 +00:00 |
|
|
|
4ae227a42d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@654 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-23 00:11:52 +00:00 |
|
|
|
b704a82daf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@645 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-22 23:41:35 +00:00 |
|
|
|
88ed44b1ea
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@296 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-02-12 17:49:09 +00:00 |
|
|
|
209f169cbc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-01-30 00:22:05 +00:00 |
|
|
|
222c95507e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2006-09-27 19:51:33 +00:00 |
|
