Changeset 5758

Timestamp:

09/13/10 07:38:16 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Stokes (stupid bug)

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -4112 +4112 @@
         /*Get dof list: */
         GetDofList(&doflist);
-        Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input);
-        Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input);
-        Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input);
-        Input* p_input =inputs->GetInput(VxEnum); ISSMASSERT(p_input);
+        Input* vx_input=inputs->GetInput(VxEnum);       ISSMASSERT(vx_input);
+        Input* vy_input=inputs->GetInput(VyEnum);       ISSMASSERT(vy_input);
+        Input* vz_input=inputs->GetInput(VzEnum);       ISSMASSERT(vz_input);
+        Input* p_input =inputs->GetInput(PressureEnum); ISSMASSERT(p_input);
 
         /*Recondition pressure: */
@@ -4871 +4871 @@
 void  Penta::InputUpdateFromSolutionDiagnosticStokes(double* solution){
         
+        const int    numdof=NDOF4*NUMVERTICES;
         int i;
-
-        const int    numdofpervertex=4;
-        const int    numdof=numdofpervertex*NUMVERTICES;
         int*         doflist=NULL;
         double       values[numdof];
@@ -4894 +4892 @@
         /*Ok, we have vx and vy in values, fill in all arrays: */
         for(i=0;i<NUMVERTICES;i++){
-                vx[i]=values[i*numdofpervertex+0];
-                vy[i]=values[i*numdofpervertex+1];
-                vz[i]=values[i*numdofpervertex+2];
-                pressure[i]=values[i*numdofpervertex+3];
+                vx[i]=values[i*NDOF4+0];
+                vy[i]=values[i*NDOF4+1];
+                vz[i]=values[i*NDOF4+2];
+                pressure[i]=values[i*NDOF4+3];
         }