added calculation of min- and max-edge-length; fixed more warnings

FileIO/MeshIO.cpp

@@ -51,6 +51,7 @@ MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name)
 
 	if(line_string.find("#FEM_MSH") != std::string::npos) // OGS mesh file
 	{
+		double edge_length[2] = { std::numeric_limits<double>::max(), std::numeric_limits<double>::min() };
 		while (!in.eof())
 		{
 			getline(in, line_string);
@@ -86,13 +87,21 @@ MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name)
 				for (unsigned i = 0; i < nElements; i++)
 				{
 					getline(in, line_string);
-					
+
+					size_t elem_idx (elements.size());
 					elements.push_back(readElement(line_string, nodes));
+
+					double elem_min_length, elem_max_length;
+					elements[elem_idx]->computeSqrEdgeLengthRange(elem_min_length, elem_max_length);
+					edge_length[0] = (elem_min_length<edge_length[0]) ? elem_min_length : edge_length[0];
+					edge_length[1] = (elem_max_length>edge_length[1]) ? elem_max_length : edge_length[1];
 				}
 			}
 		}
 
 		MeshLib::Mesh* mesh (new MeshLib::Mesh(file_name, nodes, elements));
+		mesh->setEdgeLengthRange(sqrt(edge_length[0]), sqrt(edge_length[1]));
+
 		std::cout << "Nr. Nodes: " << nodes.size() << std::endl;
 		std::cout << "Nr. Elements: " << elements.size() << std::endl;
 
@@ -163,6 +172,7 @@ MeshLib::Element* MeshIO::readElement(const std::string& line, const std::vector
 		elem = NULL;
 	}	
 
+
 	/*
 		neighbors.resize(nfaces);
 		for (unsigned i = 0; i < nfaces; i++)
@@ -174,6 +184,7 @@ MeshLib::Element* MeshIO::readElement(const std::string& line, const std::vector
 
 int MeshIO::write(std::ostream &out)
 {
+	(void)out;
 	/*
 	if(!_mesh)
 	{

MeshLib/Elements/Edge.h

@@ -44,6 +44,9 @@ public:
 	/// Returns the face i of the element.
 	const Element* getFace(unsigned i) const { (void)i; return NULL; };
 
+	/// Compute the minimum and maximum squared edge length for this element
+	void computeSqrEdgeLengthRange(double &min, double &max) const { min = _length; max = _length; };
+
 	/// 1D elements have no edges
 	unsigned getNEdges() const { return 0; };
 

MeshLib/Elements/Element.cpp

@@ -9,7 +9,7 @@
 #include "Node.h"
 #include "Edge.h"
 
-#include <cassert>
+#include "MathTools.h"
 
 namespace MeshLib {
 
@@ -41,6 +41,19 @@ const Element* Element::getEdge(unsigned i) const
 	return NULL;
 }
 
+void Element::computeSqrEdgeLengthRange(double &min, double &max) const
+{
+	min = std::numeric_limits<double>::max();
+	max = std::numeric_limits<double>::min();
+	unsigned nEdges (this->getNEdges());
+	for (unsigned i=0; i<nEdges; i++)
+	{
+		double dist (MathLib::sqrDist(getEdgeNode(i,0)->getData(), getEdgeNode(i,1)->getData()));
+		min = (dist<min) ? dist : min;
+		max = (dist>max) ? dist : max;
+	}
+}
+
 const Element* Element::getNeighbor(unsigned i) const
 {
 	if (i < getNNeighbors())
@@ -62,7 +75,7 @@ unsigned Element::getNodeIndex(unsigned i) const
 	if (i<getNNodes())
 		return _nodes[i]->getID();
 	std::cerr << "Error in MeshLib::Element::getNodeIndex() - Index does not exist." << std::endl;
-	return NULL;
+	return std::numeric_limits<unsigned>::max();
 }
 
 bool Element::hasNeighbor(Element* elem) const

MeshLib/Elements/Element.h

@@ -27,6 +27,9 @@ class Element
 	
 
 public:
+	/// Compute the minimum and maximum squared edge length for this element
+	virtual void computeSqrEdgeLengthRange(double &min, double &max) const;
+
 	/// Get node with local index i.
 	const Node* getNode(unsigned i) const;
 

MeshLib/FemMesh.h

@@ -30,6 +30,8 @@ public:
 	/// Destructor
 	virtual ~FemMesh();
 
+private:
+
 
 }; /* class */
 

MeshLib/Mesh.cpp

@@ -20,7 +20,8 @@ namespace MeshLib {
 Mesh::Mesh(const std::string &name, const std::vector<Node*> &nodes, const std::vector<Element*> &elements)
 	: _name(name), _nodes(nodes), _elements(elements)
 {
-	double _edge_length[2] = {0, 0};
+	_edge_length[0] = 0;
+	_edge_length[1] = 0;
 	this->makeNodesUnique();
 	this->setElementInformationForNodes();
 	this->setNeighborInformationForElements();
@@ -86,6 +87,16 @@ void Mesh::setElementInformationForNodes()
 	}
 }
 
+void Mesh::setEdgeLengthRange(const double &min_length, const double &max_length)
+{
+	if (min_length <= max_length)
+	{
+		_edge_length[0] = min_length;
+		_edge_length[1] = max_length;
+	}
+	std::cerr << "Error in MeshLib::Mesh::setEdgeLengthRange() - min length < max length." << std::endl;
+}
+
 void Mesh::setNeighborInformationForElements()
 {
 	/* TODO

MeshLib/Mesh.h

@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 
-
 namespace MeshLib 
 {
 	class Node;
@@ -52,6 +51,12 @@ public:
 	/// Get the element with the given index.
 	const Element* getElement(unsigned idx) const { return _elements[idx]; };
 
+	/// Get the minimum edge length for the mesh
+	double getMinEdgeLength() const { return _edge_length[0]; };
+
+	/// Get the maximum edge length for the mesh
+	double getMaxEdgeLength() const { return _edge_length[1]; };
+
 	/// Get the number of elements
 	size_t getNElements() const { return _elements.size(); };
 
@@ -66,6 +71,8 @@ public:
 
 	/// Get the element-vector for the mesh.
 	const std::vector<Element*> getElements() const { return _elements; };
+
+	void setEdgeLengthRange(const double &min_length, const double &max_length);
 	
 protected:
 	/// Checks the coordinates of all mesh nodes and removes identical nodes. Elements are adapted accordingly.
@@ -77,7 +84,7 @@ protected:
 	/// Fills in the neighbor-information for elements.
 	void setNeighborInformationForElements();
 
-	static double _edge_length[2];
+	double _edge_length[2];
 	std::string _name;
 	std::vector<Node*> _nodes;
 	std::vector<Element*> _elements;

SimpleTests/MeshTests/MeshRead.cpp

@@ -17,13 +17,13 @@
 
 int main(int argc, char *argv[])
 {
-	std::string file_name("/mnt/visdata/tom/data/TestMeshes/Mesh-dx1.00-Layered20.msh");
+	//std::string file_name("/mnt/visdata/tom/data/TestMeshes/Mesh-dx1.00-Layered20.msh");
+	std::string file_name("c:/Project/PlyTestMesh.msh");
 	std::cout << "sizeof(double): " << sizeof (double) << std::endl;
 	std::cout << "sizeof(GeoLib::Point): " << sizeof (GEOLIB::Point) << std::endl;
 	std::cout << "sizeof(GeoLib::PointWithID): " << sizeof (GEOLIB::PointWithID) << std::endl;
 	std::cout << "sizeof(Node): " << sizeof (MeshLib::Node) << std::endl;
 	std::cout << "sizeof(Element): " << sizeof (MeshLib::Element) << std::endl;
-	//std::string file_name("c:/Project/PlyTestMesh.msh");
 	FileIO::MeshIO mesh_io;
 #ifndef WIN32
 	BaseLib::MemWatch mem_watch;