[cig-commits] r4817 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/tests

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:45:53 -0700 (Wed, 11 Oct 2006)
New Revision: 4817

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c
Log:
 r2874 at earth:  boo | 2006-10-11 13:42:27 -0700
  r2790 at earth (orig r3778):  KathleenHumble | 2006-08-31 00:46:00 -0700
  changing all malloc, realloc, free and strdup into StGermain eqivalents.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2873
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3777
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2874
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3778

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.c	2006-10-11 20:45:51 UTC (rev 4816)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.c	2006-10-11 20:45:53 UTC (rev 4817)
@@ -134,7 +134,7 @@
 				
 				p = Regular;
 
-				sites = malloc( sizeof( CoordF ) * i );
+				sites = Memory_Alloc_Array(  CoordF, i, "TestDelauney_CoordF_pointSet" );
 				memset( sites, 0, sizeof( CoordF ) * i );
 		
 				generatePoints( sites, i, &p );
@@ -156,7 +156,7 @@
 
 				Stg_Class_Delete( d );
 
-				free( sites );
+				Memory_Free( sites );
 			}
 
 			printf( "Regular mesh triangulation test %s\n\n", pass?"passed..":"failed..!" );
@@ -173,7 +173,7 @@
 			
 				p = Irregular;
 				
-				sites = malloc( sizeof( CoordF ) * i );
+				sites = Memory_Alloc_Array( CoordF, i, "TestDelauney_CoordF_irregPointSet" );
 				memset( sites, 0, sizeof( CoordF ) * i );
 		
 				generatePoints( sites, i, &p );
@@ -188,7 +188,7 @@
 
 				Stg_Class_Delete( d );
 
-				free( sites );
+				Memory_Free( sites );
 			}
 
 			printf( "Irregular point-set triangulation test %s\n\n", pass?"passed..":"failed..!" );
@@ -210,7 +210,7 @@
 			
 				theta = 2*PI/((float)(i-1));
 				
-				sites = malloc( sizeof( CoordF ) * i );
+				sites = Memory_Alloc_Array(CoordF, i, "TestDelauney_CoordF_regPolygon" );
 				memset( sites, 0, sizeof( CoordF ) * i );
 		
 				generatePoints( sites, i, &p );
@@ -236,7 +236,7 @@
 			
 				Stg_Class_Delete( d );
 
-				free( sites );
+				Memory_Free( sites );
 			}
 
 			printf( "Regular polygon triangulation test %s\n", pass?"passed..":"failed..!" );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c	2006-10-11 20:45:51 UTC (rev 4816)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c	2006-10-11 20:45:53 UTC (rev 4817)
@@ -166,7 +166,7 @@
 		
 		sites = NULL;
 		if( rank == 0 ){
-			sites = malloc( sizeof( CoordF ) * numSites );
+			sites = Memory_Alloc_Array(CoordF, numSites, "TestParallelDelauney_CoordF" );
 			memset( sites, 0, sizeof( CoordF ) * numSites );
 		
 			generatePoints( sites, numSites, &p );
@@ -236,7 +236,7 @@
 		Stg_Class_Delete( pd );
 		
 		if( rank == 0 ){
-			free( sites );
+			Memory_Free( sites );
 		}
 		
 		if (rank == 0){