Changeset 12706 for issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp (modified) (3 diffs)

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -16 +16 @@
         Vector* tf_old=NULL; 
         Vector* ys=NULL; 
-        double melting_offset;
+        IssmDouble melting_offset;
 
         /*intermediary: */
@@ -47 +47 @@
         converged=false;
 
-        _printf_(VerboseSolution(),"%s\n","starting direct shooting method");
+        if(VerboseSolution()) _pprintLine_("starting direct shooting method");
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
@@ -66 +66 @@
 
                 if (!converged){
-                        _printf_(VerboseConvergence(),"%s%i\n","   #unstable constraints = ",num_unstable_constraints);
+                        if(VerboseConvergence()) _pprintLine_("   #unstable constraints = " << num_unstable_constraints);
                         if (num_unstable_constraints <= thermal_penalty_threshold)converged=true;
                         if (count>=thermal_maxiter){
                                 converged=true;
-                                _printf_(true,"   maximum number of iterations (%i) exceeded\n",thermal_maxiter); 
+                                _pprintLine_("   maximum number of iterations (" << thermal_maxiter << ") exceeded"); 
                         }
                 }