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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:18:37 -0700 (Thu, 17 Aug 2006)
New Revision: 4369

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c
Log:
 r2730 at earth:  boo | 2006-08-17 17:14:31 -0700
  r2684 at earth (orig r3765):  WalterLandry | 2006-08-17 17:27:58 -0700
  Fix a statement/declaration mix that does not work on older compilers
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2729
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3764
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2730
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3765

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2006-08-18 00:18:33 UTC (rev 4368)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2006-08-18 00:18:37 UTC (rev 4369)
@@ -570,10 +570,10 @@
 	Stream* stream = (Stream*)_stream;
 	int nProc = 0;
 
+	va_list ap;
+	
 	MPI_Comm_size( MPI_COMM_WORLD, &nProc );
 	
-	va_list ap;
-	
 	if ( expression )
 	{
 		/* Every thing is OK! Back to work as normal */

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-18 00:18:33 UTC (rev 4368)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c	2006-08-18 00:18:37 UTC (rev 4369)
@@ -177,8 +177,8 @@
 /** (Assumes 3D), Swaps coords based on i,j,k input */
 void ComplexVector_Swizzle( CoordC src, unsigned char iInd, 
 		unsigned char jInd, unsigned char kInd, CoordC dst ) {
+	CoordC dummy;
 	assert( iInd < 3 && jInd < 3 && kInd < 3 );
-	CoordC dummy;
 	dummy[0][REAL_PART] = src[iInd][REAL_PART];
 	dummy[0][IMAG_PART] = src[iInd][IMAG_PART];
 	dummy[1][REAL_PART] = src[jInd][REAL_PART];
@@ -255,11 +255,11 @@
 void StGermain_RotateCoordinateAxisComplex( Cmplx* vector, 
 			Index axis, double theta, Cmplx* rotatedVector ) {
 	
+	Cmplx r_1, r_2;
 	/* Rotation around one axis will always leave the component on that axis alone */
 	rotatedVector[axis][REAL_PART] = vector[axis][REAL_PART];
 	rotatedVector[axis][IMAG_PART] = vector[axis][IMAG_PART];
 	//printf("axis %d, %2.3f", axis, vector[axis][REAL_PART]); 				
-	Cmplx r_1, r_2;
 	switch (axis) {
 		case K_AXIS: /* Rotate around Z axis */
 			Cmplx_RealMultiply(vector[0], cos(theta), r_1);
@@ -359,10 +359,10 @@
 complex vectors
 */
 void StGermain_ComplexVectorDotProduct(Cmplx* vector1, Cmplx* vector2, Dimension_Index dim, Cmplx dotProduct) {
+	Cmplx tmp;
 	dotProduct[REAL_PART] = 0.0;
 	dotProduct[IMAG_PART] = 0.0;
 
-	Cmplx tmp;
 	switch (dim) {
 		case 3: {
 			Cmplx_Multiply(vector1[2], vector2[2], tmp);