[A/U] Use GMSH::readGMSHMesh().

Applications/DataExplorer/mainwindow.cpp

@@ -64,6 +64,7 @@
 #include "MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h"
 #include "MeshLib/IO/Legacy/MeshIO.h"
 #include "MeshLib/IO/readMeshFromFile.h"
+#include "MeshLib/IO/GmshReader.h"
 #include "FileIO/GMSHInterface.h"
 #include "FileIO/TetGenInterface.h"
 #include "PetrelInterface.h"
@@ -565,9 +566,9 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
     else if (t == ImportFileType::GMSH)
     {
         std::string msh_name (fileName.toStdString());
-        if (FileIO::GMSHInterface::isGMSHMeshFile (msh_name))
+        if (MeshLib::IO::GMSH::isGMSHMeshFile (msh_name))
         {
-            std::unique_ptr<MeshLib::Mesh> mesh(FileIO::GMSHInterface::readGMSHMesh(msh_name));
+            std::unique_ptr<MeshLib::Mesh> mesh(MeshLib::IO::GMSH::readGMSHMesh(msh_name));
             if (mesh)
                 _meshModel->addMesh(std::move(mesh));
             else

Applications/Utils/FileConverter/CMakeLists.txt

@@ -30,7 +30,7 @@ set_target_properties(generateMatPropsFromMatID
 
 add_executable(GMSH2OGS GMSH2OGS.cpp)
 set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
-target_link_libraries(GMSH2OGS MeshLib FileIO)
+target_link_libraries(GMSH2OGS MeshLib)
 ADD_VTK_DEPENDENCY(GMSH2OGS)
 
 add_executable(OGS2VTK OGS2VTK.cpp)

Applications/Utils/FileConverter/GMSH2OGS.cpp

@@ -28,8 +28,7 @@
 #include "MemWatch.h"
 #endif
 
-// FileIO
-#include "FileIO/GMSHInterface.h"
+#include "MeshLib/IO/GmshReader.h"
 
 #include "MeshLib/IO/writeMeshToFile.h"
 #include "MeshLib/MeshSearch/ElementSearch.h"
@@ -74,7 +73,8 @@ int main (int argc, char* argv[])
 #endif
     BaseLib::RunTime run_time;
     run_time.start();
-    MeshLib::Mesh * mesh(FileIO::GMSHInterface::readGMSHMesh(gmsh_mesh_arg.getValue()));
+    MeshLib::Mesh* mesh(
+        MeshLib::IO::GMSH::readGMSHMesh(gmsh_mesh_arg.getValue()));
 
     if (mesh == nullptr) {
         INFO("Could not read mesh from %s.", gmsh_mesh_arg.getValue().c_str());