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

Last change on this file since 17802 was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 5.8 KB
RevLine 
[17802]1Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16777)
4+++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16778)
5@@ -1324,7 +1324,7 @@
6 xDelete<IssmDouble>(values);
7 xDelete<IssmDouble>(xyz_list);
8 xDelete<int>(doflist);
9- if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
10+ if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
11 }/*}}}*/
12 void StressbalanceAnalysis::InputUpdateFromSolutionSSA(IssmDouble* solution,Element* element){/*{{{*/
13
14@@ -1423,7 +1423,7 @@
15 xDelete<IssmDouble>(values);
16 xDelete<IssmDouble>(xyz_list);
17 xDelete<int>(doflist);
18- if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
19+ if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
20 }/*}}}*/
21 void StressbalanceAnalysis::InputUpdateFromSolutionSSAFS(IssmDouble* solution,Element* element){/*{{{*/
22
23Index: ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp
24===================================================================
25--- ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 16777)
26+++ ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 16778)
27@@ -195,5 +195,5 @@
28 xDelete<IssmDouble>(values);
29 xDelete<IssmDouble>(residual);
30 xDelete<int>(doflist);
31- if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
32+ if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
33 }/*}}}*/
34Index: ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
35===================================================================
36--- ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 16777)
37+++ ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 16778)
38@@ -296,5 +296,5 @@
39 xDelete<IssmDouble>(oldsurface);
40 xDelete<IssmDouble>(phi);
41 xDelete<int>(doflist);
42- if(meshtype!=Mesh2DhorizontalEnum) delete basalelement;
43+ if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
44 }/*}}}*/
45Index: ../trunk-jpl/src/c/classes/Elements/Element.h
46===================================================================
47--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 16777)
48+++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 16778)
49@@ -45,6 +45,7 @@
50 virtual void CreateDVector(Vector<IssmDouble>* df)=0;
51 virtual void CreatePVector(Vector<IssmDouble>* pf)=0;
52 virtual void CreateJacobianMatrix(Matrix<IssmDouble>* Jff)=0;
53+ virtual void DeleteMaterials(void)=0;
54 virtual void EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure)=0;
55 virtual void FindParam(int* pvalue,int paramenum)=0;
56 virtual void FindParam(IssmDouble* pvalue,int paramenum)=0;
57Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
58===================================================================
59--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16777)
60+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16778)
61@@ -805,6 +805,11 @@
62 return;
63 }
64 /*}}}*/
65+/*FUNCTION Tria::DeleteMaterials{{{*/
66+void Tria::DeleteMaterials(void){
67+ delete this->material;
68+}
69+/*}}}*/
70 /*FUNCTION Tria::Delta18oParameterization{{{*/
71 void Tria::Delta18oParameterization(void){
72
73Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
74===================================================================
75--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 16777)
76+++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 16778)
77@@ -77,6 +77,7 @@
78 void CreateDVector(Vector<IssmDouble>* df);
79 void CreatePVector(Vector<IssmDouble>* pf);
80 void CreateJacobianMatrix(Matrix<IssmDouble>* Jff);
81+ void DeleteMaterials(void);
82 void Delta18oParameterization(void);
83 void EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure){_error_("not implemented yet");};
84 void FindParam(int* pvalue,int paramenum);
85Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
86===================================================================
87--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 16777)
88+++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 16778)
89@@ -73,6 +73,7 @@
90 void ComputeStrainRate(Vector<IssmDouble>* eps);
91 void ComputeStressTensor();
92 void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
93+ void DeleteMaterials(void){_error_("not implemented yet");};
94 void FindParam(int* pvalue,int paramenum);
95 void FindParam(IssmDouble* pvalue,int paramenum);
96 int FiniteElement(void);
97Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
98===================================================================
99--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 16777)
100+++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 16778)
101@@ -74,6 +74,7 @@
102 void ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
103 void ComputeStressTensor(){_error_("not implemented yet");};
104 void Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters){_error_("not implemented yet");};
105+ void DeleteMaterials(void){_error_("not implemented yet");};
106 void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters){_error_("not implemented yet");};
107 void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){_error_("not implemented yet");};
108 void CreateKMatrix(Matrix<IssmDouble>* Kff, Matrix<IssmDouble>* Kfs){_error_("not implemented yet");};
Note: See TracBrowser for help on using the repository browser.