diff --git a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp b/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp
index 2e9f08a8e62b7a7abae6d8f05ac39f90d95dbb88..de75b6a294e8b005c821386980db3dad81adda72 100644
--- a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp
+++ b/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp
@@ -9,6 +9,10 @@
#include "FEFLOWGeoInterface.h"
#include <cctype>
+#include <memory>
+
+#include <QDomElement>
+#include <QString>
#include <QtXml>
#include <logog/include/logog.hpp>
@@ -31,12 +35,13 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string &filename, GeoLib::GEO
std::ifstream in(filename.c_str());
if (!in)
{
- ERR("FEFLOWInterface::readFEFLOWFile(): Could not open file %s.", filename.c_str());
+ ERR("FEFLOWGeoInterface::readFEFLOWFile(): Could not open file %s.", filename.c_str());
+ return;
}
- FEM_CLASS fem_class;
- std::vector<GeoLib::Point*>* points = NULL;
- std::vector<GeoLib::Polyline*>* lines = NULL;
+ unsigned dimension = 0;
+ std::vector<GeoLib::Point*>* points = nullptr;
+ std::vector<GeoLib::Polyline*>* lines = nullptr;
bool isXZplane = false;
@@ -51,8 +56,11 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string &filename, GeoLib::GEO
{
getline(in, line_string);
line_stream.str(line_string);
- // problem class, time mode, problem orientation, dimension, nr. layers for 3D, saturation switch, precision of results, precision of coordinates
- line_stream >> fem_class.problem_class >> fem_class.time_mode >> fem_class.orientation >> fem_class.dimension >> fem_class.n_layers3d;
+ // problem class, time mode, problem orientation, dimension, ...
+ unsigned dummy = 0;
+ for (int i=0; i<3; i++)
+ line_stream >> dummy;
+ line_stream >> dimension;
line_stream.clear();
}
//....................................................................
@@ -72,7 +80,7 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string &filename, GeoLib::GEO
// SUPERMESH
else if (line_string.compare("SUPERMESH") == 0)
{
- readSuperMesh(in, fem_class, &points, &lines);
+ readSuperMesh(in, dimension, points, lines);
}
//....................................................................
}
@@ -124,7 +132,7 @@ void FEFLOWGeoInterface::readPoints(QDomElement &nodesEle, const std::string &ta
}
-void FEFLOWGeoInterface::readSuperMesh(std::ifstream &in, const FEM_CLASS &fem_class, std::vector<GeoLib::Point*>** p_points, std::vector<GeoLib::Polyline*>** p_lines)
+void FEFLOWGeoInterface::readSuperMesh(std::ifstream &in, unsigned dimension, std::vector<GeoLib::Point*>* &points, std::vector<GeoLib::Polyline*>* &lines)
{
// get XML strings
std::ostringstream oss;
@@ -143,15 +151,14 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream &in, const FEM_CLASS &fem_c
QDomDocument doc;
if (!doc.setContent(strXML))
{
- ERR("FEFLOWInterface::readSuperMesh(): Illegal XML format error");
+ ERR("FEFLOWGeoInterface::readSuperMesh(): Illegal XML format error");
return;
}
// get geometry data from XML
QDomElement docElem = doc.documentElement(); // #supermesh
// #nodes
- *p_points = new std::vector<GeoLib::Point*>();
- std::vector<GeoLib::Point*>* points = *p_points;
+ points = new std::vector<GeoLib::Point*>();
QDomElement nodesEle = docElem.firstChildElement("nodes");
if (nodesEle.isNull())
return;
@@ -161,14 +168,13 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream &in, const FEM_CLASS &fem_c
const long n_points = str.toLong();
points->resize(n_points);
//fixed
- readPoints(nodesEle, "fixed", fem_class.dimension, *points);
- readPoints(nodesEle, "linear", fem_class.dimension, *points);
- readPoints(nodesEle, "parabolic", fem_class.dimension, *points);
+ readPoints(nodesEle, "fixed", dimension, *points);
+ readPoints(nodesEle, "linear", dimension, *points);
+ readPoints(nodesEle, "parabolic", dimension, *points);
}
// #polygons
- *p_lines = new std::vector<GeoLib::Polyline*>();
- std::vector<GeoLib::Polyline*>* lines = *p_lines;
+ lines = new std::vector<GeoLib::Polyline*>();
QDomElement polygonsEle = docElem.firstChildElement("polygons");
if (polygonsEle.isNull())
return;
diff --git a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h b/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h
index 80794224a43a3c9684956a04538ecfce27a5d53b..285145f88eb4f475a10434c62998df9a65da2dea 100644
--- a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h
+++ b/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h
@@ -10,12 +10,10 @@
#define FEFLOWGEOINTERFACE_H_
#include <iosfwd>
-#include <memory>
#include <string>
#include <vector>
class QDomElement;
-class QString;
namespace GeoLib
{
@@ -30,8 +28,7 @@ namespace IO
{
/**
- * Read FEFLOW model files (*.fem) into OGS data structure. Currently this class supports
- * only import of mesh data and some geometry given in Supermesh section.
+ * Interface to geometric data in FEFLOW files
*/
class FEFLOWGeoInterface
{
@@ -39,35 +36,22 @@ public:
/**
* read a FEFLOW Model file (*.fem) in ASCII format (Version 5.4)
*
- * This function reads mesh data in addition to geometry data given in Supermesh.
+ * This function reads geometry data given in Supermesh.
*
* @param filename FEFLOW file name
- * @return a pointer to a created OGS mesh
+ * @param geo_objects Geometric objects where imported geometry data are added
*/
- void readFEFLOWFile(const std::string &filename, GeoLib::GEOObjects& obj);
+ void readFEFLOWFile(const std::string &filename, GeoLib::GEOObjects& geo_objects);
-private:
- // CLASS
- struct FEM_CLASS
- {
- unsigned problem_class = 0;
- unsigned time_mode = 0;
- unsigned orientation = 0;
- unsigned dimension = 0;
- unsigned n_layers3d = 0;
- unsigned saturation_flag = 0;
- unsigned save_fsize_rreal = 0;
- unsigned save_fsize_creal = 0;
- };
-
- /// read Supermesh data
+ /// read points and polylines in Supermesh section
///
/// A super mesh is a collection of polygons, lines and points in the 2D plane
/// and will be used for mesh generation and to define the modeling region
- void readSuperMesh(std::ifstream &feflow_file, const FEM_CLASS &fem_class, std::vector<GeoLib::Point*>** points, std::vector<GeoLib::Polyline*>** lines);
+ static void readSuperMesh(std::ifstream &feflow_file, unsigned dimension, std::vector<GeoLib::Point*>* &points, std::vector<GeoLib::Polyline*>* &lines);
+private:
//// read point data in Supermesh
- void readPoints(QDomElement &nodesEle, const std::string &tag, int dim, std::vector<GeoLib::Point*> &points);
+ static void readPoints(QDomElement &nodesEle, const std::string &tag, int dim, std::vector<GeoLib::Point*> &points);
};
} // IO
diff --git a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp b/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp
index 3ad97dbc1096261fb1449af3ce6e792a190cbed2..0ee2cfb31190176ab54951adeb69f5d27b55e68d 100644
--- a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp
+++ b/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp
@@ -9,13 +9,14 @@
#include "FEFLOWMeshInterface.h"
#include <cctype>
-#include <QtXml>
+#include <memory>
#include <logog/include/logog.hpp>
#include "BaseLib/FileTools.h"
#include "BaseLib/StringTools.h"
+#include "GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h"
#include "GeoLib/Point.h"
#include "GeoLib/Polygon.h"
@@ -33,14 +34,14 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string &filename)
std::ifstream in(filename.c_str());
if (!in)
{
- ERR("FEFLOWInterface::readFEFLOWFile(): Could not open file %s.", filename.c_str());
+ ERR("FEFLOWMeshInterface::readFEFLOWFile(): Could not open file %s.", filename.c_str());
return nullptr;
}
FEM_CLASS fem_class;
FEM_DIM fem_dim;
- std::vector<GeoLib::Point*>* points = NULL;
- std::vector<GeoLib::Polyline*>* lines = NULL;
+ std::vector<GeoLib::Point*>* points = nullptr;
+ std::vector<GeoLib::Polyline*>* lines = nullptr;
bool isXZplane = false;
@@ -151,7 +152,7 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string &filename)
// SUPERMESH
else if (line_string.compare("SUPERMESH") == 0)
{
- readSuperMesh(in, fem_class, &points, &lines);
+ GeoLib::IO::FEFLOWGeoInterface::readSuperMesh(in, fem_class.dimension, points, lines);
}
//....................................................................
}
@@ -373,29 +374,6 @@ MeshLib::Element* FEFLOWMeshInterface::readElement(const FEM_DIM &fem_dim,
}
}
-void FEFLOWMeshInterface::readPoints(QDomElement &nodesEle, const std::string &tag, int dim, std::vector<GeoLib::Point*> &points)
-{
- QDomElement xmlEle = nodesEle.firstChildElement(QString::fromStdString(tag));
- if (xmlEle.isNull())
- return;
- QString str_pt_list1 = xmlEle.text();
- std::istringstream ss(str_pt_list1.toStdString());
- std::string line_str;
- while (!ss.eof())
- {
- std::getline(ss, line_str);
- BaseLib::trim(line_str, ' ');
- if (line_str.empty()) continue;
- std::istringstream line_ss(line_str);
- std::size_t pt_id = 0;
- std::array<double,3> pt_xyz;
- line_ss >> pt_id;
- for (int i = 0; i < dim; i++)
- line_ss >> pt_xyz[i];
- points[pt_id - 1] = new GeoLib::Point(pt_xyz, pt_id);
- }
-}
-
void FEFLOWMeshInterface::readELEMENTALSETS(std::ifstream &in, std::vector<std::vector<std::size_t>> &vec_elementsets)
{
auto compressSpaces = [](std::string const& str) {
@@ -469,88 +447,6 @@ void FEFLOWMeshInterface::readELEMENTALSETS(std::ifstream &in, std::vector<std::
}
-//
-void FEFLOWMeshInterface::readSuperMesh(std::ifstream &in, const FEM_CLASS &fem_class, std::vector<GeoLib::Point*>** p_points, std::vector<GeoLib::Polyline*>** p_lines)
-{
- // get XML strings
- std::ostringstream oss;
- std::string line_string;
- while (true)
- {
- getline(in, line_string);
- BaseLib::trim(line_string);
- oss << line_string << "\n";
- if (line_string.find("</supermesh>") != std::string::npos)
- break;
- }
- const QString strXML(oss.str().c_str());
-
- // convert string to XML
- QDomDocument doc;
- if (!doc.setContent(strXML))
- {
- ERR("FEFLOWInterface::readSuperMesh(): Illegal XML format error");
- return;
- }
-
- // get geometry data from XML
- QDomElement docElem = doc.documentElement(); // #supermesh
- // #nodes
- *p_points = new std::vector<GeoLib::Point*>();
- std::vector<GeoLib::Point*>* points = *p_points;
- QDomElement nodesEle = docElem.firstChildElement("nodes");
- if (nodesEle.isNull())
- return;
-
- {
- const QString str = nodesEle.attribute("count");
- const long n_points = str.toLong();
- points->resize(n_points);
- //fixed
- readPoints(nodesEle, "fixed", fem_class.dimension, *points);
- readPoints(nodesEle, "linear", fem_class.dimension, *points);
- readPoints(nodesEle, "parabolic", fem_class.dimension, *points);
- }
-
- // #polygons
- *p_lines = new std::vector<GeoLib::Polyline*>();
- std::vector<GeoLib::Polyline*>* lines = *p_lines;
- QDomElement polygonsEle = docElem.firstChildElement("polygons");
- if (polygonsEle.isNull())
- return;
-
- {
- QDomNode child = polygonsEle.firstChild();
- while (!child.isNull())
- {
- if (child.nodeName() != "polygon")
- {
- child = child.nextSibling();
- continue;
- }
- QDomElement xmlEle = child.firstChildElement("nodes");
- if (xmlEle.isNull())
- continue;
- const QString str = xmlEle.attribute("count");
- const std::size_t n_points = str.toLong();
- QString str_ptId_list = xmlEle.text().simplified();
- {
- GeoLib::Polyline* line = new GeoLib::Polyline(*points);
- lines->push_back(line);
- std::istringstream ss(str_ptId_list.toStdString());
- for (std::size_t i = 0; i < n_points; i++)
- {
- int pt_id = 0;
- ss >> pt_id;
- line->addPoint(pt_id - 1);
- }
- line->addPoint(line->getPointID(0));
- }
- child = child.nextSibling();
- }
- }
-}
-
void FEFLOWMeshInterface::setMaterialIDs(FEM_CLASS const& fem_class,
FEM_DIM const& fem_dim,
std::vector<GeoLib::Polyline*>* const& lines,
diff --git a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h b/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h
index 53bf02c8f51c647791abbf96c5a27781303bc95b..6f1ae54cdf1dee03820c6a7a79b1a9a0c75c9e24 100644
--- a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h
+++ b/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h
@@ -10,13 +10,9 @@
#define FEFLOWMESHINTERFACE_H_
#include <iosfwd>
-#include <memory>
#include <string>
#include <vector>
-class QDomElement;
-class QString;
-
namespace GeoLib
{
class Point;
@@ -57,67 +53,35 @@ private:
// CLASS
struct FEM_CLASS
{
- unsigned problem_class;
- unsigned time_mode;
- unsigned orientation;
- unsigned dimension;
- unsigned n_layers3d;
- unsigned saturation_flag;
- unsigned save_fsize_rreal;
- unsigned save_fsize_creal;
-
- FEM_CLASS()
- {
- problem_class = 0;
- time_mode = 0;
- orientation = 0;
- dimension = 0;
- n_layers3d = 0;
- saturation_flag = 0;
- save_fsize_rreal = 0;
- save_fsize_creal = 0;
- }
+ unsigned problem_class = 0;
+ unsigned time_mode = 0;
+ unsigned orientation = 0;
+ unsigned dimension = 0;
+ unsigned n_layers3d = 0;
+ unsigned saturation_flag = 0;
+ unsigned save_fsize_rreal = 0;
+ unsigned save_fsize_creal = 0;
};
// DIMENSION
struct FEM_DIM
{
- std::size_t n_nodes;
- std::size_t n_elements;
- std::size_t obs;
- std::size_t np_cor;
- unsigned n_nodes_of_element;
- unsigned n_steps;
- unsigned icrank;
- unsigned upwind;
- unsigned optim;
- unsigned aquifer_type;
- unsigned nwca;
- unsigned adaptive_mesh;
- unsigned sp_fem_pcs_id;
- unsigned sorption_type;
- unsigned reaction_type;
- unsigned dispersion_type;
-
- FEM_DIM()
- {
- n_nodes = 0;
- n_elements = 0;
- n_nodes_of_element = 0;
- n_steps = 0;
- icrank = 0;
- upwind = 0;
- obs = 0;
- optim = 0;
- aquifer_type = 0;
- nwca = 0;
- np_cor = 0;
- adaptive_mesh = 0;
- sp_fem_pcs_id = 0;
- sorption_type = 0;
- reaction_type = 0;
- dispersion_type = 0;
- }
+ std::size_t n_nodes = 0;
+ std::size_t n_elements = 0;
+ std::size_t obs = 0;
+ std::size_t np_cor = 0;
+ unsigned n_nodes_of_element = 0;
+ unsigned n_steps = 0;
+ unsigned icrank = 0;
+ unsigned upwind = 0;
+ unsigned optim = 0;
+ unsigned aquifer_type = 0;
+ unsigned nwca = 0;
+ unsigned adaptive_mesh = 0;
+ unsigned sp_fem_pcs_id = 0;
+ unsigned sorption_type = 0;
+ unsigned reaction_type = 0;
+ unsigned dispersion_type = 0;
};
/// read node indices and create a mesh element
@@ -135,15 +99,6 @@ private:
/// parse ELEMENTALSETS
void readELEMENTALSETS(std::ifstream &in, std::vector<std::vector<std::size_t>> &vec_elementsets);
- /// read Supermesh data
- ///
- /// A super mesh is a collection of polygons, lines and points in the 2D plane
- /// and will be used for mesh generation and to define the modeling region
- void readSuperMesh(std::ifstream &feflow_file, const FEM_CLASS &fem_class, std::vector<GeoLib::Point*>** points, std::vector<GeoLib::Polyline*>** lines);
-
- //// read point data in Supermesh
- void readPoints(QDomElement &nodesEle, const std::string &tag, int dim, std::vector<GeoLib::Point*> &points);
-
void setMaterialIDs(FEM_CLASS const& fem_class,
FEM_DIM const& fem_dim,
std::vector<GeoLib::Polyline*>* const& lines,