source: issm/oecreview/Archive/18296-19100/ISSM-18399-18400.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 2.6 KB
RevLine 
[19102]1Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 18399)
4+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 18400)
5@@ -297,15 +297,15 @@
6 /*}}}*/
7 void Penta::ComputeDeviatoricStressTensor(){/*{{{*/
8
9- IssmDouble xyz_list[NUMVERTICES][3];
10- IssmDouble viscosity;
11- IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
12- IssmDouble tau_xx[NUMVERTICES];
13- IssmDouble tau_yy[NUMVERTICES];
14- IssmDouble tau_zz[NUMVERTICES];
15- IssmDouble tau_xy[NUMVERTICES];
16- IssmDouble tau_xz[NUMVERTICES];
17- IssmDouble tau_yz[NUMVERTICES];
18+ IssmDouble xyz_list[NUMVERTICES][3];
19+ IssmDouble viscosity;
20+ IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
21+ IssmDouble tau_xx[NUMVERTICES];
22+ IssmDouble tau_yy[NUMVERTICES];
23+ IssmDouble tau_zz[NUMVERTICES];
24+ IssmDouble tau_xy[NUMVERTICES];
25+ IssmDouble tau_xz[NUMVERTICES];
26+ IssmDouble tau_yz[NUMVERTICES];
27 GaussPenta* gauss=NULL;
28
29 /* Get node coordinates and dof list: */
30@@ -335,12 +335,12 @@
31 }
32
33 /*Add Stress tensor components into inputs*/
34- this->inputs->AddInput(new PentaInput(StressTensorxxEnum,&tau_xx[0],P1Enum));
35- this->inputs->AddInput(new PentaInput(StressTensorxyEnum,&tau_xy[0],P1Enum));
36- this->inputs->AddInput(new PentaInput(StressTensorxzEnum,&tau_xz[0],P1Enum));
37- this->inputs->AddInput(new PentaInput(StressTensoryyEnum,&tau_yy[0],P1Enum));
38- this->inputs->AddInput(new PentaInput(StressTensoryzEnum,&tau_yz[0],P1Enum));
39- this->inputs->AddInput(new PentaInput(StressTensorzzEnum,&tau_zz[0],P1Enum));
40+ this->inputs->AddInput(new PentaInput(DeviatoricStressxxEnum,&tau_xx[0],P1Enum));
41+ this->inputs->AddInput(new PentaInput(DeviatoricStressxyEnum,&tau_xy[0],P1Enum));
42+ this->inputs->AddInput(new PentaInput(DeviatoricStressxzEnum,&tau_xz[0],P1Enum));
43+ this->inputs->AddInput(new PentaInput(DeviatoricStressyyEnum,&tau_yy[0],P1Enum));
44+ this->inputs->AddInput(new PentaInput(DeviatoricStressyzEnum,&tau_yz[0],P1Enum));
45+ this->inputs->AddInput(new PentaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum));
46
47 /*Clean up and return*/
48 delete gauss;
49Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
50===================================================================
51--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18399)
52+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18400)
53@@ -1204,6 +1204,7 @@
54 }
55
56 /*Assign output pointer*/
57+ _assert_(input);
58 *pinterpolation = input->GetResultInterpolation();
59 *pnodesperelement = input->GetResultNumberOfNodes();
60 }/*}}}*/
Note: See TracBrowser for help on using the repository browser.