Merge pull request #4222 from roystgnr/short_name_fix

New utilities fixing file suffix tests

Author: jwpeterson

include/mesh/namebased_io.h

@@ -119,19 +119,6 @@ NameBasedIO::NameBasedIO (MeshBase & mesh) :
 {
 }
 
-inline
-bool
-NameBasedIO::is_parallel_file_format (std::string_view name)
-{
-  return ((name.rfind(".xda") < name.size()) ||
-          (name.rfind(".xdr") < name.size()) ||
-          (name.rfind(".nem") == name.size() - 4) ||
-          (name.rfind(".n") == name.size() - 2) ||
-          (name.rfind(".cp") < name.size())
-          );
-}
-
-
 } // namespace libMesh
 
 

include/utils/utility.h

@@ -386,6 +386,20 @@ void deallocate (std::vector<T> & vec)
 std::string_view basename_of(const std::string & fullname);
 
 
+/**
+ * Look for a substring within a string.
+ */
+bool contains(std::string_view superstring,
+              std::string_view substring);
+
+
+/**
+ * Look for a substring at the very end of a string.
+ */
+bool ends_with(std::string_view superstring,
+               std::string_view suffix);
+
+
 // Utility functions useful when dealing with complex numbers.
 
 #ifdef LIBMESH_USE_COMPLEX_NUMBERS

src/apps/projection.C

@@ -35,6 +35,7 @@
 #include "libmesh/point.h"
 #include "libmesh/replicated_mesh.h"
 #include "libmesh/enum_xdr_mode.h"
+#include "libmesh/utility.h"
 
 
 using namespace libMesh;
@@ -151,9 +152,9 @@ int main(int argc, char ** argv)
 
   XdrMODE read_mode;
 
-  if (solnname.rfind(".xdr") < solnname.size())
+  if (Utility::contains(solnname, ".xdr"))
     read_mode = DECODE;
-  else if (solnname.rfind(".xda") < solnname.size())
+  else if (Utility::contains(solnname, ".xda"))
     read_mode = READ;
   else
     libmesh_error_msg("Unrecognized file extension on " << solnname);

src/mesh/abaqus_io.C

@@ -233,7 +233,7 @@ void AbaqusIO::read (const std::string & fname)
   the_mesh.clear();
 
   // Open stream for reading
-  const bool gzipped_file = (fname.rfind(".gz") == fname.size() - 3);
+  const bool gzipped_file = Utility::ends_with(fname, ".gz");
 
   if (gzipped_file)
     {

src/mesh/dyna_io.C

@@ -138,10 +138,7 @@ DynaIO::DynaIO (MeshBase & mesh,
 
 void DynaIO::read (const std::string & name)
 {
-  const bool gzipped_file = (name.rfind(".gz") == name.size() - 3);
-  // These will be handled in unzip_file:
-  // const bool bzipped_file = (name.size() - name.rfind(".bz2") == 4);
-  // const bool xzipped_file = (name.size() - name.rfind(".xz") == 3);
+  const bool gzipped_file = Utility::ends_with(name, ".gz");
 
   std::unique_ptr<std::istream> in;