diff --git a/doc/Manual.html b/doc/Manual.html index 6a97ddf305..d11b9de225 100644 --- a/doc/Manual.html +++ b/doc/Manual.html @@ -1,7 +1,7 @@ LAMMPS-ICMS Users Manual - + @@ -22,7 +22,7 @@

LAMMPS-ICMS Documentation

-

8 Jul 2015 version +

15 Jul 2015 version

Version info:

diff --git a/doc/Manual.txt b/doc/Manual.txt index 209e9d7eef..07a347266d 100644 --- a/doc/Manual.txt +++ b/doc/Manual.txt @@ -1,6 +1,6 @@ LAMMPS-ICMS Users Manual - + @@ -18,7 +18,7 @@

LAMMPS-ICMS Documentation :c,h3 -8 Jul 2015 version :c,h4 +15 Jul 2015 version :c,h4 Version info: :h4 diff --git a/doc/accelerate_kokkos.html b/doc/accelerate_kokkos.html index fa3c98cefc..45cfa5824d 100644 --- a/doc/accelerate_kokkos.html +++ b/doc/accelerate_kokkos.html @@ -16,7 +16,8 @@

The KOKKOS package was developed primaritly by Christian Trott (Sandia) with contributions of various styles by others, including -Sikandar Mashayak (UIUC). The underlying Kokkos library was written +Sikandar Mashayak (UIUC), Stan Moore (Sandia), and Ray Shan (Sandia). +The underlying Kokkos library was written primarily by Carter Edwards, Christian Trott, and Dan Sunderland (all Sandia).

@@ -25,7 +26,8 @@ that use data structures and macros provided by the Kokkos library, which is included with LAMMPS in lib/kokkos.

The Kokkos library is part of -Trilinos and is a +Trilinos and can also +be downloaded from Github. Kokkos is a templated C++ library that provides two key abstractions for an application like LAMMPS. First, it allows a single implementation of an application kernel (e.g. a pair style) to run efficiently on @@ -71,10 +73,10 @@ mode.

Here is a quick overview of how to use the KOKKOS package:

-