Changeset 5170

Timestamp:

08/11/10 16:53:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed class destructors

Location:

issm/trunk/src/c/objects/Bamg

Files:

• BamgGeom.cpp (modified) (1 diff)
• BamgMesh.cpp (modified) (1 diff)
• Mesh.cpp (modified) (1 diff)
• Mesh.h (modified) (1 diff)

issm/trunk/src/c/objects/Bamg/BamgGeom.cpp

@@ -23 +23 @@
 
         xfree((void**)&this->Vertices);
-        xfree((void**)&this->EdgesSize);
+        xfree((void**)&this->Edges);
         xfree((void**)&this->hVertices);
         xfree((void**)&this->MetricVertices);

issm/trunk/src/c/objects/Bamg/BamgMesh.cpp

@@ -29 +29 @@
 BamgMesh::~BamgMesh(){
 
-        xfree((void**)this->Vertices);
-        xfree((void**)this->Edges);
-        xfree((void**)this->Triangles);
-        xfree((void**)this->Quadrilaterals);
-        xfree((void**)this->VerticesOnGeometricVertex);
-        xfree((void**)this->VerticesOnGeometricEdge);
-        xfree((void**)this->EdgesOnGeometricEdge);
-        xfree((void**)this->SubDomains);
-        xfree((void**)this->SubDomainsFromGeom);
-        xfree((void**)this->hVertices);
-        xfree((void**)this->IssmEdges);
-        xfree((void**)this->IssmSegments);
-        xfree((void**)this->ElementConnectivity);
-        xfree((void**)this->NodalConnectivity);
-        xfree((void**)this->NodalElementConnectivity);
-        xfree((void**)this->CrackedVertices);
-        xfree((void**)this->CrackedEdges);
+        xfree((void**)&this->Vertices);
+        xfree((void**)&this->Edges);
+        xfree((void**)&this->Triangles);
+        xfree((void**)&this->Quadrilaterals);
+        xfree((void**)&this->VerticesOnGeometricVertex);
+        xfree((void**)&this->VerticesOnGeometricEdge);
+        xfree((void**)&this->EdgesOnGeometricEdge);
+        xfree((void**)&this->SubDomains);
+        xfree((void**)&this->SubDomainsFromGeom);
+        xfree((void**)&this->hVertices);
+        xfree((void**)&this->IssmEdges);
+        xfree((void**)&this->IssmSegments);
+        xfree((void**)&this->ElementConnectivity);
+        xfree((void**)&this->NodalConnectivity);
+        xfree((void**)&this->NodalElementConnectivity);
+        xfree((void**)&this->CrackedVertices);
+        xfree((void**)&this->CrackedEdges);
 
 }

issm/trunk/src/c/objects/Bamg/Mesh.cpp

@@ -232 +232 @@
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Triangles)*/
 
-                long int verbose=2;
-                //if(vertices)  delete [] vertices; //TEST  crash if not commented
-                if(edges)     delete [] edges;
-                if(triangles) delete [] triangles;
-                if(quadtree)  delete quadtree;
-                //if(ordre)     delete [] ordre; //TEST  crash if not commented
-                if( subdomains) delete []  subdomains;
-                if (VerticesOnGeomEdge) delete [] VerticesOnGeomEdge;
+                if (vertices)             delete [] vertices;
+                if (edges)                delete [] edges;
+                if (triangles)            delete [] triangles;
+                if (quadtree)             delete    quadtree;
+                if (ordre)                delete [] ordre;
+                if (subdomains)           delete []  subdomains;
+                if (VerticesOnGeomEdge)   delete [] VerticesOnGeomEdge;
                 if (VerticesOnGeomVertex) delete [] VerticesOnGeomVertex;
-                if (VertexOnBThVertex) delete [] VertexOnBThVertex;
-                if (VertexOnBThEdge) delete [] VertexOnBThEdge;
+                if (VertexOnBThVertex)    delete [] VertexOnBThVertex;
+                if (VertexOnBThEdge)      delete [] VertexOnBThEdge;
 
                 if (&Gh) {

issm/trunk/src/c/objects/Bamg/Mesh.h

@@ -11 +11 @@
 #include "./VertexOnEdge.h"
 #include "./ListofIntersectionTriangles.h"
-
 
 namespace bamg {