[cig-commits] r15591 - mc/3D/CitcomS/trunk/lib

[becker at geodynamics.org]

Author: becker
Date: 2009-08-25 12:54:47 -0700 (Tue, 25 Aug 2009)
New Revision: 15591

Modified:
   mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c
Log:
Forgot one valid check for Uzawa iterations.



Modified: mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c	2009-08-25 17:31:36 UTC (rev 15590)
+++ mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c	2009-08-25 19:54:47 UTC (rev 15591)
@@ -380,21 +380,23 @@
                                        dvelocity, dpressure,
                                        E->monitor.incompressibility);
         }
-	if(E->control.only_check_vel_convergence){
-	  /* disregard pressure and div check */
-	  if(dvelocity < imp)
-            converging++;
-	  else
-            converging = 0;
-	  E->monitor.incompressibility = dvelocity;
+	if(!valid){
+	  converging = 0;
 	}else{
-	  /* how many consecutive converging iterations? */
-	  if(dvelocity < imp && dpressure < imp)
-            converging++;
-	  else
-            converging = 0;
-
-
+	  if(E->control.only_check_vel_convergence){
+	    /* disregard pressure and div check */
+	    if(dvelocity < imp)
+	      converging++;
+	    else
+	      converging = 0;
+	    E->monitor.incompressibility = dvelocity;
+	  }else{
+	    /* how many consecutive converging iterations? */
+	    if(dvelocity < imp && dpressure < imp)
+	      converging++;
+	    else
+	      converging = 0;
+	  }
 	}
 
         /* shift array pointers */