Changeset 5743 for issm/trunk/src/c/objects/Loads/Icefront.cpp

Timestamp:

09/10/10 10:20:08 (15 years ago)

Author:

Mathieu Morlighem

Message:

removed all double gauss

File:

• issm/trunk/src/c/objects/Loads/Icefront.cpp (modified) (9 diffs)

issm/trunk/src/c/objects/Loads/Icefront.cpp ¶

@@ -549 +549 @@
         /*Objects: */
         double  pe_g[numdofs]={0.0};
-        Node**  element_nodes=NULL;
         int    element_type;
                 
@@ -579 +578 @@
         
         //Identify which grids are comprised in the quad: 
-        if(element_type==PentaEnum)element_nodes=(Node**)xmalloc(6*sizeof(Node*));
-        element->GetNodes((void**)element_nodes);
-
-        grid1=-1; grid2=-1; grid3=-1; grid4=-1;
-        for(i=0;i<6;i++){
-                if (nodes[0]==element_nodes[i])grid1=i;
-                if (nodes[1]==element_nodes[i])grid2=i;
-                if (nodes[2]==element_nodes[i])grid3=i;
-                if (nodes[3]==element_nodes[i])grid4=i;
-        }
-        
-        if((grid1==-1) || (grid2==-1)|| (grid3==-1)||(grid4==-1)){
-                ISSMERROR("could not find element grids corresponding to quad icefront!");
-        }
+        grid1=element->GetNodeIndex(nodes[0]);
+        grid2=element->GetNodeIndex(nodes[1]);
+        grid3=element->GetNodeIndex(nodes[2]);
+        grid4=element->GetNodeIndex(nodes[3]);
 
         /*Build new xyz, bed and thickness lists for grids 1 to 4: */
@@ -653 +642 @@
 
         /*Free ressources:*/
-        xfree((void**)&element_nodes);
         xfree((void**)&doflist);
 
@@ -678 +666 @@
         /*Objects: */
         double  pe_g[numdofs]={0.0};
-        Node**  element_nodes=NULL;
         Penta*   penta=NULL;
 
@@ -709 +696 @@
         
         //Identify which grids are comprised in the quad: 
-        element_nodes=(Node**)xmalloc(6*sizeof(Node*));
-        element->GetNodes((void**)element_nodes);
-
-        grid1=-1; grid2=-1; grid3=-1; grid4=-1;
-        for(i=0;i<6;i++){
-                if (nodes[0]==element_nodes[i])grid1=i;
-                if (nodes[1]==element_nodes[i])grid2=i;
-                if (nodes[2]==element_nodes[i])grid3=i;
-                if (nodes[3]==element_nodes[i])grid4=i;
-        }
-        
-        if((grid1==-1) || (grid2==-1)|| (grid3==-1)||(grid4==-1)){
-                ISSMERROR("could not find element grids corresponding to quad icefront!");
-        }
+        grid1=element->GetNodeIndex(nodes[0]);
+        grid2=element->GetNodeIndex(nodes[1]);
+        grid3=element->GetNodeIndex(nodes[2]);
+        grid4=element->GetNodeIndex(nodes[3]);
 
         /*Build new xyz, bed and thickness lists for grids 1 to 4: */
@@ -784 +761 @@
 
         /*Free ressources:*/
-        xfree((void**)&element_nodes);
         xfree((void**)&doflist);
 
@@ -1019 +995 @@
                                 complete_list[j][2]=0;
                         }
-                        tria->GetJacobianDeterminant2d(&J[i],&complete_list[0][0],l1l2l3_tria);
+                        tria->GetJacobianDeterminant2d(&J[i],&complete_list[0][0],gauss);
                 }
 
@@ -1261 +1237 @@
                                 complete_list[j][2]=0;
                         }
-                        tria->GetJacobianDeterminant2d(&J[i],&complete_list[0][0],l1l2l3_tria);
+                        tria->GetJacobianDeterminant2d(&J[i],&complete_list[0][0],gauss);
                 }
 
@@ -1310 +1286 @@
 
                 } //for(i=0;i<4;i++)
-        } //for(ig=0;ig<num_gauss;ig++)
+        } 
 
         delete tria;