Changeset 6412 for issm/trunk/src/c/solutions/diagnostic_core.cpp

Timestamp:

10/25/10 08:57:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved ISSMERROR to _error_, ISSMASSERT to _assert_ and ISSMPRINTF to _printf_

File:

• issm/trunk/src/c/solutions/diagnostic_core.cpp (modified) (5 diffs)

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

@@ -50 +50 @@
         if(ishutter){
                         
-                ISSMPRINTF(VerboseControl(),"%s\n","   computing hutter velocities");
+                _printf_(VerboseControl(),"%s\n","   computing hutter velocities");
 
                 //Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
@@ -63 +63 @@
         if (ismacayealpattyn^isstokes){
                 
-                ISSMPRINTF(VerboseControl(),"%s\n","   computing velocities");
+                _printf_(VerboseControl(),"%s\n","   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
                 solver_diagnostic_nonlinear(femmodel,modify_loads); 
@@ -70 +70 @@
         if (ismacayealpattyn && isstokes){
 
-                ISSMPRINTF(VerboseControl(),"%s\n","   computing coupling macayealpattyn and stokes velocities and pressure ");
+                _printf_(VerboseControl(),"%s\n","   computing coupling macayealpattyn and stokes velocities and pressure ");
                 solver_stokescoupling_nonlinear(femmodel,conserve_loads);
         }
@@ -76 +76 @@
         if (dim==3 & (ishutter || ismacayealpattyn)){
 
-                ISSMPRINTF(VerboseControl(),"%s\n","   computing vertical velocities");
+                _printf_(VerboseControl(),"%s\n","   computing vertical velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
                 solver_linear(femmodel);
@@ -83 +83 @@
 
         if(solution_type==DiagnosticSolutionEnum && !control_analysis){
-                ISSMPRINTF(VerboseControl(),"   saving results\n");
+                _printf_(VerboseControl(),"   saving results\n");
                 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);