[cig-commits] commit:

[Mercurial]

changeset:   110:59058ff5130f
user:        LukeHodkinson
date:        Tue Jun 03 06:58:17 2008 +0000
files:       Utils/src/RegularMeshUtils.c
description:
Fixed some things to prevent valgrind reporting
reading of uninitialised memory.


diff -r 369c8f0ef7d3 -r 59058ff5130f Utils/src/RegularMeshUtils.c
--- a/Utils/src/RegularMeshUtils.c	Mon Jun 02 14:14:53 2008 +0000
+++ b/Utils/src/RegularMeshUtils.c	Tue Jun 03 06:58:17 2008 +0000
@@ -270,12 +270,11 @@ IndexSet* RegularMeshUtils_CreateGlobalI
 
 	for( n_i = 0; n_i < nNodes; n_i++ ) {
 		RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal( mesh, MT_VERTEX, n_i ), ijk );
-                if( nDims == 2 ) ijk[2] = 0;
 		if( ijk[1] == grid->sizes[1] - 1 && 
-		    (ijk[0] != grid->sizes[0] - 1 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[0] != 0 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[0] != grid->sizes[0] - 1 || ijk[2] != 0 ) && 
-		    (ijk[0] != 0 || ijk[2] != 0 ) )
+		    (ijk[0] != grid->sizes[0] - 1 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[0] != 0 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[0] != grid->sizes[0] - 1 || (nDims == 3 && ijk[2] != 0)) && 
+		    (ijk[0] != 0 || (nDims == 3 && ijk[2] != 0)) )
 		{
 			IndexSet_Add( set, n_i );
 		}
@@ -305,12 +304,11 @@ IndexSet* RegularMeshUtils_CreateGlobalI
 
 	for( n_i = 0; n_i < nNodes; n_i++ ) {
 		RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal( mesh, MT_VERTEX, n_i ), ijk );
-                if( nDims == 2 ) ijk[2] = 0;
 		if( ijk[1] == 0 && 
-		    (ijk[0] != grid->sizes[0] - 1 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[0] != 0 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[0] != grid->sizes[0] - 1 || ijk[2] != 0 ) && 
-		    (ijk[0] != 0 || ijk[2] != 0 ) )
+		    (ijk[0] != grid->sizes[0] - 1 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[0] != 0 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[0] != grid->sizes[0] - 1 || (nDims == 3 && ijk[2] != 0)) && 
+		    (ijk[0] != 0 || (nDims == 3 && ijk[2] != 0)) )
 		{
 			IndexSet_Add( set, n_i );
 		}
@@ -340,12 +338,11 @@ IndexSet* RegularMeshUtils_CreateGlobalI
 
 	for( n_i = 0; n_i < nNodes; n_i++ ) {
 		RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal( mesh, MT_VERTEX, n_i ), ijk );
-                if( nDims == 2 ) ijk[2] = 0;
 		if( ijk[0] == 0 && 
-		    (ijk[1] != grid->sizes[1] - 1 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[1] != 0 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[1] != grid->sizes[1] - 1 || ijk[2] != 0 ) && 
-		    (ijk[1] != 0 || ijk[2] != 0 ) )
+		    (ijk[1] != grid->sizes[1] - 1 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[1] != 0 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[1] != grid->sizes[1] - 1 || (nDims == 3 && ijk[2] != 0)) && 
+		    (ijk[1] != 0 || (nDims == 3 && ijk[2] != 0)) )
 		{
 			IndexSet_Add( set, n_i );
 		}
@@ -375,12 +372,11 @@ IndexSet* RegularMeshUtils_CreateGlobalI
 
 	for( n_i = 0; n_i < nNodes; n_i++ ) {
 		RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal( mesh, MT_VERTEX, n_i ), ijk );
-                if( nDims == 2 ) ijk[2] = 0;
 		if( ijk[0] == grid->sizes[0] - 1 && 
-		    (ijk[1] != grid->sizes[1] - 1 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[1] != 0 || ijk[2] != grid->sizes[2] - 1 ) && 
-		    (ijk[1] != grid->sizes[1] - 1 || ijk[2] != 0 ) && 
-		    (ijk[1] != 0 || ijk[2] != 0 ) )
+		    (ijk[1] != grid->sizes[1] - 1 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[1] != 0 || (nDims == 3 && ijk[2] != grid->sizes[2] - 1)) && 
+		    (ijk[1] != grid->sizes[1] - 1 || (nDims == 3 && ijk[2] != 0)) && 
+		    (ijk[1] != 0 || (nDims == 3 && ijk[2] != 0)) )
 		{
 			IndexSet_Add( set, n_i );
 		}