Fix some duplicated branch warnings.

diff --git a/include/deal.II/base/symmetric_tensor.templates.h b/include/deal.II/base/symmetric_tensor.templates.h
index 0ae1530fe5a3f3f3f0a348bd446778f258e7af70..490eddff1c9322ed4deaca48a4ec7472d8345576 100644 (file)
--- a/include/deal.II/base/symmetric_tensor.templates.h
+++ b/include/deal.II/base/symmetric_tensor.templates.h
@@ -882,7 +882,7 @@ eigenvectors(const SymmetricTensor<2, dim, Number> &T,
               // Adol-C taped
               if (method ==
                   SymmetricTensorEigenvectorMethod::ql_implicit_shifts)
-                sf = (dim == 2 ? 2e11 : 2e11);
+                sf = 2e11;
               else if (method == SymmetricTensorEigenvectorMethod::jacobi)
                 sf = (dim == 2 ? 1e6 : 1e9);
               else

diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h
index 4a439ea93f3088dbb403bdc0b5960e0dab43446d..b5082f69bdf4cf1ba17e3665b25b17d797d5adab 100644 (file)
--- a/include/deal.II/fe/fe_tools.h
+++ b/include/deal.II/fe/fe_tools.h
@@ -1406,13 +1406,11 @@ namespace FETools
    *
    * @ingroup Exceptions
    */
-  DeclException1(ExcHangingNodesNotAllowed,
-                 int,
-                 << "You are using continuous elements on a grid with "
-                 << "hanging nodes but without providing hanging node "
-                 << "constraints. Use the respective function with "
-                 << "additional AffineConstraints argument(s), instead."
-                 << (arg1 ? "" : ""));
+  DeclExceptionMsg(ExcHangingNodesNotAllowed,
+                   "You are using continuous elements on a grid with "
+                   "hanging nodes but without providing hanging node "
+                   "constraints. Use the respective function with "
+                   "additional AffineConstraints argument(s), instead.");
   /**
    * You need at least two grid levels.
    *

diff --git a/include/deal.II/fe/fe_tools_interpolate.templates.h b/include/deal.II/fe/fe_tools_interpolate.templates.h
index 715cc6ce6934bf3563ebadf40dd0d99d9a58a978..82460f14bb248c497c3bff1a6622b0713c5d4b25 100644 (file)
--- a/include/deal.II/fe/fe_tools_interpolate.templates.h
+++ b/include/deal.II/fe/fe_tools_interpolate.templates.h
@@ -178,7 +178,7 @@ namespace FETools
                  ++face)
               Assert(cell1->at_boundary(face) ||
                        cell1->neighbor(face)->level() == cell1->level(),
-                     ExcHangingNodesNotAllowed(0));
+                     ExcHangingNodesNotAllowed());
 
 
           const unsigned int dofs_per_cell1 = cell1->get_fe().dofs_per_cell;
@@ -336,7 +336,7 @@ namespace FETools
                  ++face)
               Assert(cell->at_boundary(face) ||
                        cell->neighbor(face)->level() == cell->level(),
-                     ExcHangingNodesNotAllowed(0));
+                     ExcHangingNodesNotAllowed());
 
           const unsigned int dofs_per_cell1 = cell->get_fe().dofs_per_cell;
 
@@ -656,7 +656,7 @@ namespace FETools
                  ++face)
               Assert(cell->at_boundary(face) ||
                        cell->neighbor(face)->level() == cell->level(),
-                     ExcHangingNodesNotAllowed(0));
+                     ExcHangingNodesNotAllowed());
 
           cell->get_dof_values(u1, u1_local);
           difference_matrix.vmult(u1_diff_local, u1_local);