[cig-commits] r5676 - in long/3D/Gale/trunk/src/StgFEM: . SLE/LinearAlgebra/src SLE/ProvidedSystems/AdvectionDiffusion/src

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:37:28 -0800 (Fri, 05 Jan 2007)
New Revision: 5676

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c
Log:
 r908 at earth (orig r687):  LukeHodkinson | 2007-01-01 23:38:49 -0800
 The latest PETSc requires slightly different argument
 ordering for the vector pointwise multiply and divide 
 operations.
 
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:686
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:687
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.c	2007-01-05 19:37:24 UTC (rev 5675)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.c	2007-01-05 19:37:28 UTC (rev 5676)
@@ -335,31 +335,31 @@
 	return norm;
 }
 
-void PETScVector_PointwiseMultiply( void* vector, void* _vector0, void* _dstVector ) {
+void PETScVector_PointwiseMultiply( void* vector, void* _enumVec, void* _denomVec ) {
 	PETScVector*	self = (PETScVector*)vector;
-	PETScVector*	vector0 = (PETScVector*)_vector0;
-	PETScVector*	dstVector = (PETScVector*)_dstVector;
+	PETScVector*	enumVec = (PETScVector*)_enumVec;
+	PETScVector*	denomVec = (PETScVector*)_denomVec;
 	PetscErrorCode	ec;
 
 	assert( self && Stg_CheckType( self, PETScVector ) );
-	assert( vector0 && Stg_CheckType( vector0, PETScVector ) );
-	assert( dstVector && Stg_CheckType( dstVector, PETScVector ) );
+	assert( enumVec && Stg_CheckType( enumVec, PETScVector ) );
+	assert( denomVec && Stg_CheckType( denomVec, PETScVector ) );
 
-	ec = VecPointwiseMult( self->petscVec, vector0->petscVec, dstVector->petscVec ); 
+	ec = VecPointwiseMult( self->petscVec, enumVec->petscVec, denomVec->petscVec ); 
 	CheckPETScError(ec);
 }
 
-void PETScVector_PointwiseDivide( void* vector, void* _vector0, void* _dstVector ) {
+void PETScVector_PointwiseDivide( void* vector, void* _enumVec, void* _denomVec ) {
 	PETScVector*	self = (PETScVector*)vector;
-	PETScVector*	vector0 = (PETScVector*)_vector0;
-	PETScVector*	dstVector = (PETScVector*)_dstVector;
+	PETScVector*	enumVec = (PETScVector*)_enumVec;
+	PETScVector*	denomVec = (PETScVector*)_denomVec;
 	PetscErrorCode	ec;
 
 	assert( self && Stg_CheckType( self, PETScVector ) );
-	assert( vector0 && Stg_CheckType( vector0, PETScVector ) );
-	assert( dstVector && Stg_CheckType( dstVector, PETScVector ) );
+	assert( enumVec && Stg_CheckType( enumVec, PETScVector ) );
+	assert( denomVec && Stg_CheckType( denomVec, PETScVector ) );
 	
-	ec = VecPointwiseDivide( self->petscVec, vector0->petscVec, self->petscVec ); 
+	ec = VecPointwiseDivide( self->petscVec, enumVec->petscVec, denomVec->petscVec ); 
 	CheckPETScError(ec);
 }
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.h	2007-01-05 19:37:24 UTC (rev 5675)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScVector.h	2007-01-05 19:37:28 UTC (rev 5676)
@@ -103,8 +103,8 @@
 	double PETScVector_DotProduct( void* vector, void* vector0 );
 	double PETScVector_L2Norm( void* vector );
 	double PETScVector_LInfNorm( void* vector );
-	void PETScVector_PointwiseMultiply( void* vector, void* vector0, void* dstVector );
-	void PETScVector_PointwiseDivide( void* vector, void* vector0, void* dstVector );
+	void PETScVector_PointwiseMultiply( void* vector, void* enumVec, void* denomVec );
+	void PETScVector_PointwiseDivide( void* vector, void* enumVec, void* denomVec );
 	void PETScVector_Reciprocal( void* vector );
 
 	unsigned PETScVector_GetGlobalSize( void* vector );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2007-01-05 19:37:24 UTC (rev 5675)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2007-01-05 19:37:28 UTC (rev 5676)
@@ -63,8 +63,8 @@
 	typedef double (Vector_DotProductFunc)( void* vector, void* vector0 );
 	typedef double (Vector_L2NormFunc)( void* vector );
 	typedef double (Vector_LInfNormFunc)( void* vector );
-	typedef void (Vector_PointwiseMultiplyFunc)( void* vector, void* vector0, void* dstVector );
-	typedef void (Vector_PointwiseDivideFunc)( void* vector, void* vector0, void* dstVector );
+	typedef void (Vector_PointwiseMultiplyFunc)( void* vector, void* enumVec, void* denomVec );
+	typedef void (Vector_PointwiseDivideFunc)( void* vector, void* enumVec, void* denomVec );
 	typedef void (Vector_ReciprocalFunc)( void* vector );
 
 	typedef unsigned (Vector_GetGlobalSizeFunc)( void* vector );
@@ -253,11 +253,11 @@
 	#define Vector_LInfNorm( self )	\
 		VirtualCall( self, lInfNormFunc, self )
 
-	#define Vector_PointwiseMultiply( self, vector0, dstVector )	\
-		VirtualCall( self, pointwiseMultiplyFunc, self, vector0, dstVector )
+	#define Vector_PointwiseMultiply( self, enumVec, denomVec )			\
+		VirtualCall( self, pointwiseMultiplyFunc, self, enumVec, denomVec )
 
-	#define Vector_PointwiseDivide( self, vector0, dstVector )	\
-		VirtualCall( self, pointwiseDivideFunc, self, vector0, dstVector )
+	#define Vector_PointwiseDivide( self, enumVec, denomVec )			\
+		VirtualCall( self, pointwiseDivideFunc, self, enumVec, denomVec )
 
 	#define Vector_Reciprocal( self )	\
 		VirtualCall( self, reciprocalFunc, self )

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c	2007-01-05 19:37:24 UTC (rev 5675)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c	2007-01-05 19:37:28 UTC (rev 5676)
@@ -344,7 +344,7 @@
 	ForceVector* massMatrix = Stg_CheckType( sle->massMatrix, ForceVector );
 
 	/* Calculate change in \dot \phi - See Eq. 4.2.5 */
-	Vector_PointwiseDivide( sle->residual->vector, massMatrix->vector, deltaPhiDot );
+	Vector_PointwiseDivide( deltaPhiDot, sle->residual->vector, massMatrix->vector );
 }
 
 void _AdvDiffMulticorrector_CalculatePhiDot_Implicit( AdvDiffMulticorrector* self, AdvectionDiffusionSLE* sle, Vector* deltaPhiDot ) {