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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexMath.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/units.h
Log:
 r2699 at earth:  boo | 2006-08-17 17:14:15 -0700
  r2653 at earth (orig r3734):  KathleenHumble | 2006-08-01 00:51:45 -0700
  Moved the definition of typedef Cmplx
  from ComplexMath to units where it belongs
  since it is now used by a number of other 
  *.c and *.h files
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2698
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3733
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2699
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3734

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexMath.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexMath.h	2006-08-18 00:16:52 UTC (rev 4320)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexMath.h	2006-08-18 00:16:54 UTC (rev 4321)
@@ -39,7 +39,8 @@
 #ifndef __Discretisation_Geometry_ComplexMath_h__
 #define __Discretisation_Geometry_ComplexMath_h__
 
-typedef double Cmplx[2];
+#include "units.h"
+
 /** Define names for index into complex numbers. 
 Which makes it clear what index it refers to.*/
 #define REAL_PART 0

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/units.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/units.h	2006-08-18 00:16:52 UTC (rev 4320)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/units.h	2006-08-18 00:16:54 UTC (rev 4321)
@@ -40,20 +40,22 @@
 #ifndef __Discretisation_Geometry_units_h__
 #define __Discretisation_Geometry_units_h__
 
-	#include "ComplexMath.h"
-
 	#define MAX_SYMMETRIC_TENSOR_COMPONENTS 6
 	#define MAX_TENSOR_COMPONENTS           9
 	
+	/** Defines a complex number as 2 doubles */
+	typedef double Cmplx[2];
+	/** Defines a set of 3 doubles */
 	typedef double XYZ[3];
 	typedef XYZ Coord;
-	
+	/**Defines a set of 3 floats */
 	typedef float XYZF[3];
 	typedef XYZF CoordF;
-	
+	/* Defines a set of 3 integers that can be used to index
+	into vectors */
 	typedef int XYZI[3];
 	typedef XYZI CoordI;
-
+	/* Defines a set of 3 Cmplx */
 	typedef Cmplx XYZC[3];
 	typedef XYZC CoordC;