Index: ../trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- ../trunk-jpl/src/c/classes/FemModel.cpp (revision 26889) +++ ../trunk-jpl/src/c/classes/FemModel.cpp (revision 26890) @@ -575,14 +575,14 @@ } } /*}}}*/ -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,11 +596,19 @@ } /*Print banner*/ - _printf0_(" \n"); - _printf0_("====================================================================\n"); - _printf0_(" RESTART DETECTED: "<1){ + _printf0_(" \n"); + _printf0_("====================================================================\n"); + _printf0_(" RESTART DETECTED: "<parameters->AddObject(new StringParam(RestartFileNameEnum,restartfilename)); /*Read files*/ - this->Restart(); + this->Restart(1); /*Clean up and return*/ xDelete(restartfilename); Index: ../trunk-jpl/src/c/classes/FemModel.h =================================================================== --- ../trunk-jpl/src/c/classes/FemModel.h (revision 26889) +++ ../trunk-jpl/src/c/classes/FemModel.h (revision 26890) @@ -82,7 +82,7 @@ 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);