[cig-commits] commit: Get rid of currentParticleIndex

[Mercurial]

changeset:   436:bea29dceaf4c
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Oct 23 11:55:55 2011 -0700
files:       MaterialPoints/src/NearestNeighborMapper.cxx MaterialPoints/src/NearestNeighborMapper.h MaterialPoints/src/ParticleFeVariable.cxx MaterialPoints/src/ParticleFeVariable.h
description:
Get rid of currentParticleIndex


diff -r 0860f2b74911 -r bea29dceaf4c MaterialPoints/src/NearestNeighborMapper.cxx
--- a/MaterialPoints/src/NearestNeighborMapper.cxx	Sun Oct 23 11:55:31 2011 -0700
+++ b/MaterialPoints/src/NearestNeighborMapper.cxx	Sun Oct 23 11:55:55 2011 -0700
@@ -250,7 +250,7 @@ int NearestNeighbor_FindNeighbor(void* m
 
 void NearestNeighbor_Replace
 (IntegrationPointsSwarm **swarm, IntegrationPoint **particle,
- int *particle_index, const Element_LocalIndex &lElement_I,
+ const Element_LocalIndex &lElement_I,
  const int &dim)
 {
   if(Stg_Class_IsInstance((*swarm)->mapper,NearestNeighborMapper_Type))
@@ -268,6 +268,5 @@ void NearestNeighbor_Replace
                                                   nearest_particle);
       *swarm=NNswarm;
       *particle=NNparticle;
-      *particle_index=NNswarm->cellParticleTbl[NNcell_I][nearest_particle];
     }
 }
diff -r 0860f2b74911 -r bea29dceaf4c MaterialPoints/src/NearestNeighborMapper.h
--- a/MaterialPoints/src/NearestNeighborMapper.h	Sun Oct 23 11:55:31 2011 -0700
+++ b/MaterialPoints/src/NearestNeighborMapper.h	Sun Oct 23 11:55:55 2011 -0700
@@ -123,16 +123,7 @@ void _NearestNeighborMapper_Init( void* 
 
         void NearestNeighbor_Replace(IntegrationPointsSwarm **swarm,
                                      IntegrationPoint **particle,
-                                     int *particle_index,
                                      const Element_LocalIndex &lElement_I,
                                      const int &dim);
 
-        inline void NearestNeighbor_Replace(IntegrationPointsSwarm **swarm,
-                                            IntegrationPoint **particle,
-                                            const Element_LocalIndex &lElement_I,
-                                            const int &dim)
-        {
-          int temp(0);
-          NearestNeighbor_Replace(swarm,particle,&temp,lElement_I,dim);
-        }
 #endif
diff -r 0860f2b74911 -r bea29dceaf4c MaterialPoints/src/ParticleFeVariable.cxx
--- a/MaterialPoints/src/ParticleFeVariable.cxx	Sun Oct 23 11:55:31 2011 -0700
+++ b/MaterialPoints/src/ParticleFeVariable.cxx	Sun Oct 23 11:55:55 2011 -0700
@@ -265,7 +265,6 @@ void ParticleFeVariable_AssembleElement(
 		/* Find this particle in the element */
 		particle = (IntegrationPoint*) Swarm_ParticleInCellAt( swarm, cell_I, cParticle_I );
 
-		self->currentParticleIndex = swarm->cellParticleTbl[cell_I][cParticle_I];
 		ParticleFeVariable_ValueAtParticle( self, swarm, lElement_I, particle, particleValue );
 
 		/* get shape function and detJac */
diff -r 0860f2b74911 -r bea29dceaf4c MaterialPoints/src/ParticleFeVariable.h
--- a/MaterialPoints/src/ParticleFeVariable.h	Sun Oct 23 11:55:31 2011 -0700
+++ b/MaterialPoints/src/ParticleFeVariable.h	Sun Oct 23 11:55:55 2011 -0700
@@ -71,7 +71,6 @@
 		char*									massMatrixName; \
 		ForceVector*								massMatrix; \
 		ForceTerm*								massMatrixForceTerm; \
-		int									currentParticleIndex; \
 		Bool									useDeriv; 
 		
 	struct ParticleFeVariable { __ParticleFeVariable };