diff --git a/MeshLib/IO/readMeshFromFile.cpp b/MeshLib/IO/readMeshFromFile.cpp index 13f9ad3055aee4d2fe8b861e93a9aa3bd6f7e13e..8e4af64a86d05ccd3c3cf94386e89b4cb6d1b826 100644 --- a/MeshLib/IO/readMeshFromFile.cpp +++ b/MeshLib/IO/readMeshFromFile.cpp @@ -35,6 +35,32 @@ #include "MeshLib/NodePartitionedMesh.h" #endif +namespace +{ +MeshLib::Mesh* readMeshFromFileSerial(const std::string& file_name) +{ + if (BaseLib::hasFileExtension(".msh", file_name)) + { + MeshLib::IO::Legacy::MeshIO meshIO; + return meshIO.loadMeshFromFile(file_name); + } + + if (BaseLib::hasFileExtension(".vtu", file_name)) + { + return MeshLib::IO::VtuInterface::readVTUFile(file_name); + } + + if (BaseLib::hasFileExtension(".vtk", file_name)) + { + return MeshLib::IO::VtuInterface::readVTKFile(file_name); + } + + ERR("readMeshFromFile(): Unknown mesh file format in file {:s}.", + file_name); + return nullptr; +} +} // namespace + namespace MeshLib { namespace IO @@ -65,28 +91,5 @@ MeshLib::Mesh* readMeshFromFile(const std::string& file_name) #endif } -MeshLib::Mesh* readMeshFromFileSerial(const std::string& file_name) -{ - if (BaseLib::hasFileExtension(".msh", file_name)) - { - MeshLib::IO::Legacy::MeshIO meshIO; - return meshIO.loadMeshFromFile(file_name); - } - - if (BaseLib::hasFileExtension(".vtu", file_name)) - { - return MeshLib::IO::VtuInterface::readVTUFile(file_name); - } - - if (BaseLib::hasFileExtension(".vtk", file_name)) - { - return MeshLib::IO::VtuInterface::readVTKFile(file_name); - } - - ERR("readMeshFromFile(): Unknown mesh file format in file {:s}.", - file_name); - return nullptr; -} - } // end namespace IO } // end namespace MeshLib diff --git a/MeshLib/IO/readMeshFromFile.h b/MeshLib/IO/readMeshFromFile.h index 8d685f899c570a946b031ca13940b49a834e4e61..5afde88d36cdd474b45f0d94c6120b8b22b46d87 100644 --- a/MeshLib/IO/readMeshFromFile.h +++ b/MeshLib/IO/readMeshFromFile.h @@ -26,7 +26,6 @@ class Mesh; namespace IO { -MeshLib::Mesh* readMeshFromFileSerial(const std::string &file_name); MeshLib::Mesh* readMeshFromFile(const std::string &file_name); } }