Changeset 3161

Timestamp:

03/02/10 14:40:19 (15 years ago)

Author:

Mathieu Morlighem

Message:

reordering

File:

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

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

@@ -3119 +3119 @@
                 printf("%s%s%i\n",__FUNCT__," error message: negative jacobian determinant on element ",id);
         }
+}
+/*}}}*/
+/*FUNCTION GetJacobianInvert {{{1*/
+#undef __FUNCT__ 
+#define __FUNCT__ "Penta::GetJacobianInvert"
+void Penta::GetJacobianInvert(double*  Jinv, double* xyz_list,double* gauss_coord){
+
+        double Jdet;
+        const int NDOF3=3;
+
+        /*Call Jacobian routine to get the jacobian:*/
+        GetJacobian(Jinv, xyz_list, gauss_coord);
+
+        /*Invert Jacobian matrix: */
+        MatrixInverse(Jinv,NDOF3,NDOF3,NULL,0,&Jdet);
 }
 /*}}}*/
@@ -3337 +3352 @@
 }
 /*}}}*/
+/*FUNCTION GetMatPar {{{1*/
+void* Penta::GetMatPar(){
+        return matpar;
+}
+/*}}}*/
 /*FUNCTION GetMatrixInvert {{{1*/
 #undef __FUNCT__ 
@@ -3377 +3397 @@
 }
 /*}}}*/
+/*FUNCTION GetNodalFunctions {{{1*/
+#undef __FUNCT__ 
+#define __FUNCT__ "Penta::GetNodalFunctions"
+void Penta::GetNodalFunctions(double* l1l6, double* gauss_coord){
+
+        /*This routine returns the values of the nodal functions  at the gaussian point.*/
+
+        l1l6[0]=gauss_coord[0]*(1-gauss_coord[3])/2.0;
+
+        l1l6[1]=gauss_coord[1]*(1-gauss_coord[3])/2.0;
+
+        l1l6[2]=gauss_coord[2]*(1-gauss_coord[3])/2.0;
+
+        l1l6[3]=gauss_coord[0]*(1+gauss_coord[3])/2.0;
+
+        l1l6[4]=gauss_coord[1]*(1+gauss_coord[3])/2.0;
+
+        l1l6[5]=gauss_coord[2]*(1+gauss_coord[3])/2.0;
+
+}
+/*}}}*/
 /*FUNCTION GetNodalFunctionsDerivatives {{{1*/
 #undef __FUNCT__
@@ -3576 +3617 @@
         l1l7[6]=27*gauss_coord[0]*gauss_coord[1]*gauss_coord[2]*(1.0+gauss_coord[3])*(1.0-gauss_coord[3]);
 
+}
+/*}}}*/
+/*FUNCTION GetNodes {{{1*/
+void  Penta::GetNodes(void** vpnodes){
+        int i;
+        Node** pnodes=(Node**)vpnodes;
+
+        for(i=0;i<6;i++){
+                pnodes[i]=nodes[i];
+        }
+}
+/*}}}*/
+/*FUNCTION GetOnBed {{{1*/
+int Penta::GetOnBed(){
+        return onbed;
 }
 /*}}}*/
@@ -3617 +3673 @@
 
         *pvalue=l1l6[0]*v_list[0]+l1l6[1]*v_list[1]+l1l6[2]*v_list[2]+l1l6[3]*v_list[3]+l1l6[4]*v_list[4]+l1l6[5]*v_list[5];
-}
-/*}}}*/
-/*FUNCTION GetJacobianInvert {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Penta::GetJacobianInvert"
-void Penta::GetJacobianInvert(double*  Jinv, double* xyz_list,double* gauss_coord){
-
-        double Jdet;
-        const int NDOF3=3;
-
-        /*Call Jacobian routine to get the jacobian:*/
-        GetJacobian(Jinv, xyz_list, gauss_coord);
-
-        /*Invert Jacobian matrix: */
-        MatrixInverse(Jinv,NDOF3,NDOF3,NULL,0,&Jdet);
-}
-/*}}}*/
-/*FUNCTION GetMatPar {{{1*/
-void* Penta::GetMatPar(){
-        return matpar;
-}
-/*}}}*/
-/*FUNCTION GetNodalFunctions {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Penta::GetNodalFunctions"
-void Penta::GetNodalFunctions(double* l1l6, double* gauss_coord){
-
-        /*This routine returns the values of the nodal functions  at the gaussian point.*/
-
-        l1l6[0]=gauss_coord[0]*(1-gauss_coord[3])/2.0;
-
-        l1l6[1]=gauss_coord[1]*(1-gauss_coord[3])/2.0;
-
-        l1l6[2]=gauss_coord[2]*(1-gauss_coord[3])/2.0;
-
-        l1l6[3]=gauss_coord[0]*(1+gauss_coord[3])/2.0;
-
-        l1l6[4]=gauss_coord[1]*(1+gauss_coord[3])/2.0;
-
-        l1l6[5]=gauss_coord[2]*(1+gauss_coord[3])/2.0;
-
-}
-/*}}}*/
-/*FUNCTION GetNodes {{{1*/
-void  Penta::GetNodes(void** vpnodes){
-        int i;
-        Node** pnodes=(Node**)vpnodes;
-
-        for(i=0;i<6;i++){
-                pnodes[i]=nodes[i];
-        }
-}
-/*}}}*/
-/*FUNCTION GetOnBed {{{1*/
-int Penta::GetOnBed(){
-        return onbed;
 }
 /*}}}*/