[cig-commits] r4863 - in long/3D/Gale/trunk/src/StGermain: . Base/Container/src

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c
   long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
Log:
 r2920 at earth:  boo | 2006-10-11 13:42:43 -0700
  r2836 at earth (orig r3824):  LukeHodkinson | 2006-10-04 18:04:01 -0700
  * Fixed a bug in the range set that was causing 
    incorrect index counts in sets with duplicate
    indices.
  * Fixing type warning in MPIRoutines.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2919
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3823
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2920
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3824

Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c	2006-10-11 20:47:40 UTC (rev 4862)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/MPIRoutines.c	2006-10-11 20:47:42 UTC (rev 4863)
@@ -72,7 +72,7 @@
 	unsigned*	tmpSizes;
 	unsigned*	disps;
 	unsigned	netSize;
-	unsigned*	tmpArray;
+	Stg_Byte*	tmpArray;
 	unsigned	p_i;
 
 	/* Get basic MPI info. */

Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c	2006-10-11 20:47:40 UTC (rev 4862)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c	2006-10-11 20:47:42 UTC (rev 4863)
@@ -179,7 +179,7 @@
 
 		while( curInd < nInds && tmpInds[curInd] - range->end == range->step ) {
 			range->end = tmpInds[curInd++];
-			while( tmpInds[curInd] == range->end ) {
+			while( curInd < nInds && tmpInds[curInd] == range->end ) {
 				curInd++;
 				self->nInds--;
 			}
@@ -328,6 +328,9 @@
 		for( ind_i = range->begin; ind_i < range->end; ind_i += range->step )
 			(*inds)[(*nInds)++] = ind_i;
 	}
+
+	/* Sanity check. */
+	assert( *nInds == self->nInds );
 }