[MeL] Write MeshToFile is now able to write xdmf

MeshLib/IO/VtkIO/writeXdmf.cpp → MeshLib/IO/XDMF/writeXdmf.cpp

@@ -2,7 +2,7 @@
  * \file
  * \author Tobias Meisel
  * \date   2020-10-06
- * \brief  Implementation of WriteXdmf function.
+ * \brief  Implementation of WriteXdmf3 function.
  *
  * \copyright
  * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.org)
@@ -14,6 +14,7 @@
 #include "writeXdmf.h"
 
 #include <vtkNew.h>
+#include <vtkPXdmf3Writer.h>
 #include <vtkSmartPointer.h>
 #include <vtkXdmf3Writer.h>
 
@@ -23,34 +24,36 @@ namespace MeshLib
 {
 namespace IO
 {
-bool writeXdmf3(const MeshLib::Mesh& mesh, std::string const &file_name)
+bool writeXdmf3(const MeshLib::Mesh& mesh, std::string const& file_name)
 {
-        #ifdef USE_PETSC
-            int rank;
-            MPI_Comm_rank(PETSC_COMM_WORLD, &rank);
-            int mpi_size;
-            MPI_Comm_size(PETSC_COMM_WORLD, &mpi_size);
-            vtkSmartPointer<vtkPXdmf3Writer> writer = vtkSmartPointer<vtkPXdmf3Writer>::New(); // open file handle
+#ifdef USE_PETSC
+    int rank;
+    MPI_Comm_rank(PETSC_COMM_WORLD, &rank);
+    int mpi_size;
+    MPI_Comm_size(PETSC_COMM_WORLD, &mpi_size);
+    vtkSmartPointer<vtkPXdmf3Writer> writer =
+        vtkSmartPointer<vtkPXdmf3Writer>::New();  // open file handle
 
-        #else
-            vtkSmartPointer<vtkXdmf3Writer> writer = vtkSmartPointer<vtkXdmf3Writer>::New(); // open file handle
-        #endif
+#else
+    vtkSmartPointer<vtkXdmf3Writer> writer =
+        vtkSmartPointer<vtkXdmf3Writer>::New();  // open file handle
+#endif
 
-            writer->SetFileName(file_name.c_str());
-            vtkNew<MeshLib::VtkMappedMeshSource> vtkSource;
-            vtkSource->SetMesh(&mesh);
-            vtkSource->Update();
-            writer->SetInputData(vtkSource->GetOutput());
+    writer->SetFileName(file_name.c_str());
+    vtkNew<MeshLib::VtkMappedMeshSource> vtkSource;
+    vtkSource->SetMesh(&mesh);
+    vtkSource->Update();
+    writer->SetInputData(vtkSource->GetOutput());
 
-        #ifdef USE_PETSC
-            writer->SetGhostLevel(1);
-            writer->SetNumberOfPieces(num_partitions);
-            writer->SetStartPiece(rank);
-            writer->SetEndPiece(rank);
-        #endif
-            writer->Write();
-                // close file handle
-        return 0;
+#ifdef USE_PETSC
+    writer->SetGhostLevel(1);
+    writer->SetNumberOfPieces(num_partitions);
+    writer->SetStartPiece(rank);
+    writer->SetEndPiece(rank);
+#endif
+    writer->Write();
+    // close file handle
+    return 0;
 }
-} //end namespace IO
-} //end namespace MeshLib
+}  // end namespace IO
+}  // end namespace MeshLib
\ No newline at end of file

MeshLib/IO/VtkIO/writeXdmf.h → MeshLib/IO/XDMF/writeXdmf.h

@@ -15,20 +15,18 @@
 #pragma once
 
 #include <string>
-#include "MeshLib/Mesh.h"
-
-namespace MeshLib {
 
+namespace MeshLib
+{
+class Mesh;
 
 namespace IO
 {
-
 /// Writes mesh to XDMF file.
 /// \return True on success, false on error
-bool writeXdmf3(const MeshLib::Mesh& mesh, std::string const &file_name);
 /// \param mesh           Mesh holds all data to be written.
 /// \param file_name      File name.
-/// \return True on success, false on error
+bool writeXdmf3(MeshLib::Mesh const& mesh, std::string const& file_name);
 
-} // end namespace IO
-} // end namespace MeshLib
+}  // end namespace IO
+}  // end namespace MeshLib
\ No newline at end of file

MeshLib/IO/writeMeshToFile.cpp

@@ -10,14 +10,14 @@
 #include "writeMeshToFile.h"
 
 #include "BaseLib/Logging.h"
-
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
 
 #include "MeshLib/Mesh.h"
-
 #include "MeshLib/IO/Legacy/MeshIO.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/XDMF/writeXdmf.h"
+
 
 namespace MeshLib
 {
@@ -44,9 +44,19 @@ int writeMeshToFile(const MeshLib::Mesh &mesh, const std::string &file_name)
         }
         return 0;
     }
-
+    if (BaseLib::hasFileExtension(".xdmf", file_name))
+    {
+        if (auto const result = writeXdmf3(mesh, file_name); !result)
+        {
+            ERR("writeMeshToFile(): Could not write mesh to '{:s}'.",
+                file_name);
+            return -1;
+        }
+        return 0;
+    }
     ERR("writeMeshToFile(): Unknown mesh file format in file {:s}.", file_name);
     return -1;
+
 }
 
 } // end namespace IO

MeshLib/IO/writeMeshToFile.h

@@ -18,4 +18,4 @@ namespace IO
 {
 int writeMeshToFile(const MeshLib::Mesh &mesh, const std::string &file_name);
 }
-}
+}
\ No newline at end of file

ProcessLib/Output/ProcessOutput.cpp

@@ -20,6 +20,7 @@
 #include "IntegrationPointWriter.h"
 #include "MathLib/LinAlg/LinAlg.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/XDMF/writeXdmf.h"
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
 /// Copies the ogs_version string containing the release number and the git