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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:36:34 -0800 (Fri, 05 Jan 2007)
New Revision: 5669

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
Log:
 r3240 at earth (orig r3936):  LukeHodkinson | 2007-01-03 16:17:02 -0800
 And even more.
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3935
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3936
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2007-01-05 19:36:32 UTC (rev 5668)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2007-01-05 19:36:34 UTC (rev 5669)
@@ -44,6 +44,7 @@
 	int rank;
 	int numProcessors;
 	int procToWatch;
+	Stream*  stream = Journal_Register( InfoStream_Type, "TensorMultMath" );
 	
 	/* Initialise MPI, get world info */
 	MPI_Init( &argc, &argv );
@@ -56,8 +57,6 @@
 	DiscretisationGeometry_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
-	
-	Stream*  stream = Journal_Register( InfoStream_Type, "TensorMultMath" );
 	/* stout -> file redirect code */
 	//stJournal->firewallProducesAssert = False;
 	//Stream_RedirectFile(Journal_Register( Error_Type, "TensorMultMath"), "TensorMultMath.txt");
@@ -79,6 +78,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,8 +731,6 @@
 
 		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" );
@@ -779,8 +780,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;