From 4172ebc4c2856a00ce9c0b400f8853d93a467ddd Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 5 Mar 2019 15:28:05 +0100
Subject: [PATCH] [A/FileIO] Fwd. gmsh path to readGeometryFromFile.
---
Applications/FileIO/readGeometryFromFile.cpp | 8 +++++---
Applications/FileIO/readGeometryFromFile.h | 7 ++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Applications/FileIO/readGeometryFromFile.cpp b/Applications/FileIO/readGeometryFromFile.cpp
index 4f355b73ac8..89b847d9afc 100644
--- a/Applications/FileIO/readGeometryFromFile.cpp
+++ b/Applications/FileIO/readGeometryFromFile.cpp
@@ -22,8 +22,9 @@
namespace FileIO
{
-void
-readGeometryFromFile(std::string const& fname, GeoLib::GEOObjects & geo_objs)
+void readGeometryFromFile(std::string const& fname,
+ GeoLib::GEOObjects& geo_objs,
+ std::string const& gmsh_path)
{
if (BaseLib::getFileExtension(fname) == "gml")
{
@@ -32,7 +33,8 @@ readGeometryFromFile(std::string const& fname, GeoLib::GEOObjects & geo_objs)
} else {
std::vector<std::string> errors;
std::string geo_name; // geo_name is output of the reading function
- FileIO::Legacy::readGLIFileV4(fname, geo_objs, geo_name, errors);
+ FileIO::Legacy::readGLIFileV4(
+ fname, geo_objs, geo_name, errors, gmsh_path);
}
std::vector<std::string> geo_names;
diff --git a/Applications/FileIO/readGeometryFromFile.h b/Applications/FileIO/readGeometryFromFile.h
index 4a63668dd72..84bc42c7f6a 100644
--- a/Applications/FileIO/readGeometryFromFile.h
+++ b/Applications/FileIO/readGeometryFromFile.h
@@ -14,11 +14,12 @@
namespace GeoLib
{
- class GEOObjects;
+class GEOObjects;
}
namespace FileIO
{
- void
- readGeometryFromFile(std::string const& fname, GeoLib::GEOObjects & geo_objs);
+void readGeometryFromFile(std::string const& fname,
+ GeoLib::GEOObjects& geo_objs,
+ std::string const& gmsh_path);
}
--
GitLab