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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:31:37 -0800 (Tue, 31 Oct 2006)
New Revision: 5146

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
Log:
 r851 at earth:  boo | 2006-10-31 13:30:37 -0800
  r841 at earth (orig r657):  AlanLo | 2006-10-18 19:08:32 -0700
  
  Fixed more code within assert() bugs
  
  Optimised StgFEM works now
  
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:850
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:656
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:851
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:657

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c	2006-10-31 21:31:27 UTC (rev 5145)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c	2006-10-31 21:31:37 UTC (rev 5146)
@@ -299,7 +299,8 @@
 	}	
 	
 	/* update the size depending on our now built feVariable */
-	assert( self->localSize = self->feVariable->eqNum->localEqNumsOwnedCount );
+	self->localSize = self->feVariable->eqNum->localEqNumsOwnedCount;
+	assert( self->localSize );
 	
 	/* Allocate the vector */
 	Journal_DPrintfL( self->debug, 2, "Allocating the L.A. Force Vector with %d local entries.\n", self->localSize );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2006-10-31 21:31:27 UTC (rev 5145)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2006-10-31 21:31:37 UTC (rev 5146)
@@ -456,8 +456,10 @@
 	#endif
 	
 	/* update the row and column sizes for the variables */	
-	assert( self->rowLocalSize = self->rowVariable->eqNum->localEqNumsOwnedCount );
-	assert( self->colLocalSize = self->columnVariable->eqNum->localEqNumsOwnedCount );
+	self->rowLocalSize = self->rowVariable->eqNum->localEqNumsOwnedCount;
+	assert( self->rowLocalSize );
+	self->colLocalSize = self->columnVariable->eqNum->localEqNumsOwnedCount;
+	assert( self->colLocalSize );
 	
 	/* update the number of non zero entries from the finite element variables */
 	StiffnessMatrix_CalculateNonZeroEntries( self );