[cig-commits] r4838 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:46:41 -0700 (Wed, 11 Oct 2006)
New Revision: 4838

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
Log:
 r2895 at earth:  boo | 2006-10-11 13:42:34 -0700
  r2811 at earth (orig r3799):  LukeHodkinson | 2006-09-18 00:12:29 -0700
  Fixing a couple of array freeing bugs.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2894
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3798
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2895
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3799

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c	2006-10-11 20:46:38 UTC (rev 4837)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c	2006-10-11 20:46:41 UTC (rev 4838)
@@ -382,7 +382,7 @@
 
 		/* Release some memory. */
 		FreeArray( remNReq );
-		FreeArray2D( self->nProcs, remReq );
+		FreeArray( remReq );
 		Stg_Class_Delete( globalSet );
 
 		/* Send back all the ones we found and receive from all others all our requireds they found. */
@@ -403,7 +403,7 @@
 
 	/* We can now free up some more memory. */
 	FreeArray( remNFound );
-	FreeArray2D( self->nProcs, remFound );
+	FreeArray( remFound );
 
 
 	/*
@@ -1020,13 +1020,14 @@
 		}
 		
 		/* Clobber the allocated 'uniques' arrays. */
-		FreeArray2D( self->nProcs, uniques );
+		for( proc_i = 0; proc_i < self->nProcs; proc_i++ )
+			FreeArray( uniques[proc_i] );
 	}
 	while( mostUniques );
 
 	/* Get rid of all the resources. */
-	Memory_Free( nUniques );
-	Memory_Free( uniques );
+	FreeArray( nUniques );
+	FreeArray( uniques );
 	Stg_Class_Delete( globalSet );
 }