Changeset 16141

Timestamp:

09/16/13 12:42:45 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixing memory leaks when running gsl adjoint solutions.
Getting also svn to ignore some files.

Location:

issm/trunk-jpl

Files:

• src/c/analyses/ad_core.cpp (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/classes/IoModel.cpp (modified) (1 diff)
• src/c/modules/AllocateSystemMatricesx (modified) (1 prop)
• src/c/modules/CreateJacobianMatrixx (modified) (1 prop)
• src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (3 diffs)
• src/c/modules/SystemMatricesx (modified) (1 prop)
• src/c/shared/MemOps (modified) (1 prop)
• test/NightlyRun/testad.m (added)

issm/trunk-jpl/src/c/analyses/ad_core.cpp

@@ -314 +314 @@
                         xDelete(xp);
                         xDelete(axp); 
+                        xDelete(driver);
                 #else
                         _error_("Should not be requesting AD drivers when an AD library is not available!");

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

@@ -543 +543 @@
                 }
                 delete dependent_objects;
+                xDelete<IssmPDouble>(dependents);
                 #else
                 _error_("Should not be requesting dependents when an AD library is not available!");

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

@@ -96 +96 @@
                 for(int i=0;i<MaximumNumberOfDefinitionsEnum;i++){
                         if(this->data[i]){
-                                _printf0_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)\n");
+                                /*Release data pertaining to Autodiff runs: */
+                                IssmDouble* array=this->data[i];
+                                xDelete<IssmDouble>(array);
                         }
                 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -56 +56 @@
                         xDelete<int>(indices);
                 }
+                xDelete<char>(autodiff_driver);
                 /*}}}*/
                 /*Deal with dependents first: {{{*/
@@ -76 +77 @@
                         xDelete<int>(names);
                         xDelete<int>(types);
+                        xDelete<int>(indices);
                 }
                 parameters->AddObject(new DataSetParam(AutodiffDependentObjectsEnum,dependent_objects));
@@ -100 +102 @@
                         }
                         xp=xp_backup; parameters->AddObject(new DoubleVecParam(AutodiffXpEnum,xp,num_ind));
+                        xDelete<IssmDouble>(xp);
                 }
                 parameters->AddObject(new IntParam(AutodiffNumIndependentsEnum,num_ind));