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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:45:42 -0700 (Wed, 11 Oct 2006)
New Revision: 4812

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:
 r2869 at earth:  boo | 2006-10-11 13:42:25 -0700
  r2785 at earth (orig r3773):  KathleenHumble | 2006-08-27 23:28:50 -0700
  added in a test for new function 
  NonSquareMatrix_MatrixVectorMultiplication()
  in TensorMultMath.c
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2868
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3772
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2869
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3773

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:45:40 UTC (rev 4811)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected	2006-10-11 20:45:42 UTC (rev 4812)
@@ -1,4 +1,4 @@
-StGermain Framework revision 3761. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3772. Copyright (C) 2003-2005 VPAC.
 1e-14
 /*******************    Test 1   ************************/
 Test TensorArray Identity
@@ -373,7 +373,7 @@
       2	      6	     10	
       3	      7	     11	
 
-/*******************    Test 18   ************************/
+/*******************    Test 19   ************************/
 Test function NonSquareMatrix_MultiplicationByNonSquareMatrix 
 
 nonSquareMatrixA - 
@@ -389,3 +389,16 @@
      28	     34	
      76	     98	
     124	    162	
+
+/*******************    Test 20   ************************/
+Test function NonSquareMatrix_MatrixVectorMultiplication 
+
+Tested against solutions at http://www.uni-bonn.de/~manfear/solve_lineq.php
+
+nonSquareMatrixAT - 
+      0	      4	      8	
+      1	      5	      9	
+      2	      6	     10	
+      3	      7	     11	
+vector - {1.000000, 2.000000, 3.000000}
+solutionVector - {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:45:40 UTC (rev 4811)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-10-11 20:45:42 UTC (rev 4812)
@@ -764,7 +764,7 @@
 		
 		Journal_PrintNonSquareMatrix(stream, nonSquareMatrixAT, 4, 3);
 
-		Journal_Printf(stream, "\n/*******************    Test 18   ************************/\n");
+		Journal_Printf(stream, "\n/*******************    Test 19   ************************/\n");
 		Journal_Printf( stream, "Test function NonSquareMatrix_MultiplicationByNonSquareMatrix \n\n");
 		
 		Journal_PrintNonSquareMatrix(stream, nonSquareMatrixA, 3, 4);
@@ -774,7 +774,23 @@
 			nonSquareMatrixB, 4,2, nonSquareMatrixResult );
 
 		Journal_PrintNonSquareMatrix(stream, nonSquareMatrixResult, 3, 2);
+
+		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;
 		
+		vector[0] = 1; vector[1] = 2; vector[2] = 3;
+		solutionVector = Memory_Alloc_Array(double, 4, "longVector" );
+
+		Journal_PrintNonSquareMatrix(stream, nonSquareMatrixAT, 4, 3);
+		StGermain_PrintNamedVector(stream, vector, 3);
+		
+		NonSquareMatrix_MatrixVectorMultiplication( nonSquareMatrixAT, 4, 3, vector, 3, solutionVector );
+
+		StGermain_PrintNamedVector(stream, solutionVector, 4);
+	
+		Memory_Free(solutionVector);
 		Memory_Free(nonSquareMatrixA);
 		Memory_Free(nonSquareMatrixB);
 		Memory_Free(nonSquareMatrixAT);