Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 18399) +++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 18400) @@ -297,15 +297,15 @@ /*}}}*/ void Penta::ComputeDeviatoricStressTensor(){/*{{{*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble viscosity; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/ - IssmDouble tau_xx[NUMVERTICES]; - IssmDouble tau_yy[NUMVERTICES]; - IssmDouble tau_zz[NUMVERTICES]; - IssmDouble tau_xy[NUMVERTICES]; - IssmDouble tau_xz[NUMVERTICES]; - IssmDouble tau_yz[NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble viscosity; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble tau_xx[NUMVERTICES]; + IssmDouble tau_yy[NUMVERTICES]; + IssmDouble tau_zz[NUMVERTICES]; + IssmDouble tau_xy[NUMVERTICES]; + IssmDouble tau_xz[NUMVERTICES]; + IssmDouble tau_yz[NUMVERTICES]; GaussPenta* gauss=NULL; /* Get node coordinates and dof list: */ @@ -335,12 +335,12 @@ } /*Add Stress tensor components into inputs*/ - this->inputs->AddInput(new PentaInput(StressTensorxxEnum,&tau_xx[0],P1Enum)); - this->inputs->AddInput(new PentaInput(StressTensorxyEnum,&tau_xy[0],P1Enum)); - this->inputs->AddInput(new PentaInput(StressTensorxzEnum,&tau_xz[0],P1Enum)); - this->inputs->AddInput(new PentaInput(StressTensoryyEnum,&tau_yy[0],P1Enum)); - this->inputs->AddInput(new PentaInput(StressTensoryzEnum,&tau_yz[0],P1Enum)); - this->inputs->AddInput(new PentaInput(StressTensorzzEnum,&tau_zz[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStressxxEnum,&tau_xx[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStressxyEnum,&tau_xy[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStressxzEnum,&tau_xz[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStressyyEnum,&tau_yy[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStressyzEnum,&tau_yz[0],P1Enum)); + this->inputs->AddInput(new PentaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum)); /*Clean up and return*/ delete gauss; Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18399) +++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 18400) @@ -1204,6 +1204,7 @@ } /*Assign output pointer*/ + _assert_(input); *pinterpolation = input->GetResultInterpolation(); *pnodesperelement = input->GetResultNumberOfNodes(); }/*}}}*/