|
|
607c4aa2a3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/USER-SMTBQ/pair_smtbq.cpp
|
2016-01-12 07:02:29 -05:00 |
|
|
|
05240f9467
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14427 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-12 00:43:44 +00:00 |
|
|
|
b5086e3d69
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14416 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-11 21:59:49 +00:00 |
|
|
|
50c38d8866
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-12-18 07:15:45 -05:00 |
|
|
|
7e9270e813
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14381 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-17 23:05:20 +00:00 |
|
|
|
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 |
|
|
|
f0d3095126
|
Merge branch 'merge_oct23_2015' into lammps-icms
# Resolved Conflicts:
# src/molecule.h
# src/respa.cpp
|
2015-10-22 19:55:17 -04:00 |
|
|
|
09187ebabd
|
anticipate the upcoming 23 oct 2015 patch
|
2015-10-22 19:52:03 -04:00 |
|
|
|
b229c719d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14163 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 21:48:05 +00:00 |
|
|
|
c503b8736d
|
undo cosmetic differences between LAMMPS-ICMS and LAMMPS
|
2015-09-03 06:51:55 -04:00 |
|
|
|
5107280519
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-08-06 00:51:11 -04:00 |
|
|
|
2f7344a02a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13831 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-08-04 19:55:02 +00:00 |
|
|
|
c67b0f5aa3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/read_restart.txt
# src/atom.cpp
# src/read_data.cpp
|
2015-07-18 12:29:27 -04:00 |
|
|
|
1ebb654b4d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13643 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-17 23:20:48 +00:00 |
|
|
|
6bd45c6681
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/info.txt
# src/atom.cpp
# src/info.cpp
|
2015-07-17 06:56:56 -04:00 |
|
|
|
3341c4de6b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13627 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-16 23:36:46 +00:00 |
|
|
|
5a21de608e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13609 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-16 21:21:40 +00:00 |
|
|
|
e552ffbb5a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
# potentials/AlCu.bop.table
# potentials/CCu_v1.bop.table
# potentials/CuH.bop.table
# src/atom.cpp
|
2015-07-09 06:45:53 -04:00 |
|
|
|
2e1c8137c4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13558 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 22:23:08 +00:00 |
|
|
|
5d1a8e1be9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-12-12 09:56:29 -05:00 |
|
|
|
1af7b06052
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12827 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-12 00:20:19 +00:00 |
|
|
|
643e531b11
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-11-24 10:31:37 -05:00 |
|
|
|
080fe0b70f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12765 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-21 16:34:34 +00:00 |
|
|
|
8277217db6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_accelerate.txt
src/KOKKOS/verlet_kokkos.cpp
src/version.h
|
2014-08-28 14:46:43 -04:00 |
|
|
|
d1e51c4359
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12364 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-27 16:16:07 +00:00 |
|
|
|
a0fba99324
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12341 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-25 14:29:00 +00:00 |
|
|
|
24717e500c
|
bugfix for atom style suffix testing
|
2014-08-19 09:54:37 -04:00 |
|
|
|
39a94bfbdc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt
src/Depend.sh
|
2014-08-19 09:48:29 -04:00 |
|
|
|
0f6eb0877e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-14 16:30:03 +00:00 |
|
|
|
cb8a838a63
|
remove changes left behind from GLE merge
|
2014-08-08 11:25:04 -04:00 |
|
|
|
b95497e8a9
|
Merge branch 'lammps-icms' into cle-orig
|
2014-07-30 15:02:14 -04:00 |
|
|
|
909a9ff697
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-29 15:13:15 -04:00 |
|
|
|
4455b66003
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12207 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-28 19:58:51 +00:00 |
|
|
|
86d4432ff8
|
import colored langevin thermostat package from michele ceriotti
this is the unmodified patch without testing its functionality.
|
2014-06-23 18:15:03 -04:00 |
|
|
|
1ee7cb100d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/atom_vec_hybrid.cpp
src/verlet.cpp
|
2014-06-07 19:29:51 -04:00 |
|
|
|
1f667449d1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12069 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-04 20:52:04 +00:00 |
|
|
|
4acacd8e3b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MISC/fix_efield.cpp
src/fix_addforce.cpp
src/fix_move.cpp
src/fix_setforce.cpp
|
2014-05-08 08:49:17 -04:00 |
|
|
|
320d269f42
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11939 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:30:05 +00:00 |
|
|
|
4c9bba90f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:15:31 +00:00 |
|
|
|
53db68362e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11935 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 14:30:27 +00:00 |
|
|
|
1ffcc7ff8b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11791 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-15 15:32:19 +00:00 |
|
|
|
5dd6787d0c
|
fix replicate bug, when not all settings were copied
|
2014-04-12 21:04:11 -04:00 |
|
|
|
f8daecd639
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
examples/USER/openmp/parm.pegc12e8
examples/USER/openmp/parm.pegc12e8-omp
|
2014-04-09 13:49:45 +02:00 |
|
|
|
fafdfbf5fe
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11739 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-08 17:35:21 +00:00 |
|
|
|
fb3a956155
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/atom.cpp
|
2014-04-08 12:56:10 +02:00 |
|
|
|
2292ba2c67
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11735 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-07 22:53:02 +00:00 |
|
|
|
b260aa2b11
|
fix for bug when trying to delete atoms on a node without atoms
|
2014-04-04 04:07:13 -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 |
|
|
|
19252df8ad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11403 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 21:34:55 +00:00 |
|
