|
|
1e9a4cc4b8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/REAX/fix_reax_bonds.cpp
# src/REAX/fix_reax_bonds.h
# src/REAX/pair_reax.cpp
# src/USER-MGPT/pair_mgpt.cpp
# src/USER-SMTBQ/pair_smtbq.cpp
# src/lammps.cpp
# src/timer.cpp
|
2015-10-31 10:54:08 -04:00 |
|
|
|
354e20f431
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-30 20:04:06 +00:00 |
|
|
|
dfa33f258a
|
consolidate minimizer stop condition constants into min.h header and support timeout timer
|
2015-10-25 12:10:15 -04:00 |
|
|
|
09aa1365cc
|
undo timelimit code in minimizers
|
2015-10-24 01:01:24 -04:00 |
|
|
|
cee848f948
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14164 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 22:06:49 +00:00 |
|
|
|
d18d5c1434
|
implement a wall time limit similar to HOOMD
|
2015-10-08 18:51:44 -04:00 |
|
|
|
ce59e32d1c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-08-28 20:00:56 +00:00 |
|
|
|
416f6c25e5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-11-18 10:26:44 -05:00 |
|
|
|
f14e5cdce6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12714 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-18 00:15:46 +00:00 |
|
|
|
d181769e88
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.mingw32-cross
src/MAKE/Makefile.mingw32-cross-mpi
src/MAKE/Makefile.mingw64-cross
src/MAKE/Makefile.mingw64-cross-mpi
|
2014-01-30 07:54:10 -05:00 |
|
|
|
89a4708824
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11381 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 22:22:56 +00:00 |
|
|
|
9550535392
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/GPU/fix_gpu.cpp
|
2013-07-27 12:34:08 +02:00 |
|
|
|
b4608b636e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10449 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 20:27:48 +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 |
|
|
|
978a0a8501
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/min.cpp
src/verlet.cpp
|
2012-04-13 08:56:42 -04:00 |
|
|
|
e4974ae9af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8016 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-04-12 22:32:17 +00:00 |
|
|
|
78b0055319
|
Merge branch 'ak-fix' into openmp-step2
Resolved Conflicts:
src/COLLOID/pair_colloid.cpp
src/pair_table.cpp
|
2011-09-24 13:55:42 -04: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 |
|
|
|
488eca7165
|
implemented improved timer class
|
2011-08-26 18:39:14 -04:00 |
|
|
|
aedbb28b6c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-30 20:10:18 +00:00 |
|
|
|
d51c47d9ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5705 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-22 22:09:18 +00:00 |
|
|
|
82ec94916d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5520 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-11 00:41:00 +00:00 |
|
|
|
2b8ae7a82f
|
Added tad example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5477 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-05 00:30:27 +00:00 |
|
|
|
c0ca611a19
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5451 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-03 22:42:04 +00:00 |
|
|
|
b511a75575
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5217 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-05 15:57:43 +00:00 |
|
|
|
f97280116a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4915 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-30 22:28:15 +00:00 |
|
|
|
653d41ec75
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4914 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-30 21:43:11 +00:00 |
|
|
|
c40b3cb2a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4906 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-30 18:20:52 +00:00 |
|
