Changeset 18400

Timestamp:

08/15/14 11:06:12 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed issue with deviatoric stress output in 3d

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Penta.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1205 +1205 @@
 
         /*Assign output pointer*/
+        _assert_(input);
         *pinterpolation   = input->GetResultInterpolation();
         *pnodesperelement = input->GetResultNumberOfNodes();

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -298 +298 @@
 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;
 
@@ -336 +336 @@
 
         /*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*/