From 8436709676c6e10e4813cdaecbc0237cb72c20ca Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Tue, 3 Nov 2020 19:09:03 +0100
Subject: [PATCH] added support for unstructured meshes from vtk legacy files
---
.../DataExplorer/Base/ImportFileTypes.h | 2 +-
Applications/DataExplorer/mainwindow.cpp | 8 +++-
MeshLib/IO/VtkIO/VtuInterface.cpp | 37 +++++++++++++++++++
MeshLib/IO/VtkIO/VtuInterface.h | 7 +++-
MeshLib/IO/readMeshFromFile.cpp | 5 +++
5 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/Applications/DataExplorer/Base/ImportFileTypes.h b/Applications/DataExplorer/Base/ImportFileTypes.h
index 95aec4e84f0..8e45d6018e1 100644
--- a/Applications/DataExplorer/Base/ImportFileTypes.h
+++ b/Applications/DataExplorer/Base/ImportFileTypes.h
@@ -101,7 +101,7 @@ public:
if (t == ImportFileType::OGS_STN)
return "OpenGeosys files (*.stn)";
if (t == ImportFileType::OGS_MSH)
- return "OpenGeosys files (*.vtu *.msh)";
+ return "OpenGeosys files (*.vtu *.vtk *.msh)";
if (t == ImportFileType::PETREL)
return "Petrel files (*)";
if (t == ImportFileType::RASTER)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index ec1fb1eb6bb..93d721ef552 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -585,7 +585,9 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
}
}
// OpenGeoSys mesh files
- else if (fi.suffix().toLower() == "msh" || fi.suffix().toLower() == "vtu")
+ else if (fi.suffix().toLower() == "msh" ||
+ fi.suffix().toLower() == "vtu" ||
+ fi.suffix().toLower() == "vtk")
{
#ifndef NDEBUG
QTime myTimer0;
@@ -987,7 +989,9 @@ void MainWindow::mapGeometry(const std::string &geo_name)
MeshLib::Mesh* mesh (nullptr);
if (choice == 0) // load mesh from file
{
- if (fi.suffix().toLower() == "vtu" || fi.suffix().toLower() == "msh")
+ if (fi.suffix().toLower() == "vtu" ||
+ fi.suffix().toLower() == "vtk" ||
+ fi.suffix().toLower() == "msh")
{
mesh = MeshLib::IO::readMeshFromFile(file_name.toStdString());
}
diff --git a/MeshLib/IO/VtkIO/VtuInterface.cpp b/MeshLib/IO/VtkIO/VtuInterface.cpp
index 6b958a75f44..8c98358c2f3 100644
--- a/MeshLib/IO/VtkIO/VtuInterface.cpp
+++ b/MeshLib/IO/VtkIO/VtuInterface.cpp
@@ -14,6 +14,7 @@
#include "VtuInterface.h"
#include <vtkNew.h>
+#include <vtkGenericDataObjectReader.h>
#include <vtkXMLUnstructuredGridReader.h>
#include <vtkXMLUnstructuredGridWriter.h>
#if defined(USE_PETSC) || defined(USE_MPI)
@@ -72,6 +73,42 @@ MeshLib::Mesh* VtuInterface::readVTUFile(std::string const &file_name)
return MeshLib::VtkMeshConverter::convertUnstructuredGrid(vtkGrid, mesh_name);
}
+MeshLib::Mesh* VtuInterface::readVTKFile(std::string const& file_name)
+{
+ if (!BaseLib::IsFileExisting(file_name))
+ {
+ ERR("File '{:s}' does not exist.", file_name);
+ return nullptr;
+ }
+
+ vtkSmartPointer<vtkGenericDataObjectReader> reader =
+ vtkSmartPointer<vtkGenericDataObjectReader>::New();
+ reader->SetFileName(file_name.c_str());
+ reader->Update();
+
+ // check for unstructured grid
+ if (reader->ReadOutputType() != 4)
+ {
+ ERR("Only VTK-files with dataset type \"Unstructured Grid\" are "
+ "currently supported.");
+ return nullptr;
+ }
+
+ reader->ReadAllFieldsOn();
+ reader->ReadAllScalarsOn();
+ vtkUnstructuredGrid* vtkGrid = reader->GetUnstructuredGridOutput();
+ if (vtkGrid->GetNumberOfPoints() == 0)
+ {
+ ERR("Mesh '{:s}' contains zero points.", file_name);
+ return nullptr;
+ }
+
+ std::string const mesh_name(
+ BaseLib::extractBaseNameWithoutExtension(file_name));
+ return MeshLib::VtkMeshConverter::convertUnstructuredGrid(vtkGrid,
+ mesh_name);
+}
+
#ifdef USE_PETSC
std::string getVtuFileNameForPetscOutputWithoutExtension(
std::string const& file_name)
diff --git a/MeshLib/IO/VtkIO/VtuInterface.h b/MeshLib/IO/VtkIO/VtuInterface.h
index 81e3b4bf449..c8f9cae2d20 100644
--- a/MeshLib/IO/VtkIO/VtuInterface.h
+++ b/MeshLib/IO/VtkIO/VtuInterface.h
@@ -41,10 +41,15 @@ public:
int dataMode = vtkXMLWriter::Appended,
bool compressed = false);
- /// Read an unstructured grid from a VTU file
+ /// Read an unstructured grid from a VTU file.
/// \return The converted mesh or a nullptr if reading failed
static MeshLib::Mesh* readVTUFile(std::string const &file_name);
+ /// Read an unstructured grid from a legacy VTK file.
+ /// Other data structures such as PolyData are ignored.
+ /// \return The converted mesh or a nullptr if reading failed
+ static MeshLib::Mesh* readVTKFile(std::string const& file_name);
+
/// Writes the given mesh to file.
/// \return True on success, false on error
bool writeToFile(std::string const &file_name);
diff --git a/MeshLib/IO/readMeshFromFile.cpp b/MeshLib/IO/readMeshFromFile.cpp
index 5b2f94aa849..6a6845fb96b 100644
--- a/MeshLib/IO/readMeshFromFile.cpp
+++ b/MeshLib/IO/readMeshFromFile.cpp
@@ -80,6 +80,11 @@ MeshLib::Mesh* readMeshFromFileSerial(const std::string &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;
--
GitLab