source: issm/oecreview/Archive/21724-22754/ISSM-21875-21876.diff@ 22755

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

@@ -2679 +2679 @@
 /*}}}*/
 void       Tria::ResetHooks(){/*{{{*/
 
+        if(this->nodes) xDelete<Node*>(this->nodes);
         this->nodes=NULL;
         this->vertices=NULL;
         this->material=NULL;

../trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -171 +171 @@
         this->inputs->AddInput(new PentaInput(input_enum,values,interpolation_enum));
 }
 /*}}}*/
-void     Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
+void       Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
 
         PentaRef::BasalNodeIndices(pnumindices,pindices,finiteelement);
 
@@ -2212 +2212 @@
 /*}}}*/
 void       Penta::ResetHooks(){/*{{{*/
 
+        if(this->nodes) xDelete<Node*>(this->nodes);
         this->nodes=NULL;
         this->vertices=NULL;
         this->material=NULL;

../trunk-jpl/src/c/classes/Elements/Tetra.cpp

@@ -807 +807 @@
 /*}}}*/
 void     Tetra::ResetHooks(){/*{{{*/
 
+        if(this->nodes) xDelete<Node*>(this->nodes);
         this->nodes=NULL;
         this->vertices=NULL;
         this->material=NULL;

../trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp

@@ -48 +48 @@
 
                                 FemModel* femmodel;
                                 
-                                char     **responses_descriptors    = NULL;      //these are our! there are only numresponsedescriptors of them, not d_numresponses!!!
+                                char     **responses_descriptors    = NULL;      //these are ours! there are only numresponsedescriptors of them, not d_numresponses!!!
+                                char      *response_descriptor      = NULL;
                                 int        numresponsedescriptors;
                                 int        solution_type;
                                 bool       control_analysis         = false;
@@ -127 +128 @@
                                         xDelete<char>(variable_descriptor);
                                 }
                                 xDelete<char*>(variable_descriptors);
+                                for(i=0;i<numFns;i++){
+                                        response_descriptor=responses_descriptors[i];
+                                        xDelete<char>(response_descriptor);
+                                }
+                                if(responses_descriptors) xDelete<char*>(responses_descriptors);
                                 xDelete<IssmDouble>(responses);
                                 delete femmodel;
 

../trunk-jpl/src/c/main/issm_dakota.cpp

@@ -83 +83 @@
         /* Execute the environment:*/
         env.execute();
 
+        xDelete<char>(dakota_input_file);
+        xDelete<char>(dakota_output_file);
+        xDelete<char>(dakota_error_file);
+
         /*Return unix success: */
         return 0; 
         #else 
@@ -89 +93 @@
         Cout <<  "ISSM Dakota  executable was compiled without support of Dakota! Will just return now!" << "\n";
         return 1;
         #endif
+
 }