[cig-commits] r6347 - in long/3D/Gale/trunk/src/StgFEM: . SLE/SystemSetup/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-21 22:07:09 -0700 (Wed, 21 Mar 2007)
New Revision: 6347

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
Log:
 r1068 at earth (orig r789):  LukeHodkinson | 2007-03-21 17:10:59 -0700
 Swapping back to a different assembly routine.
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:788
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:789
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2007-03-22 04:47:52 UTC (rev 6346)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2007-03-22 05:07:09 UTC (rev 6347)
@@ -258,8 +258,8 @@
 	self->stiffnessMatrixTermList = Stg_ObjectList_New();
 
 	/* Set default function for Global Stiffness Matrix Assembly */
-	/*EP_ReplaceAll( self->assembleStiffnessMatrix, StiffnessMatrix_GlobalAssembly_General );*/
-	EP_ReplaceAll( self->assembleStiffnessMatrix, StiffnessMatrix_NewAssemble );
+	EP_ReplaceAll( self->assembleStiffnessMatrix, StiffnessMatrix_GlobalAssembly_General );
+	/*EP_ReplaceAll( self->assembleStiffnessMatrix, StiffnessMatrix_NewAssemble );*/
 
 	/* We need some assembler contexts. */
 	self->zeroBCsAsm = Assembler_New();