Changeset 12706 for issm/trunk/src/c/solutions/diagnostic_core.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/solutions/diagnostic_core.cpp (modified) (6 diffs)

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -59 +59 @@
         if(ishutter){
                         
-                _printf_(VerboseSolution(),"%s\n","   computing hutter velocities");
+                if(VerboseSolution()) _pprintLine_("   computing hutter velocities");
 
                 //Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
@@ -72 +72 @@
         if (ismacayealpattyn ^ isstokes){ // ^ = xor
                 
-                _printf_(VerboseSolution(),"%s\n","   computing velocities");
+                if(VerboseSolution()) _pprintLine_("   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
                 if(isnewton)
@@ -82 +82 @@
         if (ismacayealpattyn && isstokes){
 
-                _printf_(VerboseSolution(),"%s\n","   computing coupling macayealpattyn and stokes velocities and pressure ");
+                if(VerboseSolution()) _pprintLine_("   computing coupling macayealpattyn and stokes velocities and pressure ");
                 solver_stokescoupling_nonlinear(femmodel,conserve_loads);
         }
@@ -88 +88 @@
         if (dim==3 & (ishutter || ismacayealpattyn)){
 
-                _printf_(VerboseSolution(),"%s\n","   computing vertical velocities");
+                if(VerboseSolution()) _pprintLine_("   computing vertical velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
                 solver_linear(femmodel);
@@ -95 +95 @@
 
         if(save_results){
-                _printf_(VerboseSolution(),"   saving results\n");
+                if(VerboseSolution()) _pprintLine_("   saving results");
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
@@ -105 +105 @@
 
         /*Free ressources:*/
-        xfree((void**)&requested_outputs);
+        xDelete<int>(requested_outputs);
 }