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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
Log:
 r2872 at earth:  boo | 2006-10-11 13:42:26 -0700
  r2788 at earth (orig r3776):  KathleenHumble | 2006-08-31 00:43:26 -0700
  replacing an exit_failure
  and rewriting references into symmetric tensor map
  so that they are more consitent with the maths.
  in TensorMath.c
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2871
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3775
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2872
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3776

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c	2006-10-11 20:45:47 UTC (rev 4814)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c	2006-10-11 20:45:49 UTC (rev 4815)
@@ -229,7 +229,8 @@
 		default: {
 			Stream* error = Journal_Register( ErrorStream_Type, "TensorMath" );
 			Journal_Printf( error, "Cannot store tensor for dimension %d in %s.\n", dim, __func__);
-			exit(EXIT_FAILURE);
+			Journal_Firewall( False, Journal_Register( Error_Type, "TensorMath" ),
+				"In func '%s' don't understand dim = %u\n", __func__, dim );
 		}
 	}
 }
@@ -407,15 +408,15 @@
 				        tensor[ TensorMapST3D[1][1] ] * tensor[ TensorMapST3D[1][1] ]   +
 				        tensor[ TensorMapST3D[2][2] ] * tensor[ TensorMapST3D[2][2] ] ) +
 				
-				tensor[ TensorMapST3D[0][1] ] * tensor[ TensorMapST3D[0][1] ] +
-				tensor[ TensorMapST3D[0][2] ] * tensor[ TensorMapST3D[0][2] ] +
-				tensor[ TensorMapST3D[1][2] ] * tensor[ TensorMapST3D[1][2] ] ;
+				tensor[ TensorMapST3D[0][1] ] * tensor[ TensorMapST3D[1][0] ] +
+				tensor[ TensorMapST3D[0][2] ] * tensor[ TensorMapST3D[2][0] ] +
+				tensor[ TensorMapST3D[1][2] ] * tensor[ TensorMapST3D[2][1] ] ;
 			break;
 		case 2:
 			invariant = 
 				0.5 * ( tensor[ TensorMapST2D[0][0] ] * tensor[ TensorMapST2D[0][0] ]   +
 				        tensor[ TensorMapST2D[1][1] ] * tensor[ TensorMapST2D[1][1] ] ) +
-				tensor[ TensorMapST2D[0][1] ] * tensor[ TensorMapST2D[0][1] ] ;
+				tensor[ TensorMapST2D[0][1] ] * tensor[ TensorMapST2D[1][0] ] ;
 			break;
 		default: {
 			Stream* error = Journal_Register( ErrorStream_Type, "TensorMath" );
@@ -727,7 +728,7 @@
 	return True;
 }
 
-/** Calculates eigenvectors for 2D SymmetricTensor's only. This is guaranteed to
+/** Calculates eigenvectors for 3D SymmetricTensor's only. This is guaranteed to
 return real eigenvectors and eigenvalues */
 void SymmetricTensor_CalcAllEigenvectors3D( SymmetricTensor tensor, Eigenvector* eigenvectorList ) {
 	Dimension_Index dim_I;