Changeset 4900

Timestamp:

07/30/10 10:40:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed Du for Stokes

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (4 diffs)

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

@@ -4436 +4436 @@
         /* node data: */
         const int    numgrids=3;
-        const int    numdof=2*numgrids;
-        const int    NDOF2=2;
+        const int    NDOF4=4;
+        const int    numdof=NDOF4*numgrids;
         double       xyz_list[numgrids][3];
         int          doflist[numdof];
@@ -4468 +4468 @@
         /*element vector : */
         double  pe_g[numdof]={0.0};
-        double  pe_g_gaussian[numdof];
 
         /* Jacobian: */
@@ -4490 +4489 @@
         GetVerticesCoordinates(&xyz_list[0][0], nodes, numgrids);
         GetDofList(&doflist[0],&numberofdofspernode);
+        ISSMASSERT(numberofdofspernode==4);
 
         /* Recover input data: */
@@ -4648 +4648 @@
                 /*compute Du*/
                 for (i=0;i<numgrids;i++){
-                        pe_g_gaussian[i*NDOF2+0]=dux*Jdet*gauss_weight*l1l2l3[i]; 
-                        pe_g_gaussian[i*NDOF2+1]=duy*Jdet*gauss_weight*l1l2l3[i]; 
-                }
-
-                /*Add pe_g_gaussian vector to pe_g: */
-                for( i=0; i<numdof; i++){
-                        pe_g[i]+=pe_g_gaussian[i];
+                        pe_g[i*NDOF4+0]+=dux*Jdet*gauss_weight*l1l2l3[i];
+                        pe_g[i*NDOF4+1]+=duy*Jdet*gauss_weight*l1l2l3[i]; 
                 }
         }