[cig-commits] commit: Removed more redundant info which was dumped to stdout.

[Mercurial]

changeset:   61:3a42a3ca5426
user:        DavidMay
date:        Tue Feb 12 01:17:48 2008 +0000
files:       MaterialPoints/src/Material.c MaterialPoints/src/Materials_Register.c libPICellerator/Toolbox/Toolbox.c
description:
Removed more redundant info which was dumped to stdout.


diff -r 66f1df5815b3 -r 3a42a3ca5426 MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c	Mon Feb 11 10:32:00 2008 +0000
+++ b/MaterialPoints/src/Material.c	Tue Feb 12 01:17:48 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: Material.c 518 2007-10-11 08:07:50Z SteveQuenette $
+** $Id: Material.c 532 2008-02-12 01:17:48Z DavidMay $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -229,7 +229,7 @@ void Material_Layout( void* material, Ma
 	Particle_Index        particleLocalCount = swarm->particleLocalCount;
 	Stream*               stream             = Journal_MyStream( Info_Type, self );
 
-	Journal_Printf( stream, "Laying out material '%s' within %s '%s':\n", self->name, shape->type, shape->name );
+	Journal_RPrintf( stream, "Laying out material '%s' within %s '%s':\n", self->name, shape->type, shape->name );
 	
 	for ( lParticle_I = 0 ; lParticle_I < particleLocalCount ; lParticle_I++ ) {
 		particle = (MaterialPoint*)Swarm_ParticleAt( swarm, lParticle_I );
diff -r 66f1df5815b3 -r 3a42a3ca5426 MaterialPoints/src/Materials_Register.c
--- a/MaterialPoints/src/Materials_Register.c	Mon Feb 11 10:32:00 2008 +0000
+++ b/MaterialPoints/src/Materials_Register.c	Tue Feb 12 01:17:48 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: Materials_Register.c 518 2007-10-11 08:07:50Z SteveQuenette $
+** $Id: Materials_Register.c 532 2008-02-12 01:17:48Z DavidMay $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -154,19 +154,21 @@ void Materials_Register_AssignParticlePr
 	Particle_Index      particleGlobalCount = 0;
 	Stream*             stream = Journal_Register( Info_Type, self->type );
 	double              setupStartTime = 0;
-	double              setupTime = 0;
+	double              setupTime = 0, tmin, tmax;
 	Processor_Index     formerStreamPrintingRank;
 	unsigned int        numberOfCompletionPrintIncrements=10;
 	double              completionRatioIncrement= 1 / (double)numberOfCompletionPrintIncrements;
 	double              nextCompletionRatioToPrint=0;
 	Particle_Index      nextCompletedParticleCountToPrint=0;
 	Particle_Index      nextPlusOneCompletedParticleCountToPrint=0;
+	char                *title;
+
+        formerStreamPrintingRank = Stream_GetPrintingRank( stream );
+        Stream_SetPrintingRank( stream, 0 );
 
 	Journal_Printf( stream, "In func %s(): for swarm \"%s\"\n", __func__, swarm->name );
 	Stream_Indent( stream );
 	setupStartTime = MPI_Wtime();
-	formerStreamPrintingRank = Stream_GetPrintingRank( stream );
-	Stream_SetPrintingRank( stream, 0 );
 	MPI_Reduce( &particleLocalCount, &particleGlobalCount, 1, MPI_UNSIGNED, MPI_SUM, 0, swarm->comm );
 	Journal_Printf( stream, "Assigning initial particle properties to the %u global particles\n",
 		particleGlobalCount );
@@ -215,15 +217,19 @@ void Materials_Register_AssignParticlePr
 			nextCompletedParticleCountToPrint = ceil(particleLocalCount * nextCompletionRatioToPrint - 0.001);
 		}
 	}
+
 	Stream_UnIndent( stream );
 	/* Need this barrier so the time is accurate */
 	MPI_Barrier( swarm->comm );
 	setupTime = MPI_Wtime() - setupStartTime;
 
 	Stream_UnIndent( stream );
+
+	MPI_Reduce( &setupTime, &tmin, 1, MPI_DOUBLE, MPI_MIN, 0, swarm->comm );
+	MPI_Reduce( &setupTime, &tmax, 1, MPI_DOUBLE, MPI_MAX, 0, swarm->comm );
+	Journal_Printf( stream, "%s(): finished setup of material properties for swarm \"%s\"\n"
+		"\ttook %g [min] / %g [max] secs\n", __func__, swarm->name, tmin, tmax );
 	Stream_SetPrintingRank( stream, formerStreamPrintingRank );
-	Journal_Printf( stream, "%s(): finished setup of material properties for swarm \"%s\"\n"
-		"\ttook %g secs\n", __func__, swarm->name, setupTime );
 }
 
 
diff -r 66f1df5815b3 -r 3a42a3ca5426 libPICellerator/Toolbox/Toolbox.c
--- a/libPICellerator/Toolbox/Toolbox.c	Mon Feb 11 10:32:00 2008 +0000
+++ b/libPICellerator/Toolbox/Toolbox.c	Tue Feb 12 01:17:48 2008 +0000
@@ -110,7 +110,7 @@ void PICellerator_Toolbox_Finalise( Plug
 void PICellerator_Toolbox_Finalise( PluginsManager* pluginsManager ) {
 	PICellerator_Finalise();
 	
-	Journal_Printf( Journal_Register( Info_Type, PICellerator_Toolbox_Type ), "Finalised: PICellerator Toolbox.\n" );
+	Journal_RPrintf( Journal_Register( Info_Type, PICellerator_Toolbox_Type ), "Finalised: PICellerator Toolbox.\n" );
 }
 
 Index PICellerator_Toolbox_Register( PluginsManager* pluginsManager ) {