Skip to content

Commit

Permalink
Merge branch 'master' into release-1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
eromero-vlc committed Oct 13, 2015
2 parents f9ef6e7 + d591a8b commit 6b7dff2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 5 deletions.
Binary file modified doc/objects.inv
Binary file not shown.
3 changes: 1 addition & 2 deletions doc/readme.html
Expand Up @@ -2164,8 +2164,7 @@ <h3>primme_params<a class="headerlink" href="#primme-params" title="Permalink to
methods <a class="reference internal" href="#c.primme_preset_method.DEFAULT_MIN_TIME" title="primme_preset_method.DEFAULT_MIN_TIME"><code class="xref c c-member docutils literal"><span class="pre">DEFAULT_MIN_TIME</span></code></a> and <a class="reference internal" href="#c.primme_preset_method.DEFAULT_MIN_MATVECS" title="primme_preset_method.DEFAULT_MIN_MATVECS"><code class="xref c c-member docutils literal"><span class="pre">DEFAULT_MIN_MATVECS</span></code></a>.</p>
<p>With <a class="reference internal" href="#c.primme_preset_method.DYNAMIC" title="primme_preset_method.DYNAMIC"><code class="xref c c-member docutils literal"><span class="pre">DYNAMIC</span></code></a> <a class="reference internal" href="readme.html#c.primme_set_method" title="primme_set_method"><code class="xref c c-func docutils literal"><span class="pre">primme_set_method()</span></code></a> sets
<a class="reference internal" href="#c.primme_params.dynamicMethodSwitch" title="primme_params.dynamicMethodSwitch"><code class="xref c c-member docutils literal"><span class="pre">dynamicMethodSwitch</span></code></a> = 1 and makes the same changes as
for method <a class="reference internal" href="#c.primme_preset_method.JDQMR_ETol" title="primme_preset_method.JDQMR_ETol"><code class="xref c c-member docutils literal"><span class="pre">JDQMR_ETol</span></code></a> when <a class="reference internal" href="#c.primme_params.target" title="primme_params.target"><code class="xref c c-member docutils literal"><span class="pre">target</span></code></a> is either <code class="docutils literal"><span class="pre">primme_smallest</span></code> or
<code class="docutils literal"><span class="pre">primme_largest</span></code>, or as for method <a class="reference internal" href="#c.primme_preset_method.JDQMR" title="primme_preset_method.JDQMR"><code class="xref c c-member docutils literal"><span class="pre">JDQMR</span></code></a> otherwise.</p>
for method <a class="reference internal" href="#c.primme_preset_method.DEFAULT_MIN_TIME" title="primme_preset_method.DEFAULT_MIN_TIME"><code class="xref c c-member docutils literal"><span class="pre">DEFAULT_MIN_TIME</span></code></a>.</p>
</dd></dl>

<dl class="member">
Expand Down
Binary file modified doc/readme.pdf
Binary file not shown.
4 changes: 1 addition & 3 deletions readme.txt
Expand Up @@ -1966,9 +1966,7 @@ primme_preset_method
methods "DEFAULT_MIN_TIME" and "DEFAULT_MIN_MATVECS".

With "DYNAMIC" "primme_set_method()" sets "dynamicMethodSwitch"
= 1 and makes the same changes as for method "JDQMR_ETol" when
"target" is either "primme_smallest" or "primme_largest", or as
for method "JDQMR" otherwise.
= 1 and makes the same changes as for method "DEFAULT_MIN_TIME".

Arnoldi

Expand Down

0 comments on commit 6b7dff2

Please sign in to comment.