]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #17194 from bangerth/petsc-ts-rename-2
authorMartin Kronbichler <martin.kronbichler@rub.de>
Fri, 5 Jul 2024 06:30:47 +0000 (08:30 +0200)
committerGitHub <noreply@github.com>
Fri, 5 Jul 2024 06:30:47 +0000 (08:30 +0200)
Rename a second callback in PETScWrappers::TimeStepper.

1  2 
include/deal.II/lac/petsc_ts.h
include/deal.II/lac/petsc_ts.templates.h
tests/petsc/petsc_ts_03.cc

index b4fa23918cff7ef4122607ba3c7cdb8ee1ec01a3,ebefa3d4f897e48f9fa5d2127ad0b4d517c94454..538fd7e596f025f7229d8731f51a4bfb61ca6706
@@@ -610,14 -603,31 +610,32 @@@ namespace PETScWrapper
       * See there for a description of how to deal with errors and other
       * requirements and conventions.
       */
 -    std::function<void(const real_type t, VectorType &y)> distribute;
 +    std::function<void(const real_type t, VectorType &y)>
 +      update_constrained_components;
  
      /**
-      * Callback to set up mesh adaption.
+      * This callback is equivalent to `decide_and_prepare_for_remeshing`
+      * except that it returns the decision whether or not to stop
+      * operations via the last reference argument of the function
+      * object instead of a plain return value. This callback is
+      * deprecated. Use `decide_and_prepare_for_remeshing` instead.
+      */
+     std::function<void(const real_type    t,
+                        const unsigned int step,
+                        const VectorType  &y,
+                        bool              &resize)>
+       decide_for_coarsening_and_refinement;
+     /**
+      * A callback that returns whether or not to stop time stepping at the
+      * current moment for mesh adaptation. If the callback returns `true`,
+      * then the time stepper stops time integration for now, saves some state,
+      * calls the `interpolate` callback, and then resumes time integration.
+      * Either in the current callback or the `interpolate` callback, the
+      * user code needs to perform the mesh refinement.
       *
-      * Implementation of this function is optional.
-      * @p resize must be set to true if mesh adaption is to be performed, false
+      * Implementation of this function is optional. The callback
+      * must return `true` if mesh adaption is to be performed, `false`
       * otherwise.
       * The @p y vector contains the current solution, @p t the current time,
       * @ step the step number.
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.