[cig-commits] r8900 - in long/3D/Gale/trunk: . src/StgFEM/SLE/SystemSetup/src

[walter at geodynamics.org]

Author: walter
Date: 2007-12-18 12:01:31 -0800 (Tue, 18 Dec 2007)
New Revision: 8900

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
Log:
 r1991 at earth:  boo | 2007-11-21 16:19:58 -0800
 Comment out the static friction updates to the boundaries for now



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1988
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1991

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c	2007-12-18 18:35:30 UTC (rev 8899)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c	2007-12-18 20:01:31 UTC (rev 8900)
@@ -668,37 +668,37 @@
 	Journal_Printf(self->info,"\nNon linear solver - iteration %d\n", self->nonLinearIteration_I);
 	
         /* Add this to create a new set of bcs dependent on the stress used in friction bc's. */
-        stress     = (FeVariable*)FieldVariable_Register_GetByName( ((FiniteElementContext *)_context)->fieldVariable_Register, "StressField" );
-        if(stress!=NULL)
-          {
-            ParticleFeVariable_Update( stress );
-            _SystemLinearEquations_Build(sle,_context);
-          }
+/*         stress     = (FeVariable*)FieldVariable_Register_GetByName( ((FiniteElementContext *)_context)->fieldVariable_Register, "StressField" ); */
+/*         if(stress!=NULL) */
+/*           { */
+/*             ParticleFeVariable_Update( stress ); */
+/*             _SystemLinearEquations_Build(sle,_context); */
+/*           } */
 
 	self->linearExecute( self, _context );
 	self->hasExecuted = True;
 
 	/* TODO - Give option which solution vector to test */
-	currentVector   = SystemLinearEquations_GetSolutionVectorAt( self, 0 )->vector; 
+	currentVector   = SystemLinearEquations_GetSolutionVectorAt( self, 0 )->vector;
 	Vector_Duplicate( currentVector, (void**)&previousVector );
 	Vector_SetLocalSize( previousVector, Vector_GetLocalSize( currentVector ) );
 	
 	for ( self->nonLinearIteration_I = 1 ; self->nonLinearIteration_I < maxIterations ; self->nonLinearIteration_I++ ) {
 
         /* Add this to create a new set of bcs dependent on the stress used in friction bc's. */
-        if(stress!=NULL)
-          {
-            ParticleFeVariable_Update( stress );
-            _SystemLinearEquations_Build(sle,_context);
-          }
+/*         if(stress!=NULL) */
+/*           { */
+/*             ParticleFeVariable_Update( stress ); */
+/*             _SystemLinearEquations_Build(sle,_context); */
+/*           } */
 
 
 		Vector_CopyEntries( currentVector, previousVector );
 	
 		Journal_Printf(self->info,"Non linear solver - iteration %d\n", self->nonLinearIteration_I);
-			
-		self->linearExecute( self, _context );
 
+                self->linearExecute( self, _context );
+
 		/* Calculate Residual */
 		Vector_AddScaled( previousVector, -1.0, currentVector );
 		residual = Vector_L2Norm( previousVector ) / Vector_L2Norm( currentVector );
@@ -713,7 +713,7 @@
 
 		/* Check if residual is below tolerance */
 		converged = (residual < tolerance);
-		
+
 		Journal_Printf(self->info,"Non linear solver - Residual %.8e; Tolerance %.4e%s%s - %g (secs)\n\n", residual, tolerance, 
 			(converged) ? " - Converged" : " - Not converged",
 			(self->nonLinearIteration_I < maxIterations) ? "" : " - Reached iteration limit",