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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:46:29 -0700 (Wed, 11 Oct 2006)
New Revision: 4833

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
Log:
 r2890 at earth:  boo | 2006-10-11 13:42:32 -0700
  r2806 at earth (orig r3794):  KathleenHumble | 2006-09-11 18:13:35 -0700
  changed output of error line for
  test of function:
  NonSquareMatrix_MatrixVectorMultiplication
  so that it outputs the vector value as well
  as it's location.
  This should help with debugging.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2889
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3793
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2890
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3794

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected	2006-10-11 20:46:27 UTC (rev 4832)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected	2006-10-11 20:46:29 UTC (rev 4833)
@@ -1,4 +1,4 @@
-StGermain Framework revision 3780. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3791. Copyright (C) 2003-2005 VPAC.
 1e-14
 /*******************    Test 1   ************************/
 Test TensorArray Identity
@@ -401,5 +401,5 @@
       2	      6	     10	
       3	      7	     11	
 vector - {1.000000, 2.000000, 3.000000}
-SolutionVector within tolerance 0.000010 of solution:
+SolutionVector within tolerance 1e-05 of solution:
 solutionVectorCompare - {32.000000, 38.000000, 44.000000, 50.000000}

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:46:27 UTC (rev 4832)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-10-11 20:46:29 UTC (rev 4833)
@@ -794,15 +794,15 @@
 		for ( row = 0; row < 4; row++ ) {
 			if (fabs(solutionVector[row] - solutionVectorCompare[row]) > TENSORMULTMATH_TEST_ERROR ) {
 				error_flag = True;
-				Journal_Printf(stream, "solutionVector[%d] not within tolerance  of solution, %f\n", row, solutionVectorCompare[row]);
+				Journal_Printf(stream, "solutionVector[%d]=%f not within tolerance of solution, %f\n", row, solutionVector[row], solutionVectorCompare[row]);
 			}
 		}
 		if (error_flag == False) {
-			Journal_Printf(stream, "SolutionVector within tolerance %f of solution:\n", TENSORMULTMATH_TEST_ERROR);
+			Journal_Printf(stream, "SolutionVector within tolerance %g of solution:\n", TENSORMULTMATH_TEST_ERROR);
 			StGermain_PrintNamedVector(stream, solutionVectorCompare, 4);
 		}
 		else {
-			Journal_Printf(stream, "SolutionVector not within tolerance %f of solution:\n", TENSORMULTMATH_TEST_ERROR);
+			Journal_Printf(stream, "SolutionVector not within tolerance %g of solution:\n", TENSORMULTMATH_TEST_ERROR);
 			StGermain_PrintNamedVector(stream, solutionVectorCompare, 4);
 		}