Changeset 23672

Timestamp:

01/31/19 13:25:38 (6 years ago)

Author:

youngmc3

Message:

CHG: fixing memory leak

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (4 diffs)
• FemModel.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -1427 +1427 @@
                 int         numiceverts;
                 IssmDouble  s[2],x[2],y[2];
-                int        *indices = NULL;
                 this->GetLevelsetIntersection(&indices, &numiceverts,&s[0],MaskIceLevelsetEnum,0.);
                 _assert_(numiceverts); 
@@ -1466 +1465 @@
                 x1=x[0]; y1=y[0]; x2=x[1]; y2=y[1];
                 distance=sqrt(pow((x1-x2),2)+pow((y1-y2),2));
+                
+                int numthk=numiceverts+2;
+                H=xNew<IssmDouble>(numthk);
+                for(int iv=0;iv<NUMVERTICES;iv++) Haux[iv]=-bed[indices[iv]]; //sort bed in ice/noice
+
+                switch(numiceverts){
+                        case 1: // average over triangle
+                                H[0]=Haux[0];
+                                H[1]=Haux[0]+s[0]*(Haux[1]-Haux[0]);
+                                H[2]=Haux[0]+s[1]*(Haux[2]-Haux[0]);
+                                Haverage=(H[1]+H[2])/2;
+                                break;
+                        case 2: // average over quadrangle
+                                H[0]=Haux[0];
+                                H[1]=Haux[1];
+                                H[2]=Haux[0]+s[0]*(Haux[2]-Haux[0]);
+                                H[3]=Haux[1]+s[1]*(Haux[2]-Haux[1]);
+                                Haverage=(H[2]+H[3])/2;
+                                break;
+                        default:
+                                _error_("Number of ice covered vertices wrong in Tria::GetIceFrontArea(void)");
+                                break;
+                }
+                frontarea=distance*Haverage;
         }
         else return 0;  
         
-        IssmDouble s[2]; // s:fraction of intersected triangle edges, that lies inside ice
-        this->GetLevelsetIntersection(&indices, &numiceverts, s, MaskIceLevelsetEnum, 0.);      
-        int numthk=numiceverts+2;
-        H=xNew<IssmDouble>(numthk);
-        for(int iv=0;iv<NUMVERTICES;iv++) Haux[iv]=-bed[indices[iv]]; //sort bed in ice/noice
-
-        switch(numiceverts){
-                case 1: // average over triangle
-                        H[0]=Haux[0];
-                        H[1]=Haux[0]+s[0]*(Haux[1]-Haux[0]);
-                        H[2]=Haux[0]+s[1]*(Haux[2]-Haux[0]);
-                        Haverage=(H[1]+H[2])/2;
-                        break;
-                case 2: // average over quadrangle
-                        H[0]=Haux[0];
-                        H[1]=Haux[1];
-                        H[2]=Haux[0]+s[0]*(Haux[2]-Haux[0]);
-                        H[3]=Haux[1]+s[1]*(Haux[2]-Haux[1]);
-                        Haverage=(H[2]+H[3])/2;
-                        break;
-                default:
-                        _error_("Number of ice covered vertices wrong in Tria::GetIceFrontArea(void)");
-                        break;
-        }
-        frontarea=distance*Haverage;
+        xDelete<int>(indices);
+        xDelete<IssmDouble>(H);
+        
         _assert_(frontarea>0);
         return frontarea;
@@ -3408 +3409 @@
                 if(xIsNan<IssmDouble>(meltrates[iv])) _error_("NaN found in vector");
                 if(xIsInf<IssmDouble>(meltrates[iv])) _error_("Inf found in vector");
+                
         }
 
@@ -3414 +3416 @@
    
         /*Cleanup and return*/
+        xDelete<IssmDouble>(basin_icefront_area);
         delete gauss;
 }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1527 +1527 @@
         
         xDelete<IssmDouble>(basin_icefront_area);
+        xDelete<IssmDouble>(BasinId);
 }/*}}}*/
 void FemModel::IceMassx(IssmDouble* pM, bool scaled){/*{{{*/