Changeset 8708

Timestamp:

06/24/11 08:41:37 (14 years ago)

Author:

Mathieu Morlighem

Message:

test prognostic with less Ke_gg_gaussians -> Use MatrixTripleMultiply with last argument 1

File:

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

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

@@ -938 +938 @@
         double     xyz_list[NUMVERTICES][3];
         double     L[3];
-        double     Ke_gaussian[numdof][numdof]={0.0};
         GaussTria *gauss=NULL;
 
@@ -963 +962 @@
                                         &D_scalar,1,1,0,
                                         &L[0],1,numdof,0,
-                                        &Ke_gaussian[0][0],0);
-
-                for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_gaussian[i][j];
+                                        &Ke->values[0],1);
         }
 
@@ -1103 +1100 @@
         double     DL[2][2]                        ={0.0};
         double     DLprime[2][2]                   ={0.0};
-        double     Ke_gg_gaussian[numdof][numdof]  ={0.0};
-        double     Ke_gg_thickness1[numdof][numdof]={0.0};
-        double     Ke_gg_thickness2[numdof][numdof]={0.0};
         GaussTria *gauss=NULL;
 
@@ -1160 +1154 @@
                                         &DL_scalar,1,1,0,
                                         &L[0],1,numdof,0,
-                                        &Ke_gg_gaussian[0][0],0);
+                                        &Ke->values[0],1);
 
                 GetBPrognostic(&B[0][0], &xyz_list[0][0], gauss);
@@ -1177 +1171 @@
                                         &DL[0][0],2,2,0,
                                         &B[0][0],2,numdof,0,
-                                        &Ke_gg_thickness1[0][0],0);
+                                        &Ke->values[0],1);
 
                 TripleMultiply( &B[0][0],2,numdof,1,
                                         &DLprime[0][0],2,2,0,
                                         &Bprime[0][0],2,numdof,0,
-                                        &Ke_gg_thickness2[0][0],0);
-
-                for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_gg_gaussian[i][j];
-                for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_gg_thickness1[i][j];
-                for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_gg_thickness2[i][j];
+                                        &Ke->values[0],1);
 
                 if(artdiff){
@@ -1195 +1185 @@
                                                 &KDL[0][0],2,2,0,
                                                 &Bprime[0][0],2,numdof,0,
-                                                &Ke_gg_gaussian[0][0],0);
-
-                        for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_gg_gaussian[i][j];
+                                                &Ke->values[0],1);
                 }
         }