From cb0e9a7cb3eaa304b2dc6c4b4047a4395cc41c6c Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Wed, 9 May 2012 14:37:46 +0200
Subject: [PATCH] added test application for mesh reading, fixed some bugs,
reading and creating a mesh is working now; Mesh is (for now) a friend of
Node, this should be fixed soon.
---
CMakeLists.txt | 1 +
FileIO/MeshIO.cpp | 4 ++--
FileIO/MeshIO.h | 4 ++++
MathLib/MathTools.cpp | 2 +-
MathLib/MathTools.h | 2 +-
MeshLib/Elements/Element.h | 4 ++--
MeshLib/FemMesh.cpp | 5 -----
MeshLib/FemMesh.h | 3 ---
MeshLib/Mesh.cpp | 6 ------
MeshLib/Mesh.h | 3 ---
MeshLib/Node.h | 4 ++--
SimpleTests/MeshTests/CMakeLists.txt | 25 +++++++++++++++++++++++++
SimpleTests/MeshTests/MeshRead.cpp | 19 +++++++++++++++++++
13 files changed, 57 insertions(+), 25 deletions(-)
create mode 100644 SimpleTests/MeshTests/CMakeLists.txt
create mode 100644 SimpleTests/MeshTests/MeshRead.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a66fc0842ec..e41c62e4db0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ ADD_SUBDIRECTORY( GeoLib )
ADD_SUBDIRECTORY( MathLib )
ADD_SUBDIRECTORY( MeshLib )
ADD_SUBDIRECTORY( SimpleTests/MatrixTests )
+ADD_SUBDIRECTORY( SimpleTests/MeshTests )
IF(NOT MSVC)
ADD_SUBDIRECTORY( SimpleTests/SolverTests )
ENDIF(NOT MSVC)
diff --git a/FileIO/MeshIO.cpp b/FileIO/MeshIO.cpp
index 5ad1cb2b8c1..2444bae5a56 100644
--- a/FileIO/MeshIO.cpp
+++ b/FileIO/MeshIO.cpp
@@ -29,7 +29,7 @@ MeshIO::MeshIO()
MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name)
{
- std::cout << "Read mesh ... " << std::flush;
+ std::cout << "Read mesh ... " << std::endl;
/*
#ifndef NDEBUG
QTime myTimer;
@@ -122,7 +122,7 @@ MeshLib::Element* MeshIO::readElement(const std::string& line, const std::vector
MeshLib::Element* elem;
- switch(index)
+ switch(elem_type)
{
case MshElemType::LINE:
for (int i = 0; i < 2; i++)
diff --git a/FileIO/MeshIO.h b/FileIO/MeshIO.h
index 57dfceeaf6b..2a935dcee07 100644
--- a/FileIO/MeshIO.h
+++ b/FileIO/MeshIO.h
@@ -5,6 +5,10 @@
* Author: KR
*/
+/**
+ * This is currently just test functionality for testing ogs-6 mesh data structures!
+ */
+
#ifndef MESHIO_H_
#define MESHIO_H_
diff --git a/MathLib/MathTools.cpp b/MathLib/MathTools.cpp
index d683e1284bd..88cebe7fae9 100644
--- a/MathLib/MathTools.cpp
+++ b/MathLib/MathTools.cpp
@@ -86,7 +86,7 @@ double getAngle (const double p0[3], const double p1[3], const double p2[3])
return acos (scpr (v0,v1,3) / (sqrt(scpr(v0,v0,3)) * sqrt(scpr (v1,v1,3))));
}
-double calcTriangleaArea(const double p0[3], const double p1[3], const double p2[3])
+double calcTriangleArea(const double* p0, const double* p1, const double* p2)
{
const double u0 (p2[0] - p0[0]);
const double u1 (p2[1] - p0[1]);
diff --git a/MathLib/MathTools.h b/MathLib/MathTools.h
index 5200b78726a..344d4308009 100644
--- a/MathLib/MathTools.h
+++ b/MathLib/MathTools.h
@@ -98,7 +98,7 @@ double getAngle (const double p0[3], const double p1[3], const double p2[3]);
* Calculates the area of a triangle.
* The formula is A=.5*|u x v|, i.e. half of the area of the parallelogram specified by u=p0->p1 and v=p0->p2.
*/
-double calcTriangleArea(const double p0[3], const double p1[3], const double p2[3]);
+double calcTriangleArea(const double* p0, const double* p1, const double* p2);
/**
* Calculates the volume of a tetrahedron.
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 3e07b798d0c..af765dfd52e 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -22,8 +22,8 @@ class Node;
class Element
{
/* friend functions: */
- friend void Mesh::setElementInformationForNodes();
- friend void Mesh::addElement(Element*);
+ friend class Mesh;//void Mesh::setElementInformationForNodes();
+ //friend void Mesh::addElement(Element*);
public:
diff --git a/MeshLib/FemMesh.cpp b/MeshLib/FemMesh.cpp
index fa4b55d1464..57139554a5c 100644
--- a/MeshLib/FemMesh.cpp
+++ b/MeshLib/FemMesh.cpp
@@ -24,11 +24,6 @@ FemMesh::FemMesh(const FemMesh &mesh)
{
}
-FemMesh::FemMesh(const std::string &file_name)
- : Mesh(file_name)
-{
-}
-
FemMesh::~FemMesh()
{
diff --git a/MeshLib/FemMesh.h b/MeshLib/FemMesh.h
index 335ca518789..9a390cd4e6c 100644
--- a/MeshLib/FemMesh.h
+++ b/MeshLib/FemMesh.h
@@ -27,9 +27,6 @@ public:
/// Copy constructor
FemMesh(const FemMesh &mesh);
- /// Constructor for reading a mesh from a file
- FemMesh(const std::string &file_name);
-
/// Destructor
virtual ~FemMesh();
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index fed2318fdf9..d9784233051 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -30,12 +30,6 @@ Mesh::Mesh(const Mesh &mesh)
{
}
-Mesh::Mesh(const std::string &file_name)
-{
- // read mesh
- this->makeNodesUnique();
-}
-
Mesh::~Mesh()
{
const size_t nElements (_elements.size());
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index 8f71750c766..abdfbe036b9 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -31,9 +31,6 @@ public:
/// Copy constructor
Mesh(const Mesh &mesh);
- /// Constructor for reading a mesh from a file
- Mesh(const std::string &file_name);
-
/// Destructor
virtual ~Mesh();
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index f2bcec99569..c92ba2c507c 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -25,8 +25,8 @@ class Element;
class Node : public GEOLIB::PointWithID
{
/* friend functions: */
- friend void Mesh::setElementInformationForNodes();
- friend void Mesh::addElement(Element*);
+ friend class Mesh;//void Mesh::setElementInformationForNodes();
+ //friend void Mesh::addElement(Element*);
public:
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
new file mode 100644
index 00000000000..7a52b603aa6
--- /dev/null
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+INCLUDE_DIRECTORIES(
+ .
+ ${CMAKE_SOURCE_DIR}/Base/
+ ${CMAKE_SOURCE_DIR}/Base/logog/include
+ ${CMAKE_SOURCE_DIR}/FileIO/
+ ${CMAKE_SOURCE_DIR}/MathLib/
+ ${CMAKE_SOURCE_DIR}/MeshLib/
+)
+
+# Create the executable
+ADD_EXECUTABLE( MeshRead
+ MeshRead.cpp
+ ${SOURCES}
+ ${HEADERS}
+)
+
+TARGET_LINK_LIBRARIES ( MeshRead
+ MeshLib
+ FileIO
+ MathLib
+ Base
+ GeoLib
+)
+
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
new file mode 100644
index 00000000000..6cfd71c00d0
--- /dev/null
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -0,0 +1,19 @@
+/*
+ * MeshRead.cpp
+ *
+ * Created on: 2012/05/09
+ * Author: KR
+ */
+
+#include "Mesh.h"
+#include "MeshIO.h"
+
+int main(int argc, char *argv[])
+{
+ std::string file_name("c:/Project/Data/Ammer/Ammer-Homogen100m-Final.msh");
+ FileIO::MeshIO mesh_io;
+ MeshLib::Mesh* mesh = mesh_io.loadMeshFromFile(file_name);
+
+ delete mesh;
+}
+
--
GitLab