git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14337 f3b2605a-c512-4ea7-a41b-209d697bcdaa

doc/Section_commands.html

@@ -710,7 +710,7 @@ g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.</p>
 <tr class="row-odd"><td><a class="reference internal" href="fix_rigid.html"><em>rigid/small/npt</em></a></td>
 <td><a class="reference internal" href="fix_rigid.html"><em>rigid/small/nve</em></a></td>
 <td><a class="reference internal" href="fix_rigid.html"><em>rigid/small/nvt</em></a></td>
-<td><a class="reference internal" href="fix_setforce.html"><em>setforce (c)</em></a></td>
+<td><a class="reference internal" href="fix_setforce.html"><em>setforce (ck)</em></a></td>
 <td><a class="reference internal" href="fix_shake.html"><em>shake (c)</em></a></td>
 <td><a class="reference internal" href="fix_spring.html"><em>spring</em></a></td>
 <td><a class="reference internal" href="fix_spring_rg.html"><em>spring/rg</em></a></td>

doc/Section_commands.txt

@@ -564,7 +564,7 @@ g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.
 "rigid/small/npt"_fix_rigid.html,
 "rigid/small/nve"_fix_rigid.html,
 "rigid/small/nvt"_fix_rigid.html,
-"setforce (c)"_fix_setforce.html,
+"setforce (ck)"_fix_setforce.html,
 "shake (c)"_fix_shake.html,
 "spring"_fix_spring.html,
 "spring/rg"_fix_spring_rg.html,

doc/fix_setforce.html

@@ -129,6 +129,9 @@
 </div>
 <div class="section" id="fix-setforce-cuda-command">
 <h1>fix setforce/cuda command<a class="headerlink" href="#fix-setforce-cuda-command" title="Permalink to this headline">¶</a></h1>
+</div>
+<div class="section" id="fix-setforce-kk-command">
+<h1>fix setforce/kk command<a class="headerlink" href="#fix-setforce-kk-command" title="Permalink to this headline">¶</a></h1>
 <div class="section" id="syntax">
 <h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
 <div class="highlight-python"><div class="highlight"><pre>fix ID group-ID setforce fx fy fz keyword value ...
@@ -184,13 +187,16 @@ field with optional time-dependence as well.</p>
 specified geometric <a class="reference internal" href="region.html"><em>region</em></a> in order to have force added
 to it.</p>
 <hr class="docutils" />
-<p>Styles with a <em>cuda</em> suffix are functionally the same as the
+<p>Styles with a <em>cuda</em> or <em>kk</em> suffix are functionally the same as the
 corresponding style without the suffix.  They have been optimized to
 run faster, depending on your available hardware, as discussed in
 <a class="reference internal" href="Section_accelerate.html"><em>Section_accelerate</em></a> of the manual.  The
 accelerated styles take the same arguments and should produce the same
 results, except for round-off and precision issues.</p>
-<p>These accelerated styles are part of the USER-CUDA package.  They are
+<p>The region keyword is also supported by Kokkos, but a Kokkos-enabled
+region must be used. See the region <a class="reference internal" href="region.html"><em>region</em></a> command for more
+information.</p>
+<p>These accelerated styles are part of the USER-CUDA or Kokkos package.  They are
 only enabled if LAMMPS was built with that package.  See the <a class="reference internal" href="Section_start.html#start-3"><span>Making LAMMPS</span></a> section for more info.</p>
 <p>You can specify the accelerated styles explicitly in your input script
 by including their suffix, or you can use the <a class="reference internal" href="Section_start.html#start-7"><span>-suffix command-line switch</span></a> when you invoke LAMMPS, or you can

doc/fix_setforce.txt

@@ -8,6 +8,7 @@
 
 fix setforce command :h3
 fix setforce/cuda command :h3
+fix setforce/kk command :h3
 
 [Syntax:]
 
@@ -65,14 +66,18 @@ to it.
 
 :line
 
-Styles with a {cuda} suffix are functionally the same as the
+Styles with a {cuda} or {kk} suffix are functionally the same as the
 corresponding style without the suffix.  They have been optimized to
 run faster, depending on your available hardware, as discussed in
 "Section_accelerate"_Section_accelerate.html of the manual.  The
 accelerated styles take the same arguments and should produce the same
 results, except for round-off and precision issues.
 
-These accelerated styles are part of the USER-CUDA package.  They are
+The region keyword is also supported by Kokkos, but a Kokkos-enabled
+region must be used. See the region "region"_region.html command for more
+information.
+
+These accelerated styles are part of the USER-CUDA or Kokkos package.  They are
 only enabled if LAMMPS was built with that package.  See the "Making
 LAMMPS"_Section_start.html#start_3 section for more info.
 

doc/region.html

@@ -187,6 +187,9 @@
   Px,Py,Pz = origin for axis of rotation (distance units)
   Rx,Ry,Rz = axis of rotation vector
 </pre>
+<ul class="simple">
+<li>accelerated styles (with same args) = <em>block/kk</em></li>
+</ul>
 </div>
 <div class="section" id="examples">
 <h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
@@ -401,7 +404,25 @@ wrap around the axis in the direction of rotation.</p>
 <p>The <em>move</em> and <em>rotate</em> keywords can be used together.  In this case,
 the displacement specified by the <em>move</em> keyword is applied to the <em>P</em>
 point of the <em>rotate</em> keyword.</p>
+<hr class="docutils" />
+<p>Styles with a <em>kk</em> suffix are functionally the same as the
+corresponding style without the suffix.  They have been optimized to
+run faster, depending on your available hardware, as discussed in
+<a class="reference internal" href="Section_accelerate.html"><em>Section_accelerate</em></a> of the manual.  The
+accelerated styles take the same arguments and should produce the same
+results, except for round-off and precision issues.</p>
+<p>The code using the region (such as a fix or compute) must also be supported
+by Kokkos or no acceleration will occur. Currently, only <em>block</em> style
+regions are supported by Kokkos.</p>
+<p>These accelerated styles are part of the Kokkos package.  They are
+only enabled if LAMMPS was built with that package.  See the <a class="reference internal" href="Section_start.html#start-3"><span>Making LAMMPS</span></a> section for more info.</p>
+<p>You can specify the accelerated styles explicitly in your input script
+by including their suffix, or you can use the <a class="reference internal" href="Section_start.html#start-7"><span>-suffix command-line switch</span></a> when you invoke LAMMPS, or you can
+use the <a class="reference internal" href="suffix.html"><em>suffix</em></a> command in your input script.</p>
+<p>See <a class="reference internal" href="Section_accelerate.html"><em>Section_accelerate</em></a> of the manual for
+more instructions on how to use the accelerated styles effectively.</p>
 </div>
+<hr class="docutils" />
 <div class="section" id="restrictions">
 <h2>Restrictions<a class="headerlink" href="#restrictions" title="Permalink to this headline">¶</a></h2>
 <p>A prism cannot be of 0.0 thickness in any dimension; use a small z

doc/region.txt

@@ -60,6 +60,8 @@ keyword = {side} or {units} or {move} or {rotate} :l
     v_theta = equal-style variable for rotaton of region over time (in radians)
     Px,Py,Pz = origin for axis of rotation (distance units)
     Rx,Ry,Rz = axis of rotation vector :pre
+
+accelerated styles (with same args) = {block/kk} :l
 :ule
 
 [Examples:]
@@ -299,6 +301,33 @@ The {move} and {rotate} keywords can be used together.  In this case,
 the displacement specified by the {move} keyword is applied to the {P}
 point of the {rotate} keyword.
 
+:line
+
+Styles with a {kk} suffix are functionally the same as the
+corresponding style without the suffix.  They have been optimized to
+run faster, depending on your available hardware, as discussed in
+"Section_accelerate"_Section_accelerate.html of the manual.  The
+accelerated styles take the same arguments and should produce the same
+results, except for round-off and precision issues.
+
+The code using the region (such as a fix or compute) must also be supported
+by Kokkos or no acceleration will occur. Currently, only {block} style
+regions are supported by Kokkos.
+
+These accelerated styles are part of the Kokkos package.  They are
+only enabled if LAMMPS was built with that package.  See the "Making
+LAMMPS"_Section_start.html#start_3 section for more info.
+
+You can specify the accelerated styles explicitly in your input script
+by including their suffix, or you can use the "-suffix command-line
+switch"_Section_start.html#start_7 when you invoke LAMMPS, or you can
+use the "suffix"_suffix.html command in your input script.
+
+See "Section_accelerate"_Section_accelerate.html of the manual for
+more instructions on how to use the accelerated styles effectively.
+
+:line
+
 [Restrictions:]
 
 A prism cannot be of 0.0 thickness in any dimension; use a small z