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

[walter at geodynamics.org]

Author: walter
Date: 2007-02-23 10:00:18 -0800 (Fri, 23 Feb 2007)
New Revision: 6073

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/Utils/src/PCDVC.c
Log:
 r564 at earth (orig r419):  LukeHodkinson | 2007-02-05 20:04:18 -0800
 During the construct phase, was trying to register
 a stream by dereferencing a non-initialised pointer.
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:418
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:419
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524

Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/PCDVC.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/PCDVC.c	2007-02-23 18:00:01 UTC (rev 6072)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/PCDVC.c	2007-02-23 18:00:18 UTC (rev 6073)
@@ -214,11 +214,12 @@
 	int resolution[3];
 	int maxD, maxS;
 	Bool splitInInterfaceCells;
-	Stream*  stream = Journal_Register( Info_Type, materialPointsSwarm->type );
+	Stream*  stream;
 	
 	_DVCWeights_Construct( self, cf, data );
 
 	materialPointsSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "MaterialPointsSwarm", MaterialPointsSwarm, True, data );
+	stream = Journal_Register( Info_Type, materialPointsSwarm->type );
 	upT = Stg_ComponentFactory_GetDouble( cf, self->name, "upperT", 25 );
 	lowT = Stg_ComponentFactory_GetDouble( cf, self->name, "lowerT", 0.6 );
 	maxD = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "maxDeletions", 2);