Changeset 4691

Timestamp:

07/21/10 11:00:35 (15 years ago)

Author:

seroussi

Message:

linearisation of friction in Tria (same as old version)

File:

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

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

@@ -4663 +4663 @@
         double alpha2,vx,vy;
         double geothermalflux_value;
+        double    alpha2_list[numgrids];                                       //TO BE DELETED
+        double    gauss[numgrids][numgrids] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED
 
         /* gaussian points: */
@@ -4700 +4702 @@
         if (drag_type!=2)ISSMERROR(" non-viscous friction not supported yet!");
         friction=new Friction("3d",inputs,matpar,analysis_type);
+
+        /*COMPUT alpha2_list (TO BE DELETED)*/
+        for(i=0;i<numgrids;i++){
+                friction->GetAlpha2(&alpha2_list[i],&gauss[i][0],VxEnum,VyEnum,VzEnum);
+        }
         
         /* Ice/ocean heat exchange flux on ice shelf base */
@@ -4720 +4727 @@
                 inputs->GetParameterValue(&geothermalflux_value, &gauss_coord[0],GeothermalFluxEnum);
         
-                friction->GetAlpha2(&alpha2,&gauss_coord[0],VxEnum,VyEnum,VzEnum);
+                /*Friction: */
+                //friction->GetAlpha2(&alpha2,&gauss_coord[0],VxEnum,VyEnum,VzEnum);
+                GetParameterValue(&alpha2,&alpha2_list[0],gauss_coord); // TO BE DELETED
+
                 inputs->GetParameterValue(&vx, &gauss_coord[0],VxEnum);
                 inputs->GetParameterValue(&vy, &gauss_coord[0],VyEnum);
@@ -4734 +4744 @@
                         P_terms[i]+=scalar*l1l2l3[i];
                 }
+
         }