From: Luca Heltai <luca.heltai@sissa.it>
Date: Fri, 13 Oct 2017 09:31:54 +0000 (+0200)
Subject: Remove use_local_tolerances parameter.
X-Git-Tag: v9.0.0-rc1~956^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5237%2Fhead;p=dealii.git

Remove use_local_tolerances parameter.
---

diff --git a/include/deal.II/sundials/ida.h b/include/deal.II/sundials/ida.h
index f13fe1be1a..1b6ed41ed0 100644
--- a/include/deal.II/sundials/ida.h
+++ b/include/deal.II/sundials/ida.h
@@ -288,7 +288,6 @@ namespace SUNDIALS
        *
        * @param absolute_tolerance Absolute error tolerance
        * @param relative_tolerance Relative error tolerance
-       * @param use_local_tolerances Use local tolerances when computing errors
        * @param ignore_algebraic_terms_for_errors Ignore algebraic terms for error computations
        *
        * Initial condition correction parameters:
@@ -309,7 +308,6 @@ namespace SUNDIALS
         // Error parameters
         const double &absolute_tolerance = 1e-6,
         const double &relative_tolerance = 1e-5,
-        const bool &use_local_tolerances = false,
         const bool &ignore_algebraic_terms_for_errors = true,
         // Initial conditions parameters
         const InitialConditionCorrection &ic_type = use_y_diff,
@@ -327,8 +325,7 @@ namespace SUNDIALS
         ic_type(ic_type),
         reset_type(reset_type),
         maximum_non_linear_iterations_ic(maximum_non_linear_iterations_ic),
-        maximum_non_linear_iterations(maximum_non_linear_iterations),
-        use_local_tolerances(use_local_tolerances)
+        maximum_non_linear_iterations(maximum_non_linear_iterations)
       {}
 
       /**
@@ -391,7 +388,6 @@ namespace SUNDIALS
         prm.add_parameter("Ignore algebraic terms for error computations", ignore_algebraic_terms_for_errors,
                           "Indicate whether or not to suppress algebraic variables "
                           "in the local error test.");
-        prm.add_parameter("Use local tolerances", use_local_tolerances);
         prm.leave_subsection();
 
         prm.enter_subsection("Initial condition correction parameters");
@@ -525,11 +521,6 @@ namespace SUNDIALS
        * Maximum number of iterations for Newton method during time advancement.
        */
       unsigned int maximum_non_linear_iterations;
-
-      /**
-       * Use local tolerances when computing absolute tolerance.
-       */
-      bool use_local_tolerances;
     };
 
     /**
@@ -745,12 +736,9 @@ namespace SUNDIALS
 
     /**
      * Return a vector whose components are the weights used by IDA to compute
-     * the vector norm. The implementation of this function is optional, and it
-     * is used only when `use_local_tolerances` is set to true at construction
-     * time, or through the parameter file.
-     *
-     * If you do not overwrite this function and set `use_local_tolerances` to
-     * true, an exception will be thrown when trying to start the time stepper.
+     * the vector norm. The implementation of this function is optional. If the
+     * user does not provide an implementation, the weights are assumed to be all
+     * ones.
      */
     std::function<VectorType&()> get_local_tolerances;
 
diff --git a/source/sundials/ida.cc b/source/sundials/ida.cc
index 550f9ddb63..188a44cc97 100644
--- a/source/sundials/ida.cc
+++ b/source/sundials/ida.cc
@@ -338,7 +338,7 @@ namespace SUNDIALS
     status = IDAInit(ida_mem, t_dae_residual<VectorType>, current_time, yy, yp);
     AssertIDA(status);
 
-    if (data.use_local_tolerances)
+    if (get_local_tolerances)
       {
         copy(abs_tolls, get_local_tolerances());
         status = IDASVtolerances(ida_mem, data.relative_tolerance, abs_tolls);
@@ -486,13 +486,6 @@ namespace SUNDIALS
       const unsigned int size = v->size();
       return complete_index_set(size);
     };
-
-    get_local_tolerances = []() ->VectorType &
-    {
-      std::shared_ptr<VectorType> y;
-      AssertThrow(false, ExcFunctionNotProvided("get_local_tolerances"));
-      return *y;
-    };
   }
 
   template class IDA<Vector<double> >;
diff --git a/tests/sundials/harmonic_oscillator_01.prm b/tests/sundials/harmonic_oscillator_01.prm
index 36b33edc44..e37096a166 100644
--- a/tests/sundials/harmonic_oscillator_01.prm
+++ b/tests/sundials/harmonic_oscillator_01.prm
@@ -5,7 +5,6 @@ subsection Error control
   set Absolute error tolerance                      = 1e-6
   set Ignore algebraic terms for error computations = true
   set Relative error tolerance                      = 1e-5
-  set Use local tolerances                          = false
 end
 subsection Initial condition correction parameters
   set Correction type at initial time        = none