Changeset 1677

Timestamp:

08/14/09 09:39:50 (16 years ago)

Author:

Mathieu Morlighem

Message:

Activated eps_res mechanical equilibrium cv criterion

Location:

issm/trunk/src

Files:

• c/parallel/convergence.cpp (modified) (2 diffs)
• m/solutions/cielo/convergence.m (modified) (2 diffs)

issm/trunk/src/c/parallel/convergence.cpp

@@ -80 +80 @@
         else{ 
                 if (debug) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," \%");
-                converged=1;//TTTTTTTTTTTTTTTTTTFTYICGWFYUOGCYEUOGCYEUWGCHLWGWI
+                converged=0;
         }
 
@@ -98 +98 @@
                         if((ndu/nu)<eps_rel){
                                 if (debug) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," \%");
-                                converged=1;
                         }
                         else{ 

issm/trunk/src/m/solutions/cielo/convergence.m

@@ -29 +29 @@
 else
         displaystring(debug,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
-        converged=1; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%ATTTENETIONHiohfiow 
+        converged=0;
 end
 
@@ -47 +47 @@
                 if (ndu/nu<=eps_rel),
                         displaystring(debug,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
-                        converged=1;
                 else
                         displaystring(debug,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');