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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
Log:
 r2868 at earth:  boo | 2006-10-11 13:42:24 -0700
  r2784 at earth (orig r3772):  JulianGiordani | 2006-08-24 07:54:55 -0700
  
  Made a mistake on the Journal_Firewall, it was always failing, now fixed
  
  
 



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

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:45:37 UTC (rev 4810)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c	2006-10-11 20:45:40 UTC (rev 4811)
@@ -614,8 +614,8 @@
 	Journal_Firewall( ( colsInA == rowsInB ), error,
 			"In func '%s' column dimensions of A_Matrix = %d is not equal to the row dimensions of B_Vec = %d\n",
 			__func__, colsInA, rowsInB );
-	Journal_Firewall( (resultVector == NULL) || (AMatrix == NULL) || (BVec == NULL) , error,
-			"In func '%s', Input matrices: %s %s, or Output matrix: %s is NULL \n", 
+	Journal_Firewall( (resultVector != NULL) || (AMatrix != NULL) || (BVec != NULL) , error,
+			"In func '%s', Input matrices: %p %p, or Output matrix: %p is NULL \n", 
 			__func__, AMatrix, BVec, resultVector);
 	/* calculate the result Vector */
 	for( row_I = 0 ; row_I < rowsInA ; row_I++ ) {