Commit Graph

17645 Commits

Author SHA1 Message Date
39c8a7de6e Updated kim_commands doc to descript kim_query split mode 2019-07-09 07:35:50 -04:00
1f47da6c51 Add fixed_types to kim_init & split to kim_query 2019-07-08 17:46:47 -05:00
bb5a1c5205 Adjust log.cite behavior 2019-07-03 13:38:08 -05:00
00d820dcf9 Added support for log.cite to kim_init 2019-07-03 13:20:55 -05:00
63dcd999d8 Switch to kim-api c-bindings for SimulatorModel 2019-07-03 11:49:38 -05:00
41e8cf3d69 Merge branch 'master' into kim-simulator-models
# Conflicts:
#	src/input.cpp
2019-07-02 01:15:29 -04:00
b727f0b126 Merge pull request #1537 from akohlmey/refactor-input-file-handling
Refactor input file processing flow of control
2019-07-01 17:28:15 -04:00
63fa63fb1c Merge pull request #1538 from dsbolin/gran_mods
Bug fixes to pair granular
2019-07-01 17:27:55 -04:00
f7329c0f43 Merge pull request #1540 from stanmoore1/kk_snap
Port Recent SNAP changes to Kokkos
2019-07-01 17:27:34 -04:00
559c187964 Update SNA::memory_usage() 2019-07-01 08:20:48 -06:00
61a7730bb5 Merge branch 'master' of github.com:lammps/lammps into kk_snap 2019-07-01 08:14:30 -06:00
a8d4ac74fa Remove temporary ulist variable 2019-07-01 08:13:53 -06:00
e91539d4b5 Cleanup 2019-07-01 08:11:49 -06:00
62bddd47ee limit number of nested include file levels to 16 2019-07-01 00:01:41 -04:00
33d3bd7a8d Merge pull request #1547 from rbberger/docs_fix
Workaround to make formatting of code blocks consistent
2019-06-30 17:15:25 -04:00
8fdba2ded1 Merge pull request #1546 from stanmoore1/kk_update
Update Kokkos library in LAMMPS to v2.9.00
2019-06-30 17:15:06 -04:00
a720aedabc Workaround to make formatting of code blocks consistent 2019-06-28 20:54:10 -04:00
ea2e73119d Update Kokkos library in LAMMPS to v2.9.00 2019-06-28 11:23:24 -06:00
5eabc82024 Restore lost changes 2019-06-28 10:17:22 -06:00
d918432047 Fix issue with compute_duarray 2019-06-28 09:54:24 -06:00
73968f10d5 Merge branch 'kk_snap' of ssh://github.com/stanmoore1/lammps into kk_snap 2019-06-28 09:44:36 -06:00
400af0edac Merge branch 'master' of github.com:lammps/lammps into kk_snap 2019-06-28 09:02:07 -06:00
121947e79d Added hcp query example to kim_commands 2019-06-27 12:52:20 -05:00
1e2aeed2ac Remove no-op 2019-06-27 08:53:58 -06:00
60adaa24cb Remove redundant computation 2019-06-27 08:52:34 -06:00
312a1fa004 Added species to kim_queries in docs and some other edits 2019-06-27 07:58:32 -05:00
7f342b1cd0 Merge pull request #1539 from junghans/fix_include_for_ppc64le
add missing include needed on ppc64le
2019-06-27 00:26:33 -04:00
2be0fd6180 Fix GPU issues 2019-06-26 16:22:37 -06:00
8c3d18520d add missing include needed on ppc64le 2019-06-26 10:45:31 -06:00
f1dfcaf514 WIP 2019-06-25 14:47:21 -06:00
f6319146b0 Update kim_query to new interface 2019-06-25 15:03:24 -05:00
e08146c31f Allow twisting torque to be used without rolling torque in pair granular 2019-06-25 12:06:18 -06:00
8fd1aaba7e Merge pull request #1535 from evoyiatzis/class2
Implementation of inner/middle/outer compute methods for lj/class2/coul/long
2019-06-25 06:00:06 -04:00
50e76ff7a1 restore virtual keyword and empty lines in comments 2019-06-25 05:59:29 -04:00
423eebda25 restore header 2019-06-25 05:57:48 -04:00
f6842e643e Merge pull request #1525 from akohlmey/collected-small-changes
Collected small changes and fixes for the next patch
2019-06-24 23:55:50 -04:00
5f7c4fb668 Merge pull request #1534 from uihsnv/archlinux_pkg
Archlinux install documentation
2019-06-24 23:55:09 -04:00
483353a017 Merge remote-tracking branch 'lammps/master' into kim-simulator-models 2019-06-24 15:35:06 -05:00
86d878a7eb Updated language on availability of ADP potentials in OpenKIM 2019-06-24 15:26:41 -05:00
4284a4fac4 Changed me to me_si and fixed some typos in comments 2019-06-24 14:51:35 -05:00
b653536750 Switched pair_style kim doc to "KIM Portable Model" terminology 2019-06-24 14:38:44 -05:00
1047d8f80e Change of terminology to "KIM Portable Model" and streamlining 2019-06-24 14:32:40 -05:00
c8a2f61c16 Merge branch 'kim-simulator-models' of github.com:ellio167/lammps into kim-simulator-models 2019-06-24 13:55:22 -05:00
0ddcc023a5 Improvements and additions to kim_commands doc 2019-06-24 13:54:55 -05:00
f2380a24ef fix parallel processing input include bug 2019-06-24 14:27:05 -04:00
13237155c8 make processing of Input::file(const char* filename) more like processing an include file 2019-06-24 14:24:54 -04:00
7f26862f98 simplify nested include file handling
# Conflicts:
#	src/input.h
2019-06-24 14:16:51 -04:00
826a14f54a add workaround for handline include files
# Conflicts:
#	src/input.h
2019-06-24 14:16:00 -04:00
7afcfccf48 follow convention to list all commands in a file as header 2019-06-24 13:51:41 -04:00
a36d2573cf make certain, we are not mixing cutoff and long-range coulomb when looking cutoffs 2019-06-24 09:10:00 -04:00