[17802] | 1 | Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16977)
|
---|
| 4 | +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16978)
|
---|
| 5 | @@ -3214,20 +3214,14 @@
|
---|
| 6 | ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAFS(Element* element){/*{{{*/
|
---|
| 7 |
|
---|
| 8 | /*compute all stiffness matrices for this element*/
|
---|
| 9 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 10 | ElementMatrix* Ke1=CreateKMatrixFS(element);
|
---|
| 11 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 12 | int indices[3]={18,19,20};
|
---|
| 13 | Ke1->StaticCondensation(3,&indices[0]);
|
---|
| 14 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 15 | int init = element->FiniteElement();
|
---|
| 16 | element->SetTemporaryElementType(P1Enum);
|
---|
| 17 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 18 | ElementMatrix* Ke2=CreateKMatrixSSA3d(element);
|
---|
| 19 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 20 | element->SetTemporaryElementType(init);
|
---|
| 21 | ElementMatrix* Ke3=CreateKMatrixCouplingSSAFS(element);
|
---|
| 22 | - printf("-------------- file: StressbalanceAnalysis.cpp line: %i\n",__LINE__);
|
---|
| 23 | ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3);
|
---|
| 24 |
|
---|
| 25 | /*clean-up and return*/
|
---|
| 26 | @@ -3712,6 +3706,7 @@
|
---|
| 27 |
|
---|
| 28 | /*Clean-up and return*/
|
---|
| 29 | xDelete<int>(cs_list);
|
---|
| 30 | + xDelete<Node*>(node_list);
|
---|
| 31 | xDelete<IssmDouble>(xyz_list);
|
---|
| 32 | delete basaltria->material; delete basaltria;
|
---|
| 33 | delete gauss;
|
---|
| 34 | @@ -4095,6 +4090,8 @@
|
---|
| 35 |
|
---|
| 36 | /*Clean up and return*/
|
---|
| 37 | xDelete<int>(cs_list);
|
---|
| 38 | + xDelete<Node*>(node_list);
|
---|
| 39 | + xDelete<IssmDouble>(xyz_list);
|
---|
| 40 | delete gauss;
|
---|
| 41 | return pe;
|
---|
| 42 | }/*}}}*/
|
---|