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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
Log:
 r2894 at earth:  boo | 2006-10-11 13:42:34 -0700
  r2810 at earth (orig r3798):  KathleenHumble | 2006-09-14 17:46:06 -0700
  Adding in line that adds a call to
  NonSquareMatrix_CumulativeMultiplicationByNonSquareMatrix
  from 
  NonSquareMatrix_MultiplicationByNonSquareMatrix
  as Julian missed this line :)
  
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2893
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3797
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2894
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3798

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c	2006-10-11 20:46:36 UTC (rev 4836)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c	2006-10-11 20:46:38 UTC (rev 4837)
@@ -579,11 +579,16 @@
 	for( counter = 0 ; counter < rowDimA ; counter++ ) {
 		memset( resultMatrix[counter], 0, sizeof( double ) * colDimB );
 	}
+NonSquareMatrix_CumulativeMultiplicationByNonSquareMatrix(AMatrix,rowDimA,colDimA,
+					 BMatrix,rowDimB, colDimB, 
+					 resultMatrix );	
+	
 }
 /** This function multiplies 2 non square matrices. It requires the row and column 
 	dimensions for each matrix. Columns In Matrix A = Rows In Matrix B
 	resultMatrix_ik = AMatrix_ij x BMatrix_jk */
-void NonSquareMatrix_CumulativeMultiplicationByNonSquareMatrix( double **AMatrix, int rowDimA, int colDimA,
+void NonSquareMatrix_CumulativeMultiplicationByNonSquareMatrix( double **AMatrix, 
+					 int rowDimA, int colDimA,
 					 double **BMatrix, int rowDimB, int colDimB, 
 					 double** resultMatrix ) {