From c88f7fc2e3a66fc69ad025d19ad92f811d77ea51 Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Wed, 24 Aug 2022 16:08:49 +0200
Subject: [PATCH] adding support for 2dm files
---
.../DataExplorer/Base/ImportFileTypes.h | 2 +-
Applications/DataExplorer/mainwindow.cpp | 3 +-
Applications/FileIO/GMSInterface.cpp | 53 ++++++++++++++-----
3 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/Applications/DataExplorer/Base/ImportFileTypes.h b/Applications/DataExplorer/Base/ImportFileTypes.h
index 461dca43dcb..48799a00835 100644
--- a/Applications/DataExplorer/Base/ImportFileTypes.h
+++ b/Applications/DataExplorer/Base/ImportFileTypes.h
@@ -84,7 +84,7 @@ public:
if (t == ImportFileType::FEFLOW)
return "FEFLOW files (*.fem)";
if (t == ImportFileType::GMS)
- return "GMS files (*.txt *.3dm)";
+ return "GMS files (*.txt *.2dm *.3dm)";
if (t == ImportFileType::GMSH)
return "GMSH mesh files (*.msh)";
if (t == ImportFileType::GOCAD_TSURF)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index a514a9718de..1aa8fe9a4dc 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -720,7 +720,8 @@ void MainWindow::loadFile(ImportFileType::type t, const QString& fileName)
OGSError::box("Error reading GMS file.");
}
}
- else if (fi.suffix().toLower() == "3dm") // GMS mesh files
+ else if (fi.suffix().toLower() == "2dm" ||
+ fi.suffix().toLower() == "3dm") // GMS mesh files
{
std::string name = fileName.toStdString();
std::unique_ptr<MeshLib::Mesh> mesh(
diff --git a/Applications/FileIO/GMSInterface.cpp b/Applications/FileIO/GMSInterface.cpp
index d4fe40203bd..4fbf59f02dc 100644
--- a/Applications/FileIO/GMSInterface.cpp
+++ b/Applications/FileIO/GMSInterface.cpp
@@ -24,6 +24,7 @@
#include "BaseLib/Logging.h"
#include "BaseLib/StringTools.h"
#include "GeoLib/StationBorehole.h"
+#include "MeshLib/Elements/Tri.h"
#include "MeshLib/Elements/Prism.h"
#include "MeshLib/Elements/Pyramid.h"
#include "MeshLib/Elements/Tet.h"
@@ -194,14 +195,16 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
// Read data from file
std::getline(in, line); // "MESH3D"
- if (line != "MESH3D")
+ if (line != "MESH3D" && line != "MESH2D")
{
ERR("GMSInterface::readGMS3DMMesh(): Could not read expected file "
"header.");
return nullptr;
}
+ bool const is_3d = (line == "MESH3D") ? true : false;
- INFO("GMSInterface::readGMS3DMMesh(): Read GMS-3DM mesh.");
+ std::string mesh_name = BaseLib::extractBaseNameWithoutExtension(filename);
+ INFO("GMSInterface::readGMS3DMMesh(): Reading GMS mesh...");
std::vector<MeshLib::Node*> nodes;
std::vector<MeshLib::Element*> elements;
std::vector<int> mat_ids;
@@ -227,10 +230,10 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
}
in.close();
- // NOTE: Element types E8H (Hex), E4Q (Quad), E3T (Tri) are not implemented
- // yet read elements
+ // NOTE: Element types E8H (Hex), E4Q (Quad) are not implemented yet
+ // read elements
in.open(filename.c_str());
- std::getline(in, line); // "MESH3D"
+ std::getline(in, line); // "MESH2D" / "MESH3D"
unsigned node_idx[6];
int mat_id(0);
while (std::getline(in, line))
@@ -238,7 +241,36 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
std::string element_id(line.substr(0, 3));
std::stringstream str(line);
- if (element_id == "E6W") // Prism
+ if (element_id == "MES") // "MESHNAME"
+ {
+ str >> dummy >> mesh_name;
+ mesh_name = mesh_name.substr(1, mesh_name.length() - 2);
+ }
+ else if (!is_3d && element_id == "E3T") // Triangle
+ {
+ str >> dummy >> id >> node_idx[0] >> node_idx[1] >> node_idx[2] >>
+ mat_id;
+ auto** tri_nodes = new MeshLib::Node*[3];
+ for (unsigned k(0); k < 3; k++)
+ {
+ tri_nodes[k] = nodes[id_map.find(node_idx[k])->second];
+ }
+ elements.push_back(new MeshLib::Tri(tri_nodes));
+ mat_ids.push_back(mat_id);
+ }
+ else if(!is_3d && element_id == "E6T") // Triangle
+ {
+ str >> dummy >> id >> node_idx[0] >> node_idx[3] >> node_idx[1] >>
+ node_idx[4] >> node_idx[2] >> node_idx[5] >> mat_id;
+ auto** tri_nodes = new MeshLib::Node*[3];
+ for (unsigned k(0); k < 3; k++)
+ {
+ tri_nodes[k] = nodes[id_map.find(node_idx[k])->second];
+ }
+ elements.push_back(new MeshLib::Tri(tri_nodes));
+ mat_ids.push_back(mat_id);
+ }
+ else if(is_3d && element_id == "E6W") // Prism
{
str >> dummy >> id >> node_idx[0] >> node_idx[1] >> node_idx[2] >>
node_idx[3] >> node_idx[4] >> node_idx[5] >> mat_id;
@@ -250,7 +282,7 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
elements.push_back(new MeshLib::Prism(prism_nodes));
mat_ids.push_back(mat_id);
}
- else if (element_id == "E4T") // Tet
+ else if (is_3d && element_id == "E4T") // Tet
{
str >> dummy >> id >> node_idx[0] >> node_idx[1] >> node_idx[2] >>
node_idx[3] >> mat_id;
@@ -262,9 +294,8 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
elements.push_back(new MeshLib::Tet(tet_nodes));
mat_ids.push_back(mat_id);
}
- else if ((element_id == "E4P") ||
- (element_id ==
- "E5P")) // Pyramid (both do exist for some reason)
+ // Pyramid (two versions exist for some reason)
+ else if (is_3d && (element_id == "E4P") || (element_id == "E5P"))
{
str >> dummy >> id >> node_idx[0] >> node_idx[1] >> node_idx[2] >>
node_idx[3] >> node_idx[4] >> mat_id;
@@ -293,8 +324,6 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string& filename)
in.close();
INFO("GMSInterface::readGMS3DMMesh(): finished.");
- const std::string mesh_name =
- BaseLib::extractBaseNameWithoutExtension(filename);
MeshLib::Properties properties;
if (mat_ids.size() == elements.size())
{
--
GitLab