Changeset 16950

Timestamp:

11/26/13 09:58:28 (11 years ago)

Author:

seroussi

Message:

CHG: minor

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -3102 +3102 @@
         IssmDouble  D[3][3]= {0.0};                 // material matrix, simple scalar matrix.
         IssmDouble  D_scalar;
-        IssmDouble  Ke_gg_gaussian[numdof2d][numdof2d];
+        IssmDouble  Ke_gg[numdof2d][numdof2d]={0.0};
         IssmDouble  *xyz_list  = NULL;
 
@@ -3150 +3150 @@
                                         &D[0][0],3,3,0,
                                         &Bprime[0][0],3,numdof2d,0,
-                                        &Ke_gg_gaussian[0][0],0);
-
-                for(i=0;i<numdof2d;i++) for(j=0;j<numdof2d;j++) Ke->values[i*numdof2d+j]+=Ke_gg_gaussian[i][j];
-        }
+                                        &Ke_gg[0][0],1);
+
+        }
+        for(i=0;i<numdof2d;i++) for(j=0;j<numdof2d;j++) Ke->values[i*numdof2d+j]+=Ke_gg[i][j];
 
         /*Transform Coordinate System*/
@@ -3498 +3498 @@
         IssmDouble Ke_gg[numdofs][numdofm]={0.0}; //local element stiffness matrix 
         IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix 
-        IssmDouble Ke_gg_gaussian[numdofs][numdofm]; //stiffness matrix evaluated at the gaussian point.
-        IssmDouble Ke_gg_gaussian2[numdofm][numdofs]; //stiffness matrix evaluated at the gaussian point.
         IssmDouble *xyz_list    = NULL;
         Node       *node_list[20];
@@ -3563 +3561 @@
                                         &D[0][0],4,4,0,
                                         &Bprime[0][0],4,numdofm,0,
-                                        &Ke_gg_gaussian[0][0],0);
+                                        &Ke_gg[0][0],1);
 
                 TripleMultiply( &B2[0][0],3,numdofm,1,
                                         &D2[0][0],3,3,0,
                                         &Bprime2[0][0],3,numdofs,0,
-                                        &Ke_gg_gaussian2[0][0],0);
-
-                for( i=0; i<numdofs; i++) for(j=0;j<numdofm; j++) Ke_gg[i][j]+=Ke_gg_gaussian[i][j];
-                for( i=0; i<numdofm; i++) for(j=0;j<numdofs; j++) Ke_gg2[i][j]+=Ke_gg_gaussian2[i][j];
+                                        &Ke_gg2[0][0],1);
+
         } 
         for(i=0;i<numdofs;i++) for(j=0;j<numdofm;j++) Ke->values[i*numdoftotal+j+numdofs]+=Ke_gg[i][j];