[cig-commits] r15274 - in long/3D/SNAC/trunk: Snac/libSnac/src Snac/plugins/hillSlope Snac/plugins/plastic Snac/plugins/winkler StGermain/Base/Automation/src StGermain/Base/Context/src StGermain/VMake/Config/OpenGl

echoi at geodynamics.org echoi at geodynamics.org
Mon Jun 15 14:28:38 PDT 2009


Author: echoi
Date: 2009-06-15 14:28:37 -0700 (Mon, 15 Jun 2009)
New Revision: 15274

Removed:
   long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log
   long/3D/SNAC/trunk/Snac/plugins/winkler/make.log
   long/3D/SNAC/trunk/Snac/plugins/winkler/make.warning
   long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.error
   long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.log
   long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.warning
Modified:
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
   long/3D/SNAC/trunk/Snac/plugins/plastic/ConstructExtensions.c
   long/3D/SNAC/trunk/Snac/plugins/plastic/Output.c
   long/3D/SNAC/trunk/StGermain/Base/Automation/src/Stg_Component.c
   long/3D/SNAC/trunk/StGermain/Base/Context/src/AbstractContext.c
Log:
1.Added back the lines for writing outputs.
2.Removed log files made by the make system during the building process.


Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2009-06-15 21:28:37 UTC (rev 15274)
@@ -55,8 +55,6 @@
 #include <limits.h>
 #include <math.h>
 #include <assert.h>
-#include <time.h>
-
 #ifndef PATH_MAX
 	#define PATH_MAX 1024
 #endif
@@ -310,7 +308,7 @@
 		/* When constant Dt type is specified, Dt should be given an initial-non-zero value */
 		self->dt = Dictionary_Entry_Value_AsDouble(
 			Dictionary_GetDefault( self->dictionary, "timeStep", Dictionary_Entry_Value_FromDouble( 1.0 ) ) );
-		if (self->rank==0)
+
 		Journal_Printf( self->info, "\"dtType\" set by Dictionary to \"%s\"\n", self->dtType );
 	}
 	else if( !strcmp( tmpStr, Snac_DtType_Dynamic ) ) {
@@ -321,7 +319,6 @@
 		self->dt = Dictionary_Entry_Value_AsDouble(
 			Dictionary_GetDefault( self->dictionary, "timeStep", Dictionary_Entry_Value_FromDouble( 0.0 ) ) );
 
-		if (self->rank==0)
 		Journal_Printf( self->info, "\"dtType\" set by Dictionary to \"%s\"\n", self->dtType );
 	}
 	else {
@@ -332,7 +329,7 @@
 		/* When dynamic Dt type is specified, Dt will be calculated later, give 0 as starting value... legacy behaviour. */
 		self->dt = Dictionary_Entry_Value_AsDouble(
 			Dictionary_GetDefault( self->dictionary, "timeStep", Dictionary_Entry_Value_FromDouble( 0.0 ) ) );
-		if (self->rank==0)
+
 		Journal_Printf(
 			self->info,
 			"\"dtType\" not specified in Dictionary... assuming \"%s\", of init value: %g\n",
@@ -349,7 +346,6 @@
 	/* What method are we using to calculate forces? */
 	/* "Complete" type should be always used unless there is a really good reason to use others. */
 	self->forceCalcType = Snac_Force_Complete;
-	if (self->rank==0)
 	Journal_Printf( self->info, "\"forceCalcType\" set by Dictionary to \"complete\"\n" );
 
 	/*
@@ -361,8 +357,7 @@
 	self->numProcX = ((HexaMD*)self->mesh->layout->decomp)->partition3DCounts[0];
 	self->numProcY = ((HexaMD*)self->mesh->layout->decomp)->partition3DCounts[1];
 	self->numProcZ = ((HexaMD*)self->mesh->layout->decomp)->partition3DCounts[2];
-	if (self->rank==0)
-		Journal_Printf( self->info, "\nParallel processing geometry:  nX=%d  nY=%d  nZ=%d\n\n",
+	Journal_Printf( self->info, "\nParallel processing geometry:  nX=%d  nY=%d  nZ=%d\n\n",
 			self->numProcX,self->numProcY,self->numProcZ );
 
 	/* Add initial condition managers */
@@ -932,7 +927,7 @@
 	Snac_Context* self = (Snac_Context*)context;
 	Element_LocalIndex	element_lI;
 
-#ifdef DEBUGscaling
+#ifdef DEBUG
 	fprintf(stderr, "TimeStepZero:  restartTimestep=%d,  timeStep=%d\n", self->restartTimestep, self->timeStep);
 #endif
 
@@ -1191,15 +1186,7 @@
 
 void _Snac_Context_WriteLoopInfo( void* context ) {
 	Snac_Context* self = (Snac_Context*)context;
-	/*
-	time_t now=time(NULL);
-	char *cnow;
-	cnow=ctime(&now);
 
-	if (self->rank==1)
-            fprintf( self->timeStepInfo, "Internal time (%d) = %s\n", self->timeStep, cnow);
-	*/
-
 	if( self->rank >0 )
 		return;
 	
@@ -1215,10 +1202,8 @@
 void _Snac_Context_DumpLoopInfo( void* context ) {
 	Snac_Context* self = (Snac_Context*)context;
 
-	/*
 	fprintf( self->timeStepInfo, "%16u %16g %16g\n", self->timeStep, self->currentTime, self->dt );
 	fflush( self->timeStepInfo );
-	*/
 }
 
 
@@ -1245,7 +1230,6 @@
 
 	/* Create the strain rate dumping stream */
 	self->strainRateOut = Journal_Register( VariableDumpStream_Type, "StrainRate" );
-	/*
 	sprintf( tmpBuf, "%s/strainRate.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->strainRateOut,
@@ -1253,11 +1237,9 @@
 		self->mesh->elementLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the stress dumping stream */
 	self->stressOut = Journal_Register( VariableDumpStream_Type, "Stress" );
-	/*
 	sprintf( tmpBuf, "%s/stress.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->stressOut,
@@ -1265,11 +1247,9 @@
 		self->mesh->elementLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the pressure  dumping stream */
 	self->hydroPressureOut = Journal_Register( VariableDumpStream_Type, "HydroPressure" );
-	/*
 	sprintf( tmpBuf, "%s/hydroPressure.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->hydroPressureOut,
@@ -1277,11 +1257,9 @@
 		self->mesh->elementLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the phase index dumping stream */
 	self->phaseIndexOut = Journal_Register( VariableDumpStream_Type, "PhaseIndex" );
-	/*	
 	sprintf( tmpBuf, "%s/phaseIndex.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->phaseIndexOut,
@@ -1289,11 +1267,9 @@
 		self->mesh->elementLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the coords dumping stream */
 	self->coordOut = Journal_Register( VariableDumpStream_Type, "Coord" );
-	/*
 	sprintf( tmpBuf, "%s/coord.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->coordOut,
@@ -1301,11 +1277,9 @@
 		self->mesh->nodeLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the velocity dumping stream */
 	self->velOut = Journal_Register( VariableDumpStream_Type, "Velocity" );
-	/*	
 	sprintf( tmpBuf, "%s/vel.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->velOut,
@@ -1313,12 +1287,9 @@
 		self->mesh->nodeLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the force dumping stream */
 	self->forceOut = Journal_Register( VariableDumpStream_Type, "Forces" );
-
-	/*
 	sprintf( tmpBuf, "%s/force.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->forceOut,
@@ -1326,16 +1297,12 @@
 		self->mesh->nodeLocalCount,
 		self->dumpEvery,
 		tmpBuf );
-	*/
 
 	/* Create the stressTensor dump file */
-	/*
 	sprintf( tmpBuf, "%s/stressTensor.%u", self->outputPath, self->rank );
 	if( (self->stressTensorOut = fopen( tmpBuf, "w+" )) == NULL ) {
-		assert( self->stressTensorOut );
+		assert( self->stressTensorOut /* failed to open file for writing */ );
 	}
-	*/
-
 }
 
 
@@ -1345,8 +1312,6 @@
 
 	/* Create the phase index dumping stream */
 	self->phaseIndexCheckpoint = Journal_Register( VariableDumpStream_Type, "PhaseIndexCP" );
-	
-	/*
 	sprintf( tmpBuf, "%s/phaseIndexCP.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->phaseIndexCheckpoint,
@@ -1354,12 +1319,9 @@
 		self->mesh->elementLocalCount,
 		self->checkpointEvery,
 		tmpBuf );
-	*/
 
 	/* Create the coords dumping stream */
 	self->coordCheckpoint = Journal_Register( VariableDumpStream_Type, "CoordCP" );
-
-	/*
 	sprintf( tmpBuf, "%s/coordCP.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->coordCheckpoint,
@@ -1367,11 +1329,9 @@
 		self->mesh->nodeLocalCount,
 		self->checkpointEvery,
 		tmpBuf );
-	*/
 
 	/* Create the velocity dumping stream */
 	self->velCheckpoint = Journal_Register( VariableDumpStream_Type, "VelocityCP" );
-	/*
 	sprintf( tmpBuf, "%s/velCP.%u", self->outputPath, self->rank );
 	VariableDumpStream_SetVariable(
 		self->velCheckpoint,
@@ -1379,24 +1339,19 @@
 		self->mesh->nodeLocalCount,
 		self->checkpointEvery,
 		tmpBuf );
-	*/
 
 	/* Create the stressTensor dump file */
-	/*
 	sprintf( tmpBuf, "%s/stressTensorCP.%u", self->outputPath, self->rank );
 	if( (self->stressTensorCheckpoint = fopen( tmpBuf, "w+" )) == NULL ) {
-		assert( self->stressTensorCheckpoint );
+		assert( self->stressTensorCheckpoint /* failed to open file for writing */ );
 		abort();
 	}
-	*/
 }
 
 
 void _Snac_Context_WriteOutput( void* context ) {
 	Snac_Context* self = (Snac_Context*)context;
 
-	return;
-
 	if( isTimeToDump( self ) )
 		_Snac_Context_Dump( self );
 
@@ -1494,8 +1449,6 @@
 
 Bool isTimeToDump( void* context ) {
 	Snac_Context* self = (Snac_Context*)context;
-
-	return False;
 	
 	if( (self->timeStep==1) || ((self->timeStep>1)&&(self->timeStep%self->dumpEvery==0)) ) 
 		return True;
@@ -1508,8 +1461,6 @@
 Bool isTimeToCheckpoint( void* context ) {
 	Snac_Context* self = (Snac_Context*)context;
 
-	return False;
-
 	if( (self->timeStep==self->maxTimeSteps) )
 		return True;
 	else if( (self->timeStep==0) )

Deleted: long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,8 +0,0 @@
-make[1]: Entering directory `/usr/local/SNAC/Snac/plugins/hillSlope'
-/usr/bin/cc -pipe  -DVERSION=\"14177\" -DCURR_MODULE_NAME=\"SnacHillSlope\" -DPLUGIN_NAME=SnacHillSlope -Wall -g   -fPIC -c -o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Track.o -I/usr/local/SNAC/build/include   -I/usr/local/SNAC/build/include/StGermain -I/usr/local/SNAC/build/include   -I/usr/local/include   -I/usr/include/libxml2      Track.c
-Track.c: In function `SnacHillSlope_Track':
-Track.c:58: warning: unused variable `geometry'
-Track.c:72: warning: unused variable `startThreshold'
-/usr/bin/cc -pipe  -DVERSION=\"14177\" -DCURR_MODULE_NAME=\"SnacHillSlope\" -DPLUGIN_NAME=SnacHillSlope -Wall -g   -o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/SnacHillSlopemodule.so /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Register.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/ConstructExtensions.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Build.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Context.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/InitialConditions.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Track.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/CreateWeakPoints.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/DeleteExtensions.o  -shared  -L/usr/local/SNAC/build/lib   -L/usr/local/SNAC/build/lib  -lSnac -lStGermain   -L/usr/local/lib -lmpich -lpmpich    -lpthread  -lrt    -lxml2 -lz -lpthread -lm   -lm   -Xlinker -rpath -Xlinker /usr/local/lib         
-/bin/cp -f /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/SnacHillSlopemodule.so /usr/local/SNAC/build/lib/SnacHillSlopemodule.so
-make[1]: Leaving directory `/usr/local/SNAC/Snac/plugins/hillSlope'

Modified: long/3D/SNAC/trunk/Snac/plugins/plastic/ConstructExtensions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/plastic/ConstructExtensions.c	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/plugins/plastic/ConstructExtensions.c	2009-06-15 21:28:37 UTC (rev 15274)
@@ -84,16 +84,14 @@
 									   ConditionFunction_New( _SnacVelocity_VariableCondition, "variableVelBC" ) );
 
 	/* Prepare the dump and checkpoint file */
-	/*
 	sprintf( tmpBuf, "%s/plStrain.%u", context->outputPath, context->rank );
 	if( (contextExt->plStrainOut = fopen( tmpBuf, "w+" )) == NULL ) {
-		assert( contextExt->plStrainOut  );
+		assert( contextExt->plStrainOut /* failed to open file for writing */ );
 		abort();
 	}
 	sprintf( tmpBuf, "%s/plStrainCP.%u", context->outputPath, context->rank );
 	if( (contextExt->plStrainCheckpoint = fopen( tmpBuf, "w+" )) == NULL ) {
-		assert( contextExt->plStrainCheckpoint  );
+		assert( contextExt->plStrainCheckpoint /* failed to open file for writing */ );
 		abort();
 	}
-	*/
 }

Modified: long/3D/SNAC/trunk/Snac/plugins/plastic/Output.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/plastic/Output.c	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/plugins/plastic/Output.c	2009-06-15 21:28:37 UTC (rev 15274)
@@ -44,13 +44,13 @@
 
 void _SnacPlastic_WritePlasticStrain( void* _context ) {
 	Snac_Context*				context = (Snac_Context*) _context;
-/*
+
 	if( isTimeToDump( context ) )
 		_SnacPlastic_DumpPlasticStrain( context );
 
 	if( isTimeToCheckpoint( context ) )
 		_SnacPlastic_CheckpointPlasticStrain( context );
-*/
+
 }
 
 

Deleted: long/3D/SNAC/trunk/Snac/plugins/winkler/make.log
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/winkler/make.log	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/plugins/winkler/make.log	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,12 +0,0 @@
-make[1]: Entering directory `/home/echoi/opt/SNAC/Snac/plugins/winkler'
-/usr/bin/cc -pipe  -DVERSION=\"\" -DCURR_MODULE_NAME=\"SnacWinklerForce\" -DPLUGIN_NAME=SnacWinklerForce -Wall -g   -fPIC -c -o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Register.o -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/SNAC/build/include/StGermain -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/mpich-1.2.7p1/include   -I/usr/include/libxml2      Register.c
-/usr/bin/cc -pipe  -DVERSION=\"\" -DCURR_MODULE_NAME=\"SnacWinklerForce\" -DPLUGIN_NAME=SnacWinklerForce -Wall -g   -fPIC -c -o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/InitialConditions.o -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/SNAC/build/include/StGermain -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/mpich-1.2.7p1/include   -I/usr/include/libxml2      InitialConditions.c
-/usr/bin/cc -pipe  -DVERSION=\"\" -DCURR_MODULE_NAME=\"SnacWinklerForce\" -DPLUGIN_NAME=SnacWinklerForce -Wall -g   -fPIC -c -o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Output.o -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/SNAC/build/include/StGermain -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/mpich-1.2.7p1/include   -I/usr/include/libxml2      Output.c
-/usr/bin/cc -pipe  -DVERSION=\"\" -DCURR_MODULE_NAME=\"SnacWinklerForce\" -DPLUGIN_NAME=SnacWinklerForce -Wall -g   -fPIC -c -o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Force.o -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/SNAC/build/include/StGermain -I/home/echoi/opt/SNAC/build/include   -I/home/echoi/opt/mpich-1.2.7p1/include   -I/usr/include/libxml2      Force.c
-Force.c: In function ‘_SnacWinklerForce_Apply’:
-Force.c:93: warning: unused variable ‘mantleDensity’
-Force.c: In function ‘_SnacWinklerForce_Apply_Spherical’:
-Force.c:508: warning: unused variable ‘mantleDensity’
-/usr/bin/cc -pipe  -DVERSION=\"\" -DCURR_MODULE_NAME=\"SnacWinklerForce\" -DPLUGIN_NAME=SnacWinklerForce -Wall -g   -o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/SnacWinklerForcemodule.so /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Register.o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/InitialConditions.o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Output.o /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/Force.o  -shared  -L/home/echoi/opt/SNAC/build/lib   -L/home/echoi/opt/SNAC/build/lib  -lSnac -lStGermain   -L/home/echoi/opt/mpich-1.2.7p1/lib -lmpich -lpmpich    -lpthread  -lrt    -lxml2   -lm   -Xlinker -rpath -Xlinker /home/echoi/opt/mpich-1.2.7p1/lib         
-/bin/cp -f /home/echoi/opt/SNAC/build/tmp/mod-SnacWinklerForcemodule.so/SnacWinklerForcemodule.so /home/echoi/opt/SNAC/build/lib/SnacWinklerForcemodule.so
-make[1]: Leaving directory `/home/echoi/opt/SNAC/Snac/plugins/winkler'

Deleted: long/3D/SNAC/trunk/Snac/plugins/winkler/make.warning
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/winkler/make.warning	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/Snac/plugins/winkler/make.warning	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,2 +0,0 @@
-Force.c:93: warning: unused variable ‘mantleDensity’
-Force.c:508: warning: unused variable ‘mantleDensity’

Modified: long/3D/SNAC/trunk/StGermain/Base/Automation/src/Stg_Component.c
===================================================================
--- long/3D/SNAC/trunk/StGermain/Base/Automation/src/Stg_Component.c	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/StGermain/Base/Automation/src/Stg_Component.c	2009-06-15 21:28:37 UTC (rev 15274)
@@ -199,7 +199,7 @@
 		
 		Stream* stream = Journal_Register( Info_Type, "Stg_ComponentFactory" );
 
-		/* Journal_Printf( stream, "Constructing %s..\n", self->name ); */
+		Journal_Printf( stream, "Constructing %s..\n", self->name );
 		Stream_Indent( stream );
 		
 		/*buf = Stg_Object_AppendSuffix( self, "Construct" );

Modified: long/3D/SNAC/trunk/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/SNAC/trunk/StGermain/Base/Context/src/AbstractContext.c	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/StGermain/Base/Context/src/AbstractContext.c	2009-06-15 21:28:37 UTC (rev 15274)
@@ -839,7 +839,6 @@
 	double             dt = 0;
 	double             dtLoadedFromFile = 0;
 	
-	if (self->rank==1) {
 	if (self->maxTimeSteps) {
 		Journal_Printf( self->info, "Run until %u timeSteps have been run\n", self->maxTimeSteps );
 	}
@@ -862,8 +861,7 @@
 		}
 		Journal_Printf( self->info, "until simulation time passes %g.\n", self->stopTime );
 	}
-	}
-
+	
 	self->timeStepSinceJobRestart = 1;
 
 	/* Set timeStep to 0 if not restarting, so that incrementing timestep below affects both
@@ -928,7 +926,6 @@
 	 * have just synchronised while calculating timestep anyway. */
 	MPI_Barrier( self->communicator );
 	Journal_DPrintf( self->debug, "In: %s\n", __func__ );
-	if (self->rank==1)	
 	Journal_Printf( self->info, "r=%d, ts=%d/%d: t=%.6g->%.6g\n", 
 			self->rank, self->timeStep, self->maxTimeSteps, self->currentTime, self->currentTime+dt );
 

Deleted: long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.error
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.error	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.error	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,4 +0,0 @@
-conftest.c:3: error: ‘OSMESA_RGBA’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
-conftest.c:4: error: ‘GL_UNSIGNED_BYTE’ undeclared (first use in this function)

Deleted: long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.log
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.log	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.log	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,14 +0,0 @@
-make[1]: Entering directory `/home/echoi/opt/SNAC/StGermain/VMake/Config/OpenGl'
-/usr/bin/cc -pipe  -DVERSION=\"\" -Wall -g  -DCURR_MODULE_NAME=\"conftest\"  -fPIC -c -o /home/echoi/opt/SNAC/StGermain/VMake/Config/OpenGl/bin-conftest/conftest.o -I/home/echoi/opt/SNAC/StGermain/VMake/Config/OpenGl    -I/usr/include/GL/   -I/usr/include/GL -DHAVE_GL -DHAVE_GL -DHAVE_GL    conftest.c
-conftest.c:1:20: 오류: osmesa.h: No such file or directory
-conftest.c: In function ‘main’:
-conftest.c:3: warning: implicit declaration of function ‘OSMesaCreateContext’
-conftest.c:3: error: ‘OSMESA_RGBA’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
-conftest.c:3: warning: initialization makes pointer from integer without a cast
-conftest.c:4: warning: implicit declaration of function ‘OSMesaMakeCurrent’
-conftest.c:4: error: ‘GL_UNSIGNED_BYTE’ undeclared (first use in this function)
-conftest.c:5: warning: implicit declaration of function ‘OSMesaDestroyContext’
-make[1]: *** [/home/echoi/opt/SNAC/StGermain/VMake/Config/OpenGl/bin-conftest/conftest.o] 오류 1
-make[1]: Leaving directory `/home/echoi/opt/SNAC/StGermain/VMake/Config/OpenGl'

Deleted: long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.warning
===================================================================
--- long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.warning	2009-06-15 20:49:51 UTC (rev 15273)
+++ long/3D/SNAC/trunk/StGermain/VMake/Config/OpenGl/make.warning	2009-06-15 21:28:37 UTC (rev 15274)
@@ -1,4 +0,0 @@
-conftest.c:3: warning: implicit declaration of function ‘OSMesaCreateContext’
-conftest.c:3: warning: initialization makes pointer from integer without a cast
-conftest.c:4: warning: implicit declaration of function ‘OSMesaMakeCurrent’
-conftest.c:5: warning: implicit declaration of function ‘OSMesaDestroyContext’



More information about the CIG-COMMITS mailing list