Changeset 21876

Timestamp:

07/26/17 13:54:13 (8 years ago)

Author:

schlegel

Message:

CHG: cleaned up some memory leaks during copy

Location:

issm/trunk-jpl/src/c

Files:

• classes/Dakota/IssmParallelDirectApplicInterface.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/Tetra.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• main/issm_dakota.cpp (modified) (2 diffs)

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

@@ -49 +49 @@
                                 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;
@@ -128 +129 @@
                                 }
                                 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;

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

@@ -172 +172 @@
 }
 /*}}}*/
-void     Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
+void       Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
 
         PentaRef::BasalNodeIndices(pnumindices,pindices,finiteelement);
@@ -2213 +2213 @@
 void       Penta::ResetHooks(){/*{{{*/
 
+        if(this->nodes) xDelete<Node*>(this->nodes);
         this->nodes=NULL;
         this->vertices=NULL;

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

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

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

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

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

@@ -84 +84 @@
         env.execute();
 
+        xDelete<char>(dakota_input_file);
+        xDelete<char>(dakota_output_file);
+        xDelete<char>(dakota_error_file);
+
         /*Return unix success: */
         return 0; 
@@ -90 +94 @@
         return 1;
         #endif
+
 }