Changeset 5589

Timestamp:

08/26/10 09:26:01 (15 years ago)

Author:

seroussi

Message:

keep on cleaning KMatrix Stokes

File:

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

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

@@ -2917 +2917 @@
 
         /*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
@@ -2974 +2973 @@
         /*retrive parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        this->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
 
         /*retrieve inputs :*/
@@ -2983 +2983 @@
         /*If on water or not Stokes, skip stiffness: */
         if(onwater || approximation!=StokesApproximationEnum) return;
-
-        /*retrieve some parameters: */
-        this->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
 
         /* Get node coordinates and dof list: */
@@ -3139 +3136 @@
         ReduceMatrixStokes(&Ke_reduced[0][0], &Ke_temp[0][0]);
 
-        for(i=0;i<numdof;i++){
-                for(j=0;j<numdof;j++){
-                        K_terms[i][j]+=Ke_reduced[i][j];
-                }
-        }
-
         /*Add Ke_gg to global matrix Kgg: */
-        MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES);
+        MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_reduced,ADD_VALUES);
 
         /*Free ressources:*/