|
|
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 |
|
|
|
c7a132096f
|
need to explicitly include time.h. linux has it implicitly, but windows requires it explicitly.
|
2015-10-26 16:31:46 -04:00 |
|
|
|
a5d5791be7
|
consolidate setup output and timer timeout message
|
2015-10-25 17:27:08 -04:00 |
|
|
|
693b8d7bc2
|
do remaining timelimit output formatting locally
|
2015-10-25 11:06:41 -04:00 |
|
|
|
43b64d276e
|
print remaining walltime with 1/100th of a second resolution
|
2015-10-25 10:52:34 -04:00 |
|
|
|
9be09f5ddf
|
reimplement wallclock timeout in timer class instead of update.
|
2015-10-24 22:15:10 -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 |
|
|
|
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 |
|
|
|
1f2a7add78
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-26 00:50:29 +00:00 |
|
|
|
209f169cbc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-01-30 00:22:05 +00:00 |
|
|
|
222c95507e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2006-09-27 19:51:33 +00:00 |
|
