[cig-commits] commit:

[Mercurial]

changeset:   36:88091065af2a
user:        BelindaMay
date:        Thu Feb 14 02:38:17 2008 +0000
files:       Mesh/src/CartesianGenerator.c Mesh/src/MeshClass.c
description:
Cleaned up some of my mesh checkpointing code


diff -r b51e4c6bfbe7 -r 88091065af2a Mesh/src/CartesianGenerator.c
--- a/Mesh/src/CartesianGenerator.c	Wed Feb 13 01:15:51 2008 +0000
+++ b/Mesh/src/CartesianGenerator.c	Thu Feb 14 02:38:17 2008 +0000
@@ -2006,25 +2006,37 @@ void CartesianGenerator_GenGeom( Cartesi
 			__func__,  
 			meshSaveFileName );*/
 
-		if( meshFile == 0 ) {
+		if( !meshFile ) {
 			Journal_Printf( errorStream, 
 				"Warning - Couldn't find checkpoint mesh file with filename \"%s\".\n", 
 				meshSaveFileName );
-		}
-		else {
-			fseek( meshFile, (Sync_GetNumDomains( sync ) * myRank + 2) * mesh->topo->nDims * sizeof( double ), SEEK_CUR );
 
 			for( n_i = 0; n_i < Sync_GetNumDomains( sync ); n_i++ ) {
 				gNode = Sync_DomainToGlobal( sync, n_i );
 				Grid_Lift( grid, gNode, inds );
 				vert = Mesh_GetVertex( mesh, n_i );
 
+				/* Calculate coordinate. */
+				for( d_i = 0; d_i < mesh->topo->nDims; d_i++ ) {
+					vert[d_i] = self->crdMin[d_i] + 
+						((double)inds[d_i] / (double)(grid->sizes[d_i] - 1)) * steps[d_i];
+				}
+			}
+		}
+		else {
+			fseek( meshFile, (Sync_GetNumDomains( sync ) * myRank + 2) * mesh->topo->nDims * sizeof( double ), SEEK_CUR );
+
+			for( n_i = 0; n_i < Sync_GetNumDomains( sync ); n_i++ ) {
+				gNode = Sync_DomainToGlobal( sync, n_i );
+				Grid_Lift( grid, gNode, inds );
+				vert = Mesh_GetVertex( mesh, n_i );
+
 				for( d_i = 0; d_i < mesh->topo->nDims; d_i++ ) {	
 					fread( &vert[d_i], sizeof( double ), 1, meshFile );
 				}
 			}
-		}
-		fclose( meshFile );
+			fclose( meshFile );
+		}
 	}
 	else {
 		/* Loop over domain nodes. */
diff -r b51e4c6bfbe7 -r 88091065af2a Mesh/src/MeshClass.c
--- a/Mesh/src/MeshClass.c	Wed Feb 13 01:15:51 2008 +0000
+++ b/Mesh/src/MeshClass.c	Thu Feb 14 02:38:17 2008 +0000
@@ -148,25 +148,11 @@ void _Mesh_Build( void* mesh, void* data
 	Mesh*			self = (Mesh*)mesh;
 	unsigned		nDims;
 	unsigned		d_i;
-	AbstractContext*	context = (AbstractContext*)data;
-	char 			meshSaveFileName[256];
-	double*			temp;
-	//Stream*			errorStream = Journal_Register( Error_Type, self->type );
-	int 			i, j;
-
-	assert( self );
-
-	/*printf ("Start of _Mesh_Build function\n");
-	for( i=0; i<64; i++ ) {		
-		//fread( self->verts[i], 32 * sizeof( double ), 1, meshFile );
-		for( j=0; j<32; j++) {
-			//self->verts[i][j] = 0.0;					
-			printf ("%lf  \t", self->verts[i][j] );
-		}
-	}*/
+
+	assert( self );
 
 	if( self->generator )
-		MeshGenerator_Generate( self->generator, self, context );
+		MeshGenerator_Generate( self->generator, self, data );
 
 	nDims = Mesh_GetDimSize( self );
 	if( !nDims )