Changeset 18891

Timestamp:

11/28/14 10:46:27 (10 years ago)

Author:

Eric.Larour

Message:

CHG: fix leaks. Also in m1qn3 core, do not compile if in AD mode, not good.

Location:

issm/trunk-jpl/src/c/cores

Files:

• controlad_core.cpp (modified) (4 diffs)
• controlm1qn3_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/controlad_core.cpp

@@ -158 +158 @@
         IssmPDouble* G2=NULL;
         bool onsid=true;
-
-        /*Recover Femmodel*/
+        IssmDouble  *XL = NULL;
+        IssmDouble  *XU = NULL;
         int         solution_type;
-        FemModel   *femmodel  = (FemModel*)dzs;
+        FemModel   *femmodel  =  NULL;
         FemModel   *femmodelad  = NULL;
         IssmDouble    pfd;
         int            i;
+        
+        /*Recover Femmodel*/
+        femmodel  = (FemModel*)dzs;
 
         /*Recover number of cost functions responses*/
@@ -175 +178 @@
 
         /*Constrain input vector*/
-        IssmDouble  *XL = NULL;
-        IssmDouble  *XU = NULL;
         GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound",onsid);
         GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound",onsid);
@@ -217 +218 @@
 
         if(IssmComm::GetRank()==0){
+                IssmPDouble* G_temp=NULL;
                 GenericExternalResult<IssmPDouble*>* gradient=(GenericExternalResult<IssmPDouble*>*)femmodel->results->FindResult(AutodiffJacobianEnum); _assert_(gradient);
-                G2=gradient->GetValues();
+                G_temp=gradient->GetValues();
+                /*copy onto G2, to avoid a leak: */
+                G2=xNew<IssmPDouble>(*n); 
+                xMemCpy<IssmPDouble>(G2,G_temp,*n);
         }
         else G2=xNew<IssmPDouble>(*n);
@@ -252 +257 @@
         xDelete<IssmDouble>(XL);
         xDelete<IssmPDouble>(G2);
-        //if(femmodelad)delete femmodelad;
+        
+        xDelete<char>(rootpath);
+        xDelete<char>(inputfilename
+        xDelete<char>(outputfilename);
+        xDelete<char>(toolkitsfilename);
+        xDelete<char>(lockfilename);
+        if(femmodelad)delete femmodelad;
+
 } /*}}}*/
 #else

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -11 +11 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_)
+#if defined (_HAVE_M1QN3_) & !defined(_HAVE_ADOLC_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion