[cig-commits] r6312 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-19 22:49:59 -0700 (Mon, 19 Mar 2007)
New Revision: 6312

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
Log:
 r1064 at earth (orig r788):  LukeHodkinson | 2007-03-19 17:01:19 -0700
 Adding a whole slew of journal commands to the 
 FeEquationNumber class.
 



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:787
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:788
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c	2007-03-20 05:02:33 UTC (rev 6311)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c	2007-03-20 05:49:59 UTC (rev 6312)
@@ -2250,6 +2250,8 @@
 
 
 void FeEquationNumber_BuildWithTopology( FeEquationNumber* self ) {
+	Stream*			stream;
+	double			startTime, endTime;
 	FeMesh*			feMesh;
 	Decomp_Sync*		sync;
 	CommTopology*		commTopo;
@@ -2275,6 +2277,18 @@
 
 	assert( self );
 
+	stream = Journal_Register( Info_Type, self->type );
+	Journal_Printf( stream, "FeEquationNumber: '%s'\n", self->name );
+	Stream_Indent( stream );
+	Journal_Printf( stream, "Generating equation numbers...\n" );
+	Stream_Indent( stream );
+	if( self->removeBCs )
+		Journal_Printf( stream, "BCs set to be removed.\n" );
+	else
+		Journal_Printf( stream, "BCs will not be removed.\n" );
+
+	startTime = MPI_Wtime();
+
 	/* Shortcuts. */
 	feMesh = self->feMesh;
 	commTopo = Mesh_GetCommTopology( feMesh, MT_VERTEX );
@@ -2426,11 +2440,23 @@
 	self->_lowestLocalEqNum = self->firstOwnedEqNum;
 
 	/* Bcast global sum from highest rank. */
+	if( rank == nProcs - 1 )
+		self->globalSumUnconstrainedDofs = self->lastOwnedEqNum;
 	MPI_Bcast( &self->globalSumUnconstrainedDofs, 1, MPI_UNSIGNED, nProcs - 1, comm );
 
 	/* Construct lowest global equation number list. */
 	self->_lowestGlobalEqNums = AllocArray( int, nProcs );
 	MPI_Allgather( &self->firstOwnedEqNum, 1, MPI_UNSIGNED, self->_lowestGlobalEqNums, 1, MPI_UNSIGNED, comm );
+
+	endTime = MPI_Wtime();
+
+	Journal_Printf( stream, "Assigned %d global equation numbers.\n", self->globalSumUnconstrainedDofs );
+	Journal_Printf( stream, "Assigned %d local equation numbers.\n", self->lastOwnedEqNum - self->firstOwnedEqNum );
+	Journal_Printf( stream, "Local equation numbers in the range %d to %d.\n", 
+			self->firstOwnedEqNum, self->lastOwnedEqNum );
+	Stream_UnIndent( stream );
+	Journal_Printf( stream, "... Completed in %g seconds.\n", endTime - startTime );
+	Stream_UnIndent( stream );
 }
 
 #if 0