Changeset 3820

Timestamp:

05/18/10 14:00:16 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added checks in convergence

Location:

issm/trunk/src/c/parallel

Files:

• convergence.cpp (modified) (2 diffs)
• diagnostic_core_nonlinear.cpp (modified) (2 diffs)

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

@@ -30 +30 @@
         int    verbose;
         double yts;
+
+        /*Check arguments*/
+        ISSMASSERT(Kff && pf && uf && old_uf);
 
         /*get convergence options*/
@@ -65 +68 @@
         res=nKUoldF/nF;
         if (isnan(res)){
-                PetscSynchronizedPrintf(MPI_COMM_WORLD,"norm nf %lf \n",nF);
-                PetscSynchronizedFlush(MPI_COMM_WORLD);
-
-                PetscSynchronizedPrintf(MPI_COMM_WORLD,"norm kuold %lf \n",nKUoldF);
-                PetscSynchronizedFlush(MPI_COMM_WORLD);
+                _printf_("norm nf = %lf and norm kuold = %lf\n",nF,nKUoldF);
                 ISSMERROR("mechanical equilibrium convergence criterion is NaN!");
         }

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

@@ -102 +102 @@
                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,analysis_type,sub_analysis_type); 
 
-                //if(verbose)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
-                _printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
+                if(verbose)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
 
                 /*Figure out if convergence is reached.*/
@@ -127 +126 @@
                         break;
                 }
-
         }
 
-        //more output might be needed, when running in control.c
+        //more output might be needed, when running in control
         if(pKff0){