|
|
490401bd6a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/pair_reax.html
|
2015-12-20 20:06:45 -05:00 |
|
|
|
2926854b8d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14390 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-19 18:32:29 +00:00 |
|
|
|
9195c252ee
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-12-12 08:04:57 -05:00 |
|
|
|
921bcfb12d
|
Allowed non-full_energy with triclinic
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14359 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-11 23:15:38 +00:00 |
|
|
|
5affb6c013
|
Merge branch 'master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/pair_hybrid.txt
# doc/pair_reax.html
# doc/pair_reax.txt
# doc/pair_reax_c.txt
# src/MANYBODY/pair_polymorphic.cpp
|
2015-12-11 07:33:14 -05:00 |
|
|
|
59e5d36671
|
Fixing region issue
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14343 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 16:04:31 +00:00 |
|
|
|
e7d896a459
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/improper_distance.txt
# doc/pair_mdf.txt
# python/lammps.py
# src/MANYBODY/pair_polymorphic.cpp
# src/MANYBODY/pair_polymorphic.h
|
2015-12-10 06:29:32 -05:00 |
|
|
|
ab01075956
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14336 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:31:43 +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 |
|
|
|
8ccb8bfd66
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/variable.txt
# src/reader_xyz.cpp
|
2015-09-25 09:52:07 -04:00 |
|
|
|
546186739c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14064 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-09-24 20:34:59 +00:00 |
|
|
|
3841dd58ca
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13931 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-08-21 22:55:12 +00:00 |
|
|
|
0449d00dca
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
# python/install.py
# python/lammps.py
# src/read_restart.cpp
# src/write_restart.cpp
|
2015-07-03 07:37:10 -04:00 |
|
|
|
050244f229
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13510 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-02 14:26:05 +00:00 |
|
|
|
d35e3291a3
|
removed dead code and silence warnings about C++ standard violations
|
2015-06-17 15:56:14 -04:00 |
|
|
|
69b8a38a9c
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2015-05-19 14:44:42 +02:00 |
|
|
|
f110488db0
|
Added inside_nonperiodic()
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13482 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-18 21:08:06 +00:00 |
|
|
|
f9de6b9e61
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-05-16 13:45:33 +02:00 |
|
|
|
aef75ace77
|
Added inside box check for fix_gcmc moves
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-15 22:41:51 +00:00 |
|
|
|
f83f55aac1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_temp_csvr.txt
src/fix_temp_csvr.cpp
|
2015-03-28 08:10:26 -04:00 |
|
|
|
d78bc59e06
|
alternative bugfix for the reset_box() issue reported by kasra
|
2015-03-27 17:34:16 -04:00 |
|
|
|
9435c9dcb1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-27 20:39:27 +00:00 |
|
|
|
c6fb9144ac
|
detect if somebody tries to use shrinkwrap boundaries with incompatible kspace styles
|
2015-03-10 17:36:14 -04:00 |
|
|
|
c3cb0e9124
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
src/USER-FEP/pair_lj_cut_soft.cpp
|
2015-02-02 15:23:42 -05:00 |
|
|
|
e1cd500a21
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13008 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-30 18:51:56 +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 |
|
|
|
72bf576c1a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/compute_force_molecule.cpp
|
2014-11-21 10:05:55 -05:00 |
|
|
|
d476b251e9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12753 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-20 18:16:39 +00:00 |
|
|
|
4c79bce7f1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/msm_cg_omp.cpp
src/USER-OMP/pppm_disp_tip4p_omp.cpp
src/USER-OMP/pppm_tip4p_omp.cpp
|
2014-08-09 20:10:12 -04:00 |
|
|
|
b7e6d76f38
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12286 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-08 20:36:32 +00:00 |
|
|
|
c46d3db5b8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/KSPACE/pair_lj_cut_tip4p_long.cpp
|
2014-08-04 14:44:45 -04:00 |
|
|
|
a12cc9cce8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12245 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-01 23:40:44 +00:00 |
|
|
|
f4fe83b3ba
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/STUBS/mpi.c
|
2014-07-30 10:49:57 -04:00 |
|
|
|
8047d6058e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12223 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-29 21:46:50 +00: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 |
|
|
|
9d731bbb10
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-06-12 08:46:27 -04:00 |
|
|
|
d560473a6b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12118 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-11 15:20:11 +00:00 |
|
|
|
5e1d34a23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11617 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:56:49 +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 |
|
|
|
fffe7f95b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11379 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 18:40:05 +00:00 |
|
|
|
39b1597778
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/RIGID/fix_shake.cpp
src/variable.cpp
src/write_data.cpp
|
2014-01-26 21:35:32 -05:00 |
|
|
|
0ce16af78b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-25 22:46:08 +00:00 |
|
|
|
46e8e6c120
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/MAKE/Makefile.openmpi
src/MANYBODY/fix_qeq_comb.cpp
src/MANYBODY/pair_nb3b_harmonic.cpp
src/RIGID/fix_rigid_small.cpp
src/RIGID/fix_shake.cpp
src/USER-REAXC/fix_qeq_reax.cpp
src/USER-REAXC/fix_reaxc_bonds.cpp
src/read_data.cpp
src/special.h
|
2014-01-18 11:52:59 -05:00 |
|
|
|
bad19033d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 18:43:09 +00:00 |
|
|
|
a6ca3cab54
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/RIGID/fix_rigid_small.cpp
|
2014-01-16 20:53:36 -05:00 |
|
|
|
a1ef01fc1a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-14 16:17:20 +00:00 |
|
|
|
cdbf26c64b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/gpu/lal_sw.cu
|
2014-01-14 07:06:10 -05:00 |
|
