Changeset 5670

Timestamp:

09/03/10 10:50:03 (15 years ago)

Author:

seroussi

Message:

remove gauss_tria in Stokes

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (1 diff)
• PentaRef.cpp (modified) (4 diffs)
• PentaRef.h (modified) (1 diff)

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

@@ -2897 +2897 @@
 
                         /*Get L matrix if viscous basal drag present: */
-                        GetLStokes(&LStokes[0][0],  gauss_coord_tria);
-                        GetLprimeStokes(&LprimeStokes[0][0], &xyz_list[0][0], gauss_coord_tria, gauss_coord);
+                        GetLStokes(&LStokes[0][0],  gauss_coord);
+                        GetLprimeStokes(&LprimeStokes[0][0], &xyz_list[0][0], gauss_coord);
 
                         /*Compute strain rate: */

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

@@ -477 +477 @@
 /*}}}*/
 /*FUNCTION PentaRef::GetLStokes {{{1*/
-void PentaRef::GetLStokes(double* LStokes, double* gauss_tria){
+void PentaRef::GetLStokes(double* LStokes, double* gauss){
         /*
          * Compute L  matrix. L=[L1 L2 L3] where Li is square and of size numdof. 
@@ -507 +507 @@
 
         /*Get l1l2l3 in actual coordinate system: */
-        l1l2l3[0]=gauss_tria[0];
-        l1l2l3[1]=gauss_tria[1];
-        l1l2l3[2]=gauss_tria[2];
+        l1l2l3[0]=gauss[0];
+        l1l2l3[1]=gauss[1];
+        l1l2l3[2]=gauss[2];
 
         /*Build LStokes: */
@@ -574 +574 @@
 /*}}}*/
 /*FUNCTION PentaRef::GetLprimeStokes {{{1*/
-void PentaRef::GetLprimeStokes(double* LprimeStokes, double* xyz_list, double* gauss_tria, double* gauss){
+void PentaRef::GetLprimeStokes(double* LprimeStokes, double* xyz_list, double* gauss){
 
         /*
@@ -604 +604 @@
 
         /*Get l1l2l3 in actual coordinate system: */
-        l1l2l3[0]=gauss_tria[0];
-        l1l2l3[1]=gauss_tria[1];
-        l1l2l3[2]=gauss_tria[2];
+        l1l2l3[0]=gauss[0];
+        l1l2l3[1]=gauss[1];
+        l1l2l3[2]=gauss[2];
 
         GetNodalFunctionsP1Derivatives(&dh1dh6[0][0],xyz_list,gauss);

issm/trunk/src/c/objects/Elements/PentaRef.h

@@ -43 +43 @@
                 void GetBVert(double* B, double* xyz_list, double* gauss);
                 void GetBprimeAdvec(double* Bprime_advec, double* xyz_list, double* gauss);
-                void GetLStokes(double* LStokes, double* gauss_tria);
-                void GetLprimeStokes(double* LprimeStokes, double* xyz_list, double* gauss_tria, double* gauss);
+                void GetLStokes(double* LStokes, double* gauss);
+                void GetLprimeStokes(double* LprimeStokes, double* xyz_list, double* gauss);
                 void GetParameterValue(double* pvalue,double* plist,double* gauss);
                 void GetParameterValue(double* pvalue,double* plist,GaussTria* gauss){ISSMERROR("only PentaGauss are supported");};