[cig-commits] commit: removing petsc wrapper crap

[Mercurial]

changeset:   126:964444e1a349
parent:      125:868ca3016209
parent:      124:953337e08832
user:        dave at lavaeolous
date:        Fri Oct 31 14:08:12 2008 +1100
files:       MaterialPoints/src/ParticleFeVariable.c
description:
removing petsc wrapper crap


diff -r 868ca3016209 -r 964444e1a349 .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Fri Oct 31 14:08:12 2008 +1100
@@ -0,0 +1,1 @@
+0096891fa4d4d9beab721bb240384ff50bd1fbf2 v1.2.0
diff -r 868ca3016209 -r 964444e1a349 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Fri Oct 31 14:06:57 2008 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.c	Fri Oct 31 14:08:12 2008 +1100
@@ -296,12 +296,21 @@ 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 );