source: issm/oecreview/Archive/16554-17801/ISSM-16777-16778.diff@ 17802

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

@@ -1324 +1324 @@
         xDelete<IssmDouble>(values);
         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){/*{{{*/
 
@@ -1423 +1423 @@
         xDelete<IssmDouble>(values);
         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){/*{{{*/
 

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

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

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

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

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

@@ -45 +45 @@
                 virtual void   CreateDVector(Vector<IssmDouble>* df)=0;
                 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;
                 virtual void   FindParam(IssmDouble* pvalue,int paramenum)=0;

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

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

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

@@ -77 +77 @@
                 void        CreateDVector(Vector<IssmDouble>* df);
                 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");};
                 void        FindParam(int* pvalue,int paramenum);

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

@@ -73 +73 @@
                 void   ComputeStrainRate(Vector<IssmDouble>* eps);
                 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);
                 int    FiniteElement(void);

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

@@ -74 +74 @@
                 void        ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
                 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");};
                 void        CreateKMatrix(Matrix<IssmDouble>* Kff, Matrix<IssmDouble>* Kfs){_error_("not implemented yet");};