Changeset 16221

Timestamp:

09/20/13 16:26:17 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed memory leak in DamageEvolution

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Tria.cpp (modified) (7 diffs)
• Tria.h (modified) (1 diff)

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

@@ -6952 +6952 @@
 
         /*Intermediaries */
-        IssmDouble Jdet,dt;
-        IssmDouble f,damage;
-        IssmDouble xyz_list[NUMVERTICES][3];
-        Input* damage_input  = NULL;
-        Input* f_input  = NULL;
+        IssmDouble  Jdet ,dt;
+        IssmDouble  f,damage;
+        IssmDouble  xyz_list[NUMVERTICES][3];
+        IssmDouble  f_list[NUMVERTICES];
+        Input      *damage_input             = NULL;
 
         /*Fetch number of nodes and dof for this finite element*/
@@ -6971 +6971 @@
         
         /*retrieve damage evolution forcing function: */
-        f_input=this->DamageEvolutionF();
+        this->DamageEvolutionF(&f_list[0]);
 
         /*Initialize forcing function f to 0, do not forget!:*/
@@ -6983 +6983 @@
                 GetNodalFunctions(basis,gauss);
 
-                f_input->GetInputValue(&f,gauss);
+                TriaRef::GetInputValue(&f,f_list,gauss);
                 damage_input->GetInputValue(&damage,gauss);
 
@@ -6996 +6996 @@
 /*}}}*/
 /*FUNCTION Tria::DamageEvolutionF{{{*/
-Input* Tria::DamageEvolutionF(void){
+void Tria::DamageEvolutionF(IssmDouble* f){
 
         /*Intermediaries */
@@ -7007 +7007 @@
         IssmDouble NegPsi;
         Input* damage_input=NULL;
-        Input* z_input=NULL;
         Input* sigma_xx_input  = NULL;
         Input* sigma_xy_input  = NULL;
@@ -7013 +7012 @@
         GaussTria* gauss=NULL;
         IssmDouble damage,sigma_xx,sigma_xy,sigma_yy;
-        
-        /*output: */
-        IssmDouble f[NUMVERTICES];
-        Input* f_input=NULL;
 
         /*retrieve parameters:*/
@@ -7061 +7056 @@
 
         }
-        f_input=new TriaInput(NoneEnum,&f[0],P1Enum);
         
         /*Clean up and return*/
         delete gauss;
-        return f_input;
 }
 /*}}}*/

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

@@ -283 +283 @@
                 ElementVector* CreatePVectorDamageEvolution(void);
                 ElementVector* CreatePVectorDamageEvolution_CG(void);
-                Input* DamageEvolutionF(void);
-                void           InputUpdateFromSolutionDamageEvolution(IssmDouble* solution);
+                void           DamageEvolutionF(IssmDouble* flist);
+                void             InputUpdateFromSolutionDamageEvolution(IssmDouble* solution);
                 #endif