[cig-commits] commit: Make ViscosityField and StressField not use the swarm from the ConstitutiveMatrix

[Mercurial]

changeset:   868:75801edb0a7a
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Sep 27 15:23:05 2011 -0700
files:       Utils/src/StressField.cxx Utils/src/ViscosityField.cxx
description:
Make ViscosityField and StressField not use the swarm from the ConstitutiveMatrix


diff -r c4b9c9b8e8a3 -r 75801edb0a7a Utils/src/StressField.cxx
--- a/Utils/src/StressField.cxx	Tue Sep 20 14:18:15 2011 -0700
+++ b/Utils/src/StressField.cxx	Tue Sep 27 15:23:05 2011 -0700
@@ -57,10 +57,6 @@ void _StressField_Init(
 		self->_valueAtParticle = _StressField_ValueAtParticle_FromVariable;
 	}
 		
-	/* Set pointers to swarm to be the same as the one on the constitutive matrix */
-	self->assemblyTerm->integrationSwarm = self->constitutiveMatrix->integrationSwarm;
-	self->massMatrixForceTerm->integrationSwarm = self->constitutiveMatrix->integrationSwarm;
-
 	/*
 	** If we're using this field for non-linear feedback, we'll need to update it in between
 	** non-linear iterations. */
@@ -288,7 +284,7 @@ void _StressField_ValueAtParticle_Recalc
 	
 	/* Calculate stress from strain rate and constitutive matrix */
 	ConstitutiveMatrix_Assemble( self->constitutiveMatrix, lElement_I,
-                                     self->currentParticleIndex, particle );
+                                     self->currentParticleIndex, particle, swarm);
 	FeVariable_InterpolateWithinElement( self->strainRateField, lElement_I, particle->xi, strainRate );
 	ConstitutiveMatrix_CalculateStress( self->constitutiveMatrix, strainRate, stress );
 
diff -r c4b9c9b8e8a3 -r 75801edb0a7a Utils/src/ViscosityField.cxx
--- a/Utils/src/ViscosityField.cxx	Tue Sep 20 14:18:15 2011 -0700
+++ b/Utils/src/ViscosityField.cxx	Tue Sep 27 15:23:05 2011 -0700
@@ -42,10 +42,6 @@ void _ViscosityField_Init(
 	/* Assign Pointers */
 	self->variable_Register = variable_Register;
 	self->constitutiveMatrix = constitutiveMatrix;
-	
-	/* Set pointers to swarm to be the same as the one on the constitutive matrix */
-	self->assemblyTerm->integrationSwarm = self->constitutiveMatrix->integrationSwarm;
-	self->massMatrixForceTerm->integrationSwarm = self->constitutiveMatrix->integrationSwarm;	
 }
 
 /* --- Virtual Function Implementations --- */
@@ -171,7 +167,8 @@ void _ViscosityField_ValueAtParticle( vo
 	
 	/* Calculate viscosity from constitutive matrix */
 	ConstitutiveMatrix_Assemble( self->constitutiveMatrix, lElement_I,
-                                     self->currentParticleIndex, particle );
+                                     self->currentParticleIndex, particle,
+                                     swarm);
 	*viscosity = ConstitutiveMatrix_GetIsotropicViscosity( self->constitutiveMatrix );
 }