Changeset 16502

Timestamp:

10/22/13 08:42:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: readded check that all iomodel->data are freed

File:

• issm/trunk-jpl/src/c/classes/IoModel.cpp (modified) (3 diffs)

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

@@ -92 +92 @@
 IoModel::~IoModel(){
 
-        /*Some checks in debugging mode*/
+        /*Delete independents*/
+        if(this->independents){
+                for(int i=0;i<MaximumNumberOfDefinitionsEnum;i++){
+                        if(this->independents[i]){
+                                IssmDouble* array=this->data[i];
+                                xDelete<IssmDouble>(array);
+                        }
+                }
+        }
+
+        /*checks in debugging mode*/
+        #ifdef _ISSM_DEBUG_
         if(this->data){
                 for(int i=0;i<MaximumNumberOfDefinitionsEnum;i++){
                         if(this->data[i]){
-                                /*Release data pertaining to Autodiff runs: */
-                                IssmDouble* array=this->data[i];
-                                xDelete<IssmDouble>(array);
-                        }
-                }
-        }
+                                printf0_("WARNING: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)\n");
+                        }
+                }
+        }
+        #endif
 
         if(this->constants) delete this->constants;
@@ -820 +830 @@
 
                 _assert_(this->independents);
-                if (this->independents[data_enum]){
+                if(this->independents[data_enum]){
                         /*this data has already been checked out! So cancel all that we've done here, and return 
                          * the data[data_enum] directly: */
@@ -827 +837 @@
                 else{
                         *pmatrix=xNew<IssmDouble>(M*N);
-                        for (int i=0;i<M*N;++i) (*pmatrix)[i]=matrix[i];
+                        for(int i=0;i<M*N;++i) (*pmatrix)[i]=matrix[i];
                 }
                 xDelete<IssmPDouble>(matrix);