|
|
56372120b6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
# src/lammps.cpp
|
2016-03-19 06:16:01 -04:00 |
|
|
|
042f50ac9c
|
Christian's kokkos patch that allows concurrent host and device threading
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14752 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-18 14:50:28 +00:00 |
|
|
|
bc900935fd
|
Merge branch 'merge-pull-33' into lammps-icms
|
2016-03-02 17:46:42 -05:00 |
|
|
|
35c29a0610
|
Kokkos: make lammps instantiate a kokkos atom_vec style if kokkos on
When not setting "-sf kk" this would cause an early error since you
are not allowed to instantiate a non kokkos atom_vec style if kokkos
is enabled.
|
2016-03-01 12:21:03 -07:00 |
|
|
|
057bc649d9
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/fix_store.cpp
|
2016-01-30 16:44:57 +01:00 |
|
|
|
daaadcdd86
|
Adding Kokkos output and error checks
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14525 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-29 17:24:04 +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 |
|
|
|
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 |
|
|
|
ef82677cb2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14129 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-21 18:51:09 +00:00 |
|
|
|
112d28fa49
|
need to NULL suffix2 if it is deleted and not re-set.
|
2015-10-07 18:45:03 -04:00 |
|
|
|
bfb019efa9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/compute_rdf.cpp
# src/compute_rdf.h
# src/info.cpp
|
2015-10-06 07:35:24 -04:00 |
|
|
|
fa6ad89b99
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14091 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-05 15:20:06 +00:00 |
|
|
|
b2dd298751
|
make a copy of package related command line arguments, so they can be reset after calling clear.
|
2015-10-01 15:10:40 -04:00 |
|
|
|
5603ea6d27
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/quit.txt
# src/lammps.cpp
|
2015-09-12 06:30:20 -04:00 |
|
|
|
9effcca0df
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14025 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-09-11 14:49:37 +00:00 |
|
|
|
b213e49672
|
add optional exit status argument to the quit command
|
2015-09-09 16:48:57 -04:00 |
|
|
|
31318401b6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13972 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-08-31 13:32:05 +00:00 |
|
|
|
ecd3cd9dcc
|
we cannot access comm after it has been deleted
|
2015-08-29 07:07:20 -04:00 |
|
|
|
d38957c1c0
|
Merge remote-tracking branch 'lammps-ro/master' into merge-upstream
|
2015-08-29 06:42:25 -04:00 |
|
|
|
a6a64f3790
|
fix typo
|
2015-08-29 06:23:05 -04:00 |
|
|
|
6b854b397c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13952 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-08-28 23:41:05 +00:00 |
|
|
|
823c23787e
|
need to set pointers immediately to NULL to force segfault if used after delete
|
2015-08-26 07:30:05 -04:00 |
|
|
|
498ae98a05
|
avoid insignificant memory leak
|
2015-08-18 07:50:43 -04:00 |
|
|
|
b00a397498
|
fixes bug in suffix handling spotted by coverity scan: CID 134474 and CID 134486
|
2015-08-17 23:16:19 -04:00 |
|
|
|
5288406600
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13623 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-16 22:41:28 +00:00 |
|
|
|
93b7ae0779
|
correct output bug in final wall time message
|
2015-07-07 12:01:08 -04:00 |
|
|
|
3e3209e7e3
|
compute and output the total walltime at the end of a LAMMPS script.
|
2015-07-02 14:18:31 -04:00 |
|
|
|
bff9402510
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-01-28 09:06:33 -05:00 |
|
|
|
94cd2118c7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12994 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-27 23:55:36 +00:00 |
|
|
|
fab9de6eb3
|
align help output format
|
2014-09-13 09:09:46 -04:00 |
|
|
|
052a84f81d
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resovled Conflicts:
src/lammps.cpp
|
2014-09-11 13:44:35 +02:00 |
|
|
|
90d0ffba1d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12480 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-10 22:46:53 +00:00 |
|
|
|
7f8da4e667
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12479 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-10 22:16:50 +00:00 |
|
|
|
58a11d6bc2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12474 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-10 19:39:31 +00:00 |
|
|
|
7728d4ecea
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12468 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-10 16:40:17 +00:00 |
|
|
|
d52414244a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/package.txt
src/fix_move.cpp
|
2014-09-10 14:54:22 +02:00 |
|
|
|
4374200a77
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12458 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-09 22:30:16 +00:00 |
|
|
|
b843c808a5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12455 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-09 19:23:31 +00:00 |
|
|
|
1172085ecd
|
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-16 19:31:57 -04:00 |
|
|
|
e3879a1048
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12332 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-15 15:35:51 +00:00 |
|
|
|
10dfed77c9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12316 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-14 20:07:39 +00: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 |
|
|
|
bcec3c56e4
|
Merge branch 'patch_14_06_2014' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
src/pair.cpp
|
2014-06-15 13:25:09 +02:00 |
|
|
|
598be75009
|
anticipate 14 June 2014 patch
|
2014-06-15 13:19:31 +02:00 |
|
|
|
75a456247d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12133 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-14 21:25:49 +00: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 |
|
|
|
9ed1090111
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12064 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-04 15:34:48 +00:00 |
|
|
|
f9f7283fa5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/accelerator_cuda.h
|
2014-05-14 07:18:26 -04:00 |
|
|
|
6c06a66ae7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11978 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-13 15:23:13 +00:00 |
|
