Changeset 4567

Timestamp:

07/13/10 15:55:26 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed CM (linearize gradient)

File:

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

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

@@ -1231 +1231 @@
         double       dh1dh3[NDOF2][numgrids];
 
-        /* grid data: */
-        double adjx_list[numgrids];
-        double adjy_list[numgrids];
-
         /* gaussian points: */
         int     num_gauss,ig;
@@ -1263 +1259 @@
         /*nodal functions: */
         double l1l2l3[3];
+        double    alpha2complement_list[numgrids];                          //TO BE DELETED
+        double    gauss[numgrids][numgrids] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED
 
         /* strain rate: */
@@ -1292 +1290 @@
         this->parameters->FindParam(&cm_maxdmp_slope,CmMaxDmpSlopeEnum);
 
-
         /*Get out if shelf*/
         if(shelf)return;
@@ -1303 +1300 @@
         inputs->GetParameterValue(&drag_type,DragTypeEnum);
         friction=new Friction("2d",inputs,matpar,analysis_type);
+
+        /*COMPUT alpha2_list (TO BE DELETED)*/
+        for(i=0;i<numgrids;i++){
+                friction->GetAlphaComplement(&alpha2complement_list[i],&gauss[i][0],VxEnum,VyEnum);
+        }
 
         /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */
@@ -1316 +1318 @@
 
                 /*Build alpha_complement_list: */
-                if (drag_type==2) friction->GetAlphaComplement(&alpha_complement, gauss_l1l2l3,VxEnum,VyEnum);
-                else alpha_complement=0;
+                //if (drag_type==2) friction->GetAlphaComplement(&alpha_complement, gauss_l1l2l3,VxEnum,VyEnum); // TO BE UNCOMMENTED
+                //else alpha_complement=0;
+                GetParameterValue(&alpha_complement,&alpha2complement_list[0],gauss_l1l2l3); // TO BE DELETED
         
                 /*Recover alpha_complement and k: */