Fixed TETGEN import for index ranges wich start from 1 or higher.

Author: sreiter

ugbase/lib_grid/file_io/file_io_tetgen.cpp

@@ -115,7 +115,6 @@ bool ImportGridFromTETGEN(Grid& grid,
 						AInt* paElementAttribute)
 {
 //	read nodes and store them in an array for index access
-
 	vector<RegularVertex*>	vVertices;
 
 	{
@@ -132,6 +131,8 @@ bool ImportGridFromTETGEN(Grid& grid,
 		in >> numAttribs;
 		in >> numBoundaryMarkers;
 
+		vVertices.reserve(numNodes + 1);
+
 	//	set up attachment accessors
 		if(!grid.has_vertex_attachment(aPos))
 			grid.attach_to_vertices(aPos);
@@ -158,6 +159,8 @@ bool ImportGridFromTETGEN(Grid& grid,
 
 		//	read index and coords
 			in >> index;
+			if(index > vVertices.size())
+				vVertices.resize(index, NULL);
 			in >> aaPosVRT[v].x();
 			in >> aaPosVRT[v].y();
 			in >> aaPosVRT[v].z();
@@ -275,7 +278,6 @@ bool ImportGridFromTETGEN(Grid& grid,
 
 		in.close();
 	}
-
 	return true;
 }
 
@@ -288,7 +290,6 @@ bool ImportGridFromTETGEN(Grid& grid,
 						std::vector<AFloat>* pvNodeAttributes)
 {
 //	read nodes and store them in an array for index access
-
 	vector<RegularVertex*>	vVertices;
 
 	{
@@ -305,6 +306,9 @@ bool ImportGridFromTETGEN(Grid& grid,
 		in >> numAttribs;
 		in >> numBoundaryMarkers;
 
+		vVertices.reserve(numNodes + 1);
+		grid.reserve<Vertex>(numNodes);
+
 	//	set up attachment accessors
 		if(!grid.has_vertex_attachment(aPos))
 			grid.attach_to_vertices(aPos);
@@ -323,10 +327,12 @@ bool ImportGridFromTETGEN(Grid& grid,
 		for(uint i = 0; i < numNodes; ++i)
 		{
 			RegularVertex* v = *grid.create<RegularVertex>();
-			vVertices.push_back(v);
 
 		//	read index and coords
 			in >> index;
+			if(index > vVertices.size())
+				vVertices.resize(index, NULL);
+			vVertices.push_back(v);
 			in >> aaPosVRT[v].x();
 			in >> aaPosVRT[v].y();
 			in >> aaPosVRT[v].z();
@@ -349,7 +355,7 @@ bool ImportGridFromTETGEN(Grid& grid,
 				int bm;
 				in >> bm;
 				if(psh != NULL)
-					psh->assign_subset(v, bm);
+					psh->assign_subset(v, abs(bm));
 			}
 		}
 
@@ -366,6 +372,8 @@ bool ImportGridFromTETGEN(Grid& grid,
 			in >> numFaces;
 			in >> numBoundaryMarkers;
 
+			grid.reserve<Face>(numFaces);
+
 			for(int i = 0; i < numFaces; ++i)
 			{
 				int index, i1, i2, i3;
@@ -380,9 +388,12 @@ bool ImportGridFromTETGEN(Grid& grid,
 					int bm;
 					in >> bm;
 					if(psh != NULL){
-						psh->assign_subset(t, bm);
+						psh->assign_subset(t, abs(bm));
 					}
 				}
+				else if(psh != NULL){
+					psh->assign_subset(t, 0);
+				}
 			}
 		}
 		else
@@ -402,11 +413,14 @@ bool ImportGridFromTETGEN(Grid& grid,
 			in >> numNodesPerTet;
 			in >> numAttribs;
 
+			grid.reserve<Volume>(numTets);
+
 			vector<int> vTetNodes(numNodesPerTet);
 			for(int i = 0; i < numTets; ++i)
 			{
 				int index;
 				in >> index;
+				// UG_LOG("  index = " << index << std::endl);
 				for(int j = 0; j < numNodesPerTet; ++j)
 					in >> vTetNodes[j];