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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:16:35 -0700 (Thu, 17 Aug 2006)
New Revision: 4314

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h
Log:
 r2692 at earth:  boo | 2006-08-17 17:14:12 -0700
  r2646 at earth (orig r3727):  KathleenHumble | 2006-07-30 18:42:11 -0700
  Updated somecomments in TensorMath and FullTensorMath
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2691
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3726
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2692
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3727

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.h	2006-08-18 00:16:32 UTC (rev 4313)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.h	2006-08-18 00:16:35 UTC (rev 4314)
@@ -137,4 +137,4 @@
 
 	
 	
-#endif /* __Discretisation_Geometry_TensorMath_h__ */
+#endif /* __Discretisation_Geometry_FullTensorMath_h__ */

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c	2006-08-18 00:16:32 UTC (rev 4313)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c	2006-08-18 00:16:35 UTC (rev 4314)
@@ -96,7 +96,7 @@
 	}
 	return 0;
 }
-
+/** This sets the values from a nxn array into a TensorArray */ 
 void TensorArray_SetFromDoubleArray( TensorArray tensor, double** array, Dimension_Index dim ) {
 	Dimension_Index row_I, col_I;
 
@@ -107,7 +107,8 @@
 	}
 }
 
-/* v_{ij} = 0.5 * ( u_{ij} - u_{ji} )
+/** This function extracts out the antiSymmetric part of a tensor Array
+v_{ij} = 0.5 * ( u_{ij} - u_{ji} )
 See http://mathworld.wolfram.com/AntisymmetricPart.html */
 void TensorArray_GetAntisymmetricPart( TensorArray tensor, Dimension_Index dim, TensorArray antiSymmetric ) {
 	switch (dim) {

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h	2006-08-18 00:16:32 UTC (rev 4313)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h	2006-08-18 00:16:35 UTC (rev 4314)
@@ -111,7 +111,7 @@
 int TensorArray_TensorMap(Dimension_Index row_I, Dimension_Index col_I, Dimension_Index dim);
 int SymmetricTensor_TensorMap(Dimension_Index row_I, Dimension_Index col_I, Dimension_Index dim);	
 	
-	
+//TODO Decide which of these (above or below) tensor maps to use in the code.	
 #define MAP_2D_TENSOR( ii, jj )  ( (jj) + 2*(ii) )
 #define MAP_3D_TENSOR( ii, jj )  ( (jj) + 3*(ii) )