Changeset 21931 for issm/trunk-jpl/src/c/bamg/Mesh.cpp

Timestamp:

08/10/17 10:23:14 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some cleanup from cppcheck

File:

• issm/trunk-jpl/src/c/bamg/Mesh.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -1594 +1594 @@
                         long i1 = GetId(triangles[it][VerticesOfTriangularEdge[j][1]]);
                         k = edge4->SortAndFind(i0,i1);
-                        _assert_(k>=0);
+                        if(k<0){
+                                delete [] colorV;
+                                _error_("This should not happen");
+                        }
                         subdomains[i].direction = (vertices + i0 == edges[k].v[0]) ? 1 : -1;
                         subdomains[i].edge = edges+k;
@@ -2054 +2057 @@
                                         else if (xy==1) dd=dxdy;
                                         else if (xy==2) dd=dydy;
-                                        else    _error_("not supported yet");
+                                        else{
+                                                delete [] detT;
+                                                delete [] Mmass;
+                                                delete [] workT;
+                                                delete [] workV;
+                                                delete [] Mmassxx;
+                                                delete [] OnBoundary;
+                                                _error_("not supported yet");
+                                        }
                                         // do leat 2 iteration for boundary problem
                                         for (int ijacobi=0;ijacobi<Max(NbJacobi,2);ijacobi++){
@@ -2103 +2114 @@
                 delete [] dxdy;
                 delete [] dydy;
-                delete []  workT;
+                delete [] workT;
                 delete [] workV;
                 delete [] Mmassxx;
-                delete []  OnBoundary;
+                delete [] OnBoundary;
 
         }
@@ -2394 +2405 @@
                         if (nbt == nbtout ||  !NbSubDomTot) {
                                 delete [] HeapArete;
+                                delete [] HeapTriangle;
                                 _error_("The boundary is not close: all triangles are outside");
                         }
@@ -2883 +2895 @@
                         }
                 }
-                if(kk) _error_("See above");
+                if(kk){
+                        delete [] e;
+                        _error_("See above");
+                }
 
                 return e;
@@ -4398 +4413 @@
                 printf("\n");
                 if(NbVerticesOnGeomVertex >= maxnbv){
+                        delete [] bcurve;
                         _error_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv);
                 }