Merge pull request #4273 from GiudGiud/PR_inline_1d

Remove error messages from lagrange shape computations in 1D to allow their inlining

Author: roystgnr

include/fe/fe_lagrange_shape_1D.h

@@ -39,11 +39,9 @@ Real fe_lagrange_1D_linear_shape(const unsigned int i,
     case 0:
       return .5*(1. - xi);
 
-    case 1:
-      return .5*(1. + xi);
-
+    // case 1
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return .5*(1. + xi);
     }
 }
 
@@ -63,11 +61,9 @@ Real fe_lagrange_1D_quadratic_shape(const unsigned int i,
     case 1:
       return .5*xi*(xi + 1);
 
-    case 2:
-      return (1. - xi*xi);
-
+    // case 2
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return (1. - xi*xi);
     }
 }
 
@@ -90,11 +86,9 @@ Real fe_lagrange_1D_cubic_shape(const unsigned int i,
     case 2:
       return 27./16.*(1.-xi*xi)*(1./3.-xi);
 
-    case 3:
-      return 27./16.*(1.-xi*xi)*(1./3.+xi);
-
+    // case 3
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return 27./16.*(1.-xi*xi)*(1./3.+xi);
     }
 }
 
@@ -105,6 +99,8 @@ Real fe_lagrange_1D_shape(const Order order,
                           const unsigned int i,
                           const Real xi)
 {
+  libmesh_assert_less_equal(order, THIRD);
+
   switch (order)
     {
       // Lagrange linears
@@ -116,11 +112,9 @@ Real fe_lagrange_1D_shape(const Order order,
       return fe_lagrange_1D_quadratic_shape(i, xi);
 
       // Lagrange cubics
-    case THIRD:
-      return fe_lagrange_1D_cubic_shape(i, xi);
-
+      // case THIRD
     default:
-      libmesh_error_msg("ERROR: Unsupported polynomial order = " << order);
+      return fe_lagrange_1D_cubic_shape(i, xi);
     }
 }
 
@@ -141,11 +135,9 @@ Real fe_lagrange_1D_linear_shape_deriv(const unsigned int i,
     case 0:
       return -.5;
 
-    case 1:
-      return .5;
-
+    // case 1
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return .5;
     }
 }
 
@@ -168,11 +160,9 @@ Real fe_lagrange_1D_quadratic_shape_deriv(const unsigned int i,
     case 1:
       return xi+.5;
 
-    case 2:
-      return -2.*xi;
-
+    // case 2
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return -2.*xi;
     }
 }
 
@@ -198,11 +188,9 @@ Real fe_lagrange_1D_cubic_shape_deriv(const unsigned int i,
     case 2:
       return 27./16.*(3.*xi*xi-2./3.*xi-1.);
 
-    case 3:
-      return 27./16.*(-3.*xi*xi-2./3.*xi+1.);
-
+    // case 3
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return 27./16.*(-3.*xi*xi-2./3.*xi+1.);
     }
 }
 
@@ -214,6 +202,8 @@ Real fe_lagrange_1D_shape_deriv(const Order order,
                                 const unsigned int j,
                                 const Real xi)
 {
+  libmesh_assert_less_equal(order, THIRD);
+
   switch (order)
     {
     case FIRST:
@@ -222,11 +212,9 @@ Real fe_lagrange_1D_shape_deriv(const Order order,
     case SECOND:
       return fe_lagrange_1D_quadratic_shape_deriv(i, j, xi);
 
-    case THIRD:
-      return fe_lagrange_1D_cubic_shape_deriv(i, j, xi);
-
+    // case THIRD
     default:
-      libmesh_error_msg("ERROR: Unsupported polynomial order = " << order);
+      return fe_lagrange_1D_cubic_shape_deriv(i, j, xi);
     }
 }
 
@@ -244,6 +232,7 @@ Real fe_lagrange_1D_quadratic_shape_second_deriv(const unsigned int i,
   // Don't need to switch on j.  1D shape functions
   // depend on xi only!
   libmesh_assert_equal_to (j, 0);
+  libmesh_assert_less(i, 3);
 
   switch (i)
     {
@@ -253,11 +242,9 @@ Real fe_lagrange_1D_quadratic_shape_second_deriv(const unsigned int i,
     case 1:
       return 1.;
 
-    case 2:
-      return -2.;
-
+    // case 2
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return -2.;
     }
 }
 
@@ -270,6 +257,7 @@ Real fe_lagrange_1D_cubic_shape_second_deriv(const unsigned int i,
   // Don't need to switch on j.  1D shape functions
   // depend on xi only!
   libmesh_assert_equal_to (j, 0);
+  libmesh_assert_less(i, 4);
 
   switch (i)
     {
@@ -282,11 +270,9 @@ Real fe_lagrange_1D_cubic_shape_second_deriv(const unsigned int i,
     case 2:
       return 27./16.*(6*xi-2./3.);
 
-    case 3:
-      return 27./16.*(-6*xi-2./3.);
-
+    // case 2
     default:
-      libmesh_error_msg("Invalid shape function index i = " << i);
+      return 27./16.*(-6*xi-2./3.);
     }
 }
 
@@ -298,6 +284,8 @@ Real fe_lagrange_1D_shape_second_deriv(const Order order,
                                        const unsigned int j,
                                        const Real xi)
 {
+  libmesh_assert_less_equal(order, THIRD);
+
   switch (order)
     {
     // All second derivatives of linears are zero....
@@ -307,11 +295,9 @@ Real fe_lagrange_1D_shape_second_deriv(const Order order,
     case SECOND:
       return fe_lagrange_1D_quadratic_shape_second_deriv(i, j, xi);
 
-    case THIRD:
-      return fe_lagrange_1D_cubic_shape_second_deriv(i, j, xi);
-
+    // case THIRD
     default:
-      libmesh_error_msg("ERROR: Unsupported polynomial order = " << order);
+      return fe_lagrange_1D_cubic_shape_second_deriv(i, j, xi);
     } // end switch (order)
 }