Changeset 3831

Timestamp:

05/18/10 17:25:33 (15 years ago)

Author:

Eric.Larour

Message:

Using GetParameterAverage all over

File:

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

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

@@ -972 +972 @@
         int          doflist[numdof];
         int          numberofdofspernode;
+        double  gaussgrids[numgrids][numgrids]={{1,0,0},{0,1,0},{0,0,1}};
 
         /* gaussian points: */
@@ -981 +982 @@
         double  gauss_weight;
         double  gauss_l1l2l3[3];
-        double  gaussgrids[numgrids][numgrids]={{1,0,0},{0,1,0},{0,0,1}};
 
         /* matrices: */
@@ -1000 +1000 @@
         double  surface_list[3];
         double  nx,ny,norm;
-        double  vx_list[numgrids]={0.0};
-        double  vy_list[numgrids]={0.0};
         double  dvx[2];
         double  dvy[2];
@@ -1015 +1013 @@
         double artdiff;
 
-        /*Recover velocity: */
-        inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxAverageEnum);
-        inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyAverageEnum);
-
         /*retrieve some parameters: */
         this->parameters->FindParam(&artdiff,ArtDiffEnum);
@@ -1031 +1025 @@
 
         /*Get normal vector to the surface*/
-        nx=(vx_list[0]+vx_list[1]+vx_list[2])/3;
-        ny=(vy_list[0]+vy_list[1]+vy_list[2])/3;
+        inputs->GetParameterAverage(&nx,VxAverageEnum);
+        inputs->GetParameterAverage(&ny,VyAverageEnum);
         if(nx==0 && ny==0){
                 SurfaceNormal(&surface_normal[0],xyz_list);
@@ -1053 +1047 @@
 
                 //Build K matrix (artificial diffusivity matrix)
-                v_gauss[0]=ONETHIRD*(vx_list[0]+vx_list[1]+vx_list[2]);
-                v_gauss[1]=ONETHIRD*(vy_list[0]+vy_list[1]+vy_list[2]);
+                inputs->GetParameterAverage(&v_gauss[0],VxAverageEnum);
+                inputs->GetParameterAverage(&v_gauss[1],VyAverageEnum);
 
                 K[0][0]=pow(10,2)*pow(Jdettria,(double).5)/2.0*fabs(v_gauss[0]); //pow should be zero!!
@@ -1079 +1073 @@
 
                 //Get vx, vy and their derivatives at gauss point
-                GetParameterValue(&vx, &vx_list[0],gauss_l1l2l3);
-                GetParameterValue(&vy, &vy_list[0],gauss_l1l2l3);
-
-                GetParameterDerivativeValue(&dvx[0], &vx_list[0],&xyz_list[0][0], gauss_l1l2l3);
-                GetParameterDerivativeValue(&dvy[0], &vy_list[0],&xyz_list[0][0], gauss_l1l2l3);
+                inputs->GetParameterValue(&vx,&gauss_l1l2l3[0],VxAverageEnum);
+                inputs->GetParameterValue(&vy,&gauss_l1l2l3[0],VyAverageEnum);
+
+                inputs->GetParameterDerivativeValue(&dvx[0],&xyz_list[0][0],&gauss_l1l2l3[0],VxAverageEnum);
+                inputs->GetParameterDerivativeValue(&dvy[0],&xyz_list[0][0],&gauss_l1l2l3[0],VyAverageEnum);
 
                 dvxdx=dvx[0];
@@ -1654 +1648 @@
         double  gauss_weight;
         double  gauss_l1l2l3[3];
-        double  gaussgrids[numgrids][numgrids]={{1,0,0},{0,1,0},{0,0,1}};
 
         /* matrices: */
@@ -1670 +1663 @@
 
         /*input parameters for structural analysis (diagnostic): */
-        double  vx_list[numgrids]={0.0};
-        double  vy_list[numgrids]={0.0};
         double  dvx[2];
         double  dvy[2];
@@ -1694 +1685 @@
         GetDofList(&doflist[0],&numberofdofspernode);
 
-        /*Recover velocity: */
-        inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxAverageEnum);
-        inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyAverageEnum);
-
         //Create Artificial diffusivity once for all if requested
         if(artdiff==1){
@@ -1705 +1692 @@
 
                 //Build K matrix (artificial diffusivity matrix)
-                v_gauss[0]=ONETHIRD*(vx_list[0]+vx_list[1]+vx_list[2]);
-                v_gauss[1]=ONETHIRD*(vy_list[0]+vy_list[1]+vy_list[2]);
+                inputs->GetParameterAverage(&v_gauss[0],VxAverageEnum);
+                inputs->GetParameterAverage(&v_gauss[1],VyAverageEnum);
 
                 K[0][0]=pow(Jdettria,(double).5)/2.0*fabs(v_gauss[0]);
@@ -1743 +1730 @@
 
                 //Get vx, vy and their derivatives at gauss point
-                GetParameterValue(&vx, &vx_list[0],gauss_l1l2l3);
-                GetParameterValue(&vy, &vy_list[0],gauss_l1l2l3);
-
-                GetParameterDerivativeValue(&dvx[0], &vx_list[0],&xyz_list[0][0], gauss_l1l2l3);
-                GetParameterDerivativeValue(&dvy[0], &vy_list[0],&xyz_list[0][0], gauss_l1l2l3);
+                inputs->GetParameterValue(&vx,&gauss_l1l2l3[0],VxAverageEnum);
+                inputs->GetParameterValue(&vy,&gauss_l1l2l3[0],VyAverageEnum);
+
+                inputs->GetParameterDerivativeValue(&dvx[0],&xyz_list[0][0],&gauss_l1l2l3[0],VxAverageEnum);
+                inputs->GetParameterDerivativeValue(&dvy[0],&xyz_list[0][0],&gauss_l1l2l3[0],VyAverageEnum);
 
                 dvxdx=dvx[0];