Changeset 13975 for issm/trunk/src/c/classes/objects/Elements/PentaRef.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/objects/Elements/PentaRef.cpp (modified) (4 diffs)

issm/trunk/src/c/classes/objects/Elements/PentaRef.cpp

@@ -699 +699 @@
         IssmDouble l1l2l3[NUMNODESP1_2d];
 
-
         /*Get l1l2l3 in actual coordinate system: */
         l1l2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
@@ -812 +811 @@
         IssmDouble l1l2l3[NUMNODESP1_2d];
 
-
         /*Get l1l2l3 in actual coordinate system: */
         l1l2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
@@ -882 +880 @@
 void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussPenta* gauss){
 
-        int i,j;
-
         /*The Jacobian is constant over the element, discard the gaussian points. 
          * J is assumed to have been allocated of size NDOF2xNDOF2.*/
@@ -899 +895 @@
         A3=gauss->coord3;
 
-        xi=A2-A1;
-        eta=SQRT3*A3;
-        zi=gauss->coord4;
+        xi  = A2-A1;
+        eta = SQRT3*A3;
+        zi  = gauss->coord4;
 
         x1=*(xyz_list+3*0+0);