|
|
e240e15c4d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/dihedral_nharmonic.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.h
|
2013-06-09 14:35:36 +02:00 |
|
|
|
be25ac9878
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10061 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 22:02:17 +00:00 |
|
|
|
65a19bf52b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10056 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:50:21 +00:00 |
|
|
|
79f5cde449
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10055 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:50:20 +00:00 |
|
|
|
2a3686c201
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10054 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:45:55 +00:00 |
|
|
|
3e5c7ae60f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10053 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:43:17 +00:00 |
|
|
|
00fe31ddd4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10052 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:35:06 +00:00 |
|
|
|
eec6088ce7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10051 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:29:19 +00:00 |
|
|
|
5f25e2a828
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10050 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-08 21:29:04 +00:00 |
|
|
|
ea3a951b0d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2013-06-08 12:21:38 +02:00 |
|
|
|
5e6ed7be1f
|
Updated FixLangevinEff
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10048 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-07 16:05:02 +00:00 |
|
|
|
22eb9e8f5d
|
update the readme in src/USER-COLVARS as well
|
2013-06-07 17:05:04 +02:00 |
|
|
|
8cde901846
|
adapt fix langevin/eff for updates in parent class
|
2013-06-07 16:05:40 +02:00 |
|
|
|
a9ca859af2
|
update list of files to be purged
|
2013-06-07 15:20:51 +02:00 |
|
|
|
e0e2abe0b9
|
fix numerical argument parsing for new API
|
2013-06-07 15:20:39 +02:00 |
|
|
|
9f1fcd4982
|
dipole package now depend on kspace
|
2013-06-07 15:07:21 +02:00 |
|
|
|
34a5233bac
|
add dependency support and better numeric error reporting
|
2013-06-07 15:06:16 +02:00 |
|
|
|
c9710e0c20
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/DIPOLE/pair_lj_cut_dipole_cut.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.h
|
2013-06-07 14:49:08 +02:00 |
|
|
|
3d664382ae
|
update version number
|
2013-06-07 14:43:39 +02:00 |
|
|
|
df08be2f01
|
update colvars library from github repo
|
2013-06-07 14:39:17 +02:00 |
|
|
|
916211df33
|
updated the README with github URLs
|
2013-06-07 14:33:47 +02:00 |
|
|
|
2eeae0aade
|
ignore files generated by merge tools
|
2013-06-07 14:26:16 +02:00 |
|
|
|
6354d994c2
|
ignore Makefile.lammps entries as they are generated
|
2013-06-07 14:25:45 +02:00 |
|
|
|
2a9ada3ce4
|
update makefiles to reflect changes in the build procedure
|
2013-06-07 14:25:01 +02:00 |
|
|
|
d49831782f
|
add code to flag non-ASCII characters and silence warnings
|
2013-06-07 11:02:47 +02:00 |
|
|
|
7c021cd57e
|
get rid of non-ASCII characters
|
2013-06-07 11:02:14 +02:00 |
|
|
|
e63ae146f4
|
Cleanup of colvars documentation. Reference github project URLs.
|
2013-06-07 09:29:38 +02:00 |
|
|
|
aa1ebc8444
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10047 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 20:18:08 +00:00 |
|
|
|
51814ba9bd
|
Added GJF Langevin method
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10046 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 18:11:00 +00:00 |
|
|
|
fe71627776
|
Added GJF Langevin method
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10045 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 18:10:38 +00:00 |
|
|
|
8f2bc5c721
|
Just a few tweaks
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10044 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 18:08:40 +00:00 |
|
|
|
fcf628fab6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10043 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 16:08:31 +00:00 |
|
|
|
acd168812e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10042 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 16:04:40 +00:00 |
|
|
|
ca981d4e9b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10039 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 15:22:24 +00:00 |
|
|
|
e342c864a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10038 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 15:22:24 +00:00 |
|
|
|
e61a6b2250
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10036 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 15:19:12 +00:00 |
|
|
|
451b01d769
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10035 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:55:08 +00:00 |
|
|
|
5b7440bf64
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10034 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:54:57 +00:00 |
|
|
|
5a7652a8b4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10033 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:53:58 +00:00 |
|
|
|
b1e4e5593b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:53:20 +00:00 |
|
|
|
af5a33fd16
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10031 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:52:51 +00:00 |
|
|
|
c3d6358742
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10030 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:52:02 +00:00 |
|
|
|
94d3ef2744
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10029 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-06 14:51:09 +00:00 |
|
|
|
c33562cb77
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2013-06-06 12:30:57 +02:00 |
|
|
|
d7cd69f288
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10028 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-05 17:03:22 +00:00 |
|
|
|
ad9e26e107
|
make sure communication buffers for atom data are fully initialized.
|
2013-06-05 18:01:27 +02:00 |
|
|
|
849a767dc6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10027 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-05 14:30:38 +00:00 |
|
|
|
296e1695f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10026 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-05 14:07:59 +00:00 |
|
|
|
d5f93e9e2c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10025 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-05 13:55:19 +00:00 |
|
|
|
548be3761f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10024 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-05 13:41:11 +00:00 |
|
