[cig-commits] r16167 - in long/3D/SNAC/trunk/Snac/plugins: hillSlope remesher remesherSPR

[cstark at geodynamics.org]

Author: cstark
Date: 2010-01-24 08:01:33 -0800 (Sun, 24 Jan 2010)
New Revision: 16167

Modified:
   long/3D/SNAC/trunk/Snac/plugins/hillSlope/InitialConditions.c
   long/3D/SNAC/trunk/Snac/plugins/remesher/InitialConditions.c
   long/3D/SNAC/trunk/Snac/plugins/remesherSPR/InitialConditions.c
Log:
Bugs in remesher plugins corrected.

Reference now made to "initCoords" rather than "initcoords" when restarting, since the former is the output name convention adopted by snac2restart.  Presumably recent changes in remesher and remesherSPR were not tested against restarts.



Modified: long/3D/SNAC/trunk/Snac/plugins/hillSlope/InitialConditions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hillSlope/InitialConditions.c	2010-01-24 02:39:01 UTC (rev 16166)
+++ long/3D/SNAC/trunk/Snac/plugins/hillSlope/InitialConditions.c	2010-01-24 16:01:33 UTC (rev 16167)
@@ -112,6 +112,11 @@
 	    plugin = plugin->next;
 	}
     }
+    /* 
+    if(context->restartTimestep > 0) {
+	restart = TRUE;
+    }
+    */
     if( restart ) {
 	fprintf(stderr, "Restarting: thus bailing from hillSlope/InitialConditions.c to avoid overwriting the mesh geometry\n");
 	return;

Modified: long/3D/SNAC/trunk/Snac/plugins/remesher/InitialConditions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/remesher/InitialConditions.c	2010-01-24 02:39:01 UTC (rev 16166)
+++ long/3D/SNAC/trunk/Snac/plugins/remesher/InitialConditions.c	2010-01-24 16:01:33 UTC (rev 16167)
@@ -82,8 +82,8 @@
 		char path[PATH_MAX];
 		double	x,y,z;
 
-		sprintf(path, "%s/snac.initcoord.%d.%06d.restart",context->outputPath,context->rank,context->restartTimestep);
-		Journal_Firewall( ( (fp=fopen(path,"r")) != NULL), context->snacError, "Can't find %s", path );
+		sprintf(path, "%s/snac.initCoord.%d.%06d.restart",context->outputPath,context->rank,context->restartTimestep);
+		Journal_Firewall( ( (fp=fopen(path,"r")) != NULL), context->snacError, "Can't find %s\n", path );
 		for( lNode_i = 0; lNode_i < mesh->nodeLocalCount; lNode_i++ ) {
 			fscanf( fp, "%le %le %le", &x,&y,&z);
 			meshExt->newNodeCoords[lNode_i][0] = x;

Modified: long/3D/SNAC/trunk/Snac/plugins/remesherSPR/InitialConditions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/remesherSPR/InitialConditions.c	2010-01-24 02:39:01 UTC (rev 16166)
+++ long/3D/SNAC/trunk/Snac/plugins/remesherSPR/InitialConditions.c	2010-01-24 16:01:33 UTC (rev 16167)
@@ -82,8 +82,8 @@
 		char path[PATH_MAX];
 		double	x,y,z;
 
-		sprintf(path, "%s/snac.initcoord.%d.%06d.restart",context->outputPath,context->rank,context->restartTimestep);
-		Journal_Firewall( ( (fp=fopen(path,"r")) != NULL), context->snacError, "Can't find %s", path );
+		sprintf(path, "%s/snac.initCoord.%d.%06d.restart",context->outputPath,context->rank,context->restartTimestep);
+		Journal_Firewall( ( (fp=fopen(path,"r")) != NULL), context->snacError, "Can't find %s\n", path );
 		for( lNode_i = 0; lNode_i < mesh->nodeLocalCount; lNode_i++ ) {
 			fscanf( fp, "%le %le %le", &x,&y,&z);
 			meshExt->newNodeCoords[lNode_i][0] = x;