|
|
0e04550043
|
massive patch to flag non-numeric input
|
2013-06-23 14:34:38 +02:00 |
|
|
|
34c103e2c9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/Depend.sh
|
2013-05-26 11:57:22 +02:00 |
|
|
|
db8eda0253
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9913 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-24 18:55:24 +00: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 |
|
|
|
25e319f781
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/read_dump.txt
|
2012-06-02 14:37:18 -04:00 |
|
|
|
17be5191be
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8216 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-01 23:29:31 +00:00 |
|
|
|
f884a7ec85
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7647 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-01 16:27:41 +00:00 |
|
|
|
4df037aa3b
|
use a namespace with static const to propagate fix flags safely.
|
2012-01-30 18:15:25 -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 |
|
|
|
a0e2e04aed
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7202 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-26 14:42:52 +00:00 |
|
|
|
19e8c92a90
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 18:06:55 +00:00 |
|
|
|
e85b65f387
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-12-01 16:59:10 +00:00 |
|
|
|
060fc976d6
|
fix bug in "fix wall/reflect" and sanitize enums
enums are not required to start at 0. now make it
explicit where the later code expects specific values.
|
2010-11-30 18:37:58 -05:00 |
|
|
|
7b516d0751
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5047 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-14 17:18:05 +00:00 |
|
|
|
544dde674b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5023 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-12 17:58:40 +00:00 |
|
|
|
8f02ff3b29
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4690 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-06 16:19:47 +00:00 |
|
|
|
b3039e9e2a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4304 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-06-18 17:22:51 +00:00 |
|
|
|
a9cdb2f856
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4212 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-06-01 15:06:14 +00:00 |
|
|
|
60cdeb2ede
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3399 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-11-13 00:03:09 +00:00 |
|
|
|
0cc1d090f4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-05 22:26:08 +00:00 |
|
|
|
b2b8adfae9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1360 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-09 21:56:57 +00:00 |
|
|
|
3bf07918d4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@402 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-03-15 23:38:38 +00:00 |
|
|
|
9e1f8bcd6a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@371 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-03-08 00:54:02 +00:00 |
|
|
|
7c5b79781f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@318 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-02-19 18:02:36 +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 |
|
