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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:17:49 -0700 (Thu, 17 Aug 2006)
New Revision: 4345

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
Log:
 r2717 at earth:  boo | 2006-08-17 17:14:25 -0700
  r2671 at earth (orig r3752):  LukeHodkinson | 2006-08-06 22:22:15 -0700
  Modified the interface to Array_2DTo1D.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2716
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3751
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2717
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3752

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c	2006-08-18 00:17:49 UTC (rev 4344)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c	2006-08-18 00:17:49 UTC (rev 4345)
@@ -1330,7 +1330,7 @@
 			void*	tmpSrcArray1D;
 			unsigned*	disps;
 			
-			Array_2DTo1D( nProcs, sizes, array, &tmpSrcArray1D, &disps, sizeof(unsigned) );
+			Array_2DTo1D( nProcs, sizes, array, &tmpSrcArray1D, sizeof(unsigned), &disps );
 			
 			/* Generate a temporary set of sizes to include 'itemSize'. Modify 'dists' while we're at it. */
 			tmpSizes = Memory_Alloc_Array_Unnamed( unsigned, nProcs );