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

[walter at geodynamics.org]

Author: walter
Date: 2007-03-13 11:13:20 -0700 (Tue, 13 Mar 2007)
New Revision: 6245

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
Log:
 r1049 at earth (orig r781):  LukeHodkinson | 2007-03-13 01:12:10 -0700
 Steve found a big nasty problem with the new BC remocal
 and assembly code; reverting to the old method until I
 can figure out what's going on here...
 



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:779
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:781
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-13 18:13:16 UTC (rev 6244)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2007-03-13 18:13:20 UTC (rev 6245)
@@ -254,8 +254,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 = ZeroBCs_New();