[cig-commits] r5708 - in long/3D/Gale/trunk/src/StgFEM: . SLE/MultiGrid/src SLE/ProvidedSystems/StokesFlow/src plugins/StandardConditionFunctions

[walter at geodynamics.org]

Author: walter
Date: 2007-01-08 23:50:48 -0800 (Mon, 08 Jan 2007)
New Revision: 5708

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
Log:
 r926 at earth (orig r695):  WalterLandry | 2007-01-07 01:19:41 -0800
 C89 fixes



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:694
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:695
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
===================================================================

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c	2007-01-09 07:49:51 UTC (rev 5707)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c	2007-01-09 07:50:48 UTC (rev 5708)
@@ -273,16 +273,15 @@
 /* 	MatTranspose( gradMat, &GTrans ); */
 /* 	 since CInv is diagonal we can just scale mat entries by the diag vector */
 	Matrix_DiagonalScale( divMat, diagC, NULL );	/*  Div = CInve Div */
-        /* 	MatMatMult_any( &tmpMat, C, *divMat );		*/
-        /* tmpMat = CInv Div */
+        /* 	MatMatMult_any( &tmpMat, C, *divMat );	*/ /* tmpMat = CInv Div */
 	
 	
 	Journal_DPrintf( self->debug, "UpdivMat mat mat mult \n");
 	Matrix_Duplicate( gradMat, (void**)&kHat );
-	Matrix_MatrixMultiply( gradMat, divMat, kHat );		// tmpMat2 = G CInv Div
+	Matrix_MatrixMultiply( gradMat, divMat, kHat );		/* tmpMat2 = G CInv Div */
 	Journal_DPrintf( self->debug, "done mult \n");
-	Matrix_Scale( kHat, -1 );			// tmpMat2 = - G CInv Div
-	Matrix_AddScaled( kHat, one, kMatrix );	// kHat = kHat + kMatrix
+	Matrix_Scale( kHat, -1 );			/* tmpMat2 = - G CInv Div */
+	Matrix_AddScaled( kHat, one, kMatrix );	/* kHat = kHat + kMatrix */
 	
 	/* Setup solver context and make sure that it uses a direct solver */
 #ifndef HAVE_PETSC
@@ -306,9 +305,9 @@
 /* 		 never modified Div_null so set divMat to point back to it */
 		divMat = sle->dStiffMat->matrix;
 	}
-	Matrix_Multiply( divMat, uVec, hTempVec );		// hTemp = Div v	
-	Vector_AddScaled( hVec, negOne, hTempVec );	// hTemp = H - hTemp	: hTemp = H - Div v
-	Matrix_Multiply( C_InvMat, hTempVec, pVec );		// p = CInv hTemp	: p = CInv ( H - Div v )
+	Matrix_Multiply( divMat, uVec, hTempVec );		/* hTemp = Div v */
+	Vector_AddScaled( hVec, negOne, hTempVec );	/* hTemp = H - hTemp	: hTemp = H - Div v */
+	Matrix_Multiply( C_InvMat, hTempVec, pVec );		/* p = CInv hTemp	: p = CInv ( H - Div v ) */
 	
 	
 	FreeObject( kHat );

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================