Changeset 16778

Timestamp:

11/15/13 09:05:51 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed leak, spawned element need to delete its materials

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp ¶

@@ -196 +196 @@
         xDelete<IssmDouble>(residual);
         xDelete<int>(doflist);
-        if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp ¶

@@ -297 +297 @@
         xDelete<IssmDouble>(phi);
         xDelete<int>(doflist);
-        if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
-}/*}}}*/
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+}/*}}}*/

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp ¶

@@ -1325 +1325 @@
         xDelete<IssmDouble>(xyz_list);
         xDelete<int>(doflist);
-        if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 }/*}}}*/
 void StressbalanceAnalysis::InputUpdateFromSolutionSSA(IssmDouble* solution,Element* element){/*{{{*/
@@ -1424 +1424 @@
         xDelete<IssmDouble>(xyz_list);
         xDelete<int>(doflist);
-        if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 }/*}}}*/
 void StressbalanceAnalysis::InputUpdateFromSolutionSSAFS(IssmDouble* solution,Element* element){/*{{{*/

issm/trunk-jpl/src/c/classes/Elements/Element.h ¶

@@ -46 +46 @@
                 virtual void   CreatePVector(Vector<IssmDouble>* pf)=0;
                 virtual void   CreateJacobianMatrix(Matrix<IssmDouble>* Jff)=0;
+                virtual void   DeleteMaterials(void)=0;
                 virtual void   EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure)=0;
                 virtual void   FindParam(int* pvalue,int paramenum)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.h ¶

@@ -74 +74 @@
                 void   ComputeStressTensor();
                 void   Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
+                void   DeleteMaterials(void){_error_("not implemented yet");};
                 void   FindParam(int* pvalue,int paramenum);
                 void   FindParam(IssmDouble* pvalue,int paramenum);

issm/trunk-jpl/src/c/classes/Elements/Seg.h ¶

@@ -75 +75 @@
                 void        ComputeStressTensor(){_error_("not implemented yet");};
                 void        Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters){_error_("not implemented yet");};
+                void        DeleteMaterials(void){_error_("not implemented yet");};
                 void        SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters){_error_("not implemented yet");};
                 void        SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){_error_("not implemented yet");};

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

@@ -804 +804 @@
 
         return;
+}
+/*}}}*/
+/*FUNCTION Tria::DeleteMaterials{{{*/
+void Tria::DeleteMaterials(void){
+        delete this->material;
 }
 /*}}}*/

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

@@ -78 +78 @@
                 void        CreatePVector(Vector<IssmDouble>* pf);
                 void        CreateJacobianMatrix(Matrix<IssmDouble>* Jff);
+                void        DeleteMaterials(void);
                 void        Delta18oParameterization(void);
                 void        EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure){_error_("not implemented yet");};