Changeset 12515 for issm/trunk-jpl/src/c/solutions/issm.cpp

Timestamp:

06/22/12 16:56:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

Starting to replace _printf by _pprintString

File:

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

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -60 +60 @@
 
         /*First process inputs*/
-        _printf_(true,"\n");
-        _printf_(true,"Ice Sheet System Model (%s) version %s\n",PACKAGE_NAME,PACKAGE_VERSION);
-        _printf_(true,"(website: %s contact: %s)\n",PACKAGE_URL,PACKAGE_BUGREPORT);
-        _printf_(true,"\n");
+        if(true) _pprintLine_("");
+        if(true) _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
+        if(true) _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
+        if(true) _pprintLine_("");
         ProcessArguments(&solution_type,&binfilename,&outbinfilename,&petscfilename,&lockfilename,argc,argv);
 
@@ -100 +100 @@
         #endif
 
-        _printf_(true,"call computational core:\n");
+        if(true) _pprintLine_("call computational core:");
         #ifdef _HAVE_MPI_
         MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
@@ -133 +133 @@
         #endif
         
-        _printf_(true,"write results to disk:\n");
+        if(true) _pprintLine_("write results to disk:");
         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
 
@@ -139 +139 @@
         pfclose(output_fid,lockfilename);
         if (waitonlock>0){
-                _printf_(true,"write lock file:\n");
+                if(true) _pprintLine_("write lock file:");
                 WriteLockFile(lockfilename);
         }
@@ -174 +174 @@
         
         #ifdef _HAVE_PETSC_
-        _printf_(true,"closing MPI and Petsc\n");
+        if(true) _pprintLine_("closing MPI and Petsc");
         PetscFinalize(); 
         #else
         #ifdef _HAVE_MPI_
-        _printf_(true,"closing MPI and Petsc\n");
+        if(true) _pprintLine_("closing MPI and Petsc");
         MPI_Finalize();
         #endif