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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:47:50 -0700 (Wed, 11 Oct 2006)
New Revision: 4867

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c
Log:
 r2924 at earth:  boo | 2006-10-11 13:42:44 -0700
  r2840 at earth (orig r3828):  LukeHodkinson | 2006-10-04 18:10:23 -0700
  One of the routines in here was mutating the set
  of inter-process index intersections; modified to
  make copies if they need to be modified.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2923
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3827
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2924
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3828

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c	2006-10-11 20:47:49 UTC (rev 4866)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c	2006-10-11 20:47:50 UTC (rev 4867)
@@ -238,8 +238,11 @@
 
 	/* Update remaining neighbours as to which indices we've taken. */
 	for( p_j = p_i; p_j < nInc; p_j++ ) {
-		RangeSet_Intersection( isects[p_j], lSet );
-		RangeSet_Pickle( isects[p_j], &nBytes, &bytes );
+		RangeSet*	intersect;
+
+		intersect = RangeSet_DeepCopy( isects[p_j] );
+		RangeSet_Intersection( intersect, lSet );
+		RangeSet_Pickle( intersect, &nBytes, &bytes );
 		MPI_Send( &nBytes, 1, MPI_UNSIGNED, inc[p_j], tag, topo->comm );
 		MPI_Send( bytes, nBytes, MPI_BYTE, inc[p_j], tag, topo->comm );
 		FreeArray( bytes );