resolved conflicts
This commit is contained in:
@ -73,7 +73,8 @@
|
||||
|
||||
|
||||
|
||||
<ul class="current">
|
||||
<p class="caption"><span class="caption-text">User Documentation</span></p>
|
||||
<ul class="current">
|
||||
<li class="toctree-l1"><a class="reference internal" href="Section_intro.html">1. Introduction</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="Section_start.html">2. Getting Started</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="Section_commands.html">3. Commands</a></li>
|
||||
@ -95,6 +96,18 @@
|
||||
</li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="Section_history.html">13. Future and history</a></li>
|
||||
</ul>
|
||||
<p class="caption"><span class="caption-text">Index</span></p>
|
||||
<ul>
|
||||
<li class="toctree-l1"><a class="reference internal" href="tutorials.html">Tutorials</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="commands.html">Commands</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="fixes.html">Fixes</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="computes.html">Computes</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="pairs.html">Pair Styles</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="bonds.html">Bonds</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="angles.html">Angle Styles</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="dihedrals.html">Dihedral Styles</a></li>
|
||||
<li class="toctree-l1"><a class="reference internal" href="impropers.html">Improper Styles</a></li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
@ -6491,7 +6504,7 @@ per timestep.</dd>
|
||||
<dd>If there are other fixes that act immediately after the intitial stage
|
||||
of time integration within a timestep (i.e. after atoms move), then
|
||||
the command that sets up the dynamic group should appear after those
|
||||
fixes. This will insure that dynamic group assignements are made
|
||||
fixes. This will insure that dynamic group assignments are made
|
||||
after all atoms have moved.</dd>
|
||||
<dt><em>One or more respa levels compute no forces</em></dt>
|
||||
<dd>This is computationally inefficient.</dd>
|
||||
|
||||
Reference in New Issue
Block a user