Changeset 5588

Timestamp:

08/26/10 09:19:06 (15 years ago)

Author:

seroussi

Message:

removed some useless parameters in CreateKMatrixStokes

File:

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

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

@@ -2899 +2899 @@
 
         int i,j;
-
         const int numgrids=6;
         const int DOFPERGRID=4;
@@ -2908 +2907 @@
         const int numdof2d=numgrids2d*DOFPERGRID;
 
-        double K_terms[numdof][numdof]={0.0};
-
-        /*Material properties: */
-        double    gravity,rho_ice,rho_water;
-
         /*Collapsed formulation: */
         Tria*  tria=NULL;
 
         /*Grid data: */
-        double        xyz_list[numgrids][3];
-
-        /*parameters: */
-        double             xyz_list_tria[numgrids2d][3];
-        double             surface_normal[3];
-        double             bed_normal[3];
-        double         thickness;
+        double     xyz_list[numgrids][3];
+        double    xyz_list_tria[numgrids2d][3];
+        double    surface_normal[3];
+        double    bed_normal[3];
 
         /*matrices: */
+        double     K_terms[numdof][numdof]={0.0};
         double     Ke_temp[27][27]={0.0}; //for the six nodes and the bubble 
         double     Ke_reduced[numdof][numdof]; //for the six nodes only
@@ -2957 +2949 @@
         double  gauss_coord[4];
         double  gauss_coord_tria[3];
-        int area_order=5;
-        int     num_vert_gauss=5;
+        int     area_order=5;
+        int       num_vert_gauss=5;
 
         double  epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/
@@ -2991 +2983 @@
         /*If on water or not Stokes, skip stiffness: */
         if(onwater || approximation!=StokesApproximationEnum) return;
-
-        /*recovre material parameters: */
-        rho_water=matpar->GetRhoWater();
-        rho_ice=matpar->GetRhoIce();
-        gravity=matpar->GetG();
 
         /*retrieve some parameters: */
@@ -3160 +3147 @@
         /*Add Ke_gg to global matrix Kgg: */
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES);
-
 
         /*Free ressources:*/