[cig-commits] r11601 - in long/3D/Gale/trunk: . src/StgFEM/SLE/SystemSetup/src
walter at geodynamics.org
walter at geodynamics.org
Wed Mar 26 16:15:30 PDT 2008
Author: walter
Date: 2008-03-26 16:15:30 -0700 (Wed, 26 Mar 2008)
New Revision: 11601
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
Log:
r2062 at earth: boo | 2008-03-26 16:14:24 -0700
Re-enable static friction bc's
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2060
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2062
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2008-03-26 22:53:30 UTC (rev 11600)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2008-03-26 23:15:30 UTC (rev 11601)
@@ -668,25 +668,26 @@
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;
Vector_Duplicate( currentVector, (void**)&previousVector );
- Vector_SetLocalSize( previousVector, Vector_GetLocalSize( currentVector ) );
+ 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) */
+/* if(stress!=NULL && self->nonLinearIteration_I!=1) */
/* { */
/* ParticleFeVariable_Update( stress ); */
/* _SystemLinearEquations_Build(sle,_context); */
@@ -710,7 +711,6 @@
self->context->timeStep, self->nonLinearIteration_I, residual, tolerance );
}
-
/* Check if residual is below tolerance */
converged = (residual < tolerance);
More information about the cig-commits
mailing list