[cig-commits] commit: removing petsc wrapper crap

[Mercurial]

changeset:   127:f1d86bddcb11
user:        dave at lavaeolous
date:        Fri Oct 31 14:08:51 2008 +1100
files:       MaterialPoints/src/ParticleFeVariable.c
description:
removing petsc wrapper crap


diff -r 964444e1a349 -r f1d86bddcb11 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Fri Oct 31 14:08:12 2008 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.c	Fri Oct 31 14:08:51 2008 +1100
@@ -296,21 +296,12 @@ void ParticleFeVariable_Update( void* ma
 	printf( "***\n*** Updating %s\n***\n", self->name );
 
 	/* Initialise Vectors */
-<<<<<<< local
-=======
-	//Vector_Zero( self->assemblyVector->vector );
-	//Vector_Zero( self->massMatrix->vector );
->>>>>>> other
 	VecSet( self->assemblyVector->vector, 0.0 );
 	VecSet( self->massMatrix->vector, 0.0 );
 
 	ForceVector_Assemble( self->assemblyVector );
 	ForceVector_Assemble( self->massMatrix );
 
-<<<<<<< local
-=======
-	//Vector_PointwiseDivide( self->assemblyVector->vector, self->assemblyVector->vector, self->massMatrix->vector );
->>>>>>> other
 	VecPointwiseDivide( self->assemblyVector->vector, self->assemblyVector->vector, self->massMatrix->vector );
 
 	SolutionVector_UpdateSolutionOntoNodes( self->assemblyVector );