[cig-commits] commit: Remove some stuff that was #if 0'd out AND redundant
Mercurial
hg at geodynamics.org
Mon Feb 1 15:32:02 PST 2010
changeset: 387:62ce1a314b2f
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Mon Feb 01 02:19:14 2010 -0800
files: MaterialPoints/src/MaterialPointsSwarm.c
description:
Remove some stuff that was #if 0'd out AND redundant
diff -r 38e28a9ce954 -r 62ce1a314b2f MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Wed Jan 27 06:59:34 2010 -0800
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Mon Feb 01 02:19:14 2010 -0800
@@ -430,31 +430,7 @@ void _MaterialPointsSwarm_Initialise( vo
Memory_Free( particleCPUID );
}
/* TODO: print info / debug message */
- }
-#if 0
- else {
- Particle_Index lParticle_I=0;
- MaterialPoint* matPoint=NULL;
-
- /* Beforehand, set each particle to have UNDEFINED_MATERIAL */
- for ( lParticle_I = 0; lParticle_I < self->particleLocalCount; lParticle_I++ ) {
- matPoint = (MaterialPoint*)Swarm_ParticleAt( self, lParticle_I );
- matPoint->materialIndex = UNDEFINED_MATERIAL;
- }
- /* Now setup the material properties */
- if ( self->material == NULL ) {
- /* Do it by the layout of all known materials */
- Materials_Register_SetupSwarm( self->materials_Register, self );
- }
- else {
- Material_Layout( self->material, self );
- Materials_Register_AssignParticleProperties(
- self->materials_Register,
- self,
- self->swarmVariable_Register->variable_Register );
- }
- }
-#endif
+ }
}
void _MaterialPointsSwarm_Execute( void* swarm, void* data ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*)swarm;
More information about the CIG-COMMITS
mailing list