Simplify code somewhat.

diff --git a/source/sundials/kinsol.cc b/source/sundials/kinsol.cc
index 13a25fc3bb09742309576a78740dd8ca18466b4f..dc57fc7a2321d6ca94ec344a0b6a2ec622fe1363 100644 (file)
--- a/source/sundials/kinsol.cc
+++ b/source/sundials/kinsol.cc
@@ -217,14 +217,10 @@ namespace SUNDIALS
 
       internal::copy(*src_yy, yy);
 
-      int err = 0;
-      if (solver.residual)
-        err = call_and_possibly_capture_exception(solver.residual,
-                                                  solver.pending_exception,
-                                                  *src_yy,
-                                                  *dst_FF);
-      else
-        Assert(false, ExcInternalError());
+      Assert(solver.residual, ExcInternalError());
+
+      const int err = call_and_possibly_capture_exception(
+        solver.residual, solver.pending_exception, *src_yy, *dst_FF);
 
       internal::copy(FF, *dst_FF);
 
@@ -249,14 +245,10 @@ namespace SUNDIALS
 
       internal::copy(*src_yy, yy);
 
-      int err = 0;
-      if (solver.iteration_function)
-        err = call_and_possibly_capture_exception(solver.iteration_function,
-                                                  solver.pending_exception,
-                                                  *src_yy,
-                                                  *dst_FF);
-      else
-        Assert(false, ExcInternalError());
+      Assert(solver.iteration_function, ExcInternalError());
+
+      const int err = call_and_possibly_capture_exception(
+        solver.iteration_function, solver.pending_exception, *src_yy, *dst_FF);
 
       internal::copy(FF, *dst_FF);