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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-01 01:54:01 -0700 (Tue, 01 Aug 2006)
New Revision: 4155

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c
Log:
 r2616 at earth:  boo | 2006-08-01 01:50:43 -0700
  r2595 at earth (orig r3718):  KathleenHumble | 2006-07-26 22:15:20 -0700
  --Renamed an internal #define variable
  ONE_THIRD renamed to STGERMAIN_COMPLEXVECTOR_ONE_THIRD
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2615
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3717
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2616
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3718

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c	2006-08-01 08:53:58 UTC (rev 4154)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c	2006-08-01 08:54:01 UTC (rev 4155)
@@ -468,7 +468,7 @@
 
 
 
-#define ONE_THIRD 0.3333333333333333333
+#define STGERMAIN_COMPLEXVECTOR_ONE_THIRD 0.3333333333333333333
 
 /*StGermain_ComplexTriangleCentroid Calculates the position vector to the centroid of a triangle whose verticies are given by position vectors 
 Position vectors have to be of size dim Cmplx */
@@ -479,23 +479,23 @@
 		case 3:
 			Cmplx_Add(pos0[2], pos1[2], tmp);
 			Cmplx_Add(pos2[2], tmp, tmp);
-			Cmplx_RealMultiply(tmp, ONE_THIRD, centroid[2]);
+			Cmplx_RealMultiply(tmp, STGERMAIN_COMPLEXVECTOR_ONE_THIRD, centroid[2]);
 			
 		case 2: 
 			Cmplx_Add(pos0[1], pos1[1], tmp);
 			Cmplx_Add(pos2[1], tmp, tmp);
-			Cmplx_RealMultiply(tmp, ONE_THIRD, centroid[1]);
+			Cmplx_RealMultiply(tmp, STGERMAIN_COMPLEXVECTOR_ONE_THIRD, centroid[1]);
 		case 1:
 			Cmplx_Add(pos0[0], pos1[0], tmp);
 			Cmplx_Add(pos2[0], tmp, tmp);
-			Cmplx_RealMultiply(tmp, ONE_THIRD, centroid[0]);
+			Cmplx_RealMultiply(tmp, STGERMAIN_COMPLEXVECTOR_ONE_THIRD, centroid[0]);
 			return;
 		default: {
 			Index d;
 			for ( d = 0 ; d < dim ; d++ ) {
 				Cmplx_Add(pos0[d], pos1[d], tmp);
 				Cmplx_Add(pos2[d], tmp, tmp);
-				Cmplx_RealMultiply(tmp, ONE_THIRD, centroid[d]);
+				Cmplx_RealMultiply(tmp, STGERMAIN_COMPLEXVECTOR_ONE_THIRD, centroid[d]);
 			}
 			return;
 		}