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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:36:19 -0800 (Fri, 05 Jan 2007)
New Revision: 5665

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c
Log:
 r3236 at earth (orig r3928):  LukeHodkinson | 2007-01-02 16:35:02 -0800
 Wasn't clearing memory to zero, was causing an
 allocation error.
 
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3927
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3928
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c	2007-01-05 19:36:17 UTC (rev 5664)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c	2007-01-05 19:36:19 UTC (rev 5665)
@@ -410,8 +410,12 @@
 	memcpy( self->cellShadowInfo.procNbrInfo->procNbrTbl, incProcs, nIncProcs * sizeof(unsigned) );
 
 	/* Count shadow info. */
-	self->cellShadowInfo.procShadowedCnt = AllocArray( unsigned, nIncProcs );
-	self->cellShadowInfo.procShadowCnt = AllocArray( unsigned, nIncProcs );
+	if( nIncProcs ) {
+		self->cellShadowInfo.procShadowedCnt = AllocArray( unsigned, nIncProcs );
+		memset( self->cellShadowInfo.procShadowedCnt, 0, nIncProcs * sizeof(unsigned) );
+		self->cellShadowInfo.procShadowCnt = AllocArray( unsigned, nIncProcs );
+		memset( self->cellShadowInfo.procShadowCnt, 0, nIncProcs * sizeof(unsigned) );
+	}
 	for( n_i = 0; n_i < Mesh_GetSharedSize( self->mesh, nDims ); n_i++ ) {
 		unsigned	nSharers;
 		unsigned*	sharers;