Merge pull request #4220 from pbehne/variational_smoother_enum_cleanup

VariationalMeshSmoother: Refactored element type check to use string comparison

Author: roystgnr

src/systems/variational_smoother_system.C

@@ -29,6 +29,7 @@
 #include "libmesh/quadrature.h"
 #include "libmesh/string_to_enum.h"
 #include "libmesh/utility.h"
+#include "libmesh/enum_to_string.h"
 
 // C++ includes
 #include <functional> // std::reference_wrapper
@@ -139,8 +140,10 @@ void VariationalSmootherSystem::prepare_for_smoothing()
           target_elem_inverse_jacobian_dets[elem->type()] =
               std::vector<Real>(nq_points, 1.0);
 
+          const auto type_str = Utility::enum_to_string(elem->type());
+
           // Elems deriving from Tri
-          if (elem->type() == TRI3 || elem->type() == TRI6)
+          if (type_str.compare(0, 3, "TRI") == 0)
             {
 
               // The target element will be an equilateral triangle with area equal to
@@ -180,7 +183,7 @@ void VariationalSmootherSystem::prepare_for_smoothing()
                   }
 
                 default:
-                  libmesh_error_msg("Unsupported triangular element!");
+                  libmesh_error_msg("Unsupported triangular element: " << type_str);
                   break;
                 }
 

tests/mesh/mesh_smoother_test.C

@@ -14,6 +14,7 @@
 #include <libmesh/system.h> // LIBMESH_HAVE_SOLVER define
 #include "libmesh/face_tri.h"
 #include "libmesh/utility.h"
+#include "libmesh/enum_to_string.h"
 
 #include "test_comm.h"
 #include "libmesh_cppunit.h"
@@ -283,7 +284,7 @@ public:
     // Get mesh dimension, determine whether type is triangular
     const auto * ref_elem = &(ReferenceElem::get(type));
     const auto dim = ref_elem->dim();
-    const bool type_is_tri = dynamic_cast<const Tri*>(ref_elem);
+    const bool type_is_tri = Utility::enum_to_string(type).compare(0, 3, "TRI") == 0;
 
     unsigned int n_elems_per_side = 5;