Changeset 15452

Timestamp:

07/07/13 09:40:45 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: ice front now working for quadratic elements

File:

• issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp

@@ -591 +591 @@
 
         /*Fetch number of nodes and dof for this finite element*/
-        //int numnodes = this->NumberofNodes();
-        int numnodes = 2; 
+        int numnodes = tria->NumberofNodes();
         int numdof   = numnodes*NDOF2;
 
         /*Initialize Element vector and vectors*/
-        ElementVector* pe=new ElementVector(nodes,NUMVERTICESSEG,this->parameters,MacAyealApproximationEnum);
+        ElementVector* pe=new ElementVector(tria->nodes,numnodes,this->parameters,MacAyealApproximationEnum);
         IssmDouble*    basis = xNew<IssmDouble>(numnodes);
 
@@ -641 +640 @@
 
                 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss);
-                tria->GetSegmentNodalFunctions(&basis[0],gauss,index1,index2);
+                tria->GetNodalFunctions(basis,gauss);
 
                 for (int i=0;i<numnodes;i++){
@@ -650 +649 @@
 
         /*Transform load vector*/
-        TransformLoadVectorCoord(pe,nodes,NUMVERTICESSEG,XYEnum);
+        TransformLoadVectorCoord(pe,tria->nodes,numnodes,XYEnum);
 
         /*Clean up and return*/