usnistgov · guyer · Jun 5, 2025 · Jan 8, 2021 · Jan 10, 2021 · Jan 12, 2021
diff --git a/.codacy.yml b/.codacy.yml
@@ -1,3 +1,3 @@
 ---
 exclude_paths:
-  - documentation/_themes/**
+  - docs/source/_themes/**
diff --git a/docs/source/ADMINISTRATA.rst b/docs/source/ADMINISTRATA.rst
@@ -155,6 +155,22 @@ The `conda-lock <https://github.com/conda/conda-lock>`_ lockfiles in
    Do not merge new lockfiles to ``master`` without validating that
    everything still works.
 
+.. attention::
+
+   As of 2025-04-30, locking 
+   :file:`environment/locks/trilinos-environment.yml` is extremely slow.
+
+.. attention::
+
+   Due to an issue with URL encoding, it may be necessary to replace
+   ``%21`` with ``!`` in the
+   :file:`environments/locks/conda-${solver}-lock.yml` files before calling
+   :command:`conda-lock render`.
+
+   See `conda/conda-lock#764 <https://github.com/conda/conda-lock/issues/764>`_, 
+   `mamba-org/mamba#3737 <https://github.com/mamba-org/mamba/issues/3737>`_,
+   `conda/conda#14481 <https://github.com/conda/conda/pull/14481>`_.
+
 =====================
 README-like documents
 =====================

diff --git a/docs/source/FAQ.rst b/docs/source/FAQ.rst
@@ -303,7 +303,8 @@ want, and then issue supplemental commands for the underlying plotting
 package. The better option is to make a "subclass" of the :term:`FiPy`
 :class:`Viewer <viewer.AbstractViewer>` that comes closest to producing the image you want. You can
 then override just the behavior you wan to change, while letting :term:`FiPy` do
-most of the heavy lifting. See :mod:`examples.phase.anisotropy` and
+most of the heavy lifting. See :mod:`examples.phase.anisotropy`,
+:mod:`examples.phase.binary`, :mod:`examples.phase.binaryCoupled`, and
 :mod:`examples.phase.polyxtal` for examples of creating a custom
 :term:`Matplotlib` :class:`Viewer <viewer.AbstractViewer>` class; see
 :mod:`examples.cahnHilliard.sphere` for an example of creating a custom

diff --git a/docs/source/USAGE.rst b/docs/source/USAGE.rst
@@ -1053,6 +1053,19 @@
 
    %    \subsection{Internal boundary conditions}
 
+-----------------
+Adaptive Stepping
+-----------------
+
+Step size can be controlled with the :term:`steppyngstounes` package.
+Demonstrations of its use are found in :mod:`examples.phase.binary` and
+:mod:`examples.phase.binaryCoupled.`
+
+.. note::
+
+   The old :mod:`fipy.steppers` classes are now deprecated.  They were
+   undocumented and did not work very well.
+
 .. _RunningUnderPython2:
 
 ----------------------

diff --git a/docs/source/figures/examples/phase/binary/binary-0.000080.pdf b/docs/source/figures/examples/phase/binary/binary-0.000080.pdf
diff --git a/docs/source/figures/examples/phase/binary/binary-0.000080.png b/docs/source/figures/examples/phase/binary/binary-0.000080.png
diff --git a/docs/source/figures/examples/phase/binary/binary-0.000899.pdf b/docs/source/figures/examples/phase/binary/binary-0.000899.pdf
diff --git a/docs/source/figures/examples/phase/binary/binary-0.000899.png b/docs/source/figures/examples/phase/binary/binary-0.000899.png
diff --git a/docs/source/figures/examples/phase/binary/binary-1080000.000000.pdf b/docs/source/figures/examples/phase/binary/binary-1080000.000000.pdf
diff --git a/docs/source/figures/examples/phase/binary/binary-1080000.000000.png b/docs/source/figures/examples/phase/binary/binary-1080000.000000.png
diff --git a/docs/source/figures/examples/phase/binary/binary-8.949963.pdf b/docs/source/figures/examples/phase/binary/binary-8.949963.pdf
diff --git a/docs/source/figures/examples/phase/binary/binary-8.949963.png b/docs/source/figures/examples/phase/binary/binary-8.949963.png
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-0.000080.pdf b/docs/source/figures/examples/phase/binary/binaryCoupled-0.000080.pdf
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-0.000080.png b/docs/source/figures/examples/phase/binary/binaryCoupled-0.000080.png
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-0.000899.pdf b/docs/source/figures/examples/phase/binary/binaryCoupled-0.000899.pdf
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-0.000899.png b/docs/source/figures/examples/phase/binary/binaryCoupled-0.000899.png
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-1080000.000000.pdf b/docs/source/figures/examples/phase/binary/binaryCoupled-1080000.000000.pdf
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-1080000.000000.png b/docs/source/figures/examples/phase/binary/binaryCoupled-1080000.000000.png
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-8.949963.pdf b/docs/source/figures/examples/phase/binary/binaryCoupled-8.949963.pdf
diff --git a/docs/source/figures/examples/phase/binary/binaryCoupled-8.949963.png b/docs/source/figures/examples/phase/binary/binaryCoupled-8.949963.png
diff --git a/docs/source/figures/examples/phase/binary/coupled-stationary.pdf b/docs/source/figures/examples/phase/binary/coupled-stationary.pdf
diff --git a/docs/source/figures/examples/phase/binary/coupled-stationary.png b/docs/source/figures/examples/phase/binary/coupled-stationary.png
diff --git a/docs/source/figures/examples/phase/binary/moving.pdf b/docs/source/figures/examples/phase/binary/moving.pdf
diff --git a/docs/source/figures/examples/phase/binary/moving.png b/docs/source/figures/examples/phase/binary/moving.png
diff --git a/docs/source/figures/examples/phase/binary/stationary.pdf b/docs/source/figures/examples/phase/binary/stationary.pdf
diff --git a/docs/source/figures/examples/phase/binary/stationary.png b/docs/source/figures/examples/phase/binary/stationary.png
diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
@@ -199,6 +199,11 @@ Glossary
       See
       http://sphinx.pocoo.org/.
 
+   steppyngstounes
+      This package provides iterators that simplify both deterministic and
+      adaptive stepping in time (or other independent variables).
+      See https://pages.nist.gov/steppyngstounes/en/latest.
+
    TravisCI
       A cloud-based :term:`Continuous Integration` tool.
       See https://travis-ci.org.

diff --git a/environments/locks/conda-petsc-linux-64.lock b/environments/locks/conda-petsc-linux-64.lock