Changeset 15441

Timestamp:

07/05/13 13:49:24 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some bug fix for quadratic elements

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (3 diffs)
• Tria.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1011 +1011 @@
         _assert_(sidlist);
         _assert_(nodes);
-
-        for(int i=0;i<NUMVERTICES;i++){
+        int numnodes = this->GetNumberOfNodes();
+
+        for(int i=0;i<numnodes;i++){
                 sidlist[i]=nodes[i]->Sid();
         }
@@ -2630 +2631 @@
 void Penta::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
 
+        /*Intermediaries*/
+        const int numnodes = this->GetNumberOfNodes();
+
         /*Output */
         int d_nz = 0;
@@ -2635 +2639 @@
 
         /*Loop over all nodes*/
-        for(int i=0;i<6;i++){
+        for(int i=0;i<numnodes;i++){
 
                 if(!flags[this->nodes[i]->Sid()]){

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -121 +121 @@
 void Tria::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
 
+        /*Intermediaries*/
+        const int numnodes = this->GetNumberOfNodes();
+
         /*Output */
         int d_nz = 0;
@@ -126 +129 @@
 
         /*Loop over all nodes*/
-        for(int i=0;i<3;i++){
+        for(int i=0;i<numnodes;i++){
 
                 if(!flags[this->nodes[i]->Sid()]){
@@ -891 +894 @@
         _assert_(sidlist);
         _assert_(nodes);
-
-        for(int i=0;i<NUMVERTICES;i++){
+        int numnodes = this->GetNumberOfNodes();
+
+        for(int i=0;i<numnodes;i++){
                 sidlist[i]=nodes[i]->Sid();
         }
@@ -2819 +2823 @@
 
         /*Transform Coordinate System*/
-        TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum);
+        TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum);
 
         /*Clean up and return*/
@@ -2907 +2911 @@
 
         /*Transform Coordinate System*/
-        TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum);
+        TransformStiffnessMatrixCoord(Ke,nodes,numnodes,XYEnum);
 
         /*Clean up and return*/
@@ -2968 +2972 @@
 
         /*Initialize Element vector and vectors*/
-        ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
+        ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,MacAyealApproximationEnum);
         GaussTria*     gauss  = new GaussTria(2);
         IssmDouble*    basis = xNew<IssmDouble>(numnodes);
@@ -2993 +2997 @@
                 /*Build load vector: */
                 for (i=0;i<numnodes;i++){
-                        for (j=0;j<NDOF2;j++){
+                        for(j=0;j<NDOF2;j++){
                                 pe->values[i*NDOF2+j]+=-driving_stress_baseline*slope[j]*Jdet*gauss->weight*basis[i];
                         }
@@ -3000 +3004 @@
 
         /*Transform coordinate system*/
-        TransformLoadVectorCoord(pe,nodes,NUMVERTICES,XYEnum);
+        TransformLoadVectorCoord(pe,nodes,numnodes,XYEnum);
 
         /*Clean up and return*/