source: issm/oecreview/Archive/26740-27031/ISSM-26889-26890.diff@ 27032

../trunk-jpl/src/c/classes/FemModel.cpp

@@ -575 +575 @@
         }
 }
 /*}}}*/
-void FemModel::Restart(){ /*{{{*/
+void FemModel::Restart(int verboselevel){ /*{{{*/
 
-        FILE* restartfid=NULL;
-        char* restartfilename = NULL;
-        int   femmodel_size=0;
-        int   fread_return=0;
-        char* femmodel_buffer=NULL;
-        char* femmodel_buffer_ini=NULL;
+        FILE *restartfid          = NULL;
+        char *restartfilename     = NULL;
+        int   femmodel_size       = 0;
+        int   fread_return        = 0;
+        char *femmodel_buffer     = NULL;
+        char *femmodel_buffer_ini = NULL;
 
         /*First, recover the name of the restart file: */
         parameters->FindParam(&restartfilename,RestartFileNameEnum);
@@ -596 +596 @@
         }
 
         /*Print banner*/
-        _printf0_("                                                                    \n");
-        _printf0_("====================================================================\n");
-        _printf0_(" RESTART DETECTED: "<<restartfilename<<                            "\n");
-        _printf0_("====================================================================\n");
-        _printf0_("                                                                    \n");
+   if(verboselevel>1){
+      _printf0_("                                                                    \n");
+      _printf0_("====================================================================\n");
+      _printf0_(" RESTART DETECTED: "<<restartfilename<<                            "\n");
+      _printf0_("====================================================================\n");
+      _printf0_("                                                                    \n");
+   }
+   else if(verboselevel==1){
+      _printf0_("    == restarting from "<<restartfilename<<"\n");
+   }
+   else{
+      /*Do not print anything*/
+   }
 
         /*Figure out size of buffer to be read: */
         fseek(restartfid, 0L, SEEK_END);
@@ -644 +652 @@
         this->parameters->AddObject(new StringParam(RestartFileNameEnum,restartfilename));
 
         /*Read files*/
-        this->Restart();
+        this->Restart(1);
 
         /*Clean up and return*/
         xDelete<char>(restartfilename);

../trunk-jpl/src/c/classes/FemModel.h

@@ -82 +82 @@
                 void InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, char* restartfilename, char* modelname, const int solution_type,bool trace,IssmPDouble* X=NULL);
                 void InitFromFids(char* rootpath, FILE* IOMODEL, FILE* toolkitsoptionsfid, int in_solution_type, bool trace, IssmPDouble* X=NULL);
                 void Marshall(MarshallHandle* marshallhandle);
-                void Restart(void);
+                void Restart(int verboselevel=2);
                 void RestartAD(int step);
                 void SetCurrentConfiguration(int configuration_type);
                 void SetCurrentConfiguration(int configuration_type,int analysis_type);