[cig-commits] commit:

[Mercurial]

changeset:   6:fca4f65e6cc6
user:        BelindaMay
date:        Fri Oct 26 05:30:46 2007 +0000
files:       Swarm/src/SwarmClass.c Swarm/src/SwarmDump.c
description:
Added an xml option "checkpointDir" so that checkpointing files don't have to live in the outputPath directory


diff -r 11d2526ecff1 -r fca4f65e6cc6 Swarm/src/SwarmClass.c
--- a/Swarm/src/SwarmClass.c	Thu Oct 25 06:04:26 2007 +0000
+++ b/Swarm/src/SwarmClass.c	Fri Oct 26 05:30:46 2007 +0000
@@ -1619,10 +1619,10 @@ void Swarm_ReplaceCurrentParticleLayoutW
 	
 	Journal_DPrintf( self->debug, "overriding the particleLayout specified via XML/constructor\n"
 		"of \"%s\" (of type %s) with a FileParticleLayout to load\n"
-		"this swarm's checkpoint file from outputPath \"%s\",\n"
+		"this swarm's checkpoint file from checkpointPath \"%s\",\n"
 		"with prefix \"%s\" from timestep %u with total name:\n\"%s\"\n",
 		self->particleLayout->name, self->particleLayout->type,
-		context->outputPath,
+		context->checkpointPath,
 		context->checkPointPrefixString, context->restartTimestep,
 		swarmSaveFileName );
 
@@ -1640,11 +1640,11 @@ void Swarm_ReplaceCurrentParticleLayoutW
 
 void Swarm_GetCheckpointFilenameForGivenTimestep( Swarm* self, AbstractContext* context, char* swarmSaveFileName ) {
 	if ( strlen(context->checkPointPrefixString) > 0 ) {
-		sprintf( swarmSaveFileName, "%s/%s.%s.%05d.dat", context->outputPath,
+		sprintf( swarmSaveFileName, "%s/%s.%s.%05d.dat", context->checkpointPath,
 			context->checkPointPrefixString, self->name, context->restartTimestep );
 	}
 	else {
-		sprintf( swarmSaveFileName, "%s/%s.%05d.dat", context->outputPath,
+		sprintf( swarmSaveFileName, "%s/%s.%05d.dat", context->checkpointPath,
 			self->name, context->restartTimestep );
 	}
 }
diff -r 11d2526ecff1 -r fca4f65e6cc6 Swarm/src/SwarmDump.c
--- a/Swarm/src/SwarmDump.c	Thu Oct 25 06:04:26 2007 +0000
+++ b/Swarm/src/SwarmDump.c	Fri Oct 26 05:30:46 2007 +0000
@@ -250,21 +250,21 @@ void _SwarmDump_Execute( void* swarmDump
 
 		if ( self->newFileEachTime ) {
 			if ( strlen(context->checkPointPrefixString) > 0 ) {
-				Stg_asprintf( &filename, "%s/%s.%s.%05d.dat", context->outputPath,
+				Stg_asprintf( &filename, "%s/%s.%s.%05d.dat", context->checkpointPath,
 					context->checkPointPrefixString, swarm->name, context->timeStep );
 			}
 			else {
-				Stg_asprintf( &filename, "%s/%s.%05d.dat", context->outputPath,
+				Stg_asprintf( &filename, "%s/%s.%05d.dat", context->checkpointPath,
 					swarm->name, context->timeStep );
 			}
 		}	
 		else { 
 			if ( strlen(context->checkPointPrefixString) > 0 ) {
-				Stg_asprintf( &filename, "%s/%s.%s.dat", context->outputPath,
+				Stg_asprintf( &filename, "%s/%s.%s.dat", context->checkpointPath,
 					context->checkPointPrefixString, swarm->name );
 			}
 			else {
-				Stg_asprintf( &filename, "%s/%s.dat", context->outputPath, swarm->name );
+				Stg_asprintf( &filename, "%s/%s.dat", context->checkpointPath, swarm->name );
 			}
 		}