[cig-commits] r5729 - in long/3D/Gale/trunk: . src/PICellerator/Weights/src

[walter at geodynamics.org]

Author: walter
Date: 2007-01-09 10:36:53 -0800 (Tue, 09 Jan 2007)
New Revision: 5729

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
Log:
 r1338 at earth:  boo | 2007-01-05 13:04:48 -0800
 Fix up a bad merge



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1337
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1338

Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c	2007-01-09 18:36:50 UTC (rev 5728)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c	2007-01-09 18:36:53 UTC (rev 5729)
@@ -823,7 +823,7 @@
 	      /* We should be able to swap out the WeightsCalculator_CalculateAll instead of just setting
                  a pointer inside that function */
 	      visited++;
-	      construct_grid(&cells,numz,numy,numx,BBXMIN,BBYMIN,BBZMIN,BBXMAX,BBYMAX,BBZMAX);
+	      _DVCWeights_ConstructGrid(&cells,numz,numy,numx,BBXMIN,BBYMIN,BBZMIN,BBXMAX,BBYMAX,BBZMAX);
 	}
 	
 	
@@ -905,7 +905,7 @@
 	      /* We should be able to swap out the WeightsCalculator_CalculateAll instead of just setting
                  a pointer inside that function */
 	      visited++;
-	      construct_grid2d(&cells,numy,numx,BBXMIN,BBYMIN,BBXMAX,BBYMAX);
+	      _DVCWeights_ConstructGrid2D(&cells,numy,numx,BBXMIN,BBYMIN,BBXMAX,BBYMAX);
 	}