[cig-commits] commit: Cleaned up the information reported to stdout.

[Mercurial]

changeset:   60:66f1df5815b3
user:        DavidMay
date:        Mon Feb 11 10:32:00 2008 +0000
files:       Utils/src/PCDVC.c Weights/src/WeightsCalculator.c
description:
Cleaned up the information reported to stdout.

* Modified the journaling statements in the files below.

* Most of the places where I made the modifications were either
print redundant information on every processor, or simply logging
time information. In the latter case, I just report the min and
max times.

* I don't report which cpu which produced the min/max time, but
if ever the difference between the min and max is large you
know that the function in question has an obvious sync. problem
and further examination is obviously required.


diff -r 0f946ec77e05 -r 66f1df5815b3 Utils/src/PCDVC.c
--- a/Utils/src/PCDVC.c	Thu Feb 07 08:00:56 2008 +0000
+++ b/Utils/src/PCDVC.c	Mon Feb 11 10:32:00 2008 +0000
@@ -1156,9 +1156,10 @@ void _PCDVC_Calculate( void* pcdvc, void
          are being created and destroyed while maintaining some population that it has converged on */
       if(lCell_I == 0){
 
+/*
 	   Journal_Printf( stream, "\nOn Proc %d: In func %s(): for swarm \"%s\" Population is %d\n", swarm->myRank, __func__, swarm->name, swarm->particleLocalCount );
 	   Journal_Printf( stream, "On Proc %d: In func %s(): for swarm \"%s\" Population is %d\n\n", matSwarm->myRank,__func__, matSwarm->name, matSwarm->particleLocalCount );
-
+*/
       }
       if(dim == 3){
 	    _PCDVC_Calculate3D( pcdvc, _swarm, lCell_I);
diff -r 0f946ec77e05 -r 66f1df5815b3 Weights/src/WeightsCalculator.c
--- a/Weights/src/WeightsCalculator.c	Thu Feb 07 08:00:56 2008 +0000
+++ b/Weights/src/WeightsCalculator.c	Mon Feb 11 10:32:00 2008 +0000
@@ -38,7 +38,7 @@
 **  License along with this library; if not, write to the Free Software
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** $Id: WeightsCalculator.c 518 2007-10-11 08:07:50Z SteveQuenette $
+** $Id: WeightsCalculator.c 531 2008-02-11 10:32:00Z DavidMay $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -208,12 +208,12 @@ void WeightsCalculator_CalculateAll( voi
 	Stream*              stream = Journal_Register( Info_Type, self->type );
 	Processor_Index      formerStreamPrintingRank = 0;
 
-	Journal_Printf( stream, "In func %s(): for swarm \"%s\"\n", __func__, swarm->name );
+	Journal_RPrintf( stream, "In func %s(): for swarm \"%s\"\n", __func__, swarm->name );
 	Stream_Indent( stream );
 	formerStreamPrintingRank = Stream_GetPrintingRank( stream );
 	Stream_SetPrintingRank( stream, 0 );
 	MPI_Reduce( &cellLocalCount, &cellGlobalCount, 1, MPI_UNSIGNED, MPI_SUM, 0, swarm->comm );
-	Journal_Printf( stream, "Calculating weights for the particles in the %u global cells\n",
+	Journal_RPrintf( stream, "Calculating weights for the particles in the %u global cells\n",
 		cellGlobalCount );
 	Stream_Indent( stream );
 
@@ -252,7 +252,7 @@ void WeightsCalculator_CalculateAll( voi
 	MPI_Barrier( swarm->comm );
 	Stream_SetPrintingRank( stream, formerStreamPrintingRank );
 	Stream_UnIndent( stream );
-	Journal_Printf( stream, "%s(): finished update of weights for swarm \"%s\"\n"
+	Journal_RPrintf( stream, "%s(): finished update of weights for swarm \"%s\"\n"
 		/*"\ttook %g secs\n"*/, __func__, swarm->name );
 }