[cig-commits] r4874 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/tests

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:48:05 -0700 (Wed, 11 Oct 2006)
New Revision: 4874

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testFullTensorMath.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
Log:
 r2931 at earth:  boo | 2006-10-11 13:42:46 -0700
  r2847 at earth (orig r3835):  LukeHodkinson | 2006-10-04 18:46:50 -0700
  There's more, how did these guys fly under the 
  radar?
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2930
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3834
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2931
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3835

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.c	2006-10-11 20:48:03 UTC (rev 4873)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.c	2006-10-11 20:48:05 UTC (rev 4874)
@@ -43,6 +43,7 @@
 	int rank;
 	int numProcessors;
 	int procToWatch;
+	Stream* stream;
 	
 	/* Initialise MPI, get world info */
 	MPI_Init( &argc, &argv );
@@ -55,7 +56,7 @@
 	DiscretisationGeometry_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
-	Stream* stream = Journal_Register( Info_Type, "ComplexVectorMath" );
+	stream = Journal_Register( Info_Type, "ComplexVectorMath" );
 	
 	if( argc >= 2 ) {
 		procToWatch = atoi( argv[1] );
@@ -209,6 +210,8 @@
 		Cmplx *coordList[4];
 		int d;
 		double realVector[3], tolerance;
+		Cmplx dotProductResult;
+		Cmplx value;
 		
 		tolerance = STG_COMPLEXVECTOR_TOL;
 		
@@ -393,7 +396,7 @@
 		Journal_Printf( stream, "Check Dot Product Function\n");
 		Journal_Printf( stream, "value = A . B \n");
 		
-		Cmplx dotProductResult;
+		
 		for (d = 0; d <=6; d++) {
 		StGermain_ComplexVectorDotProduct(A, B, d, dotProductResult);			
 		Journal_Printf( stream, "dim = %d dot product = %2.3f + %2.3f i\n",
@@ -446,7 +449,6 @@
 
 		Journal_Printf( stream, "\n****************************\n");
 		Journal_Printf( stream, "Check StGermain_ComplexVectorCrossProductMagnitude\n");
-		Cmplx value;
 		A[0][REAL_PART] = 1.0; A[0][IMAG_PART] = 1.0; 
 		A[1][REAL_PART] = 2.0; A[1][IMAG_PART] = 0.0;
 		A[2][REAL_PART] = 3.0; A[2][IMAG_PART] = 0.0;

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testFullTensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testFullTensorMath.c	2006-10-11 20:48:03 UTC (rev 4873)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testFullTensorMath.c	2006-10-11 20:48:05 UTC (rev 4874)
@@ -43,6 +43,7 @@
 	int rank;
 	int numProcessors;
 	int procToWatch;
+	Stream*  stream;
 	
 	/* Initialise MPI, get world info */
 	MPI_Init( &argc, &argv );
@@ -55,8 +56,8 @@
 	DiscretisationGeometry_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
-	
-	Stream*  stream = Journal_Register( InfoStream_Type, "FullTensorMath" );
+	stream = Journal_Register( InfoStream_Type, "FullTensorMath" );
+
 	stJournal->firewallProducesAssert = False;
 	Stream_RedirectFile(Journal_Register( Error_Type, "FullTensorMath"), "FullTensorMath.txt");
 	Stream_RedirectFile(stream, "FullTensorMath.txt");

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-10-11 20:48:03 UTC (rev 4873)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-10-11 20:48:05 UTC (rev 4874)
@@ -44,6 +44,7 @@
 	int rank;
 	int numProcessors;
 	int procToWatch;
+	Stream*  stream;
 	
 	/* Initialise MPI, get world info */
 	MPI_Init( &argc, &argv );
@@ -57,7 +58,7 @@
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	
-	Stream*  stream = Journal_Register( InfoStream_Type, "TensorMultMath" );
+	stream = Journal_Register( InfoStream_Type, "TensorMultMath" );
 	/* stout -> file redirect code */
 	//stJournal->firewallProducesAssert = False;
 	//Stream_RedirectFile(Journal_Register( Error_Type, "TensorMultMath"), "TensorMultMath.txt");
@@ -79,6 +80,10 @@
 		double result, errorValue;
 		Dimension_Index row, col;
 		Bool tensorMultMathTest_Flag;
+		double  **nonSquareMatrixA, **nonSquareMatrixB;
+		double	**nonSquareMatrixResult, **nonSquareMatrixAT;
+		double solutionVector[4], solutionVectorCompare[4];
+		Bool error_flag;
 		#define STG_TENSORMULTMATHTEST_ERROR 1.0e-14;
 		
 		errorValue = STG_TENSORMULTMATHTEST_ERROR;
@@ -728,9 +733,8 @@
 
 		Journal_Printf(stream, "\n/*******************    Test 17   ************************/\n");
 		Journal_Printf( stream, "Test function Journal_PrintNonSquareMatrix \n\n");
-		double  **nonSquareMatrixA, **nonSquareMatrixB;
-		double	**nonSquareMatrixResult, **nonSquareMatrixAT;
 
+
 		nonSquareMatrixA = Memory_Alloc_2DArray(double, 3, 4, "NonSquareMatrixA" );
 		nonSquareMatrixB = Memory_Alloc_2DArray(double, 4, 2, "NonSquareMatrixB" );
 		nonSquareMatrixAT = Memory_Alloc_2DArray(double, 4, 3, "NonSquareMatrixAT" );
@@ -779,8 +783,6 @@
 		Journal_Printf(stream, "\n/*******************    Test 20   ************************/\n");
 		Journal_Printf( stream, "Test function NonSquareMatrix_MatrixVectorMultiplication \n\n");
 		Journal_Printf( stream, "Tested against solutions at http://www.uni-bonn.de/~manfear/solve_lineq.php\n\n");
-		double solutionVector[4], solutionVectorCompare[4];
-		Bool error_flag;
 		
 		vector[0] = 1; vector[1] = 2; vector[2] = 3;
 		solutionVectorCompare[0] = 32; solutionVectorCompare[1] = 38;