[cig-commits] commit: Modifying this to account for a change I made

[Mercurial]

changeset:   117:977da3a363ef
user:        LukeHodkinson
date:        Thu Sep 11 05:26:49 2008 +0000
files:       MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/ParticleFeVariable.h
description:
Modifying this to account for a change I made
in the rheology code; passing particle index
along with the particle itself.


diff -r 05b31774b616 -r 977da3a363ef MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Sat Sep 06 14:45:03 2008 +0000
+++ b/MaterialPoints/src/ParticleFeVariable.c	Thu Sep 11 05:26:49 2008 +0000
@@ -38,7 +38,7 @@
 **  License along with this library; if not, write to the Free Software
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** $Id: ParticleFeVariable.c 583 2008-08-19 08:03:13Z LukeHodkinson $
+** $Id: ParticleFeVariable.c 595 2008-09-11 05:26:49Z LukeHodkinson $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -331,6 +331,7 @@ 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 );
 
 		ElementType_EvaluateShapeFunctionsAt( elementType, particle->xi, shapeFunc );
@@ -373,6 +374,7 @@ void ParticleFeVariable_AssembleElement_
 		ElementType_ShapeFunctionsGlobalDerivs( elementType, mesh, lElement_I,
 							particle->xi, dim, &detJac, self->GNx );
 
+		self->currentParticleIndex = swarm->cellParticleTbl[cell_I][cParticle_I];
 		ParticleFeVariable_ValueAtParticle( self, swarm, lElement_I, particle, particleValue );
 
 		for ( dof_I = 0 ; dof_I < dofCount ; dof_I++ ) {
diff -r 05b31774b616 -r 977da3a363ef MaterialPoints/src/ParticleFeVariable.h
--- a/MaterialPoints/src/ParticleFeVariable.h	Sat Sep 06 14:45:03 2008 +0000
+++ b/MaterialPoints/src/ParticleFeVariable.h	Thu Sep 11 05:26:49 2008 +0000
@@ -71,6 +71,7 @@
 		Name                                              massMatrixName;                 \
 		ForceVector*                                      massMatrix;                     \
 		ForceTerm*                                        massMatrixForceTerm;            \
+		int                                               currentParticleIndex;           \
 		Bool                                              useDeriv;                       \
 		double**                                          GNx;