[cig-commits] r7774 - mc/3D/CitcomS/branches/compressible/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-03 12:01:02 -0700 (Fri, 03 Aug 2007)
New Revision: 7774

Modified:
   mc/3D/CitcomS/branches/compressible/lib/Element_calculations.c
Log:
Rearranged the code calculating element stiffness matrix

Modified: mc/3D/CitcomS/branches/compressible/lib/Element_calculations.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Element_calculations.c	2007-08-03 19:00:41 UTC (rev 7773)
+++ mc/3D/CitcomS/branches/compressible/lib/Element_calculations.c	2007-08-03 19:01:02 UTC (rev 7774)
@@ -291,14 +291,15 @@
       bdbmu[2][1]=bdbmu[2][2]=bdbmu[2][3]=
       bdbmu[3][1]=bdbmu[3][2]=bdbmu[3][3]=0.0;
 
-    if(E->control.inv_gruneisen > 0)
+    if(E->control.inv_gruneisen < 1e-6)
       for(i=1;i<=dims;i++)
         for(j=1;j<=dims;j++)
           for(i1=1;i1<=6;i1++)
             for(j1=1;j1<=6;j1++)
 	      for(k=1;k<=VPOINTS3D;k++)
 		bdbmu[i][j] +=
-                  W[k]*d2[i1][j1]*ba[a][k][i][i1]*ba[b][k][j][j1];
+                  W[k]*d1[i1][j1]*ba[a][k][i][i1]*ba[b][k][j][j1];
+
     else
       for(i=1;i<=dims;i++)
         for(j=1;j<=dims;j++)
@@ -306,7 +307,7 @@
             for(j1=1;j1<=6;j1++)
 	      for(k=1;k<=VPOINTS3D;k++)
 		bdbmu[i][j] +=
-                  W[k]*d1[i1][j1]*ba[a][k][i][i1]*ba[b][k][j][j1];
+                  W[k]*d2[i1][j1]*ba[a][k][i][i1]*ba[b][k][j][j1];
 
 
 		/**/